[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.1.5-3-8-g9d2d7df
Iain Lane
laney at ubuntu.com
Tue May 18 17:57:33 UTC 2010
The following commit has been merged in the master branch:
commit 146a940fea08e8d7a2e6aa4b2e3c891ffa75d45c
Author: Iain Lane <laney at ubuntu.com>
Date: Mon May 17 11:59:30 2010 +0100
Imported Upstream version 0.6.2
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index b42a17a..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
- These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
- The file `configure.in' is used to create `configure' by a program
-called `autoconf'. You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-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. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 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
- 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
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. You can give `configure'
-initial values for variables by setting them in the environment. Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as 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 `..'.
-
- If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory. After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' 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.
-
- 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
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-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.
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on. Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
- CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
- If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
- Use and save the results of the tests in FILE instead of
- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
- debugging `configure'.
-
-`--help'
- Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--version'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/Makefile.addins b/Makefile.addins
new file mode 100644
index 0000000..bcf3727
--- /dev/null
+++ b/Makefile.addins
@@ -0,0 +1,45 @@
+ASSEMBLY = $(addin).dll
+
+include $(top_srcdir)/Makefile.include
+
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
+
+addin_SOURCES = \
+ $(build_sources)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+
+EXTRA_DIST = \
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
diff --git a/Makefile.am b/Makefile.am
index e556ecc..b44eff5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = \
+ build \
lib \
docs \
icons \
@@ -19,10 +20,17 @@ desktop_files=$(desktop_in_files:.desktop.in=.desktop)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = f-spot.pc
+schemadir = $(sysconfdir)/gconf/schemas
+schema_in_files = f-spot.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+ at INTLTOOL_SCHEMAS_RULE@
+
Applicationsdir = $(datadir)/applications
Applications_DATA = $(desktop_files)
CLEANFILES = \
+ $(desktop_DATA) \
+ $(schema_DATA) \
intltool-extract \
intltool-update \
intltool-merge
@@ -35,8 +43,10 @@ EXTRA_DIST = \
f-spot.pc.in \
f-spot.spec \
Makefile.include \
+ Makefile.addins \
gnome-doc-utils.make \
icon-theme-installer \
+ $(schema_in_files) \
$(desktop_in_files) \
$(desktop_files)
@@ -56,6 +66,9 @@ UPDATE_DESKTOP = \
fi \
fi
+install-data-local:
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+
install-data-hook:
$(UPDATE_DESKTOP)
diff --git a/Makefile.in b/Makefile.in
index 6b94bb5..0466ca1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40,22 +40,27 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/f-spot-import.desktop.in.in \
$(srcdir)/f-spot-view.desktop.in.in \
$(srcdir)/f-spot.desktop.in.in $(srcdir)/f-spot.pc.in \
- $(srcdir)/f-spot.spec.in $(top_srcdir)/configure \
+ $(srcdir)/f-spot.spec.in \
+ $(top_srcdir)/build/m4/shave/shave-libtool.in \
+ $(top_srcdir)/build/m4/shave/shave.in $(top_srcdir)/configure \
$(top_srcdir)/src/Core/Defines.cs.in AUTHORS COPYING ChangeLog \
- INSTALL NEWS TODO config.guess config.sub depcomp install-sh \
- ltmain.sh missing mkinstalldirs
+ NEWS TODO config.guess config.sub depcomp install-sh ltmain.sh \
+ missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = src/Core/Defines.cs f-spot.pc f-spot.spec \
- f-spot.desktop.in f-spot-view.desktop.in \
- f-spot-import.desktop.in
+CONFIG_CLEAN_FILES = build/m4/shave/shave build/m4/shave/shave-libtool \
+ src/Core/Defines.cs f-spot.pc f-spot.spec f-spot.desktop.in \
+ f-spot-view.desktop.in f-spot-import.desktop.in
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@@ -88,8 +93,8 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(Applicationsdir)" \
- "$(DESTDIR)$(pkgconfigdir)"
-DATA = $(Applications_DATA) $(pkgconfig_DATA)
+ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(schemadir)"
+DATA = $(Applications_DATA) $(pkgconfig_DATA) $(schema_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -130,21 +135,22 @@ am__relativize = \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -161,8 +167,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -175,9 +180,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -226,16 +236,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -246,6 +258,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -256,21 +269,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -298,6 +315,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -322,6 +341,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -329,6 +349,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = \
+ build \
lib \
docs \
icons \
@@ -346,9 +367,14 @@ desktop_in_files = \
desktop_files = $(desktop_in_files:.desktop.in=.desktop)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = f-spot.pc
+schemadir = $(sysconfdir)/gconf/schemas
+schema_in_files = f-spot.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
Applicationsdir = $(datadir)/applications
Applications_DATA = $(desktop_files)
CLEANFILES = \
+ $(desktop_DATA) \
+ $(schema_DATA) \
intltool-extract \
intltool-update \
intltool-merge
@@ -361,8 +387,10 @@ EXTRA_DIST = \
f-spot.pc.in \
f-spot.spec \
Makefile.include \
+ Makefile.addins \
gnome-doc-utils.make \
icon-theme-installer \
+ $(schema_in_files) \
$(desktop_in_files) \
$(desktop_files)
@@ -390,15 +418,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -435,6 +463,10 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
+build/m4/shave/shave: $(top_builddir)/config.status $(top_srcdir)/build/m4/shave/shave.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+build/m4/shave/shave-libtool: $(top_builddir)/config.status $(top_srcdir)/build/m4/shave/shave-libtool.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
src/Core/Defines.cs: $(top_builddir)/config.status $(top_srcdir)/src/Core/Defines.cs.in
cd $(top_builddir) && $(SHELL) ./config.status $@
f-spot.pc: $(top_builddir)/config.status $(srcdir)/f-spot.pc.in
@@ -496,6 +528,26 @@ uninstall-pkgconfigDATA:
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+install-schemaDATA: $(schema_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
+ @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
+ done
+
+uninstall-schemaDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(schemadir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -504,7 +556,7 @@ uninstall-pkgconfigDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -529,7 +581,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -693,7 +745,8 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -701,7 +754,6 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
-
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -721,7 +773,6 @@ dist-tarZ: distdir
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__remove_distdir)
-
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
@@ -729,6 +780,9 @@ dist-zip: distdir
dist dist-all: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -737,17 +791,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -811,7 +865,7 @@ check: check-recursive
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(Applicationsdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
+ for dir in "$(DESTDIR)$(Applicationsdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(schemadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -863,7 +917,8 @@ info: info-recursive
info-am:
-install-data-am: install-ApplicationsDATA install-pkgconfigDATA
+install-data-am: install-ApplicationsDATA install-data-local \
+ install-pkgconfigDATA install-schemaDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-recursive
@@ -910,7 +965,8 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-ApplicationsDATA uninstall-pkgconfigDATA
+uninstall-am: uninstall-ApplicationsDATA uninstall-pkgconfigDATA \
+ uninstall-schemaDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
@@ -925,18 +981,23 @@ uninstall-am: uninstall-ApplicationsDATA uninstall-pkgconfigDATA
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-ApplicationsDATA install-am install-data \
- install-data-am install-data-hook install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-recursive uninstall \
- uninstall-ApplicationsDATA uninstall-am uninstall-hook \
- uninstall-pkgconfigDATA
+ install-data-am install-data-hook install-data-local \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-pkgconfigDATA \
+ install-ps install-ps-am install-schemaDATA install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-ApplicationsDATA \
+ uninstall-am uninstall-hook uninstall-pkgconfigDATA \
+ uninstall-schemaDATA
@INTLTOOL_DESKTOP_RULE@
+ at INTLTOOL_SCHEMAS_RULE@
+
+install-data-local:
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
install-data-hook:
$(UPDATE_DESKTOP)
diff --git a/Makefile.include b/Makefile.include
index ca739b8..4e0ec9a 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -3,12 +3,8 @@
## Directories
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -18,19 +14,16 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
## Links
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
## Build
diff --git a/NEWS b/NEWS
index d010cf2..6dda354 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+f-spot 0.6.2 - May 14 2010 - Bulldozer Time
+-------------------------------------------
+- Stable release before starting large cleanup refactorings, mostly usability,
+ bug fixes and translations as well as some modernization. A large part of this
+ comes from the Ubuntu one hundred papercuts effort.
+ - Replaced the old slow slideshow code with new fast SlideShow (bgo #608849) (Gabriel Burt)
+ - Wording changes for clarity (Edit Tag) (Jeffrey Finkelstein)
+ - Fix version selection tooltip (Lorenzo Milesi)
+ - Add gconf schema (Jeffrey Stedfast)
+ - Added a border to filmstrip thumbnails (bgo #540772) (Matt Perry)
+ - Fix display names of color profiles (Pascal de Bruijn)
+ - Fix histogram colors on theme change (bgo #601565) (Paul Wellner Bou)
+ - Always update ImageView adjustments when scaling. (Wojciech Dzierżanowski)
+ - Correctly set attributes on copying (Yann Leprince)
+ - Correct mnemonics in create tag dialog (Yves Kurz)
+ - Provide sane defaults for image resize size (bgo #608440) (Yves Kurz)
+ - Updates to the build system, including fixes for distcheck (Ruben Vermeersch)
+ - Fix wording for duplicate hashing (bgo #607916) (Matt Perry)
+ - Fix wording for imported tags tag (bgo #603053) (Ian Churcher)
+ - Fix label alignment in preferences dialog (bgo #607318) (Pascal de Bruijn)
+ - Add unique# and use it to handle our activation (Stephane Delcroix)
+ - Stop bundling Mono.Addins (Stephane Delcroix)
+ - Avoid leakage in straighten and softfocus editor (Stephane Delcroix)
+ - Allow to copy files to clipboard (Stephane Delcroix)
+ - Large number of color management related fixes (Stephane Delcroix)
+ - Removed the Beagle plugin at the request of the openSUSE team (Ruben Vermeersch)
+ - A pile of other cleanups and fixes (Ruben Vermeersch)
+ - Two performance improvement patches for our database interaction (bgo #614403 and bgo #614580) (Michal Nánási)
+ - Fix the longstanding issue of F-Spot changing photo timestamps (bgo #340903) (Paul Wellner Bou)
+ - Tons of translation updates (seriously)
+
f-spot 0.6.1.5 - Nov 4 2009 - What Next ?
-----------------------------------------
- bugfix release for 0.6.x branch
diff --git a/aclocal.m4 b/aclocal.m4
index 067204c..f929493 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -64,640 +64,6 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
])
-# Configure paths for GLIB
-# Owen Taylor 1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-dnl gthread, or gio is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
- , enable_glibtest=yes)
-
- pkg_config_args=glib-2.0
- for module in . $4
- do
- case "$module" in
- gmodule)
- pkg_config_args="$pkg_config_args gmodule-2.0"
- ;;
- gmodule-no-export)
- pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
- ;;
- gobject)
- pkg_config_args="$pkg_config_args gobject-2.0"
- ;;
- gthread)
- pkg_config_args="$pkg_config_args gthread-2.0"
- ;;
- gio*)
- pkg_config_args="$pkg_config_args $module-2.0"
- ;;
- esac
- done
-
- PKG_PROG_PKG_CONFIG([0.16])
-
- no_glib=""
-
- if test "x$PKG_CONFIG" = x ; then
- no_glib=yes
- PKG_CONFIG=no
- fi
-
- min_glib_version=ifelse([$1], ,2.0.0,$1)
- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
- if test x$PKG_CONFIG != xno ; then
- ## don't try to run the test against uninstalled libtool libs
- if $PKG_CONFIG --uninstalled $pkg_config_args; then
- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
- enable_glibtest=no
- fi
-
- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
- :
- else
- no_glib=yes
- fi
- fi
-
- if test x"$no_glib" = x ; then
- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_glibtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
- rm -f conf.glibtest
- AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
- int ignored;
-
- ignored = system ("touch conf.glibtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_glib_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_glib_version");
- exit(1);
- }
-
- if ((glib_major_version != $glib_config_major_version) ||
- (glib_minor_version != $glib_config_minor_version) ||
- (glib_micro_version != $glib_config_micro_version))
- {
- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version);
- printf ("*** was found! If pkg-config was correct, then it is best\n");
- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
- printf("*** to point to the correct configuration files\n");
- }
- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
- (glib_minor_version != GLIB_MINOR_VERSION) ||
- (glib_micro_version != GLIB_MICRO_VERSION))
- {
- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- }
- else
- {
- if ((glib_major_version > major) ||
- ((glib_major_version == major) && (glib_minor_version > minor)) ||
- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_glib" = x ; then
- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** A new enough version of pkg-config was not found."
- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
- else
- if test -f conf.glibtest ; then
- :
- else
- echo "*** Could not run GLIB test program, checking why..."
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
- AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GLIB_CFLAGS=""
- GLIB_LIBS=""
- GLIB_GENMARSHAL=""
- GOBJECT_QUERY=""
- GLIB_MKENUMS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- AC_SUBST(GLIB_GENMARSHAL)
- AC_SUBST(GOBJECT_QUERY)
- AC_SUBST(GLIB_MKENUMS)
- rm -f conf.glibtest
-])
-
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License. As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl.
-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
- [AC_CHECK_HEADERS([locale.h])
- if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
-
- gt_cv_have_gettext=no
-
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
-
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
-
- #
- # First check in libc
- #
- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !ngettext ("","", 1)],
- gt_cv_func_ngettext_libc=yes,
- gt_cv_func_ngettext_libc=no)
- ])
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !dgettext ("","")],
- gt_cv_func_dgettext_libc=yes,
- gt_cv_func_dgettext_libc=no)
- ])
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
-
- #
- # If we don't have everything we want, check in libintl
- #
- if test "$gt_cv_func_dgettext_libc" != "yes" \
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
- AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
- AC_MSG_RESULT([])
- AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dcgettext,
- [gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv],
- :,-liconv)],
- :,-liconv)
- fi
-
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
- # we'll prefer libc if neither have bind_textdomain_codeset(),
- # and both have dgettext and ngettext
- #
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
- else
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- && test "$gt_cv_func_ngettext_libc" = "yes"; then
- gt_cv_func_dgettext_libintl=no
- fi
- fi
- fi
- fi
-
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
- gt_cv_have_gettext=yes
- fi
-
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS="-lintl $libintl_extra_libs"
- fi
-
- if test "$gt_cv_have_gettext" = "yes"; then
- AC_DEFINE(HAVE_GETTEXT,1,
- [Define if the GNU gettext() function is already present or preinstalled.])
- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
- AC_CHECK_FUNCS(dcgettext)
- MSGFMT_OPTS=
- AC_MSG_CHECKING([if msgfmt accepts -c])
- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo at bar.xx>\n"
-"Language-Team: C <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
- AC_SUBST(MSGFMT_OPTS)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share and
- dnl and CATOBJEXT=.gmo in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [CATOBJEXT=.mo
- DATADIRNAME=lib])
- ;;
- *)
- CATOBJEXT=.mo
- DATADIRNAME=lib
- ;;
- esac])
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
- gt_cv_have_gettext=no
- fi
- fi
- ])
-
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
- [always defined to indicate that i18n is enabled])
- fi
-
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is not GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
-
- # We need to process the po/ directory.
- POSUB=po
-
- AC_OUTPUT_COMMANDS(
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
-
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
-
- dnl Make all variables we use known to autoconf.
- AC_SUBST(CATALOGS)
- AC_SUBST(CATOBJEXT)
- AC_SUBST(DATADIRNAME)
- AC_SUBST(GMOFILES)
- AC_SUBST(INSTOBJEXT)
- AC_SUBST(INTLLIBS)
- AC_SUBST(PO_IN_DATADIR_TRUE)
- AC_SUBST(PO_IN_DATADIR_FALSE)
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
- ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
-
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
- fi
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
- ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
-else
- localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
- [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-#
-# Create a temporary file with TEST-FILE as its contents and pass the
-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
-# 0 and perform ACTION-IF-FAIL for any other exit status.
-AC_DEFUN([GLIB_RUN_PROG],
-[cat >conftest.foo <<_ACEOF
-$2
-_ACEOF
-if AC_RUN_LOG([$1 conftest.foo]); then
- m4_ifval([$3], [$3], [:])
-m4_ifvaln([$4], [else $4])dnl
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
-
-
dnl GNOME_COMPILE_WARNINGS
dnl Turn on many useful compiler warnings
dnl For now, only works on GCC
@@ -1048,7 +414,7 @@ IT_PO_SUBDIR([po])
AC_DEFUN([IT_PO_SUBDIR],
[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl The following CONFIG_COMMANDS should be executed at the very end
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
@@ -3557,10 +2923,13 @@ linux* | k*bsd*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -8931,15 +8300,15 @@ m4_define([lt_dict_filter],
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
@@ -9240,7 +8609,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -9256,7 +8625,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -10224,4 +9593,653 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Configure paths for GLIB
+# Owen Taylor 1997-2001
+
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
+dnl gthread, or gio is specified in MODULES, pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GLIB_2_0],
+[dnl
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
+ , enable_glibtest=yes)
+
+ pkg_config_args=glib-2.0
+ for module in . $4
+ do
+ case "$module" in
+ gmodule)
+ pkg_config_args="$pkg_config_args gmodule-2.0"
+ ;;
+ gmodule-no-export)
+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+ ;;
+ gobject)
+ pkg_config_args="$pkg_config_args gobject-2.0"
+ ;;
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
+ gio*)
+ pkg_config_args="$pkg_config_args $module-2.0"
+ ;;
+ esac
+ done
+
+ PKG_PROG_PKG_CONFIG([0.16])
+
+ no_glib=""
+
+ if test "x$PKG_CONFIG" = x ; then
+ no_glib=yes
+ PKG_CONFIG=no
+ fi
+
+ min_glib_version=ifelse([$1], ,2.0.0,$1)
+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+ if test x$PKG_CONFIG != xno ; then
+ ## don't try to run the test against uninstalled libtool libs
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+ enable_glibtest=no
+ fi
+
+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+ :
+ else
+ no_glib=yes
+ fi
+ fi
+
+ if test x"$no_glib" = x ; then
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+
+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_glibtest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+ rm -f conf.glibtest
+ AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ fclose (fopen ("conf.glibtest", "w"));
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_glib_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_glib_version");
+ exit(1);
+ }
+
+ if ((glib_major_version != $glib_config_major_version) ||
+ (glib_minor_version != $glib_config_minor_version) ||
+ (glib_micro_version != $glib_config_micro_version))
+ {
+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+ glib_major_version, glib_minor_version, glib_micro_version);
+ printf ("*** was found! If pkg-config was correct, then it is best\n");
+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+ printf("*** required on your system.\n");
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+ printf("*** to point to the correct configuration files\n");
+ }
+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+ (glib_minor_version != GLIB_MINOR_VERSION) ||
+ (glib_micro_version != GLIB_MICRO_VERSION))
+ {
+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+ printf("*** library (version %d.%d.%d)\n",
+ glib_major_version, glib_minor_version, glib_micro_version);
+ }
+ else
+ {
+ if ((glib_major_version > major) ||
+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+ glib_major_version, glib_minor_version, glib_micro_version);
+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+ major, minor, micro);
+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this error\n");
+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** so that the correct libraries are found at run-time))\n");
+ }
+ }
+ return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_glib" = x ; then
+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+ else
+ if test -f conf.glibtest ; then
+ :
+ else
+ echo "*** Could not run GLIB test program, checking why..."
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ LIBS="$LIBS $GLIB_LIBS"
+ AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ GLIB_CFLAGS=""
+ GLIB_LIBS=""
+ GLIB_GENMARSHAL=""
+ GOBJECT_QUERY=""
+ GLIB_MKENUMS=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ AC_SUBST(GLIB_GENMARSHAL)
+ AC_SUBST(GOBJECT_QUERY)
+ AC_SUBST(GLIB_MKENUMS)
+ rm -f conf.glibtest
+])
+
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License. As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+#
+# Modified to never use included libintl.
+# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
+
+dnl
+dnl We go to great lengths to make sure that aclocal won't
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
+
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+ [AC_CHECK_HEADERS([locale.h])
+ if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+ fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ /*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$]$1)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
+
+ gt_cv_have_gettext=no
+
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
+
+ AC_CHECK_HEADER(libintl.h,
+ [gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
+
+ #
+ # First check in libc
+ #
+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !ngettext ("","", 1)],
+ gt_cv_func_ngettext_libc=yes,
+ gt_cv_func_ngettext_libc=no)
+ ])
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !dgettext ("","")],
+ gt_cv_func_dgettext_libc=yes,
+ gt_cv_func_dgettext_libc=no)
+ ])
+ fi
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ fi
+
+ #
+ # If we don't have everything we want, check in libintl
+ #
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+ AC_CHECK_LIB(intl, bindtextdomain,
+ [AC_CHECK_LIB(intl, ngettext,
+ [AC_CHECK_LIB(intl, dgettext,
+ gt_cv_func_dgettext_libintl=yes)])])
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
+ AC_MSG_RESULT([])
+ AC_CHECK_LIB(intl, ngettext,
+ [AC_CHECK_LIB(intl, dcgettext,
+ [gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv],
+ :,-liconv)],
+ :,-liconv)
+ fi
+
+ #
+ # If we found libintl, then check in it for bind_textdomain_codeset();
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
+ # and both have dgettext and ngettext
+ #
+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ LIBS="$glib_save_LIBS"
+
+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+ gt_cv_func_dgettext_libc=no
+ else
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
+ gt_cv_func_dgettext_libintl=no
+ fi
+ fi
+ fi
+ fi
+
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ gt_cv_have_gettext=yes
+ fi
+
+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ INTLLIBS="-lintl $libintl_extra_libs"
+ fi
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+ AC_DEFINE(HAVE_GETTEXT,1,
+ [Define if the GNU gettext() function is already present or preinstalled.])
+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+ if test "$MSGFMT" != "no"; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS $INTLLIBS"
+ AC_CHECK_FUNCS(dcgettext)
+ MSGFMT_OPTS=
+ AC_MSG_CHECKING([if msgfmt accepts -c])
+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo at bar.xx>\n"
+"Language-Team: C <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+ AC_SUBST(MSGFMT_OPTS)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share and
+ dnl and CATOBJEXT=.gmo in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [CATOBJEXT=.mo
+ DATADIRNAME=lib])
+ ;;
+ *)
+ CATOBJEXT=.mo
+ DATADIRNAME=lib
+ ;;
+ esac])
+ LIBS="$glib_save_LIBS"
+ INSTOBJEXT=.mo
+ else
+ gt_cv_have_gettext=no
+ fi
+ fi
+ ])
+
+ if test "$gt_cv_have_gettext" = "yes" ; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [always defined to indicate that i18n is enabled])
+ fi
+
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is not GNU xgettext we define it as : so that the
+ dnl Makefiles still can work.
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+ AC_MSG_RESULT(
+ [found xgettext program is not GNU xgettext; ignore it])
+ XGETTEXT=":"
+ fi
+ fi
+
+ # We need to process the po/ directory.
+ POSUB=po
+
+ AC_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
+
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+ done
+
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
+ AC_SUBST(DATADIRNAME)
+ AC_SUBST(GMOFILES)
+ AC_SUBST(INSTOBJEXT)
+ AC_SUBST(INTLLIBS)
+ AC_SUBST(PO_IN_DATADIR_TRUE)
+ AC_SUBST(PO_IN_DATADIR_FALSE)
+ AC_SUBST(POFILES)
+ AC_SUBST(POSUB)
+ ])
+
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+
+ GLIB_LC_MESSAGES
+ GLIB_WITH_NLS
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+ AC_MSG_CHECKING(for catalogs to be installed)
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+ AC_MSG_RESULT($LINGUAS)
+ fi
+
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
+
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ posrcprefix="$srcdir/"
+ else
+ posrcprefix="../$srcdir/"
+ fi
+ else
+ posrcprefix="../"
+ fi
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+ localedir=`eval echo "${libdir}/locale"`
+else
+ localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+ [Define the location where the catalogs will be installed])
+])
+
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_in,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+#
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+ m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
+m4_include([build/m4/shave/shave.m4])
+m4_include([build/m4/shamrock/expansions.m4])
+m4_include([build/m4/shamrock/mono.m4])
+m4_include([build/m4/shamrock/programs.m4])
m4_include([acinclude.m4])
diff --git a/build/Makefile.am b/build/Makefile.am
new file mode 100644
index 0000000..f811656
--- /dev/null
+++ b/build/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = m4
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/build/Makefile.in b/build/Makefile.in
new file mode 100644
index 0000000..22e820d
--- /dev/null
+++ b/build/Makefile.in
@@ -0,0 +1,654 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = build
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = m4
+MAINTAINERCLEANFILES = Makefile.in
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign build/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/build/m4/Makefile.am b/build/m4/Makefile.am
new file mode 100644
index 0000000..6c1d899
--- /dev/null
+++ b/build/m4/Makefile.am
@@ -0,0 +1,6 @@
+EXTRA_DIST = \
+ $(srcdir)/shamrock/*.m4 \
+ $(srcdir)/shave/*.m4 \
+ $(srcdir)/shave/*.in
+MAINTAINERCLEANFILES = Makefile.in
+
diff --git a/build/m4/Makefile.in b/build/m4/Makefile.in
new file mode 100644
index 0000000..72a71d6
--- /dev/null
+++ b/build/m4/Makefile.in
@@ -0,0 +1,456 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = build/m4
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = \
+ $(srcdir)/shamrock/*.m4 \
+ $(srcdir)/shave/*.m4 \
+ $(srcdir)/shave/*.in
+
+MAINTAINERCLEANFILES = Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/m4/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign build/m4/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/build/m4/shamrock/expansions.m4 b/build/m4/shamrock/expansions.m4
new file mode 100644
index 0000000..ba62356
--- /dev/null
+++ b/build/m4/shamrock/expansions.m4
@@ -0,0 +1,50 @@
+AC_DEFUN([SHAMROCK_EXPAND_LIBDIR],
+[
+ expanded_libdir=`(
+ case $prefix in
+ NONE) prefix=$ac_default_prefix ;;
+ *) ;;
+ esac
+ case $exec_prefix in
+ NONE) exec_prefix=$prefix ;;
+ *) ;;
+ esac
+ eval echo $libdir
+ )`
+ AC_SUBST(expanded_libdir)
+])
+
+AC_DEFUN([SHAMROCK_EXPAND_BINDIR],
+[
+ expanded_bindir=`(
+ case $prefix in
+ NONE) prefix=$ac_default_prefix ;;
+ *) ;;
+ esac
+ case $exec_prefix in
+ NONE) exec_prefix=$prefix ;;
+ *) ;;
+ esac
+ eval echo $bindir
+ )`
+ AC_SUBST(expanded_bindir)
+])
+
+AC_DEFUN([SHAMROCK_EXPAND_DATADIR],
+[
+ case $prefix in
+ NONE) prefix=$ac_default_prefix ;;
+ *) ;;
+ esac
+
+ case $exec_prefix in
+ NONE) exec_prefix=$prefix ;;
+ *) ;;
+ esac
+
+ expanded_datadir=`(eval echo $datadir)`
+ expanded_datadir=`(eval echo $expanded_datadir)`
+
+ AC_SUBST(expanded_datadir)
+])
+
diff --git a/build/m4/shamrock/i18n.m4 b/build/m4/shamrock/i18n.m4
new file mode 100644
index 0000000..e632647
--- /dev/null
+++ b/build/m4/shamrock/i18n.m4
@@ -0,0 +1,10 @@
+AC_DEFUN([SHAMROCK_CONFIGURE_I18N],
+[
+ ALL_LINGUAS=`grep -v '^#' $srcdir/po/LINGUAS | $SED ':a;N;$!ba;s/\n/ /g; s/[ ]+/ /g' | xargs`
+ GETTEXT_PACKAGE=$1
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
+ AM_GLIB_GNU_GETTEXT
+ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+])
+
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
new file mode 100644
index 0000000..c40ecbf
--- /dev/null
+++ b/build/m4/shamrock/mono.m4
@@ -0,0 +1,94 @@
+AC_DEFUN([SHAMROCK_FIND_MONO_1_0_COMPILER],
+[
+ SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
+])
+
+AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER],
+[
+ SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
+])
+
+AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
+[
+ SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
+])
+
+AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
+[
+ SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
+])
+
+AC_DEFUN([_SHAMROCK_CHECK_MONO_MODULE],
+[
+ PKG_CHECK_MODULES(MONO_MODULE, $1 >= $2)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO_MODULE],
+[
+ _SHAMROCK_CHECK_MONO_MODULE(mono, $1)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO2_MODULE],
+[
+ _SHAMROCK_CHECK_MONO_MODULE(mono-2, $1)
+])
+
+AC_DEFUN([_SHAMROCK_CHECK_MONO_MODULE_NOBAIL],
+[
+ PKG_CHECK_MODULES(MONO_MODULE, $2 >= $1,
+ HAVE_MONO_MODULE=yes, HAVE_MONO_MODULE=no)
+ AC_SUBST(HAVE_MONO_MODULE)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO_MODULE_NOBAIL],
+[
+ _SHAMROCK_CHECK_MONO_MODULE_NOBAIL(mono, $1)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO2_MODULE_NOBAIL],
+[
+ _SHAMROCK_CHECK_MONO_MODULE_NOBAIL(mono-2, $1)
+])
+
+AC_DEFUN([_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES],
+[
+ for asm in $(echo "$*" | cut -d, -f3- | sed 's/\,/ /g')
+ do
+ AC_MSG_CHECKING([for Mono $2 GAC for $asm.dll])
+ if test \
+ -e "$($PKG_CONFIG --variable=libdir $1)/mono/$2/$asm.dll" -o \
+ -e "$($PKG_CONFIG --variable=prefix $1)/lib/mono/$2/$asm.dll"; \
+ then \
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_ERROR([missing required Mono $2 assembly: $asm.dll])
+ fi
+ done
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO_1_0_GAC_ASSEMBLIES],
+[
+ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 1.0, $*)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES],
+[
+ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 2.0, $*)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO2_2_0_GAC_ASSEMBLIES],
+[
+ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 2.0, $*)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES],
+[
+ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES],
+[
+ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*)
+])
+
diff --git a/build/m4/shamrock/monodoc.m4 b/build/m4/shamrock/monodoc.m4
new file mode 100644
index 0000000..891ac74
--- /dev/null
+++ b/build/m4/shamrock/monodoc.m4
@@ -0,0 +1,25 @@
+AC_DEFUN([SHAMROCK_CHECK_MONODOC],
+[
+ AC_ARG_ENABLE(docs, AC_HELP_STRING([--disable-docs],
+ [Do not build documentation]), , enable_docs=yes)
+
+ if test "x$enable_docs" = "xyes"; then
+ AC_PATH_PROG(MONODOCER, monodocer, no)
+ if test "x$MONODOCER" = "xno"; then
+ AC_MSG_ERROR([You need to install monodoc, or pass --disable-docs to configure to skip documentation installation])
+ fi
+
+ AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
+ if test "x$MDASSEMBLER" = "xno"; then
+ AC_MSG_ERROR([You need to install mdassembler, or pass --disable-docs to configure to skip documentation installation])
+ fi
+
+ DOCDIR=`$PKG_CONFIG monodoc --variable=sourcesdir`
+ AC_SUBST(DOCDIR)
+ AM_CONDITIONAL(BUILD_DOCS, true)
+ else
+ AC_MSG_NOTICE([not building ${PACKAGE} API documentation])
+ AM_CONDITIONAL(BUILD_DOCS, false)
+ fi
+])
+
diff --git a/build/m4/shamrock/nunit.m4 b/build/m4/shamrock/nunit.m4
new file mode 100644
index 0000000..4d57d00
--- /dev/null
+++ b/build/m4/shamrock/nunit.m4
@@ -0,0 +1,29 @@
+AC_DEFUN([SHAMROCK_CHECK_NUNIT],
+[
+ NUNIT_REQUIRED=2.4.7
+
+ AC_ARG_ENABLE(tests, AC_HELP_STRING([--enable-tests], [Enable NUnit tests]),
+ enable_tests=$enableval, enable_tests="no")
+
+ if test "x$enable_tests" = "xno"; then
+ do_tests=no
+ AM_CONDITIONAL(ENABLE_TESTS, false)
+ else
+ PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED,
+ do_tests="yes", do_tests="no")
+
+ AC_SUBST(NUNIT_LIBS)
+ AM_CONDITIONAL(ENABLE_TESTS, test "x$do_tests" = "xyes")
+
+ if test "x$do_tests" = "xno"; then
+ PKG_CHECK_MODULES(NUNIT, mono-nunit >= 2.4,
+ do_tests="yes", do_tests="no")
+
+ AC_SUBST(NUNIT_LIBS)
+ AM_CONDITIONAL(ENABLE_TESTS, test "x$do_tests" = "xyes")
+
+ if test "x$do_tests" = "xno"; then
+ AC_MSG_WARN([Could not find nunit: tests will not be available]) fi
+ fi
+ fi
+])
diff --git a/build/m4/shamrock/programs.m4 b/build/m4/shamrock/programs.m4
new file mode 100644
index 0000000..2bdacfe
--- /dev/null
+++ b/build/m4/shamrock/programs.m4
@@ -0,0 +1,15 @@
+AC_DEFUN([SHAMROCK_FIND_PROGRAM],
+[
+ AC_PATH_PROG($1, $2, $3)
+ AC_SUBST($1)
+])
+
+AC_DEFUN([SHAMROCK_FIND_PROGRAM_OR_BAIL],
+[
+ SHAMROCK_FIND_PROGRAM($1, $2, no)
+ if test "x$$1" = "xno"; then
+ AC_MSG_ERROR([You need to install '$2'])
+ fi
+])
+
+
diff --git a/build/m4/shamrock/util.m4 b/build/m4/shamrock/util.m4
new file mode 100644
index 0000000..de85ba9
--- /dev/null
+++ b/build/m4/shamrock/util.m4
@@ -0,0 +1,11 @@
+AC_DEFUN([SHAMROCK_CONCAT],
+[
+ $1="$$1 $$2"
+])
+
+AC_DEFUN([SHAMROCK_CONCAT_MODULE],
+[
+ SHAMROCK_CONCAT($1_CFLAGS, $2_CFLAGS)
+ SHAMROCK_CONCAT($1_LIBS, $2_LIBS)
+])
+
diff --git a/build/m4/shave/shave-libtool.in b/build/m4/shave/shave-libtool.in
new file mode 100644
index 0000000..54ebd69
--- /dev/null
+++ b/build/m4/shave/shave-libtool.in
@@ -0,0 +1,109 @@
+#!/bin/sh
+#
+# Copyright (c) 2009, Damien Lespiau <damien.lespiau at gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+# we need sed
+SED=@SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+
+lt_unmangle ()
+{
+ last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
+}
+
+# the real libtool to use
+LIBTOOL="$1"
+shift
+
+# if 1, don't print anything, the underlaying wrapper will do it
+pass_though=0
+
+# scan the arguments, keep the right ones for libtool, and discover the mode
+preserved_args=
+
+# have we seen the --tag option of libtool in the command line ?
+tag_seen=0
+
+while test "$#" -gt 0; do
+ opt="$1"
+ shift
+
+ case $opt in
+ --mode=*)
+ mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
+ preserved_args="$preserved_args $opt"
+ ;;
+ -o)
+ lt_output="$1"
+ preserved_args="$preserved_args $opt"
+ ;;
+ --tag=*)
+ tag_seen=1
+ preserved_args="$preserved_args $opt"
+ ;;
+ *)
+ preserved_args="$preserved_args $opt"
+ ;;
+ esac
+done
+
+case "$mode" in
+compile)
+ # shave will be called and print the actual CC/CXX/LINK line
+ preserved_args="$preserved_args --shave-mode=$mode"
+ pass_though=1
+ ;;
+link)
+ preserved_args="$preserved_args --shave-mode=$mode"
+ Q=" LINK "
+ ;;
+*)
+ # let's u
+ # echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
+ ;;
+esac
+
+lt_unmangle "$lt_output"
+output=$last_result
+
+# automake does not add a --tag switch to its libtool invocation when
+# assembling a .s file and rely on libtool to infer the right action based
+# on the compiler name. As shave is using CC to hook a wrapper, libtool gets
+# confused. Let's detect these cases and add a --tag=CC option.
+tag=""
+if test $tag_seen -eq 0 -a x"$mode" = xcompile; then
+ tag="--tag=CC"
+fi
+
+if test -z $V; then
+ if test $pass_though -eq 0; then
+ echo "$Q$output"
+ fi
+ $LIBTOOL --silent $tag $preserved_args
+else
+ echo $LIBTOOL $tag $preserved_args
+ $LIBTOOL $tag $preserved_args
+fi
diff --git a/build/m4/shave/shave.in b/build/m4/shave/shave.in
new file mode 100644
index 0000000..490d6c5
--- /dev/null
+++ b/build/m4/shave/shave.in
@@ -0,0 +1,109 @@
+#!/bin/sh
+#
+# Copyright (c) 2009, Damien Lespiau <damien.lespiau at gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+# we need sed
+SED=@SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+
+lt_unmangle ()
+{
+ last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
+}
+
+# the tool to wrap (cc, cxx, ar, ranlib, ..)
+tool="$1"
+shift
+
+# the reel tool (to call)
+REEL_TOOL="$1"
+shift
+
+pass_through=0
+preserved_args=
+while test "$#" -gt 0; do
+ opt="$1"
+ shift
+
+ case $opt in
+ --shave-mode=*)
+ mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
+ ;;
+ -o)
+ lt_output="$1"
+ preserved_args="$preserved_args $opt"
+ ;;
+ -out:*|/out:*)
+ lt_output="${opt#*:}"
+ preserved_args="$preserved_args $opt"
+ ;;
+ *)
+ preserved_args="$preserved_args $opt"
+ ;;
+ esac
+done
+
+# mode=link is handled in the libtool wrapper
+case "$mode,$tool" in
+link,*)
+ pass_through=1
+ ;;
+*,cxx)
+ Q=" CXX "
+ ;;
+*,cc)
+ Q=" CC "
+ ;;
+*,fc)
+ Q=" FC "
+ ;;
+*,f77)
+ Q=" F77 "
+ ;;
+*,objc)
+ Q=" OBJC "
+ ;;
+*,mcs)
+ Q=" MCS "
+ ;;
+*,*)
+ # should not happen
+ Q=" CC "
+ ;;
+esac
+
+lt_unmangle "$lt_output"
+output=$last_result
+
+if test -z $V; then
+ if test $pass_through -eq 0; then
+ echo "$Q$output"
+ fi
+ $REEL_TOOL $preserved_args
+else
+ echo $REEL_TOOL $preserved_args
+ $REEL_TOOL $preserved_args
+fi
diff --git a/build/m4/shave/shave.m4 b/build/m4/shave/shave.m4
new file mode 100644
index 0000000..40e47f4
--- /dev/null
+++ b/build/m4/shave/shave.m4
@@ -0,0 +1,102 @@
+dnl Make automake/libtool output more friendly to humans
+dnl
+dnl Copyright (c) 2009, Damien Lespiau <damien.lespiau at gmail.com>
+dnl
+dnl Permission is hereby granted, free of charge, to any person
+dnl obtaining a copy of this software and associated documentation
+dnl files (the "Software"), to deal in the Software without
+dnl restriction, including without limitation the rights to use,
+dnl copy, modify, merge, publish, distribute, sublicense, and/or sell
+dnl copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following
+dnl conditions:
+dnl
+dnl The above copyright notice and this permission notice shall be
+dnl included in all copies or substantial portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+dnl EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+dnl OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+dnl NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+dnl HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+dnl WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl SHAVE_INIT([shavedir],[default_mode])
+dnl
+dnl shavedir: the directory where the shave scripts are, it defaults to
+dnl $(top_builddir)
+dnl default_mode: (enable|disable) default shave mode. This parameter
+dnl controls shave's behaviour when no option has been
+dnl given to configure. It defaults to disable.
+dnl
+dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
+dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and
+dnl LIBTOOL, you don't want the configure tests to have these variables
+dnl re-defined.
+dnl * This macro requires GNU make's -s option.
+
+AC_DEFUN([_SHAVE_ARG_ENABLE],
+[
+ AC_ARG_ENABLE([shave],
+ AS_HELP_STRING(
+ [--enable-shave],
+ [use shave to make the build pretty [[default=$1]]]),,
+ [enable_shave=$1]
+ )
+])
+
+AC_DEFUN([SHAVE_INIT],
+[
+ dnl you can tweak the default value of enable_shave
+ m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
+
+ if test x"$enable_shave" = xyes; then
+ dnl where can we find the shave scripts?
+ m4_if([$1],,
+ [shavedir="$ac_pwd"],
+ [shavedir="$ac_pwd/$1"])
+ AC_SUBST(shavedir)
+
+ dnl make is now quiet
+ AC_SUBST([MAKEFLAGS], [-s])
+ AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
+
+ dnl we need sed
+ AC_CHECK_PROG(SED,sed,sed,false)
+
+ dnl substitute libtool
+ SHAVE_SAVED_LIBTOOL=$LIBTOOL
+ LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
+ AC_SUBST(LIBTOOL)
+
+ dnl substitute cc/cxx
+ SHAVE_SAVED_CC=$CC
+ SHAVE_SAVED_CXX=$CXX
+ SHAVE_SAVED_FC=$FC
+ SHAVE_SAVED_F77=$F77
+ SHAVE_SAVED_OBJC=$OBJC
+ SHAVE_SAVED_MCS=$MCS
+ CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
+ CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
+ FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
+ F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
+ OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
+ MCS="${SHELL} ${shavedir}/shave mcs ${SHAVE_SAVED_MCS}"
+ AC_SUBST(CC)
+ AC_SUBST(CXX)
+ AC_SUBST(FC)
+ AC_SUBST(F77)
+ AC_SUBST(OBJC)
+ AC_SUBST(MCS)
+
+ V=@
+ else
+ V=1
+ fi
+ Q='$(V:1=)'
+ AC_SUBST(V)
+ AC_SUBST(Q)
+])
+
diff --git a/config.guess b/config.guess
index f32079a..dc84c68 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2008-01-23'
+timestamp='2009-11-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2008-01-23'
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per at bothner.com>.
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches at gnu.org> and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -324,14 +324,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -640,7 +659,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
+ grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
@@ -791,12 +810,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
+ *:Interix*:*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd)
+ authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -806,6 +825,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -835,6 +857,20 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -857,6 +893,17 @@ EOF
frv:Linux:*:*)
echo frv-unknown-linux-gnu
exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -866,74 +913,33 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef mips64
- #undef mips64el
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
+ CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
@@ -943,8 +949,11 @@ EOF
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
@@ -967,69 +976,6 @@ EOF
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
- s/.*supported targets: *//
- s/ .*//
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
- }
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -1058,7 +1004,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1102,8 +1048,11 @@ EOF
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
@@ -1141,6 +1090,16 @@ EOF
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1153,7 +1112,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1216,6 +1175,9 @@ EOF
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit ;;
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1243,6 +1205,16 @@ EOF
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1324,6 +1296,9 @@ EOF
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.h.in b/config.h.in
index 261d5f8..cf0ec66 100644
--- a/config.h.in
+++ b/config.h.in
@@ -76,6 +76,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff --git a/config.sub b/config.sub
index 6759825..2a55a50 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2008-01-16'
+timestamp='2009-11-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2008-01-16'
# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -122,6 +125,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -148,10 +152,13 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
+ -bluegene*)
+ os=-cnk
+ ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -249,13 +256,16 @@ case $basic_machine in
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64vr | mips64vrel \
+ | mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
@@ -268,6 +278,7 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
| mt \
| msp430 \
| nios | nios2 \
@@ -276,20 +287,22 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
+ | ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
+ | z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
@@ -329,14 +342,17 @@ case $basic_machine in
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64vr-* | mips64vrel-* \
+ | mips64octeon-* | mips64octeonel-* \
| mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
@@ -357,21 +373,22 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
+ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-*)
+ | z8k-* | z80-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
@@ -439,6 +456,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -455,10 +476,18 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -526,6 +555,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -699,6 +732,9 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -1128,6 +1164,10 @@ case $basic_machine in
basic_machine=z8k-unknown
os=-sim
;;
+ z80-*-coff)
+ basic_machine=z80-unknown
+ os=-sim
+ ;;
none)
basic_machine=none-none
os=-none
@@ -1166,7 +1206,7 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1216,6 +1256,9 @@ case $os in
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1236,10 +1279,11 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,7 +1292,7 @@ case $os in
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1258,7 +1302,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1388,6 +1432,9 @@ case $os in
-zvmoe)
os=-zvmoe
;;
+ -dicos*)
+ os=-dicos
+ ;;
-none)
;;
*)
@@ -1585,7 +1632,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
- -aix*)
+ -cnk*|-aix*)
vendor=ibm
;;
-beos*)
diff --git a/configure b/configure
index 9ea6948..23ffd35 100755
--- a/configure
+++ b/configure
@@ -1,18 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for F-Spot 0.6.1.5.
+# Generated by GNU Autoconf 2.65 for f-spot 0.6.2.
+#
+# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot>.
+#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -20,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -44,7 +42,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -55,7 +59,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -78,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -94,15 +91,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -114,12 +111,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -131,330 +132,301 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
else
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
+ if test "x$CONFIG_SHELL" != x; then :
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and
+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+ fi
+ exit 1
fi
-
-
fi
-
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-exitcode=0
-if as_func_success; then
- :
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
else
- exitcode=1
- echo as_func_success failed.
-fi
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-if as_func_ret_success; then
- :
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_expr=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
fi
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf at gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -471,8 +443,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -482,29 +453,18 @@ test \$exitcode = 0") || {
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -534,7 +494,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -553,10 +513,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in
+ case $1 in #(
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -571,7 +531,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -720,7 +679,8 @@ fi
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -738,16 +698,15 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
-PACKAGE_NAME='F-Spot'
+PACKAGE_NAME='f-spot'
PACKAGE_TARNAME='f-spot'
-PACKAGE_VERSION='0.6.1.5'
-PACKAGE_STRING='F-Spot 0.6.1.5'
-PACKAGE_BUGREPORT=''
+PACKAGE_VERSION='0.6.2'
+PACKAGE_STRING='f-spot 0.6.2'
+PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot'
+PACKAGE_URL=''
-ac_unique_file="src/main.cs"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -784,13 +743,22 @@ ac_includes_default="\
# include <unistd.h>
#endif"
+ac_unique_file="src/main.cs"
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+Q
+V
+OBJC
+F77
+FC
+AM_MAKEFLAGS
+MAKEFLAGS
+shavedir
GNOME_ICON_THEME_PREFIX
-expanded_libdir
LIBJPEG
+MKINSTALLDIRS
POSUB
POFILES
PO_IN_DATADIR_FALSE
@@ -808,6 +776,8 @@ GNOME_SCREENSAVER_SAVERDIR
TURTLEDIR
WITH_TURTLE_FALSE
WITH_TURTLE_TRUE
+UNIQUE_LIBS
+UNIQUE_CFLAGS
EXIF_SOVERSION
LIBEXIF_VERSION_CHECK_LIBS
LIBEXIF_VERSION_CHECK_CFLAGS
@@ -818,28 +788,20 @@ LIBGPHOTO2_LIBS
LIBGPHOTO2_CFLAGS
LCMS_LIBS
LCMS_CFLAGS
-GCONF_SCHEMAS_INSTALL_FALSE
-GCONF_SCHEMAS_INSTALL_TRUE
-GCONF_SCHEMA_FILE_DIR
-GCONF_SCHEMA_CONFIG_SOURCE
-GCONFTOOL
NUNIT_DEFINES
ENABLE_TESTS_FALSE
ENABLE_TESTS_TRUE
NUNIT_LIBS
NUNIT_CFLAGS
-PATH_DBUS
-LINK_DBUS
-DIR_DBUS_GLIB
-DIR_DBUS
NDESK_DBUS_LIBS
NDESK_DBUS_CFLAGS
-LINK_BEAGLE
-BEAGLE_DIR
-BEAGLE_LIBS
-BEAGLE_CFLAGS
GCONF_SHARP_LIBS
GCONF_SHARP_CFLAGS
+GCONF_SCHEMAS_INSTALL_FALSE
+GCONF_SCHEMAS_INSTALL_TRUE
+GCONF_SCHEMA_FILE_DIR
+GCONF_SCHEMA_CONFIG_SOURCE
+GCONFTOOL
NOGCONF_FALSE
NOGCONF_TRUE
GLIBSHARP_LIBS
@@ -852,22 +814,40 @@ F_LIBS
F_CFLAGS
HAVE_GNOME_DOC_UTILS_FALSE
HAVE_GNOME_DOC_UTILS_TRUE
-DISTCHECK_CONFIGURE_FLAGS
ENABLE_SK_FALSE
ENABLE_SK_TRUE
DOC_USER_FORMATS
OMF_DIR
HELP_DIR
-MCS
-MONO
+GAPI2CODEGEN
+GAPI2PARSER
+GAPI2FIXUP
GLIB_MKENUMS
GOBJECT_QUERY
GLIB_GENMARSHAL
GLIB_LIBS
GLIB_CFLAGS
-PKG_CONFIG
WARN_CFLAGS
CXXCPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+MONO
+MCS
+MONO_MODULE_LIBS
+MONO_MODULE_CFLAGS
+PKG_CONFIG
+expanded_datadir
+expanded_bindir
+expanded_libdir
+DISPLAY_VERSION
+ASM_VERSION
+API_VERSION
+DISTCHECK_CONFIGURE_FLAGS
+CPP
OTOOL64
OTOOL
LIPO
@@ -883,6 +863,8 @@ ac_ct_DUMPBIN
DUMPBIN
LD
FGREP
+EGREP
+GREP
SED
host_os
host_vendor
@@ -893,15 +875,6 @@ build_vendor
build_cpu
build
LIBTOOL
-EGREP
-GREP
-CPP
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ac_ct_CXX
-CXXFLAGS
-CXX
DATADIRNAME
am__fastdepCC_FALSE
am__fastdepCC_TRUE
@@ -948,6 +921,7 @@ INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
USE_NLS
+ACLOCAL_AMFLAGS
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -1004,6 +978,7 @@ bindir
program_transform_name
prefix
exec_prefix
+PACKAGE_URL
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
@@ -1036,6 +1011,9 @@ with_gconf_schema_file_dir
enable_schemas_install
with_turtle
with_gnome_screensaver
+with_gnome_screensaver_privlibexecdir
+with_gnome_screensaver_themesdir
+enable_shave
'
ac_precious_vars='build_alias
host_alias
@@ -1045,12 +1023,14 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
+CPP
+PKG_CONFIG
+MONO_MODULE_CFLAGS
+MONO_MODULE_LIBS
CXX
CXXFLAGS
CCC
-CPP
CXXCPP
-PKG_CONFIG
F_CFLAGS
F_LIBS
GIO_CFLAGS
@@ -1061,8 +1041,6 @@ GLIBSHARP_CFLAGS
GLIBSHARP_LIBS
GCONF_SHARP_CFLAGS
GCONF_SHARP_LIBS
-BEAGLE_CFLAGS
-BEAGLE_LIBS
NDESK_DBUS_CFLAGS
NDESK_DBUS_LIBS
NUNIT_CFLAGS
@@ -1074,7 +1052,9 @@ LIBGPHOTO2_LIBS
EXIF_CFLAGS
EXIF_LIBS
LIBEXIF_VERSION_CHECK_CFLAGS
-LIBEXIF_VERSION_CHECK_LIBS'
+LIBEXIF_VERSION_CHECK_LIBS
+UNIQUE_CFLAGS
+UNIQUE_LIBS'
# Initialize some variables set by options.
@@ -1183,8 +1163,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1210,8 +1189,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1415,8 +1393,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1432,8 +1409,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1463,17 +1439,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1490,15 +1466,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1521,8 +1495,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1552,11 +1525,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1595,13 +1566,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1627,7 +1596,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures F-Spot 0.6.1.5 to adapt to many kinds of systems.
+\`configure' configures f-spot 0.6.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1697,7 +1666,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of F-Spot 0.6.1.5:";;
+ short | recursive ) echo "Configuration of f-spot 0.6.2:";;
esac
cat <<\_ACEOF
@@ -1723,6 +1692,7 @@ Optional Features:
--disable-gconf build without gconf preference backend
--disable-schemas-install
Disable the schemas installation
+ --enable-shave use shave to make the build pretty [[default=yes]]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1740,6 +1710,8 @@ Optional Packages:
Directory for installing schema files.
--with-turtle=DIR set path to source directory for turtle
--with-gnome-screensaver=PREFIX set gnome gnome-screensaver prefix
+ --with-gnome-screensaver-privlibexecdir=DIR set gnome-screensaver privlibexecdir
+ --with-gnome-screensaver-themesdir=DIR set gnome-screensaver themesdir
Some influential environment variables:
CC C compiler command
@@ -1747,13 +1719,17 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ MONO_MODULE_CFLAGS
+ C compiler flags for MONO_MODULE, overriding pkg-config
+ MONO_MODULE_LIBS
+ linker flags for MONO_MODULE, overriding pkg-config
CXX C++ compiler command
CXXFLAGS C++ compiler flags
- CPP C preprocessor
CXXCPP C++ preprocessor
- PKG_CONFIG path to pkg-config utility
F_CFLAGS C compiler flags for F, overriding pkg-config
F_LIBS linker flags for F, overriding pkg-config
GIO_CFLAGS C compiler flags for GIO, overriding pkg-config
@@ -1770,9 +1746,6 @@ Some influential environment variables:
C compiler flags for GCONF_SHARP, overriding pkg-config
GCONF_SHARP_LIBS
linker flags for GCONF_SHARP, overriding pkg-config
- BEAGLE_CFLAGS
- C compiler flags for BEAGLE, overriding pkg-config
- BEAGLE_LIBS linker flags for BEAGLE, overriding pkg-config
NDESK_DBUS_CFLAGS
C compiler flags for NDESK_DBUS, overriding pkg-config
NDESK_DBUS_LIBS
@@ -1793,10 +1766,14 @@ Some influential environment variables:
pkg-config
LIBEXIF_VERSION_CHECK_LIBS
linker flags for LIBEXIF_VERSION_CHECK, overriding pkg-config
+ UNIQUE_CFLAGS
+ C compiler flags for UNIQUE, overriding pkg-config
+ UNIQUE_LIBS linker flags for UNIQUE, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot>.
_ACEOF
ac_status=$?
fi
@@ -1859,22 +1836,500 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-F-Spot configure 0.6.1.5
-generated by GNU Autoconf 2.63
+f-spot configure 0.6.2
+generated by GNU Autoconf 2.65
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
exit
fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( cat <<\_ASBOX
+## --------------------------------------------------------------------- ##
+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot ##
+## --------------------------------------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by F-Spot $as_me 0.6.1.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+It was created by f-spot $as_me 0.6.2, which was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -1910,8 +2365,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
} >&5
@@ -1948,9 +2403,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1966,13 +2421,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1997,13 +2452,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -2075,39 +2530,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
+
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
@@ -2125,8 +2582,8 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
@@ -2134,10 +2591,10 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -2145,7 +2602,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -2160,11 +2617,11 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
@@ -2174,17 +2631,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
@@ -2196,43 +2653,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -2242,32 +2676,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_config_headers="$ac_config_headers config.h"
-
-
am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2293,10 +2715,10 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if test "${ac_cv_path_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2304,11 +2726,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2345,7 +2767,7 @@ case $as_dir/ in
;;
esac
-done
+ done
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
@@ -2361,7 +2783,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2372,7 +2794,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
@@ -2383,15 +2805,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2413,11 +2831,8 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
+alias in your environment" "$LINENO" 5
fi
test "$2" = conftest.file
@@ -2426,13 +2841,10 @@ then
# Ok.
:
else
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -2460,7 +2872,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -2481,9 +2893,9 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -2494,24 +2906,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2521,9 +2933,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -2534,24 +2946,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
$as_echo "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2560,7 +2972,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -2573,10 +2985,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
+ if test "${ac_cv_path_mkdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2584,7 +2996,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
+ for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2596,11 +3008,12 @@ do
esac
done
done
-done
+ done
IFS=$as_save_IFS
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -2608,11 +3021,10 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
@@ -2625,9 +3037,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -2638,24 +3050,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
$as_echo "$AWK" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2663,11 +3075,11 @@ fi
test -n "$AWK" && break
done
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2685,11 +3097,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2709,9 +3121,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -2727,7 +3137,7 @@ fi
# Define the identity of the package.
PACKAGE='f-spot'
- VERSION='0.6.1.5'
+ VERSION='0.6.2'
cat >>confdefs.h <<_ACEOF
@@ -2762,7 +3172,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
AMTAR=${AMTAR-"${am_missing_run}tar"}
-{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
@@ -2835,13 +3245,13 @@ do
done
rm -rf conftest.dir
-if test "${am_cv_prog_tar_ustar+set}" = set; then
+if test "${am_cv_prog_tar_ustar+set}" = set; then :
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
$as_echo "$am_cv_prog_tar_ustar" >&6; }
@@ -2849,17 +3259,16 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
fi
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
@@ -2872,18 +3281,22 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
+ac_config_headers="$ac_config_headers config.h"
+
+ACLOCAL_AMFLAGS="-I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"
+
- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
$as_echo_n "checking whether NLS is requested... " >&6; }
# Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
+if test "${enable_nls+set}" = set; then :
enableval=$enable_nls; USE_NLS=$enableval
else
USE_NLS=yes
fi
- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
$as_echo "$USE_NLS" >&6; }
@@ -2899,7 +3312,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
@@ -2927,12 +3340,12 @@ if test "$am__include" = "#"; then
fi
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
fi
@@ -2957,9 +3370,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -2970,24 +3383,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2997,9 +3410,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3010,24 +3423,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3036,7 +3449,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3050,9 +3463,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3063,24 +3476,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3090,9 +3503,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3104,18 +3517,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -3134,10 +3547,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3149,9 +3562,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3162,24 +3575,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3193,9 +3606,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3206,24 +3619,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3236,7 +3649,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3247,57 +3660,37 @@ fi
fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3313,8 +3706,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -3330,17 +3723,17 @@ do
done
rm -f $ac_rmfiles
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -3357,7 +3750,7 @@ do
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -3376,84 +3769,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
- $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
- fi
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3468,32 +3819,83 @@ for ac_file in conftest.exe conftest conftest.*; do
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3505,17 +3907,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
@@ -3528,31 +3930,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3566,37 +3960,16 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -3605,20 +3978,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3629,35 +3998,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3668,36 +4013,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
- ac_c_werror_flag=$ac_save_c_werror_flag
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3708,42 +4029,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -3760,18 +4056,14 @@ else
CFLAGS=
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -3828,32 +4120,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_c89=$ac_arg
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -3864,17 +4133,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3884,9 +4155,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3994,7 +4265,7 @@ else
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -4014,35 +4285,31 @@ fi
case "$am__api_version" in
1.01234)
- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
;;
*)
;;
esac
if test -n "0.35.0"; then
- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
fi
# Extract the first word of "intltool-update", so it can be a program name with args.
set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
@@ -4055,14 +4322,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -4070,19 +4337,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
$as_echo "$INTLTOOL_UPDATE" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "intltool-merge", so it can be a program name with args.
set dummy intltool-merge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
@@ -4095,14 +4362,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -4110,19 +4377,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
$as_echo "$INTLTOOL_MERGE" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "intltool-extract", so it can be a program name with args.
set dummy intltool-extract; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
@@ -4135,14 +4402,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -4150,18 +4417,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
$as_echo "$INTLTOOL_EXTRACT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -4283,9 +4548,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
@@ -4298,14 +4563,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -4313,19 +4578,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
$as_echo "$XGETTEXT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
@@ -4338,14 +4603,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -4353,19 +4618,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
$as_echo "$MSGMERGE" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
@@ -4378,14 +4643,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -4393,19 +4658,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
$as_echo "$MSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -4418,14 +4683,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -4434,33 +4699,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
$as_echo "$GMSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
@@ -4473,14 +4734,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -4488,41 +4749,35 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
$as_echo "$INTLTOOL_PERL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test -z "$INTLTOOL_PERL"; then
- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
-$as_echo "$as_me: error: perl not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "perl not found" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
$as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
$as_echo_n "checking for XML::Parser... " >&6; }
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- { $as_echo "$as_me:$LINENO: result: ok" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
else
- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
fi
fi
@@ -4532,11 +4787,7 @@ fi
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4548,120 +4799,13 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
DATADIRNAME=share
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- case $host in
+ case $host in
*-*-solaris*)
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char bind_textdomain_codeset (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef bind_textdomain_codeset
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bind_textdomain_codeset ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
-
-int
-main ()
-{
-return bind_textdomain_codeset ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_bind_textdomain_codeset=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
DATADIRNAME=share
else
DATADIRNAME=lib
@@ -4673,1653 +4817,195 @@ fi
;;
esac
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+case `pwd` in
+ *\ * | *\ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
+macro_version='2.2.6b'
+macro_revision='1.3017'
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
- test -n "$ac_ct_CC" && break
-done
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ltmain="$ac_aux_dir/ltmain.sh"
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_c89=$ac_arg
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC" am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
-else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
-fi
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CXX" && break
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
done
-fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CXX" && break
-done
-
- if test "x$ac_ct_CXX" = x; then
- CXX="g++"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CXX=$ac_ct_CXX
- fi
-fi
-
- fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GXX=yes
-else
- GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
- ac_cv_prog_cxx_g=no
- CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CXXFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX" am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CXX_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ $ac_path_SED_found && break 3
done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
- fi
- fi
done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
-else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_search_strerror=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_strerror+set}" = set; then
- break
-fi
-done
-if test "${ac_cv_search_strerror+set}" = set; then
- :
else
- ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
+ ac_cv_path_SED=$SED
fi
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
- done
- ac_cv_prog_CPP=$CPP
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
-else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -6330,7 +5016,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
+ for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -6350,7 +5036,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
@@ -6365,26 +5051,24 @@ esac
$ac_path_GREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -6398,7 +5082,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
+ for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -6418,7 +5102,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
@@ -6433,12 +5117,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -6446,384 +5128,14 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-case `pwd` in
- *\ * | *\ *)
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.6'
-macro_revision='1.3012'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- for ac_i in 1 2 3 4 5 6 7; do
- ac_script="$ac_script$as_nl$ac_script"
- done
- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- $as_unset ac_script || ac_script=
- if test -z "$SED"; then
- ac_path_SED_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
- # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo '' >> "conftest.nl"
- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_SED_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_SED="$ac_path_SED"
- ac_path_SED_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_SED_found && break 3
- done
- done
-done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
- fi
-else
- ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
- rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then
+if test "${ac_cv_path_FGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6837,7 +5149,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in fgrep; do
+ for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
@@ -6857,7 +5169,7 @@ case `"$ac_path_FGREP" --version 2>&1` in
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
@@ -6872,12 +5184,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -6885,7 +5195,7 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
@@ -6911,7 +5221,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
@@ -6920,7 +5230,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
@@ -6950,13 +5260,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -6987,18 +5297,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -7011,7 +5319,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -7023,9 +5331,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+if test "${lt_cv_path_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -7072,7 +5380,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
@@ -7083,9 +5391,9 @@ else
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -7096,24 +5404,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
DUMPBIN=$ac_cv_prog_DUMPBIN
if test -n "$DUMPBIN"; then
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
$as_echo "$DUMPBIN" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7127,9 +5435,9 @@ if test -z "$DUMPBIN"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
@@ -7140,24 +5448,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
if test -n "$ac_ct_DUMPBIN"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
$as_echo "$ac_ct_DUMPBIN" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7170,7 +5478,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7190,44 +5498,44 @@ test -z "$NM" && NM=nm
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then
+if test "${lt_cv_nm_interface+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7200: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5508: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7203: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5511: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7206: output\"" >&5)
+ (eval echo "\"\$as_me:5514: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
fi
rm -f conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
$as_echo "$lt_cv_nm_interface" >&6; }
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
$as_echo "no, using $LN_S" >&6; }
fi
# find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
$as_echo_n "(cached) " >&6
else
i=0
@@ -7345,10 +5653,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: none" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
@@ -7362,7 +5670,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
@@ -7372,17 +5680,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
$as_echo "$xsi_shell" >&6; }
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
lt_shell_append=no
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
>/dev/null 2>&1 \
&& lt_shell_append=yes
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
$as_echo "$lt_shell_append" >&6; }
@@ -7417,14 +5725,14 @@ esac
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
@@ -7453,9 +5761,9 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -7466,24 +5774,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OBJDUMP=$ac_cv_prog_OBJDUMP
if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
$as_echo "$OBJDUMP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7493,9 +5801,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -7506,24 +5814,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
$as_echo "$ac_ct_OBJDUMP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7532,7 +5840,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7552,9 +5860,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -7748,7 +6056,7 @@ tpf*)
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
@@ -7768,9 +6076,9 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
+if test "${ac_cv_prog_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -7781,24 +6089,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
$as_echo "$AR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7808,9 +6116,9 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -7821,24 +6129,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
$as_echo "$ac_ct_AR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7847,7 +6155,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7873,9 +6181,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -7886,24 +6194,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7913,9 +6221,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -7926,24 +6234,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
$as_echo "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7952,7 +6260,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7972,9 +6280,9 @@ test -z "$STRIP" && STRIP=:
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -7985,24 +6293,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
$as_echo "$RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8012,9 +6320,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -8025,24 +6333,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
$as_echo "$ac_ct_RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8051,7 +6359,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8129,9 +6437,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -8247,18 +6555,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -8311,11 +6619,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
@@ -8349,10 +6657,10 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { $as_echo "$as_me:$LINENO: result: failed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
$as_echo "failed" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: ok" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
fi
@@ -8378,7 +6686,7 @@ fi
# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
@@ -8390,11 +6698,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
@@ -8408,12 +6716,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8411 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ echo '#line 6719 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
@@ -8447,11 +6755,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -8500,9 +6808,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
@@ -8511,11 +6819,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -8526,38 +6830,13 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_cc_needs_belf=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8565,7 +6844,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -8575,11 +6854,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
@@ -8605,9 +6884,9 @@ need_locks="$enable_libtool_lock"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
@@ -8618,24 +6897,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
$as_echo "$DSYMUTIL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8645,9 +6924,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
@@ -8658,24 +6937,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
$as_echo "$ac_ct_DSYMUTIL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8684,7 +6963,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8697,9 +6976,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
@@ -8710,24 +6989,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
$as_echo "$NMEDIT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8737,9 +7016,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
@@ -8750,24 +7029,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
$as_echo "$ac_ct_NMEDIT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8776,7 +7055,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8789,9 +7068,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then
+if test "${ac_cv_prog_LIPO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
@@ -8802,24 +7081,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
LIPO=$ac_cv_prog_LIPO
if test -n "$LIPO"; then
- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
$as_echo "$LIPO" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8829,9 +7108,9 @@ if test -z "$ac_cv_prog_LIPO"; then
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
@@ -8842,24 +7121,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LIPO="lipo"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
if test -n "$ac_ct_LIPO"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
$as_echo "$ac_ct_LIPO" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8868,7 +7147,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8881,9 +7160,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
@@ -8894,24 +7173,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OTOOL=$ac_cv_prog_OTOOL
if test -n "$OTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
$as_echo "$OTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8921,9 +7200,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
@@ -8934,24 +7213,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL="otool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
if test -n "$ac_ct_OTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
$as_echo "$ac_ct_OTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8960,7 +7239,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8973,9 +7252,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
@@ -8986,24 +7265,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OTOOL64=$ac_cv_prog_OTOOL64
if test -n "$OTOOL64"; then
- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
$as_echo "$OTOOL64" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -9013,9 +7292,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
@@ -9026,24 +7305,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
if test -n "$ac_ct_OTOOL64"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
$as_echo "$ac_ct_OTOOL64" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -9052,7 +7331,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -9088,9 +7367,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
@@ -9115,22 +7394,18 @@ else
rm -f conftest.*
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
echo "_main" > conftest.sym
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -9141,42 +7416,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_ld_exported_symbols_list=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_ld_exported_symbols_list=no
+ lt_cv_ld_exported_symbols_list=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
@@ -9213,661 +7463,26 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
;;
esac
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CXX" && break
- done
-fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CXX" && break
-done
-
- if test "x$ac_ct_CXX" = x; then
- CXX="g++"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CXX=$ac_ct_CXX
- fi
-fi
-
- fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GXX=yes
-else
- GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
- ac_cv_prog_cxx_g=no
- CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CXXFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX" am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CXX_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
-else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
fi
-
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
- if test "${ac_cv_prog_CXXCPP+set}" = set; then
+if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- # Double quotes because CXXCPP needs to be expanded
- for CXXCPP in "$CXX -E" "/lib/cpp"
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
do
ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
+for ac_c_preproc_warn_flag in '' yes
do
# Use a header file that comes with gcc, so configuring glibc
# with a fresh cross-compiler works.
@@ -9875,11 +7490,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -9888,93 +7499,49 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
break
fi
done
- ac_cv_prog_CXXCPP=$CXXCPP
+ ac_cv_prog_CPP=$CPP
fi
- CXXCPP=$ac_cv_prog_CXXCPP
+ CPP=$ac_cv_prog_CPP
else
- ac_cv_prog_CXXCPP=$CXXCPP
+ ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
+for ac_c_preproc_warn_flag in '' yes
do
# Use a header file that comes with gcc, so configuring glibc
# with a fresh cross-compiler works.
@@ -9982,11 +7549,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -9995,83 +7558,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+if $ac_preproc_ok; then :
+
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-_lt_caught_CXX_error=yes; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -10080,11 +7600,149 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- _lt_caught_CXX_error=yes
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+fi
+
+done
+
+
+for ac_header in dlfcn.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+fi
+
+done
@@ -10099,7 +7757,7 @@ fi
# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
+if test "${enable_shared+set}" = set; then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
@@ -10130,7 +7788,7 @@ fi
# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
+if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
@@ -10162,7 +7820,7 @@ fi
# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
+if test "${with_pic+set}" = set; then :
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
@@ -10178,7 +7836,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
+if test "${enable_fast_install+set}" = set; then :
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
@@ -10259,9 +7917,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
+if test "${lt_cv_objdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
@@ -10274,7 +7932,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
@@ -10367,9 +8025,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -10420,10 +8078,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -10433,9 +8091,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
- { $as_echo "$as_me:$LINENO: checking for file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -10486,10 +8144,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -10566,9 +8224,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
@@ -10584,11 +8242,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10587: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8245: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10591: \$? = $ac_status" >&5
+ echo "$as_me:8249: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10601,7 +8259,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
@@ -10621,7 +8279,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
@@ -10893,7 +8551,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
$as_echo "$lt_prog_compiler_pic" >&6; }
@@ -10905,9 +8563,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
@@ -10923,11 +8581,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10926: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8584: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10930: \$? = $ac_status" >&5
+ echo "$as_me:8588: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10940,7 +8598,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
@@ -10964,9 +8622,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
@@ -10992,7 +8650,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
@@ -11007,9 +8665,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -11028,11 +8686,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11031: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8689: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11035: \$? = $ac_status" >&5
+ echo "$as_me:8693: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11054,7 +8712,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
@@ -11062,9 +8720,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -11083,11 +8741,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11086: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8744: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11090: \$? = $ac_status" >&5
+ echo "$as_me:8748: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11109,7 +8767,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
@@ -11118,7 +8776,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
@@ -11126,10 +8784,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
@@ -11142,7 +8800,7 @@ fi
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
@@ -11584,11 +9242,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11599,27 +9253,7 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -11633,16 +9267,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -11655,11 +9282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11670,27 +9293,7 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -11704,16 +9307,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -11925,42 +9521,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
int foo(void) {}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -12216,7 +9786,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
@@ -12253,16 +9823,16 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -12276,11 +9846,11 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
then
archive_cmds_need_lc=no
else
@@ -12291,7 +9861,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
cat conftest.err 1>&5
fi
$RM conftest*
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
@@ -12455,7 +10025,7 @@ esac
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
@@ -12877,11 +10447,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -12892,41 +10458,13 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+if ac_fn_c_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
shlibpath_overrides_runpath=yes
fi
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
@@ -12935,10 +10473,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -13138,7 +10679,7 @@ uts4*)
dynamic_linker=no
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -13240,7 +10781,7 @@ fi
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
@@ -13265,7 +10806,7 @@ else
# directories.
hardcode_action=unsupported
fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
@@ -13310,18 +10851,14 @@ else
darwin*)
# if libdl is installed we need to link against it
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13339,43 +10876,18 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -13388,106 +10900,18 @@ fi
;;
*)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shl_load=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load"
else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13505,145 +10929,32 @@ return shl_load ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dld_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13661,57 +10972,28 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13729,57 +11011,28 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_svld_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13797,43 +11050,18 @@ return dld_link ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dld_dld_link=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -13872,9 +11100,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
+if test "${lt_cv_dlopen_self+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -13883,7 +11111,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13886 "configure"
+#line 11114 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13942,11 +11170,11 @@ int main ()
return status;
}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -13963,14 +11191,14 @@ rm -fr conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
$as_echo "$lt_cv_dlopen_self" >&6; }
if test "x$lt_cv_dlopen_self" = xyes; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -13979,7 +11207,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13982 "configure"
+#line 11210 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14038,11 +11266,11 @@ int main ()
return status;
}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -14059,7 +11287,7 @@ rm -fr conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
@@ -14098,12 +11326,12 @@ fi
striplib=
old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
@@ -14112,15 +11340,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
;;
*)
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
;;
esac
@@ -14138,12 +11366,12 @@ fi
# Report which library types will actually be built
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
$as_echo "$can_build_shared" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
@@ -14164,14 +11392,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
fi
;;
esac
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
$as_echo "$enable_shared" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -14187,6 +11415,2004 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$lt_save_CC"
+
+
+
+
+
+
+
+
+
+
+
+ ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+
+DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-release"
+
+
+API_VERSION=0.6
+
+ASM_VERSION=0.6.0.0
+
+DISPLAY_VERSION="0.6.2"
+
+
+
+ expanded_libdir=`(
+ case $prefix in
+ NONE) prefix=$ac_default_prefix ;;
+ *) ;;
+ esac
+ case $exec_prefix in
+ NONE) exec_prefix=$prefix ;;
+ *) ;;
+ esac
+ eval echo $libdir
+ )`
+
+
+
+ expanded_bindir=`(
+ case $prefix in
+ NONE) prefix=$ac_default_prefix ;;
+ *) ;;
+ esac
+ case $exec_prefix in
+ NONE) exec_prefix=$prefix ;;
+ *) ;;
+ esac
+ eval echo $bindir
+ )`
+
+
+
+ case $prefix in
+ NONE) prefix=$ac_default_prefix ;;
+ *) ;;
+ esac
+
+ case $exec_prefix in
+ NONE) exec_prefix=$prefix ;;
+ *) ;;
+ esac
+
+ expanded_datadir=`(eval echo $datadir)`
+ expanded_datadir=`(eval echo $expanded_datadir)`
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MONO_MODULE" >&5
+$as_echo_n "checking for MONO_MODULE... " >&6; }
+
+if test -n "$MONO_MODULE_CFLAGS"; then
+ pkg_cv_MONO_MODULE_CFLAGS="$MONO_MODULE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mono >= 2.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MONO_MODULE_CFLAGS=`$PKG_CONFIG --cflags "mono >= 2.2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$MONO_MODULE_LIBS"; then
+ pkg_cv_MONO_MODULE_LIBS="$MONO_MODULE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mono >= 2.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MONO_MODULE_LIBS=`$PKG_CONFIG --libs "mono >= 2.2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mono >= 2.2" 2>&1`
+ else
+ MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "mono >= 2.2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MONO_MODULE_PKG_ERRORS" >&5
+
+ as_fn_error "Package requirements (mono >= 2.2) were not met:
+
+$MONO_MODULE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables MONO_MODULE_CFLAGS
+and MONO_MODULE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables MONO_MODULE_CFLAGS
+and MONO_MODULE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ MONO_MODULE_CFLAGS=$pkg_cv_MONO_MODULE_CFLAGS
+ MONO_MODULE_LIBS=$pkg_cv_MONO_MODULE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+
+
+
+
+
+ # Extract the first word of "gmcs", so it can be a program name with args.
+set dummy gmcs; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MCS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MCS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_MCS" && ac_cv_path_MCS="no"
+ ;;
+esac
+fi
+MCS=$ac_cv_path_MCS
+if test -n "$MCS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
+$as_echo "$MCS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+ if test "x$MCS" = "xno"; then
+ as_fn_error "You need to install 'gmcs'" "$LINENO" 5
+ fi
+
+
+
+
+
+ # Extract the first word of "mono", so it can be a program name with args.
+set dummy mono; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MONO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MONO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MONO="$MONO" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MONO="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_MONO" && ac_cv_path_MONO="no"
+ ;;
+esac
+fi
+MONO=$ac_cv_path_MONO
+if test -n "$MONO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONO" >&5
+$as_echo "$MONO" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+ if test "x$MONO" = "xno"; then
+ as_fn_error "You need to install 'mono'" "$LINENO" 5
+ fi
+
+
+
+
+ for asm in $(echo "mono,2.0,Mono.Data.SqliteClient
+ Mono.Posix
+ System.Runtime.Remoting
+ System.Web
+ System.Web.Services
+ Mono.Cairo
+" | cut -d, -f3- | sed 's/\,/ /g')
+ do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono 2.0 GAC for $asm.dll" >&5
+$as_echo_n "checking for Mono 2.0 GAC for $asm.dll... " >&6; }
+ if test \
+ -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/$asm.dll" -o \
+ -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/$asm.dll"; \
+ then \
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ as_fn_error "missing required Mono 2.0 assembly: $asm.dll" "$LINENO" 5
+ fi
+ done
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CXX" && break
+ done
+fi
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CXX" && break
+done
+
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
+fi
+
+ fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
+else
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
+else
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
+fi
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CXX" && break
+ done
+fi
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CXX" && break
+done
+
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
+fi
+
+ fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
+else
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
+else
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
+fi
+
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+_lt_caught_CXX_error=yes; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+else
+ _lt_caught_CXX_error=yes
+fi
+
+
+
+
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -14312,7 +13538,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
@@ -14321,7 +13547,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
@@ -14351,13 +13577,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -14388,18 +13614,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -14412,7 +13636,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -14467,7 +13691,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
fi
# PORTME: fill in a description of your system's C++ link characteristics
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
@@ -14568,11 +13792,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -14583,27 +13803,7 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -14617,16 +13817,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -14640,11 +13833,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -14655,27 +13844,7 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -14689,16 +13858,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -15442,7 +14604,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
esac
- { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
@@ -15470,11 +14632,11 @@ private:
};
_LT_EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -15655,7 +14817,7 @@ fi
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
@@ -15972,7 +15134,7 @@ case $host_os in
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
@@ -15981,9 +15143,9 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
@@ -15999,11 +15161,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16002: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15164: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16006: \$? = $ac_status" >&5
+ echo "$as_me:15168: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16016,7 +15178,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
@@ -16037,9 +15199,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
@@ -16065,7 +15227,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
@@ -16077,9 +15239,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
@@ -16098,11 +15260,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16101: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15263: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16105: \$? = $ac_status" >&5
+ echo "$as_me:15267: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16124,14 +15286,14 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
@@ -16150,11 +15312,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16153: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15315: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16157: \$? = $ac_status" >&5
+ echo "$as_me:15319: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16176,7 +15338,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
@@ -16185,7 +15347,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
@@ -16193,10 +15355,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
@@ -16206,7 +15368,7 @@ fi
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -16232,7 +15394,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
@@ -16260,16 +15422,16 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -16283,11 +15445,11 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
then
archive_cmds_need_lc_CXX=no
else
@@ -16298,7 +15460,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
cat conftest.err 1>&5
fi
$RM conftest*
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
@@ -16369,7 +15531,7 @@ esac
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
@@ -16739,11 +15901,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16754,41 +15912,13 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+if ac_fn_cxx_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
shlibpath_overrides_runpath=yes
fi
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
@@ -16797,10 +15927,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17000,7 +16133,7 @@ uts4*)
dynamic_linker=no
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -17051,7 +16184,7 @@ fi
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
@@ -17076,7 +16209,7 @@ else
# directories.
hardcode_action_CXX=unsupported
fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
@@ -17115,30 +16248,179 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_strerror=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_strerror+set}" = set; then :
+ break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then :
+
+else
+ ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+int
+main ()
+{
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+fi
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
- ac_config_commands="$ac_config_commands libtool"
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+fi
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
-# Only expand once:
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
# Check whether --enable-compile-warnings was given.
-if test "${enable_compile_warnings+set}" = set; then
+if test "${enable_compile_warnings+set}" = set; then :
enableval=$enable_compile_warnings;
else
enable_compile_warnings="yes"
@@ -17169,13 +16451,9 @@ fi
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
$as_echo_n "checking whether gcc understands $option... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -17186,35 +16464,14 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
has_option=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- has_option=no
+ has_option=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$SAVE_CFLAGS"
- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
@@ -17228,26 +16485,24 @@ $as_echo "$has_option" >&6; }
fi
;;
*)
- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
;;
esac
CFLAGS="$realsave_CFLAGS"
- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
$as_echo "$warning_flags" >&6; }
# Check whether --enable-iso-c was given.
-if test "${enable_iso_c+set}" = set; then
+if test "${enable_iso_c+set}" = set; then :
enableval=$enable_iso_c;
else
enable_iso_c=no
fi
- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
@@ -17262,14 +16517,14 @@ $as_echo_n "checking what language compliance flags to pass to the C compiler...
esac
fi
fi
- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
# Check whether --enable-glibtest was given.
-if test "${enable_glibtest+set}" = set; then
+if test "${enable_glibtest+set}" = set; then :
enableval=$enable_glibtest;
else
enable_glibtest=yes
@@ -17304,9 +16559,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -17319,14 +16574,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -17334,10 +16589,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
$as_echo "$PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -17347,9 +16602,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -17362,14 +16617,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -17377,10 +16632,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -17389,7 +16644,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -17402,13 +16657,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.16
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
@@ -17423,7 +16678,7 @@ fi
fi
min_glib_version=2.0.0
- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
if test x$PKG_CONFIG != xno ; then
@@ -17459,14 +16714,10 @@ $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$GLIB_LIBS $LIBS"
rm -f conf.glibtest
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <glib.h>
@@ -17478,9 +16729,8 @@ main ()
{
int major, minor, micro;
char *tmp_version;
- int ignored;
- ignored = system ("touch conf.glibtest");
+ fclose (fopen ("conf.glibtest", "w"));
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_glib_version");
@@ -17542,52 +16792,25 @@ main ()
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-no_glib=yes
+else
+ no_glib=yes
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_glib" = x ; then
- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
:
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
@@ -17601,11 +16824,7 @@ $as_echo "no" >&6; }
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <glib.h>
@@ -17619,27 +16838,7 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
@@ -17650,16 +16849,11 @@ $as_echo "$ac_try_echo") >&5
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
@@ -17682,9 +16876,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
# Extract the first word of "mono", so it can be a program name with args.
set dummy mono; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MONO+set}" = set; then
+if test "${ac_cv_path_MONO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MONO in
@@ -17697,14 +16891,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MONO="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -17712,19 +16906,19 @@ esac
fi
MONO=$ac_cv_path_MONO
if test -n "$MONO"; then
- { $as_echo "$as_me:$LINENO: result: $MONO" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONO" >&5
$as_echo "$MONO" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "gmcs", so it can be a program name with args.
set dummy gmcs; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MCS+set}" = set; then
+if test "${ac_cv_path_MCS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MCS in
@@ -17737,14 +16931,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -17752,10 +16946,10 @@ esac
fi
MCS=$ac_cv_path_MCS
if test -n "$MCS"; then
- { $as_echo "$as_me:$LINENO: result: $MCS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
$as_echo "$MCS" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -17763,44 +16957,180 @@ fi
CS="C#"
if test ! -x "$MCS"; then
- { { $as_echo "$as_me:$LINENO: error: No $CS compiler found" >&5
-$as_echo "$as_me: error: No $CS compiler found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "No $CS compiler found" "$LINENO" 5
+fi
+
+
+# Extract the first word of "gapi2-fixup", so it can be a program name with args.
+set dummy gapi2-fixup; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GAPI2FIXUP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GAPI2FIXUP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GAPI2FIXUP="$GAPI2FIXUP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GAPI2FIXUP="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GAPI2FIXUP" && ac_cv_path_GAPI2FIXUP="no"
+ ;;
+esac
+fi
+GAPI2FIXUP=$ac_cv_path_GAPI2FIXUP
+if test -n "$GAPI2FIXUP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GAPI2FIXUP" >&5
+$as_echo "$GAPI2FIXUP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+if test ! -x "$GAPI2FIXUP"; then
+ as_fn_error "No gapi post-processor found" "$LINENO" 5
+fi
+
+# Extract the first word of "gapi2-parser", so it can be a program name with args.
+set dummy gapi2-parser; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GAPI2PARSER+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GAPI2PARSER in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GAPI2PARSER="$GAPI2PARSER" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GAPI2PARSER="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GAPI2PARSER" && ac_cv_path_GAPI2PARSER="no"
+ ;;
+esac
+fi
+GAPI2PARSER=$ac_cv_path_GAPI2PARSER
+if test -n "$GAPI2PARSER"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GAPI2PARSER" >&5
+$as_echo "$GAPI2PARSER" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+if test ! -x "$GAPI2PARSER"; then
+ as_fn_error "No gapi parser found" "$LINENO" 5
+fi
+
+# Extract the first word of "gapi2-codegen", so it can be a program name with args.
+set dummy gapi2-codegen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GAPI2CODEGEN+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GAPI2CODEGEN in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GAPI2CODEGEN="$GAPI2CODEGEN" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GAPI2CODEGEN="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GAPI2CODEGEN" && ac_cv_path_GAPI2CODEGEN="no"
+ ;;
+esac
+fi
+GAPI2CODEGEN=$ac_cv_path_GAPI2CODEGEN
+if test -n "$GAPI2CODEGEN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GAPI2CODEGEN" >&5
+$as_echo "$GAPI2CODEGEN" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+if test ! -x "$GAPI2CODEGEN"; then
+ as_fn_error "No gapi code generator found" "$LINENO" 5
+fi
+
+
+
+
gdu_cv_version_required=0.3.2
-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
gdu_cv_have_gdu=yes
else
gdu_cv_have_gdu=no
fi
if test "$gdu_cv_have_gdu" = "yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
fi
# Check whether --with-help-dir was given.
-if test "${with_help_dir+set}" = set; then
+if test "${with_help_dir+set}" = set; then :
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
@@ -17811,7 +17141,7 @@ HELP_DIR="$with_help_dir"
# Check whether --with-omf-dir was given.
-if test "${with_omf_dir+set}" = set; then
+if test "${with_omf_dir+set}" = set; then :
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
@@ -17822,7 +17152,7 @@ OMF_DIR="$with_omf_dir"
# Check whether --with-help-formats was given.
-if test "${with_help_formats+set}" = set; then
+if test "${with_help_formats+set}" = set; then :
withval=$with_help_formats;
else
with_help_formats=''
@@ -17832,7 +17162,7 @@ DOC_USER_FORMATS="$with_help_formats"
# Check whether --enable-scrollkeeper was given.
-if test "${enable_scrollkeeper+set}" = set; then
+if test "${enable_scrollkeeper+set}" = set; then :
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
@@ -17862,33 +17192,16 @@ fi
-{ $as_echo "$as_me:$LINENO: checking for mono.pc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mono.pc" >&5
$as_echo_n "checking for mono.pc... " >&6; }
if test -z `$PKG_CONFIG --variable=prefix mono`; then
- { { $as_echo "$as_me:$LINENO: error: missing the mono.pc file, usually found in the mono-devel package" >&5
-$as_echo "$as_me: error: missing the mono.pc file, usually found in the mono-devel package" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "missing the mono.pc file, usually found in the mono-devel package" "$LINENO" 5
else
- { $as_echo "$as_me:$LINENO: result: found" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; }
fi
-needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services Mono.Cairo"
-for i in $needed_dlls; do
- { $as_echo "$as_me:$LINENO: checking for $i.dll" >&5
-$as_echo_n "checking for $i.dll... " >&6; }
- if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/2.0//$i.dll \); then
- { { $as_echo "$as_me:$LINENO: error: missing required mono 2.0 DLL: $i.dll" >&5
-$as_echo "$as_me: error: missing required mono 2.0 DLL: $i.dll" >&2;}
- { (exit 1); exit 1; }; }
- else
- { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
- fi
-done
-
-
LIBGNOME_REQUIRED=2.2
LIBGNOMEUI_REQUIRED=2.2
LIBEXIF_REQUIRED_MIN=0.5.7
@@ -17897,30 +17210,30 @@ GIO_REQUIRED=2.16.0
GIOSHARP_REQUIRED=2.13.92
GTKSHARPBEANS_REQUIRED=2.13.92
GTKSHARP_REQUIRED=2.12.2
-MONO_REQUIRED=2.0.0
GTK_REQUIRED=2.14
-BEAGLE_REQUIRED=0.3.0
NDESK_DBUS_REQUIRED=0.4.2
NDESK_DBUS_GLIB_REQUIRED=0.3.0
MONO_CAIRO_REQUIRED=1.2.4
CAIRO_REQUIRED=1.4.0
LCMS_REQUIRED=1.12
+LIBGPHOTO2_REQUIRED=2.4
+MONOADDINS_REQUIRED=0.3
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for F" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for F" >&5
$as_echo_n "checking for F... " >&6; }
if test -n "$F_CFLAGS"; then
pkg_cv_F_CFLAGS="$F_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libexif >= \$LIBEXIF_REQUIRED_MIN libexif < \$LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED glib-sharp-2.0 >= \$GTKSHARP_REQUIRED glade-sharp-2.0 >= \$GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= \$GTKSHARP_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED mono >= \$MONO_REQUIRED mono-cairo >= \$MONO_CAIRO_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libexif >= \$LIBEXIF_REQUIRED_MIN libexif < \$LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED glib-sharp-2.0 >= \$GTKSHARP_REQUIRED glade-sharp-2.0 >= \$GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= \$GTKSHARP_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED mono-cairo >= \$MONO_CAIRO_REQUIRED cairo >= \$CAIRO_REQUIRED mono-addins >= \$MONOADDINS_REQUIRED mono-addins-gui >= \$MONOADDINS_REQUIRED mono-addins-setup >= \$MONOADDINS_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_F_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_F_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -17931,12 +17244,12 @@ if test -n "$F_LIBS"; then
pkg_cv_F_LIBS="$F_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libexif >= \$LIBEXIF_REQUIRED_MIN libexif < \$LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED glib-sharp-2.0 >= \$GTKSHARP_REQUIRED glade-sharp-2.0 >= \$GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= \$GTKSHARP_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED mono >= \$MONO_REQUIRED mono-cairo >= \$MONO_CAIRO_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libexif >= \$LIBEXIF_REQUIRED_MIN libexif < \$LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED glib-sharp-2.0 >= \$GTKSHARP_REQUIRED glade-sharp-2.0 >= \$GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= \$GTKSHARP_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED mono-cairo >= \$MONO_CAIRO_REQUIRED cairo >= \$CAIRO_REQUIRED mono-addins >= \$MONOADDINS_REQUIRED mono-addins-gui >= \$MONOADDINS_REQUIRED mono-addins-setup >= \$MONOADDINS_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_F_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_F_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -17954,25 +17267,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- F_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
+ F_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED" 2>&1`
else
- F_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
+ F_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$F_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
-
-$F_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables F_CFLAGS
-and F_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
+ as_fn_error "Package requirements (libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED) were not met:
$F_PKG_ERRORS
@@ -17982,12 +17284,11 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables F_CFLAGS
and F_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -17996,22 +17297,11 @@ and F_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables F_CFLAGS
-and F_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
F_CFLAGS=$pkg_cv_F_CFLAGS
F_LIBS=$pkg_cv_F_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
@@ -18020,18 +17310,18 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GIO" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
$as_echo_n "checking for GIO... " >&6; }
if test -n "$GIO_CFLAGS"; then
pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -18043,11 +17333,11 @@ if test -n "$GIO_LIBS"; then
pkg_cv_GIO_LIBS="$GIO_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -18073,18 +17363,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GIO_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met:
-
-$GIO_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GIO_CFLAGS
-and GIO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met:
+ as_fn_error "Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met:
$GIO_PKG_ERRORS
@@ -18094,22 +17373,11 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GIO_CFLAGS
and GIO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GIO_CFLAGS
-and GIO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -18118,12 +17386,11 @@ and GIO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
GIO_LIBS=$pkg_cv_GIO_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
@@ -18133,18 +17400,18 @@ fi
CSC_DEFINES=""
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GNOME_SHARP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_SHARP" >&5
$as_echo_n "checking for GNOME_SHARP... " >&6; }
if test -n "$GNOME_SHARP_CFLAGS"; then
pkg_cv_GNOME_SHARP_CFLAGS="$GNOME_SHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-sharp-2.0 >= 2.8\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-sharp-2.0 >= 2.8\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-sharp-2.0 >= 2.8") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_GNOME_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gnome-sharp-2.0 >= 2.8" 2>/dev/null`
else
pkg_failed=yes
@@ -18156,11 +17423,11 @@ if test -n "$GNOME_SHARP_LIBS"; then
pkg_cv_GNOME_SHARP_LIBS="$GNOME_SHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-sharp-2.0 >= 2.8\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-sharp-2.0 >= 2.8\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-sharp-2.0 >= 2.8") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_GNOME_SHARP_LIBS=`$PKG_CONFIG --libs "gnome-sharp-2.0 >= 2.8" 2>/dev/null`
else
pkg_failed=yes
@@ -18186,7 +17453,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_SHARP_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-sharp-2.0 >= 2.8) were not met:
+ as_fn_error "Package requirements (gnome-sharp-2.0 >= 2.8) were not met:
$GNOME_SHARP_PKG_ERRORS
@@ -18196,33 +17463,11 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GNOME_SHARP_CFLAGS
and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (gnome-sharp-2.0 >= 2.8) were not met:
-
-$GNOME_SHARP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GNOME_SHARP_CFLAGS
-and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GNOME_SHARP_CFLAGS
-and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -18231,30 +17476,29 @@ and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
GNOME_SHARP_CFLAGS=$pkg_cv_GNOME_SHARP_CFLAGS
GNOME_SHARP_LIBS=$pkg_cv_GNOME_SHARP_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GLIBSHARP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIBSHARP" >&5
$as_echo_n "checking for GLIBSHARP... " >&6; }
if test -n "$GLIBSHARP_CFLAGS"; then
pkg_cv_GLIBSHARP_CFLAGS="$GLIBSHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= 2.12\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= 2.12\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-sharp-2.0 >= 2.12") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_GLIBSHARP_CFLAGS=`$PKG_CONFIG --cflags "glib-sharp-2.0 >= 2.12" 2>/dev/null`
else
pkg_failed=yes
@@ -18266,11 +17510,11 @@ if test -n "$GLIBSHARP_LIBS"; then
pkg_cv_GLIBSHARP_LIBS="$GLIBSHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= 2.12\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= 2.12\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-sharp-2.0 >= 2.12") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_GLIBSHARP_LIBS=`$PKG_CONFIG --libs "glib-sharp-2.0 >= 2.12" 2>/dev/null`
else
pkg_failed=yes
@@ -18296,18 +17540,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GLIBSHARP_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-sharp-2.0 >= 2.12) were not met:
-
-$GLIBSHARP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
-and GLIBSHARP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (glib-sharp-2.0 >= 2.12) were not met:
+ as_fn_error "Package requirements (glib-sharp-2.0 >= 2.12) were not met:
$GLIBSHARP_PKG_ERRORS
@@ -18317,22 +17550,11 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
and GLIBSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
-and GLIBSHARP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -18341,12 +17563,11 @@ and GLIBSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
GLIBSHARP_CFLAGS=$pkg_cv_GLIBSHARP_CFLAGS
GLIBSHARP_LIBS=$pkg_cv_GLIBSHARP_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
@@ -18356,13 +17577,11 @@ if pkg-config --atleast-version=1.2.5 mono-cairo; then
fi
if pkg-config --atleast-version=2.13.0 gtk-sharp-2.0 && pkg-config --max-version=2.14 gtk-sharp-2.0; then
- { { $as_echo "$as_me:$LINENO: error: There's a svn version of gtk-sharp 2.13.x installed. Uninstall it." >&5
-$as_echo "$as_me: error: There's a svn version of gtk-sharp 2.13.x installed. Uninstall it." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "There's a svn version of gtk-sharp 2.13.x installed. Uninstall it." "$LINENO" 5
fi
# Check whether --enable-gconf was given.
-if test "${enable_gconf+set}" = set; then
+if test "${enable_gconf+set}" = set; then :
enableval=$enable_gconf;
fi
@@ -18379,20 +17598,110 @@ fi
if test "x$enable_gconf" = "xno"; then
CSC_DEFINES="$CSC_DEFINES -d:NOGCONF"
else
+ # Extract the first word of "gconftool-2", so it can be a program name with args.
+set dummy gconftool-2; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GCONFTOOL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+GCONFTOOL=$ac_cv_path_GCONFTOOL
+if test -n "$GCONFTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
+$as_echo "$GCONFTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ else
+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+ fi
+
+
+# Check whether --with-gconf-source was given.
+if test "${with_gconf_source+set}" = set; then :
+ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
+fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+ fi
+
+
+# Check whether --with-gconf-schema-file-dir was given.
+if test "${with_gconf_schema_file_dir+set}" = set; then :
+ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
+fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+
+ # Check whether --enable-schemas-install was given.
+if test "${enable_schemas_install+set}" = set; then :
+ enableval=$enable_schemas_install; case ${enableval} in
+ yes|no) ;;
+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ esac
+fi
+
+ if test "$enable_schemas_install" != no; then
+ GCONF_SCHEMAS_INSTALL_TRUE=
+ GCONF_SCHEMAS_INSTALL_FALSE='#'
+else
+ GCONF_SCHEMAS_INSTALL_TRUE='#'
+ GCONF_SCHEMAS_INSTALL_FALSE=
+fi
+
+
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GCONF_SHARP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF_SHARP" >&5
$as_echo_n "checking for GCONF_SHARP... " >&6; }
if test -n "$GCONF_SHARP_CFLAGS"; then
pkg_cv_GCONF_SHARP_CFLAGS="$GCONF_SHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0 >= \$GTKSHARP_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0 >= \$GTKSHARP_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_GCONF_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -18404,11 +17713,11 @@ if test -n "$GCONF_SHARP_LIBS"; then
pkg_cv_GCONF_SHARP_LIBS="$GCONF_SHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0 >= \$GTKSHARP_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0 >= \$GTKSHARP_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_GCONF_SHARP_LIBS=`$PKG_CONFIG --libs "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -18434,7 +17743,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GCONF_SHARP_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (gconf-sharp-2.0 >= $GTKSHARP_REQUIRED) were not met:
+ as_fn_error "Package requirements (gconf-sharp-2.0 >= $GTKSHARP_REQUIRED) were not met:
$GCONF_SHARP_PKG_ERRORS
@@ -18444,23 +17753,11 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GCONF_SHARP_CFLAGS
and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (gconf-sharp-2.0 >= $GTKSHARP_REQUIRED) were not met:
-
-$GCONF_SHARP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GCONF_SHARP_CFLAGS
-and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -18469,22 +17766,11 @@ and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GCONF_SHARP_CFLAGS
-and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
GCONF_SHARP_CFLAGS=$pkg_cv_GCONF_SHARP_CFLAGS
GCONF_SHARP_LIBS=$pkg_cv_GCONF_SHARP_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
@@ -18496,102 +17782,24 @@ fi
fi
fi
-
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for BEAGLE" >&5
-$as_echo_n "checking for BEAGLE... " >&6; }
-
-if test -n "$BEAGLE_CFLAGS"; then
- pkg_cv_BEAGLE_CFLAGS="$BEAGLE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"beagle-0.0 >= \$BEAGLE_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "beagle-0.0 >= $BEAGLE_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_BEAGLE_CFLAGS=`$PKG_CONFIG --cflags "beagle-0.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$BEAGLE_LIBS"; then
- pkg_cv_BEAGLE_LIBS="$BEAGLE_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"beagle-0.0 >= \$BEAGLE_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "beagle-0.0 >= $BEAGLE_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_BEAGLE_LIBS=`$PKG_CONFIG --libs "beagle-0.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
+if pkg-config --at-least-version=2.16 gtk+-2.0; then
+ CSC_DEFINES="$CSC_DEFINES -d:GTK_2_16"
fi
- if test $_pkg_short_errors_supported = yes; then
- BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "beagle-0.0 >= $BEAGLE_REQUIRED" 2>&1`
- else
- BEAGLE_PKG_ERRORS=`$PKG_CONFIG --print-errors "beagle-0.0 >= $BEAGLE_REQUIRED" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$BEAGLE_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
- { $as_echo "$as_me:$LINENO: result: beagle not found" >&5
-$as_echo "beagle not found" >&6; }
-
-elif test $pkg_failed = untried; then
-
- { $as_echo "$as_me:$LINENO: result: beagle not found" >&5
-$as_echo "beagle not found" >&6; }
-
-else
- BEAGLE_CFLAGS=$pkg_cv_BEAGLE_CFLAGS
- BEAGLE_LIBS=$pkg_cv_BEAGLE_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
- BEAGLE_DIR=`$PKG_CONFIG --variable=dlldir beagle-0.0`
- LINK_BEAGLE="-r:$BEAGLE_DIR/Beagle"
- CSC_DEFINES="$CSC_DEFINES -d:ENABLE_BEAGLE"
-
-fi
-
-
-
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for NDESK_DBUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NDESK_DBUS" >&5
$as_echo_n "checking for NDESK_DBUS... " >&6; }
if test -n "$NDESK_DBUS_CFLAGS"; then
pkg_cv_NDESK_DBUS_CFLAGS="$NDESK_DBUS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= \$NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= \$NDESK_DBUS_GLIB_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= \$NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= \$NDESK_DBUS_GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_NDESK_DBUS_CFLAGS=`$PKG_CONFIG --cflags "ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -18603,11 +17811,11 @@ if test -n "$NDESK_DBUS_LIBS"; then
pkg_cv_NDESK_DBUS_LIBS="$NDESK_DBUS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= \$NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= \$NDESK_DBUS_GLIB_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= \$NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= \$NDESK_DBUS_GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_NDESK_DBUS_LIBS=`$PKG_CONFIG --libs "ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -18633,52 +17841,53 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NDESK_DBUS_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ as_fn_error "Package requirements (ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED) were not met:
+
+$NDESK_DBUS_PKG_ERRORS
- LINK_DBUS='-r:$(top_builddir)/lib/dbus-sharp/NDesk.DBus.dll -r:$(top_builddir)/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll'
- DIR_DBUS="dbus-sharp"
- DIR_DBUS_GLIB="dbus-sharp-glib"
- PATH_DBUS='../lib/dbus-sharp:../lib/dbus-sharp-glib:'
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+Alternatively, you may set the environment variables NDESK_DBUS_CFLAGS
+and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
- LINK_DBUS='-r:$(top_builddir)/lib/dbus-sharp/NDesk.DBus.dll -r:$(top_builddir)/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll'
- DIR_DBUS="dbus-sharp"
- DIR_DBUS_GLIB="dbus-sharp-glib"
- PATH_DBUS='../lib/dbus-sharp:../lib/dbus-sharp-glib:'
+Alternatively, you may set the environment variables NDESK_DBUS_CFLAGS
+and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
else
NDESK_DBUS_CFLAGS=$pkg_cv_NDESK_DBUS_CFLAGS
NDESK_DBUS_LIBS=$pkg_cv_NDESK_DBUS_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-
- LINK_DBUS="-pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0"
- DIR_DBUS=""
- DIR_DBUS_GLIB=""
- PATH_DBUS=""
-
+ :
fi
-
-
-
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for NUNIT" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NUNIT" >&5
$as_echo_n "checking for NUNIT... " >&6; }
if test -n "$NUNIT_CFLAGS"; then
pkg_cv_NUNIT_CFLAGS="$NUNIT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit >= \$NUNIT_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nunit >= \$NUNIT_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "nunit >= $NUNIT_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit >= $NUNIT_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -18690,11 +17899,11 @@ if test -n "$NUNIT_LIBS"; then
pkg_cv_NUNIT_LIBS="$NUNIT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit >= \$NUNIT_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nunit >= \$NUNIT_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "nunit >= $NUNIT_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit >= $NUNIT_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -18720,7 +17929,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NUNIT_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
do_tests="no"
elif test $pkg_failed = untried; then
@@ -18728,7 +17937,7 @@ elif test $pkg_failed = untried; then
else
NUNIT_CFLAGS=$pkg_cv_NUNIT_CFLAGS
NUNIT_LIBS=$pkg_cv_NUNIT_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
do_tests="yes"
fi
@@ -18746,18 +17955,18 @@ fi
if test "x$do_tests" = "xno"; then
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for NUNIT" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NUNIT" >&5
$as_echo_n "checking for NUNIT... " >&6; }
if test -n "$NUNIT_CFLAGS"; then
pkg_cv_NUNIT_CFLAGS="$NUNIT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit >= 2.0\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono-nunit >= 2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "mono-nunit >= 2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit >= 2.0" 2>/dev/null`
else
pkg_failed=yes
@@ -18769,11 +17978,11 @@ if test -n "$NUNIT_LIBS"; then
pkg_cv_NUNIT_LIBS="$NUNIT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit >= 2.0\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono-nunit >= 2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "mono-nunit >= 2.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit >= 2.0" 2>/dev/null`
else
pkg_failed=yes
@@ -18799,7 +18008,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NUNIT_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
do_tests="no"
elif test $pkg_failed = untried; then
@@ -18807,7 +18016,7 @@ elif test $pkg_failed = untried; then
else
NUNIT_CFLAGS=$pkg_cv_NUNIT_CFLAGS
NUNIT_LIBS=$pkg_cv_NUNIT_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
do_tests="yes"
fi
@@ -18824,7 +18033,7 @@ fi
if test "x$do_tests" = "xno"; then
NUNIT_DEFINES=''
- { $as_echo "$as_me:$LINENO: WARNING: Could not find nunit: tests will not be available." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find nunit: tests will not be available." >&5
$as_echo "$as_me: WARNING: Could not find nunit: tests will not be available." >&2;}
else
NUNIT_DEFINES='-d:ENABLE_NUNIT'
@@ -18836,9 +18045,9 @@ fi
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GCONFTOOL+set}" = set; then
+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
@@ -18851,14 +18060,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
@@ -18867,10 +18076,10 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
$as_echo "$GCONFTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -18884,13 +18093,13 @@ fi
# Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then
+if test "${with_gconf_source+set}" = set; then :
withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
fi
- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
@@ -18899,22 +18108,20 @@ $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installatio
# Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then
+if test "${with_gconf_schema_file_dir+set}" = set; then :
withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
fi
- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
# Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then
+if test "${enable_schemas_install+set}" = set; then :
enableval=$enable_schemas_install; case ${enableval} in
yes|no) ;;
- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
esac
fi
@@ -18930,19 +18137,14 @@ fi
-
-{ $as_echo "$as_me:$LINENO: checking for jpeg_start_decompress in -ljpeg" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_decompress in -ljpeg" >&5
$as_echo_n "checking for jpeg_start_decompress in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_start_decompress+set}" = set; then
+if test "${ac_cv_lib_jpeg_jpeg_start_decompress+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ljpeg -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -18960,43 +18162,18 @@ return jpeg_start_decompress ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_jpeg_jpeg_start_decompress=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_jpeg_jpeg_start_decompress=no
+ ac_cv_lib_jpeg_jpeg_start_decompress=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5
$as_echo "$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_start_decompress" = x""yes; then
+if test "x$ac_cv_lib_jpeg_jpeg_start_decompress" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
@@ -19004,144 +18181,14 @@ _ACEOF
LIBS="-ljpeg $LIBS"
else
- { { $as_echo "$as_me:$LINENO: error: libjpeg not found" >&5
-$as_echo "$as_me: error: libjpeg not found" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-if test "${ac_cv_header_jpeglib_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-$as_echo_n "checking for jpeglib.h... " >&6; }
-if test "${ac_cv_header_jpeglib_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-$as_echo "$ac_cv_header_jpeglib_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
-$as_echo_n "checking jpeglib.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <jpeglib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
-$as_echo_n "checking jpeglib.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <jpeglib.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
+ as_fn_error "libjpeg not found" "$LINENO" 5
fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-$as_echo_n "checking for jpeglib.h... " >&6; }
-if test "${ac_cv_header_jpeglib_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_jpeglib_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
+if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
-fi
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then
- :
else
- { { $as_echo "$as_me:$LINENO: error: libjpeg not found" >&5
-$as_echo "$as_me: error: libjpeg not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "libjpeg not found" "$LINENO" 5
fi
@@ -19150,18 +18197,18 @@ LIBJPEG='-ljpeg'
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for LCMS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5
$as_echo_n "checking for LCMS... " >&6; }
if test -n "$LCMS_CFLAGS"; then
pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lcms >= \$LCMS_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms >= \$LCMS_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "lcms >= $LCMS_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= $LCMS_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -19173,11 +18220,11 @@ if test -n "$LCMS_LIBS"; then
pkg_cv_LCMS_LIBS="$LCMS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lcms >= \$LCMS_REQUIRED\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms >= \$LCMS_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "lcms >= $LCMS_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms >= $LCMS_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -19203,21 +18250,16 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$LCMS_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for cmsCreateBCHSWabstractProfile in -llcms" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsCreateBCHSWabstractProfile in -llcms" >&5
$as_echo_n "checking for cmsCreateBCHSWabstractProfile in -llcms... " >&6; }
-if test "${ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile+set}" = set; then
+if test "${ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-llcms -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19235,43 +18277,18 @@ return cmsCreateBCHSWabstractProfile ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile=no
+ ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" >&5
$as_echo "$ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" >&6; }
-if test "x$ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" = x""yes; then
+if test "x$ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLCMS 1
_ACEOF
@@ -19279,163 +18296,28 @@ _ACEOF
LIBS="-llcms $LIBS"
else
- { { $as_echo "$as_me:$LINENO: error: liblcms not found" >&5
-$as_echo "$as_me: error: liblcms not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "liblcms not found" "$LINENO" 5
fi
- if test "${ac_cv_header_lcms_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for lcms.h" >&5
-$as_echo_n "checking for lcms.h... " >&6; }
-if test "${ac_cv_header_lcms_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-$as_echo "$ac_cv_header_lcms_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking lcms.h usability" >&5
-$as_echo_n "checking lcms.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <lcms.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+ ac_fn_c_check_header_mongrel "$LINENO" "lcms.h" "ac_cv_header_lcms_h" "$ac_includes_default"
+if test "x$ac_cv_header_lcms_h" = x""yes; then :
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking lcms.h presence" >&5
-$as_echo_n "checking lcms.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <lcms.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: lcms.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: lcms.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: lcms.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: lcms.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: lcms.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: lcms.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: lcms.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for lcms.h" >&5
-$as_echo_n "checking for lcms.h... " >&6; }
-if test "${ac_cv_header_lcms_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_lcms_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-$as_echo "$ac_cv_header_lcms_h" >&6; }
-
-fi
-if test "x$ac_cv_header_lcms_h" = x""yes; then
- :
-else
- { { $as_echo "$as_me:$LINENO: error: liblcms not found" >&5
-$as_echo "$as_me: error: liblcms not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "liblcms not found" "$LINENO" 5
fi
LCMS_LIBS='-llcms'
LCMS_CFLAGS=''
elif test $pkg_failed = untried; then
-
-{ $as_echo "$as_me:$LINENO: checking for cmsCreateBCHSWabstractProfile in -llcms" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsCreateBCHSWabstractProfile in -llcms" >&5
$as_echo_n "checking for cmsCreateBCHSWabstractProfile in -llcms... " >&6; }
-if test "${ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile+set}" = set; then
+if test "${ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-llcms -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19453,43 +18335,18 @@ return cmsCreateBCHSWabstractProfile ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile=no
+ ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" >&5
$as_echo "$ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" >&6; }
-if test "x$ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" = x""yes; then
+if test "x$ac_cv_lib_lcms_cmsCreateBCHSWabstractProfile" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLCMS 1
_ACEOF
@@ -19497,144 +18354,14 @@ _ACEOF
LIBS="-llcms $LIBS"
else
- { { $as_echo "$as_me:$LINENO: error: liblcms not found" >&5
-$as_echo "$as_me: error: liblcms not found" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
- if test "${ac_cv_header_lcms_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for lcms.h" >&5
-$as_echo_n "checking for lcms.h... " >&6; }
-if test "${ac_cv_header_lcms_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-$as_echo "$ac_cv_header_lcms_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking lcms.h usability" >&5
-$as_echo_n "checking lcms.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <lcms.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking lcms.h presence" >&5
-$as_echo_n "checking lcms.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <lcms.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
+ as_fn_error "liblcms not found" "$LINENO" 5
fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: lcms.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: lcms.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: lcms.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: lcms.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: lcms.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: lcms.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: lcms.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: lcms.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for lcms.h" >&5
-$as_echo_n "checking for lcms.h... " >&6; }
-if test "${ac_cv_header_lcms_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_lcms_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-$as_echo "$ac_cv_header_lcms_h" >&6; }
+ ac_fn_c_check_header_mongrel "$LINENO" "lcms.h" "ac_cv_header_lcms_h" "$ac_includes_default"
+if test "x$ac_cv_header_lcms_h" = x""yes; then :
-fi
-if test "x$ac_cv_header_lcms_h" = x""yes; then
- :
else
- { { $as_echo "$as_me:$LINENO: error: liblcms not found" >&5
-$as_echo "$as_me: error: liblcms not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "liblcms not found" "$LINENO" 5
fi
@@ -19643,7 +18370,7 @@ fi
else
LCMS_CFLAGS=$pkg_cv_LCMS_CFLAGS
LCMS_LIBS=$pkg_cv_LCMS_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
@@ -19652,19 +18379,19 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for LIBGPHOTO2" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGPHOTO2" >&5
$as_echo_n "checking for LIBGPHOTO2... " >&6; }
if test -n "$LIBGPHOTO2_CFLAGS"; then
pkg_cv_LIBGPHOTO2_CFLAGS="$LIBGPHOTO2_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.1.4\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.1.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= \$LIBGPHOTO2_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= $LIBGPHOTO2_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_LIBGPHOTO2_CFLAGS=`$PKG_CONFIG --cflags "libgphoto2 >= 2.1.4" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGPHOTO2_CFLAGS=`$PKG_CONFIG --cflags "libgphoto2 >= $LIBGPHOTO2_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -19675,12 +18402,12 @@ if test -n "$LIBGPHOTO2_LIBS"; then
pkg_cv_LIBGPHOTO2_LIBS="$LIBGPHOTO2_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.1.4\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.1.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= \$LIBGPHOTO2_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= $LIBGPHOTO2_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_LIBGPHOTO2_LIBS=`$PKG_CONFIG --libs "libgphoto2 >= 2.1.4" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGPHOTO2_LIBS=`$PKG_CONFIG --libs "libgphoto2 >= $LIBGPHOTO2_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -19698,14 +18425,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBGPHOTO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgphoto2 >= 2.1.4" 2>&1`
+ LIBGPHOTO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgphoto2 >= $LIBGPHOTO2_REQUIRED" 2>&1`
else
- LIBGPHOTO2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgphoto2 >= 2.1.4" 2>&1`
+ LIBGPHOTO2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgphoto2 >= $LIBGPHOTO2_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBGPHOTO2_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (libgphoto2 >= 2.1.4) were not met:
+ as_fn_error "Package requirements (libgphoto2 >= $LIBGPHOTO2_REQUIRED) were not met:
$LIBGPHOTO2_PKG_ERRORS
@@ -19715,23 +18442,11 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables LIBGPHOTO2_CFLAGS
and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libgphoto2 >= 2.1.4) were not met:
-
-$LIBGPHOTO2_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBGPHOTO2_CFLAGS
-and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -19740,48 +18455,33 @@ and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBGPHOTO2_CFLAGS
-and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
LIBGPHOTO2_CFLAGS=$pkg_cv_LIBGPHOTO2_CFLAGS
LIBGPHOTO2_LIBS=$pkg_cv_LIBGPHOTO2_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
-if pkg-config --atleast-version=2.4 libgphoto2; then
- CSC_DEFINES="$CSC_DEFINES -d:GPHOTO2_2_4"
-fi
-
LIBEXIF_API_CHANGE=0.6.0
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for EXIF" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIF" >&5
$as_echo_n "checking for EXIF... " >&6; }
if test -n "$EXIF_CFLAGS"; then
pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif >= \$LIBEXIF_API_CHANGE\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= \$LIBEXIF_API_CHANGE\""; } >&5
($PKG_CONFIG --exists --print-errors "libexif >= $LIBEXIF_API_CHANGE") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_EXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= $LIBEXIF_API_CHANGE" 2>/dev/null`
else
pkg_failed=yes
@@ -19793,11 +18493,11 @@ if test -n "$EXIF_LIBS"; then
pkg_cv_EXIF_LIBS="$EXIF_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif >= \$LIBEXIF_API_CHANGE\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= \$LIBEXIF_API_CHANGE\""; } >&5
($PKG_CONFIG --exists --print-errors "libexif >= $LIBEXIF_API_CHANGE") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_EXIF_LIBS=`$PKG_CONFIG --libs "libexif >= $LIBEXIF_API_CHANGE" 2>/dev/null`
else
pkg_failed=yes
@@ -19823,18 +18523,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EXIF_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (libexif >= $LIBEXIF_API_CHANGE) were not met:
-
-$EXIF_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables EXIF_CFLAGS
-and EXIF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libexif >= $LIBEXIF_API_CHANGE) were not met:
+ as_fn_error "Package requirements (libexif >= $LIBEXIF_API_CHANGE) were not met:
$EXIF_PKG_ERRORS
@@ -19844,22 +18533,11 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables EXIF_CFLAGS
and EXIF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables EXIF_CFLAGS
-and EXIF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -19868,12 +18546,11 @@ and EXIF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
else
EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
EXIF_LIBS=$pkg_cv_EXIF_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
@@ -19883,18 +18560,18 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for LIBEXIF_VERSION_CHECK" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEXIF_VERSION_CHECK" >&5
$as_echo_n "checking for LIBEXIF_VERSION_CHECK... " >&6; }
if test -n "$LIBEXIF_VERSION_CHECK_CFLAGS"; then
pkg_cv_LIBEXIF_VERSION_CHECK_CFLAGS="$LIBEXIF_VERSION_CHECK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.12\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.12\""; } >&5
($PKG_CONFIG --exists --print-errors "libexif >= 0.6.12") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_LIBEXIF_VERSION_CHECK_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.12" 2>/dev/null`
else
pkg_failed=yes
@@ -19906,11 +18583,11 @@ if test -n "$LIBEXIF_VERSION_CHECK_LIBS"; then
pkg_cv_LIBEXIF_VERSION_CHECK_LIBS="$LIBEXIF_VERSION_CHECK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.12\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.12\""; } >&5
($PKG_CONFIG --exists --print-errors "libexif >= 0.6.12") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_LIBEXIF_VERSION_CHECK_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.12" 2>/dev/null`
else
pkg_failed=yes
@@ -19936,7 +18613,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$LIBEXIF_VERSION_CHECK_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
EXIF_SOVERSION=10
elif test $pkg_failed = untried; then
@@ -19944,16 +18621,103 @@ elif test $pkg_failed = untried; then
else
LIBEXIF_VERSION_CHECK_CFLAGS=$pkg_cv_LIBEXIF_VERSION_CHECK_CFLAGS
LIBEXIF_VERSION_CHECK_LIBS=$pkg_cv_LIBEXIF_VERSION_CHECK_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
EXIF_SOVERSION=12
fi
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5
+$as_echo_n "checking for UNIQUE... " >&6; }
+
+if test -n "$UNIQUE_CFLAGS"; then
+ pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "unique-1.0 >= 1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0 >= 1.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$UNIQUE_LIBS"; then
+ pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "unique-1.0 >= 1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0 >= 1.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "unique-1.0 >= 1.0" 2>&1`
+ else
+ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "unique-1.0 >= 1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$UNIQUE_PKG_ERRORS" >&5
+
+ as_fn_error "Package requirements (unique-1.0 >= 1.0) were not met:
+
+$UNIQUE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables UNIQUE_CFLAGS
+and UNIQUE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables UNIQUE_CFLAGS
+and UNIQUE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS
+ UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+
+
# Check whether --with-turtle was given.
-if test "${with_turtle+set}" = set; then
+if test "${with_turtle+set}" = set; then :
withval=$with_turtle;
fi
@@ -19973,50 +18737,39 @@ fi
# Check whether --with-gnome-screensaver was given.
-if test "${with_gnome_screensaver+set}" = set; then
- withval=$with_gnome_screensaver;
+if test "${with_gnome_screensaver+set}" = set; then :
+ withval=$with_gnome_screensaver; gnome_screensaver_prefix=$with_gnome_screensaver
+else
+ gnome_screensaver_prefix=$prefix
fi
-if test "x$with_gnome_screensaver" != "x"; then
- gnome_screensaver_prefix=$with_gnome_screensaver
-else
- gnome_screensaver_prefix=$prefix
-fi
-if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-screensaver\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-screensaver") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- have_gs_pkgconfig=yes
+# Check whether --with-gnome-screensaver-privlibexecdir was given.
+if test "${with_gnome_screensaver_privlibexecdir+set}" = set; then :
+ withval=$with_gnome_screensaver_privlibexecdir; GNOME_SCREENSAVER_SAVERDIR=$with_gnome_screensaver_privlibexecdir
else
- have_gs_pkgconfig=no
-fi
-if test "$have_gs_pkgconfig" = "yes"; then
- gs_pc_prefix=`$PKG_CONFIG --variable=prefix gnome-screensaver`
- gs_pc_saverdir=`$PKG_CONFIG --variable=privlibexecdir gnome-screensaver`
- gs_pc_themesdir=`$PKG_CONFIG --variable=themesdir gnome-screensaver`
+ if test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
+ GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver
+ else
+ GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/libexec/gnome-screensaver
+ fi
fi
-if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
- GNOME_SCREENSAVER_SAVERDIR=$gs_pc_saverdir
-elif test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
- GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver/gnome-screensaver
-else
- GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/libexec/gnome-screensaver
-fi
-if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
- GNOME_SCREENSAVER_THEMESDIR=$gs_pc_themesdir
+
+# Check whether --with-gnome-screensaver-themesdir was given.
+if test "${with_gnome_screensaver_themesdir+set}" = set; then :
+ withval=$with_gnome_screensaver_themesdir; GNOME_SCREENSAVER_THEMESDIR=$with_gnome_screensaver_themesdir
else
- GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
+ GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
+
fi
+
ICONS_DIRECTORY=${datadir}/${PACKAGE}-${VERSION}
@@ -20030,146 +18783,12 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-
-for ac_header in locale.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_header in locale.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+if test "x$ac_cv_header_locale_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LOCALE_H 1
_ACEOF
fi
@@ -20177,16 +18796,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
$as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
int
@@ -20197,46 +18812,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_val_LC_MESSAGES=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_val_LC_MESSAGES=no
+ am_cv_val_LC_MESSAGES=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
if test $am_cv_val_LC_MESSAGES = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
fi
fi
@@ -20249,150 +18837,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
- if test "${ac_cv_header_libintl_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
-$as_echo_n "checking libintl.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <libintl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
-$as_echo_n "checking libintl.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <libintl.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_libintl_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-
-fi
-if test "x$ac_cv_header_libintl_h" = x""yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
gt_cv_func_dgettext_libintl="no"
libintl_extra_libs=""
#
# First check in libc
#
- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
$as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
@@ -20405,54 +18863,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_ngettext_libc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_ngettext_libc=no
+ gt_cv_func_ngettext_libc=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
$as_echo "$gt_cv_func_ngettext_libc" >&6; }
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
$as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
@@ -20465,141 +18894,26 @@ return !dgettext ("","")
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_dgettext_libc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_dgettext_libc=no
+ gt_cv_func_dgettext_libc=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
$as_echo "$gt_cv_func_dgettext_libc" >&6; }
fi
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-
-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
fi
@@ -20614,18 +18928,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20643,55 +18953,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_bindtextdomain=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_bindtextdomain=no
+ ac_cv_lib_intl_bindtextdomain=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20709,55 +18990,26 @@ return ngettext ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_ngettext=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_ngettext=no
+ ac_cv_lib_intl_ngettext=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20775,43 +19027,18 @@ return dgettext ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_dgettext=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_dgettext=no
+ ac_cv_lib_intl_dgettext=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
gt_cv_func_dgettext_libintl=yes
fi
@@ -20821,22 +19048,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
- { $as_echo "$as_me:$LINENO: result: " >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
$as_echo "" >&6; }
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20854,55 +19077,26 @@ return ngettext ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_ngettext=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_ngettext=no
+ ac_cv_lib_intl_ngettext=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20920,43 +19114,18 @@ return dcgettext ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_dcgettext=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_intl_dcgettext=no
+ ac_cv_lib_intl_dcgettext=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
@@ -20978,102 +19147,12 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
-
-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
fi
@@ -21103,15 +19182,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
@@ -21136,118 +19213,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
$as_echo "$MSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
LIBS="$LIBS $INTLLIBS"
-
-for ac_func in dcgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_func in dcgettext
+do :
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_DCGETTEXT 1
_ACEOF
fi
done
MSGFMT_OPTS=
- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
@@ -21262,14 +19249,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-else { $as_echo "$as_me:$LINENO: result: no" >&5
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
@@ -21277,9 +19264,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -21292,14 +19279,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -21308,19 +19295,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
$as_echo "$GMSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
@@ -21345,18 +19332,14 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
$as_echo "$XGETTEXT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -21368,121 +19351,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
CATOBJEXT=.gmo
DATADIRNAME=share
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- case $host in
+ case $host in
*-*-solaris*)
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char bind_textdomain_codeset (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef bind_textdomain_codeset
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bind_textdomain_codeset ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
-
-int
-main ()
-{
-return bind_textdomain_codeset ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_bind_textdomain_codeset=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
CATOBJEXT=.gmo
DATADIRNAME=share
else
@@ -21497,10 +19373,8 @@ fi
;;
esac
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
@@ -21514,9 +19388,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
fi
@@ -21524,7 +19396,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
@@ -21557,7 +19429,7 @@ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
@@ -21582,7 +19454,7 @@ $as_echo_n "checking for catalogs to be installed... " >&6; }
fi
done
LINGUAS=$NEW_LINGUAS
- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
$as_echo "$LINGUAS" >&6; }
fi
@@ -21591,6 +19463,15 @@ $as_echo "$LINGUAS" >&6; }
fi
fi
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+
+
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -21614,18 +19495,105 @@ $as_echo "$LINGUAS" >&6; }
-expanded_libdir=`( case $prefix in NONE) prefix=$ac_default_prefix ;; *) ;; esac
- case $exec_prefix in NONE) exec_prefix=$prefix ;; *) ;; esac
- eval echo $libdir )`
-
-
ac_config_files="$ac_config_files src/f-spot"
GNOME_ICON_THEME_PREFIX=`$PKG_CONFIG --variable=prefix gnome-icon-theme`
-ac_config_files="$ac_config_files Makefile lib/dbus-sharp/Makefile lib/dbus-sharp-glib/Makefile lib/dpap-sharp/Makefile lib/dpap-sharp/lib/Makefile lib/dpap-sharp/dpap-client/Makefile lib/dpap-sharp/dpap-server/Makefile lib/dpap-sharp/DPAPService/Makefile lib/dpap-sharp/DPAPBrowser/Makefile lib/GKeyFile/Makefile lib/gio-sharp/Makefile lib/gio-sharp/gio/Makefile lib/gio-sharp/generator/Makefile lib/glitz-sharp/Makefile lib/glitz-sharp/src/Makefile lib/gnome-keyring-sharp/Makefile lib/gtk-sharp-beans/Makefile lib/libfspot/Makefile lib/libgphoto2-sharp/Makefile lib/libjpegtran/Makefile lib/Makefile lib/mono-addins/Makefile lib/mono-addins/Mono.Addins.Gui/Makefile lib/mono-addins/Mono.Addins/Makefile lib/mono-addins/Mono.Addins.Setup/Makefile lib/semweb/Makefile docs/Makefile icons/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Cms.dll.config src/FSpot.Widgets.dll.config src/Makefile extensions/Makefile extensions/Exporters/Makefile extensions/Exporters/CDExport/Makefile extensions/Exporters/DefaultExporters/Makefile extensions/Exporters/FlickrExport/Makefile extensions/Exporters/FlickrExport/FlickrNet/Makefile extensions/Exporters/GalleryExport/Makefile extensions/Exporters/FacebookExport/Makefile extensions/Exporters/FolderExport/Makefile extensions/Exporters/SmugMugExport/SmugMugNet/Makefile extensions/Exporters/SmugMugExport/Makefile extensions/Exporters/TabbloExport/Makefile extensions/Exporters/TabbloExport/Tabblo/Makefile extensions/Exporters/PicasaWebExport/Makefile extensions/Exporters/PicasaWebExport/google-sharp/Makefile extensions/Exporters/ZipExport/Makefile extensions/Services/Makefile extensions/Services/BeagleService/Makefile extensions/Services/DBusService/Makefile extensions/Tools/Makefile extensions/Tools/RawPlusJpeg/Makefile extensions/Tools/ChangePhotoPath/Makefile extensions/Tools/HashJob/Makefile extensions/Tools/DevelopInUFraw/Makefile extensions/Tools/MergeDb/Makefile extensions/Tools/ScreensaverConfig/Makefile extensions/Transitions/Makefile extensions/Transitions/CoverTransition/Makefile tests/Makefile tests/src/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in f-spot-import.desktop.in"
+
+
+ # Check whether --enable-shave was given.
+if test "${enable_shave+set}" = set; then :
+ enableval=$enable_shave;
+else
+ enable_shave=yes
+
+fi
+
+
+
+ if test x"$enable_shave" = xyes; then
+ shavedir="$ac_pwd/build/m4/shave"
+
+
+ MAKEFLAGS=-s
+
+ AM_MAKEFLAGS='`test -z $V && echo -s`'
+
+
+ # Extract the first word of "sed", so it can be a program name with args.
+set dummy sed; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_SED+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$SED"; then
+ ac_cv_prog_SED="$SED" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_SED="sed"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
+fi
+fi
+SED=$ac_cv_prog_SED
+if test -n "$SED"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+ SHAVE_SAVED_LIBTOOL=$LIBTOOL
+ LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
+
+
+ SHAVE_SAVED_CC=$CC
+ SHAVE_SAVED_CXX=$CXX
+ SHAVE_SAVED_FC=$FC
+ SHAVE_SAVED_F77=$F77
+ SHAVE_SAVED_OBJC=$OBJC
+ SHAVE_SAVED_MCS=$MCS
+ CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
+ CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
+ FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
+ F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
+ OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
+ MCS="${SHELL} ${shavedir}/shave mcs ${SHAVE_SAVED_MCS}"
+
+
+
+
+
+
+
+ V=@
+ else
+ V=1
+ fi
+ Q='$(V:1=)'
+
+
+
+
+ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool lib/dpap-sharp/Makefile lib/dpap-sharp/lib/Makefile lib/dpap-sharp/dpap-client/Makefile lib/dpap-sharp/dpap-server/Makefile lib/dpap-sharp/DPAPService/Makefile lib/dpap-sharp/DPAPBrowser/Makefile lib/GKeyFile/Makefile lib/gio-sharp/Makefile lib/gio-sharp/gio/Makefile lib/gio-sharp/generator/Makefile lib/gnome-keyring-sharp/Makefile lib/gtk-sharp-beans/Makefile lib/libfspot/Makefile lib/libgphoto2-sharp/Makefile lib/libgphoto2-sharp/libgphoto2-sharp.dll.config lib/libgphoto2-sharp/glue/Makefile lib/libjpegtran/Makefile lib/Makefile lib/semweb/Makefile lib/unique-sharp/Makefile lib/unique-sharp/generator/Makefile lib/unique-sharp/unique/Makefile docs/Makefile icons/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Cms.dll.config src/FSpot.Widgets.dll.config src/Makefile extensions/Makefile extensions/Editors/Makefile extensions/Editors/BlackoutEditor/Makefile extensions/Editors/BWEditor/Makefile extensions/Editors/FlipEditor/Makefile extensions/Editors/PixelateEditor/Makefile extensions/Editors/ResizeEditor/Makefile extensions/Exporters/Makefile extensions/Exporters/CDExport/Makefile extensions/Exporters/FlickrExport/Makefile extensions/Exporters/FlickrExport/FlickrNet/Makefile extensions/Exporters/GalleryExport/Makefile extensions/Exporters/FacebookExport/Makefile extensions/Exporters/FolderExport/Makefile extensions/Exporters/SmugMugExport/SmugMugNet/Makefile extensions/Exporters/SmugMugExport/Makefile extensions/Exporters/TabbloExport/Makefile extensions/Exporters/TabbloExport/Tabblo/Makefile extensions/Exporters/PicasaWebExport/Makefile extensions/Exporters/PicasaWebExport/google-sharp/Makefile extensions/Exporters/ZipExport/Makefile extensions/Services/Makefile extensions/Services/DBusService/Makefile extensions/Tools/Makefile extensions/Tools/RawPlusJpeg/Makefile extensions/Tools/ChangePhotoPath/Makefile extensions/Tools/HashJob/Makefile extensions/Tools/DevelopInUFraw/Makefile extensions/Tools/LiveWebGallery/Makefile extensions/Tools/MergeDb/Makefile extensions/Tools/RetroactiveRoll/Makefile extensions/Tools/ScreensaverConfig/Makefile extensions/Transitions/Makefile extensions/Transitions/CoverTransition/Makefile tests/Makefile tests/src/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in f-spot-import.desktop.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21654,13 +19622,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -21668,8 +19636,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -21692,11 +19660,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
@@ -21716,8 +19684,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -21733,108 +19701,74 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
ac_config_commands="$ac_config_commands po/stamp-it"
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${NOGCONF_TRUE}" && test -z "${NOGCONF_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"NOGCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"NOGCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"NOGCONF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ENABLE_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"ENABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ENABLE_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"ENABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_TURTLE_TRUE}" && test -z "${WITH_TURTLE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_TURTLE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"WITH_TURTLE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"WITH_TURTLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -21844,17 +19778,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -21862,23 +19797,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -21886,7 +19813,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -21897,7 +19830,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -21920,13 +19853,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -21936,15 +19862,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -21956,12 +19882,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -21973,7 +19903,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -21987,8 +19999,12 @@ else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
@@ -22008,76 +20024,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -22106,8 +20071,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -22126,10 +20139,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in
+ case $1 in #(
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -22144,13 +20157,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by F-Spot $as_me 0.6.1.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+This file was extended by f-spot $as_me 0.6.2, which was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -22182,13 +20201,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -22207,16 +20228,17 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <bug-autoconf at gnu.org>."
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-F-Spot config.status 0.6.1.5
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+f-spot config.status 0.6.2
+configured by $0, generated by GNU Autoconf 2.65,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -22252,6 +20274,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
@@ -22259,20 +20283,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
+ as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -22280,11 +20303,10 @@ Try \`$0 --help' for more information." >&2
ac_cs_silent=: ;;
# This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
+ *) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
esac
@@ -22693,8 +20715,10 @@ do
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"src/f-spot") CONFIG_FILES="$CONFIG_FILES src/f-spot" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "lib/dbus-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dbus-sharp/Makefile" ;;
- "lib/dbus-sharp-glib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dbus-sharp-glib/Makefile" ;;
+ "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
+ "build/m4/Makefile") CONFIG_FILES="$CONFIG_FILES build/m4/Makefile" ;;
+ "build/m4/shave/shave") CONFIG_FILES="$CONFIG_FILES build/m4/shave/shave" ;;
+ "build/m4/shave/shave-libtool") CONFIG_FILES="$CONFIG_FILES build/m4/shave/shave-libtool" ;;
"lib/dpap-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dpap-sharp/Makefile" ;;
"lib/dpap-sharp/lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dpap-sharp/lib/Makefile" ;;
"lib/dpap-sharp/dpap-client/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dpap-sharp/dpap-client/Makefile" ;;
@@ -22705,19 +20729,18 @@ do
"lib/gio-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gio-sharp/Makefile" ;;
"lib/gio-sharp/gio/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gio-sharp/gio/Makefile" ;;
"lib/gio-sharp/generator/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gio-sharp/generator/Makefile" ;;
- "lib/glitz-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glitz-sharp/Makefile" ;;
- "lib/glitz-sharp/src/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glitz-sharp/src/Makefile" ;;
"lib/gnome-keyring-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gnome-keyring-sharp/Makefile" ;;
"lib/gtk-sharp-beans/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gtk-sharp-beans/Makefile" ;;
"lib/libfspot/Makefile") CONFIG_FILES="$CONFIG_FILES lib/libfspot/Makefile" ;;
"lib/libgphoto2-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/libgphoto2-sharp/Makefile" ;;
+ "lib/libgphoto2-sharp/libgphoto2-sharp.dll.config") CONFIG_FILES="$CONFIG_FILES lib/libgphoto2-sharp/libgphoto2-sharp.dll.config" ;;
+ "lib/libgphoto2-sharp/glue/Makefile") CONFIG_FILES="$CONFIG_FILES lib/libgphoto2-sharp/glue/Makefile" ;;
"lib/libjpegtran/Makefile") CONFIG_FILES="$CONFIG_FILES lib/libjpegtran/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
- "lib/mono-addins/Makefile") CONFIG_FILES="$CONFIG_FILES lib/mono-addins/Makefile" ;;
- "lib/mono-addins/Mono.Addins.Gui/Makefile") CONFIG_FILES="$CONFIG_FILES lib/mono-addins/Mono.Addins.Gui/Makefile" ;;
- "lib/mono-addins/Mono.Addins/Makefile") CONFIG_FILES="$CONFIG_FILES lib/mono-addins/Mono.Addins/Makefile" ;;
- "lib/mono-addins/Mono.Addins.Setup/Makefile") CONFIG_FILES="$CONFIG_FILES lib/mono-addins/Mono.Addins.Setup/Makefile" ;;
"lib/semweb/Makefile") CONFIG_FILES="$CONFIG_FILES lib/semweb/Makefile" ;;
+ "lib/unique-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/unique-sharp/Makefile" ;;
+ "lib/unique-sharp/generator/Makefile") CONFIG_FILES="$CONFIG_FILES lib/unique-sharp/generator/Makefile" ;;
+ "lib/unique-sharp/unique/Makefile") CONFIG_FILES="$CONFIG_FILES lib/unique-sharp/unique/Makefile" ;;
"docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
"icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
@@ -22729,9 +20752,14 @@ do
"src/FSpot.Widgets.dll.config") CONFIG_FILES="$CONFIG_FILES src/FSpot.Widgets.dll.config" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"extensions/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Makefile" ;;
+ "extensions/Editors/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Editors/Makefile" ;;
+ "extensions/Editors/BlackoutEditor/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Editors/BlackoutEditor/Makefile" ;;
+ "extensions/Editors/BWEditor/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Editors/BWEditor/Makefile" ;;
+ "extensions/Editors/FlipEditor/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Editors/FlipEditor/Makefile" ;;
+ "extensions/Editors/PixelateEditor/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Editors/PixelateEditor/Makefile" ;;
+ "extensions/Editors/ResizeEditor/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Editors/ResizeEditor/Makefile" ;;
"extensions/Exporters/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Exporters/Makefile" ;;
"extensions/Exporters/CDExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Exporters/CDExport/Makefile" ;;
- "extensions/Exporters/DefaultExporters/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Exporters/DefaultExporters/Makefile" ;;
"extensions/Exporters/FlickrExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Exporters/FlickrExport/Makefile" ;;
"extensions/Exporters/FlickrExport/FlickrNet/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Exporters/FlickrExport/FlickrNet/Makefile" ;;
"extensions/Exporters/GalleryExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Exporters/GalleryExport/Makefile" ;;
@@ -22745,14 +20773,15 @@ do
"extensions/Exporters/PicasaWebExport/google-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Exporters/PicasaWebExport/google-sharp/Makefile" ;;
"extensions/Exporters/ZipExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Exporters/ZipExport/Makefile" ;;
"extensions/Services/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Services/Makefile" ;;
- "extensions/Services/BeagleService/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Services/BeagleService/Makefile" ;;
"extensions/Services/DBusService/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Services/DBusService/Makefile" ;;
"extensions/Tools/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/Makefile" ;;
"extensions/Tools/RawPlusJpeg/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/RawPlusJpeg/Makefile" ;;
"extensions/Tools/ChangePhotoPath/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/ChangePhotoPath/Makefile" ;;
"extensions/Tools/HashJob/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/HashJob/Makefile" ;;
"extensions/Tools/DevelopInUFraw/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/DevelopInUFraw/Makefile" ;;
+ "extensions/Tools/LiveWebGallery/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/LiveWebGallery/Makefile" ;;
"extensions/Tools/MergeDb/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/MergeDb/Makefile" ;;
+ "extensions/Tools/RetroactiveRoll/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/RetroactiveRoll/Makefile" ;;
"extensions/Tools/ScreensaverConfig/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Tools/ScreensaverConfig/Makefile" ;;
"extensions/Transitions/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Transitions/Makefile" ;;
"extensions/Transitions/CoverTransition/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Transitions/CoverTransition/Makefile" ;;
@@ -22765,9 +20794,7 @@ do
"f-spot-import.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot-import.desktop.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -22794,7 +20821,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ trap 'as_fn_exit 1' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
@@ -22805,11 +20832,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -22817,10 +20840,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -22834,24 +20863,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -22873,7 +20896,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -22887,7 +20910,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -22940,9 +20963,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -22983,9 +21004,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -23070,9 +21089,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -23085,9 +21102,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
- { (exit 1); exit 1; }; };;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -23115,12 +21130,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- ac_file_inputs="$ac_file_inputs '$ac_f'"
+ as_fn_append ac_file_inputs " '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -23131,7 +21144,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
@@ -23144,9 +21157,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; } ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -23174,47 +21185,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
case "$ac_dir" in
@@ -23271,7 +21242,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-
ac_sed_dataroot='
/datarootdir/ {
p
@@ -23281,12 +21251,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -23296,7 +21265,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
@@ -23325,14 +21294,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
@@ -23342,9 +21309,7 @@ which seems to be undefined. Please make sure it is defined." >&2;}
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -23355,25 +21320,19 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -23411,7 +21370,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -23506,47 +21465,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
@@ -24361,9 +22280,7 @@ _LT_EOF
"src/f-spot":F) chmod +x src/f-spot ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
@@ -24386,15 +22303,12 @@ $as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;
done # for ac_tag
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -24415,10 +22329,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit $?
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
diff --git a/configure.ac b/configure.ac
index 8512ba9..a24ad1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,89 @@
-AC_INIT(F-Spot, 0.6.1.5)
-AC_CONFIG_SRCDIR(src/main.cs)
+dnl Granularly define the version components
+dnl Remember to also update the Display Version
+m4_define([fspot_version_major], [0])
+m4_define([fspot_version_minor], [6])
+m4_define([fspot_version_micro], [2])
-AM_CONFIG_HEADER(config.h)
+dnl set to 0 when doing an official release
+m4_define([fspot_version_pre_release], [0])
+
+m4_define([concat], $1$2$3$4)
+
+dnl create base version string
+m4_define([fspot_version], concat(
+ fspot_version_major.,
+ fspot_version_minor.,
+ fspot_version_micro))
+
+dnl create the release version
+m4_define([fspot_version],
+ m4_if(fspot_version_pre_release, [0],
+ fspot_version,
+ concat(fspot_version, fspot_version_pre_release)))
+
+dnl this can sometimes differ manually
+m4_define([fspot_display_version],
+ ["0.6.2"])
+
+m4_define([fspot_api_version],
+ [fspot_version_major.fspot_version_minor])
-AM_INIT_AUTOMAKE([tar-ustar])
+m4_define([fspot_asm_version],
+ [fspot_api_version.0.0])
+AC_PREREQ(2.52)
+AC_INIT([f-spot], fspot_version,
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot])
+
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip foreign])
AM_MAINTAINER_MODE
+AM_CONFIG_HEADER(config.h)
+AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
IT_PROG_INTLTOOL([0.35.0])
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+
+dnl How to configure for distcheck
+DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-release"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+
+dnl Export Version Info
+AC_SUBST([API_VERSION], [fspot_api_version])
+AC_SUBST([ASM_VERSION], [fspot_asm_version])
+AC_SUBST([DISPLAY_VERSION], [fspot_display_version])
+
+dnl Expansions
+SHAMROCK_EXPAND_LIBDIR
+SHAMROCK_EXPAND_BINDIR
+SHAMROCK_EXPAND_DATADIR
+
+
+dnl Mono and gmcs
+SHAMROCK_CHECK_MONO_MODULE(2.2)
+SHAMROCK_FIND_MONO_2_0_COMPILER
+SHAMROCK_FIND_MONO_RUNTIME
+SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
+ Mono.Data.SqliteClient
+ Mono.Posix
+ System.Runtime.Remoting
+ System.Web
+ System.Web.Services
+ Mono.Cairo
+])
+
+
+
+
+
+
+
+AC_CONFIG_SRCDIR(src/main.cs)
AC_PROG_CC
AC_PROG_CXX
AC_ISC_POSIX
AC_HEADER_STDC
-AM_PROG_LIBTOOL
GNOME_COMPILE_WARNINGS
AM_PATH_GLIB_2_0
@@ -28,6 +98,27 @@ if test ! -x "$MCS"; then
AC_MSG_ERROR([No $CS compiler found])
fi
+dnl --- Check for gapi programs
+
+AC_PATH_PROG(GAPI2FIXUP, gapi2-fixup, no)
+
+if test ! -x "$GAPI2FIXUP"; then
+ AC_MSG_ERROR([No gapi post-processor found])
+fi
+
+AC_PATH_PROG(GAPI2PARSER, gapi2-parser, no)
+
+if test ! -x "$GAPI2PARSER"; then
+ AC_MSG_ERROR([No gapi parser found])
+fi
+
+AC_PATH_PROG(GAPI2CODEGEN, gapi2-codegen, no)
+
+if test ! -x "$GAPI2CODEGEN"; then
+ AC_MSG_ERROR([No gapi code generator found])
+fi
+
+
dnl -- Initialize docs
GNOME_DOC_INIT
@@ -41,18 +132,6 @@ else
AC_MSG_RESULT([found])
fi
-dnl -- check for various mono DLLs that we need.
-
-needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services Mono.Cairo"
-for i in $needed_dlls; do
- AC_MSG_CHECKING([for $i.dll])
- if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/2.0//$i.dll \); then
- AC_MSG_ERROR([missing required mono 2.0 DLL: $i.dll])
- else
- AC_MSG_RESULT([found])
- fi
-done
-
dnl --- Required libraries
LIBGNOME_REQUIRED=2.2
@@ -63,18 +142,16 @@ GIO_REQUIRED=2.16.0
GIOSHARP_REQUIRED=2.13.92
GTKSHARPBEANS_REQUIRED=2.13.92
GTKSHARP_REQUIRED=2.12.2
-MONO_REQUIRED=2.0.0
GTK_REQUIRED=2.14
-BEAGLE_REQUIRED=0.3.0
NDESK_DBUS_REQUIRED=0.4.2
NDESK_DBUS_GLIB_REQUIRED=0.3.0
MONO_CAIRO_REQUIRED=1.2.4
CAIRO_REQUIRED=1.4.0
-dnl -- this check is
LCMS_REQUIRED=1.12
-dnl -- LIBGPHOTO2_REQUIRED=2.1.4
+LIBGPHOTO2_REQUIRED=2.4
+MONOADDINS_REQUIRED=0.3
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED)
AC_SUBST(F_CFLAGS)
AC_SUBST(F_LIBS)
@@ -103,6 +180,8 @@ AM_CONDITIONAL(NOGCONF, test "x$enable_gconf" = "xno")
if test "x$enable_gconf" = "xno"; then
CSC_DEFINES="$CSC_DEFINES -d:NOGCONF"
else
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ AM_GCONF_SOURCE_2
PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED)
if pkg-config --atleast-version=2.18 gconf-sharp-2.0; then
CSC_DEFINES="$CSC_DEFINES -d:GCONF_SHARP_2_18"
@@ -112,39 +191,13 @@ else
fi
fi
+if pkg-config --at-least-version=2.16 gtk+-2.0; then
+ CSC_DEFINES="$CSC_DEFINES -d:GTK_2_16"
+fi
-PKG_CHECK_MODULES(BEAGLE, beagle-0.0 >= $BEAGLE_REQUIRED,
-[
- dnl this is a work around to avoid linking against beagles Util.dll
- BEAGLE_DIR=`$PKG_CONFIG --variable=dlldir beagle-0.0`
- LINK_BEAGLE="-r:$BEAGLE_DIR/Beagle"
- CSC_DEFINES="$CSC_DEFINES -d:ENABLE_BEAGLE"
-],
-[
- AC_MSG_RESULT([beagle not found])
-])
-AC_SUBST(BEAGLE_DIR)
-AC_SUBST(LINK_BEAGLE)
-
-
-dnl -- dbus-sharp: link or bundle ?
-PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
-[
- LINK_DBUS="-pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0"
- DIR_DBUS=""
- DIR_DBUS_GLIB=""
- PATH_DBUS=""
-],
-[
- LINK_DBUS='-r:$(top_builddir)/lib/dbus-sharp/NDesk.DBus.dll -r:$(top_builddir)/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll'
- DIR_DBUS="dbus-sharp"
- DIR_DBUS_GLIB="dbus-sharp-glib"
- PATH_DBUS='../lib/dbus-sharp:../lib/dbus-sharp-glib:'
-])
-AC_SUBST(DIR_DBUS)
-AC_SUBST(DIR_DBUS_GLIB)
-AC_SUBST(LINK_DBUS)
-AC_SUBST(PATH_DBUS)
+dnl -- dbus-sharp
+PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
+AC_SUBST(NDESK_DBUS_LIBS)
dnl -- nunit
PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED,
@@ -193,13 +246,9 @@ PKG_CHECK_MODULES(LCMS, lcms >= $LCMS_REQUIRED, [],
LCMS_CFLAGS=''])
-dnl --- libgphoto2-sharp
-
-PKG_CHECK_MODULES(LIBGPHOTO2, libgphoto2 >= 2.1.4)
+dnl --- libgphoto2
-if pkg-config --atleast-version=2.4 libgphoto2; then
- CSC_DEFINES="$CSC_DEFINES -d:GPHOTO2_2_4"
-fi
+PKG_CHECK_MODULES(LIBGPHOTO2, libgphoto2 >= $LIBGPHOTO2_REQUIRED)
AC_SUBST(CSC_DEFINES)
@@ -214,6 +263,9 @@ AC_SUBST(EXIF_LIBS)
PKG_CHECK_MODULES(LIBEXIF_VERSION_CHECK, libexif >= 0.6.12, EXIF_SOVERSION=12, EXIF_SOVERSION=10)
AC_SUBST(EXIF_SOVERSION)
+dnl --- libunique check
+PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= 1.0)
+
dnl --- Set up paths
AC_ARG_WITH(turtle, [ --with-turtle=DIR set path to source directory for turtle])
@@ -224,34 +276,25 @@ if test "x$with_turtle" != "xno"; then
AC_SUBST(TURTLEDIR)
fi
-AC_ARG_WITH(gnome-screensaver,[ --with-gnome-screensaver=PREFIX set gnome gnome-screensaver prefix])
-
-if test "x$with_gnome_screensaver" != "x"; then
- gnome_screensaver_prefix=$with_gnome_screensaver
-else
- gnome_screensaver_prefix=$prefix
-fi
-
-PKG_CHECK_EXISTS(gnome-screensaver, have_gs_pkgconfig=yes, have_gs_pkgconfig=no)
-if test "$have_gs_pkgconfig" = "yes"; then
- gs_pc_prefix=`$PKG_CONFIG --variable=prefix gnome-screensaver`
- gs_pc_saverdir=`$PKG_CONFIG --variable=privlibexecdir gnome-screensaver`
- gs_pc_themesdir=`$PKG_CONFIG --variable=themesdir gnome-screensaver`
-fi
-
-if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
- GNOME_SCREENSAVER_SAVERDIR=$gs_pc_saverdir
-elif test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
- GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver/gnome-screensaver
-else
- GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/libexec/gnome-screensaver
-fi
-
-if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
- GNOME_SCREENSAVER_THEMESDIR=$gs_pc_themesdir
-else
- GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
-fi
+AC_ARG_WITH(gnome-screensaver,
+ [ --with-gnome-screensaver=PREFIX set gnome gnome-screensaver prefix],
+ gnome_screensaver_prefix=$with_gnome_screensaver,
+ gnome_screensaver_prefix=$prefix)
+
+AC_ARG_WITH(gnome-screensaver-privlibexecdir,
+ [ --with-gnome-screensaver-privlibexecdir=DIR set gnome-screensaver privlibexecdir],
+ GNOME_SCREENSAVER_SAVERDIR=$with_gnome_screensaver_privlibexecdir,
+ if test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
+ GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver
+ else
+ GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/libexec/gnome-screensaver
+ fi)
+
+AC_ARG_WITH(gnome-screensaver-themesdir,
+ [ --with-gnome-screensaver-themesdir=DIR set gnome-screensaver themesdir],
+ GNOME_SCREENSAVER_THEMESDIR=$with_gnome_screensaver_themesdir,
+ GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
+ )
AC_SUBST(GNOME_SCREENSAVER_SAVERDIR)
AC_SUBST(GNOME_SCREENSAVER_THEMESDIR)
@@ -276,20 +319,21 @@ AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
-expanded_libdir=`( case $prefix in NONE) prefix=$ac_default_prefix ;; *) ;; esac
- case $exec_prefix in NONE) exec_prefix=$prefix ;; *) ;; esac
- eval echo $libdir )`
-AC_SUBST(expanded_libdir)
-
AC_CONFIG_FILES([src/f-spot],[chmod +x src/f-spot])
GNOME_ICON_THEME_PREFIX=`$PKG_CONFIG --variable=prefix gnome-icon-theme`
AC_SUBST(GNOME_ICON_THEME_PREFIX)
+SHAVE_INIT([build/m4/shave], [enable])
+
AC_OUTPUT(
Makefile
-lib/dbus-sharp/Makefile
-lib/dbus-sharp-glib/Makefile
+
+build/Makefile
+build/m4/Makefile
+build/m4/shave/shave
+build/m4/shave/shave-libtool
+
lib/dpap-sharp/Makefile
lib/dpap-sharp/lib/Makefile
lib/dpap-sharp/dpap-client/Makefile
@@ -300,19 +344,18 @@ lib/GKeyFile/Makefile
lib/gio-sharp/Makefile
lib/gio-sharp/gio/Makefile
lib/gio-sharp/generator/Makefile
-lib/glitz-sharp/Makefile
-lib/glitz-sharp/src/Makefile
lib/gnome-keyring-sharp/Makefile
lib/gtk-sharp-beans/Makefile
lib/libfspot/Makefile
lib/libgphoto2-sharp/Makefile
+lib/libgphoto2-sharp/libgphoto2-sharp.dll.config
+lib/libgphoto2-sharp/glue/Makefile
lib/libjpegtran/Makefile
lib/Makefile
-lib/mono-addins/Makefile
-lib/mono-addins/Mono.Addins.Gui/Makefile
-lib/mono-addins/Mono.Addins/Makefile
-lib/mono-addins/Mono.Addins.Setup/Makefile
lib/semweb/Makefile
+lib/unique-sharp/Makefile
+lib/unique-sharp/generator/Makefile
+lib/unique-sharp/unique/Makefile
docs/Makefile
icons/Makefile
tools/Makefile
@@ -324,9 +367,14 @@ src/Cms.dll.config
src/FSpot.Widgets.dll.config
src/Makefile
extensions/Makefile
+extensions/Editors/Makefile
+extensions/Editors/BlackoutEditor/Makefile
+extensions/Editors/BWEditor/Makefile
+extensions/Editors/FlipEditor/Makefile
+extensions/Editors/PixelateEditor/Makefile
+extensions/Editors/ResizeEditor/Makefile
extensions/Exporters/Makefile
extensions/Exporters/CDExport/Makefile
-extensions/Exporters/DefaultExporters/Makefile
extensions/Exporters/FlickrExport/Makefile
extensions/Exporters/FlickrExport/FlickrNet/Makefile
extensions/Exporters/GalleryExport/Makefile
@@ -340,14 +388,15 @@ extensions/Exporters/PicasaWebExport/Makefile
extensions/Exporters/PicasaWebExport/google-sharp/Makefile
extensions/Exporters/ZipExport/Makefile
extensions/Services/Makefile
-extensions/Services/BeagleService/Makefile
extensions/Services/DBusService/Makefile
extensions/Tools/Makefile
extensions/Tools/RawPlusJpeg/Makefile
extensions/Tools/ChangePhotoPath/Makefile
extensions/Tools/HashJob/Makefile
extensions/Tools/DevelopInUFraw/Makefile
+extensions/Tools/LiveWebGallery/Makefile
extensions/Tools/MergeDb/Makefile
+extensions/Tools/RetroactiveRoll/Makefile
extensions/Tools/ScreensaverConfig/Makefile
extensions/Transitions/Makefile
extensions/Transitions/CoverTransition/Makefile
diff --git a/depcomp b/depcomp
index 807b991..df8eea7 100755
--- a/depcomp
+++ b/depcomp
@@ -1,7 +1,10 @@
#! /bin/sh
-
# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,9 +17,7 @@
# 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/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -25,22 +26,45 @@
# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+ exit $?
+ ;;
+esac
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
- dir=`echo "$object" | sed 's,/.*$,/,'`
- if test "$dir" = "$object"; then
- dir=
- fi
- # FIXME: should be _deps on DOS.
- depfile="$dir.deps/$base"
-fi
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
@@ -61,12 +85,34 @@ if test "$depmode" = dashXmstdout; then
depmode=dashmstdout
fi
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u="sed s,\\\\\\\\,/,g"
+ depmode=msvisualcpp
+fi
+
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -153,14 +199,14 @@ sgi)
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
-' ' ' >> $depfile
- echo >> $depfile
+' ' ' >> "$depfile"
+ echo >> "$depfile"
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
+ >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -172,31 +218,43 @@ sgi)
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. This file always lives in the current directory.
- # Also, the AIX compiler puts `$object:' at the start of each line;
- # $object doesn't have directory information.
- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
- outname="$stripped.o"
+ # in a .u file. In older versions, this file always lives in the
+ # current directory. Also, the AIX compiler puts `$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
-
stat=$?
+
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -206,6 +264,89 @@ aix)
rm -f "$tmpdepfile"
;;
+icc)
+ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+ # sub/foo.o: sub/foo.c
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using \ :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -217,31 +358,47 @@ tru64)
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
- tmpdepfile1="$dir.libs/$base.lo.d"
- tmpdepfile2="$dir.libs/$base.d"
+ # With Tru64 cc, shared objects can also be used to make a
+ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+ tmpdepfile2=$dir$base.o.d # libtool 1.5
+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
- tmpdepfile1="$dir$base.o.d"
- tmpdepfile2="$dir$base.d"
+ tmpdepfile1=$dir$base.o.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ tmpdepfile4=$dir$base.d
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
- if test -f "$tmpdepfile1"; then
- tmpdepfile="$tmpdepfile1"
- else
- tmpdepfile="$tmpdepfile2"
- fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a space and a tab in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -254,20 +411,18 @@ tru64)
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o.
+ # always write the preprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
+ while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
- # Remove `-o $object'. We will use -o /dev/null later,
- # however we can't do the remplacement now because
- # `-o $object' might simply not be used
+ # Remove `-o $object'.
IFS=" "
for arg
do
@@ -287,7 +442,11 @@ dashmstdout)
done
test -z "$dashmflag" && dashmflag=-M
- "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ # Require at least two characters before searching for `:'
+ # in the target name. This is to cope with DOS-style filenames:
+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ "$@" $dashmflag |
+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
@@ -306,25 +465,41 @@ dashXmstdout)
makedepend)
"$@" || exit $?
+ # Remove any Libtool call
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
# X makedepend
shift
- cleared=no
- for arg in "$@"; do
+ cleared=no eat=no
+ for arg
+ do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
+ if test $eat = yes; then
+ eat=no
+ continue
+ fi
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
- -*)
+ # Strip any option that makedepend may not understand. Remove
+ # the object too, otherwise makedepend will parse it as a source file.
+ -arch)
+ eat=yes ;;
+ -*|$object)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
+ obj_suffix=`echo "$object" | sed 's/^.*\././'`
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
@@ -339,12 +514,12 @@ makedepend)
cpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout.
+ # always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
+ while test "X$1" != 'X--mode=compile'; do
shift
done
shift
@@ -370,7 +545,8 @@ cpp)
done
"$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
@@ -381,13 +557,27 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
+ # always write the preprocessed file to stdout.
"$@" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
IFS=" "
for arg
do
case "$arg" in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
@@ -400,16 +590,23 @@ msvisualcpp)
;;
esac
done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+ "$@" -E 2>/dev/null |
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
+msvcmsys)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
none)
exec "$@"
;;
@@ -421,3 +618,13 @@ none)
esac
exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f48424b..496b41a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -16,4 +16,4 @@ DOC_FIGURES = \
figures/f-spot-soft-focus.png \
figures/f-spot-straighten.png
-DOC_LINGUAS = cs da de es fr it oc pt_BR ru sv
+DOC_LINGUAS = cs da de es fr it oc pt_BR ru sl sv uk
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 59cac98..8633fcd 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -61,11 +61,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/gnome-doc-utils.make
subdir = docs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,6 +277,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -273,6 +291,7 @@ _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
$(DOC_LINGUAS))
_DOC_ABS_SRCDIR = @abs_srcdir@
+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
@ENABLE_SK_TRUE at _ENABLE_SK = true
################################################################################
@@ -306,14 +325,16 @@ _DOC_OMF_ALL = \
################################################################################
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
_DOC_C_DOCS = \
$(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
- $(_DOC_C_MODULE)
+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
_DOC_C_DOCS_NOENT = \
- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
+ $(_DOC_C_PAGES)
_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
$(foreach fig,$(DOC_FIGURES),C/$(fig)), \
@@ -329,12 +350,17 @@ _DOC_C_HTML = $(foreach f, \
###############################################################################
-_DOC_POFILES = $(if $(DOC_MODULE), \
+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
+_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
_DOC_LC_MODULES = $(if $(DOC_MODULE), \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
+_DOC_LC_PAGES = \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
+ $(lc)/$(notdir $(page)) ))
+
_DOC_LC_INCLUDES = \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
$(lc)/$(notdir $(inc)) ))
@@ -346,7 +372,7 @@ _DOC_LC_HTML = \
$(lc)/$(notdir $(doc)) ))
_DOC_LC_DOCS = \
- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
@@ -366,7 +392,8 @@ _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
DOC_MODULE = f-spot
DOC_ENTITIES =
DOC_INCLUDES =
@@ -382,7 +409,7 @@ DOC_FIGURES = \
figures/f-spot-soft-focus.png \
figures/f-spot-straighten.png
-DOC_LINGUAS = cs da de es fr it oc pt_BR ru sv
+DOC_LINGUAS = cs da de es fr it oc pt_BR ru sl sv uk
all: all-am
.SUFFIXES:
@@ -395,9 +422,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu docs/Makefile
+ $(AUTOMAKE) --foreign docs/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -633,6 +660,10 @@ all: $(DOC_H_FILE)
DOC_MODULE ?=
+DOC_ID ?=
+
+DOC_PAGES ?=
+
DOC_ENTITIES ?=
DOC_INCLUDES ?=
@@ -649,6 +680,7 @@ _xml2po ?= `which xml2po`
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
@@ -678,6 +710,9 @@ omf: $(_DOC_OMF_ALL)
.PHONY: po
po: $(_DOC_POFILES)
+.PHONY: mo
+mo: $(_DOC_MOFILES)
+
$(_DOC_POFILES):
@if ! test -d $(dir $@); then \
echo "mkdir $(dir $@)"; \
@@ -693,33 +728,41 @@ $(_DOC_POFILES):
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
(cd $(dir $@) && \
- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
else \
echo "(cd $(dir $@) && \
- $(_xml2po) -e -u $(notdir $@) $$docs)"; \
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
(cd $(dir $@) && \
- $(_xml2po) -e -u $(notdir $@) $$docs); \
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
fi
+$(_DOC_MOFILES): %.mo: %.po
+ @if ! test -d $(dir $@); then \
+ echo "mkdir $(dir $@)"; \
+ mkdir "$(dir $@)"; \
+ fi
+ msgfmt -o $@ $<
+
# FIXME: fix the dependancy
# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
+$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
if ! test -d $(dir $@); then mkdir $(dir $@); fi
if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
+ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
(cd $(dir $@) && \
- $(_xml2po) -e -p \
- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
"$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
.PHONY: pot
pot: $(_DOC_POT)
$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
- $(_xml2po) -e -o $@ $^
+ $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
@@ -731,25 +774,29 @@ all: \
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
+################################################################################
+
.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
clean-doc-lc:
rm -f $(_DOC_LC_DOCS)
+ rm -f $(_DOC_MOFILES)
@list='$(_DOC_POFILES)'; for po in $$list; do \
if ! test "$$po" -ef "$(srcdir)/$$po"; then \
echo "rm -f $$po"; \
rm -f "$$po"; \
fi; \
done
+# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
rm -f "$$lc/.xml2po.mo"; \
fi; \
done
-clean-doc-dir:
+clean-doc-dir: clean-doc-lc
@for lc in C $(_DOC_REAL_LINGUAS); do \
for dir in `find $$lc -depth -type d`; do \
if ! test $$dir -ef $(srcdir)/$$dir; then \
@@ -772,10 +819,12 @@ maintainer-clean-local: \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
-.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: \
- $(if $(DOC_MODULE),dist-doc-docs) \
- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
+################################################################################
+
+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
+doc-dist-hook: \
+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
$(if $(_DOC_OMF_IN),dist-doc-omf)
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
@@ -821,9 +870,12 @@ dist-doc-dsk:
echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
+################################################################################
+
.PHONY: check-doc-docs check-doc-omf
check: \
$(if $(DOC_MODULE),check-doc-docs) \
+ $(if $(DOC_ID),check-doc-pages) \
$(if $(_DOC_OMF_IN),check-doc-omf)
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
@@ -839,15 +891,33 @@ check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
done
+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
+ for lc in C $(_DOC_REAL_LINGUAS); do \
+ if test -f "$$lc"; \
+ then d=; \
+ xmlpath="$$lc"; \
+ else \
+ d="$(srcdir)/"; \
+ xmlpath="$$lc:$(srcdir)/$$lc"; \
+ fi; \
+ for page in $(DOC_PAGES); do \
+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
+ xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
+ done; \
+ done
+
check-doc-omf: $(_DOC_OMF_ALL)
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
done
+################################################################################
+
.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
+
install-data-local: \
- $(if $(DOC_MODULE),install-doc-docs) \
+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
$(if $(_DOC_HTML_ALL),install-doc-html) \
$(if $(_DOC_C_FIGURES),install-doc-figs) \
$(if $(_DOC_OMF_IN),install-doc-omf)
@@ -855,19 +925,19 @@ install-data-local: \
install-doc-docs:
@for lc in C $(_DOC_REAL_LINGUAS); do \
- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
if ! test -d "$$docdir"; then \
echo "$(mkinstalldirs) $$docdir"; \
$(mkinstalldirs) "$$docdir"; \
fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
done
install-doc-figs:
@@ -882,7 +952,7 @@ install-doc-figs:
figsymlink=true; \
fi; \
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
if ! test -d "$$figdir"; then \
echo "$(mkinstalldirs) $$figdir"; \
$(mkinstalldirs) "$$figdir"; \
@@ -902,22 +972,24 @@ install-doc-html:
echo install-html
install-doc-omf:
- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
done
@if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
fi;
install-doc-dsk:
echo install-dsk
+################################################################################
+
.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
uninstall-local: \
- $(if $(DOC_MODULE),uninstall-doc-docs) \
+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
@@ -925,24 +997,24 @@ uninstall-local: \
uninstall-doc-docs:
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
done
uninstall-doc-figs:
@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
done;
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
fi; \
- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
done
dist-hook: doc-dist-hook
diff --git a/docs/sl/f-spot.xml b/docs/sl/f-spot.xml
new file mode 100644
index 0000000..2b20540
--- /dev/null
+++ b/docs/sl/f-spot.xml
@@ -0,0 +1,874 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="f-spot" lang="sl">
+ <bookinfo>
+ <title>F-Spot priročnik</title>
+ <abstract role="description">
+ <para>To je uporabniški priročnik za F-Spot, GNOME upravljalnik fotografij</para>
+ </abstract>
+ <subtitle>To je uporabniški priročnik za F-Spot, GNOME upravljalnik fotografij</subtitle>
+ <copyright>
+ <year>2007-2009</year>
+ <holder>Aaron Bockover, Gabriel Burt, Miguel de Icaza, Bengt Thuree</holder>
+ </copyright>
+ <publisher>
+ <publishername>GNOME projekt dokumentacije</publishername>
+ </publisher>
+ <authorgroup>
+ <author>
+ <firstname>Miguel</firstname>
+ <surname>de Icaza</surname>
+ </author>
+ <author>
+ <firstname>Aaron</firstname>
+ <surname>Bockover</surname>
+ </author>
+ <author>
+ <firstname>Bengt</firstname>
+ <surname>Thuree</surname>
+ </author>
+ <author>
+ <firstname>Gabriel</firstname>
+ <surname>Burt</surname>
+ </author>
+ <author>
+ <firstname>Alexandre</firstname>
+ <surname>Prokoudine</surname>
+ </author>
+ <author role="maintainer">
+ <firstname>Stephane</firstname>
+ <surname>Delcroix</surname>
+ </author>
+ </authorgroup>
+ <!--<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>-->
+ <revhistory>
+ <revision>
+ <revnumber>0,5</revnumber>
+ <date>2008-09-25</date>
+ </revision>
+ <revision>
+ <revnumber>0,4</revnumber>
+ <date>2008-09-12</date>
+ </revision>
+ <revision>
+ <revnumber>0,3</revnumber>
+ <date>26-07-2007</date>
+ </revision>
+ </revhistory>
+ </bookinfo>
+
+ <chapter id="organizing">
+ <title>Organizacija vaših fotografij</title>
+
+ <sect1 id="import">
+ <title>Uvažanje</title>
+
+ <para>Fotografije lahko uvozite s trdega diska ali fotoaparata. V primeru uvoza fotografij v F-Spot s fotoaparata, bo F-Spot vedno naredil njihovo kopijo in vam omogočil čiščenje pomnilnika vašega fotoaparata. Privzeto F-Spot naredi kopijo fotografij uvoženih s trdega diska. V primeru da datotek ne želite kopirati s trdega diska, odkljukajte možnost <guilabel>Kopiranje datotek v mapo fotografij</guilabel> v pogovornem oknu uvoza ali pa med vlečenjem fotografij v F-Spot držite tipko <keycap>Dvigalka</keycap>.</para>
+
+ <para>Privzeto F-Spot kopira vaše fotografije v mapo <filename class="directory">~/Slike</filename>. Mapo, ki jo uporablja F-Spot lahko spremenite v pogovornem oknu <guilabel>Možnosti</guilabel> (<menuchoice><guimenu>Uredi</guimenu><guimenuitem>Možnosti</guimenuitem></menuchoice>).</para>
+ <para>V primeru da ste morda nekatere fotografije iz izbranega vira že uvozili, lahko uporabite možnost <guilabel>Zaznavanje dvojnikov</guilabel>. F-Spot bo poskusil ugotoviti ali natanko ta slika že obstaja v podatkovni zbirki. V tem primeru kopija slike ne bo uvožena.</para>
+ <para>V primeru da so vse uvožene fotografije z določenega dogodka, ali imajo neko drugo skupno značilnost, lahko za njih ustvarite oznako zato da jih kasneje lahko najdete. Za to sledite navodilom z <xref linkend="tag"/> za ustvarjanje nove oznake, nato med uvažanjem označite gumb <guilabel>Pripni oznako</guilabel> in izberite ustvarjeno oznako.</para>
+
+ <tip>
+ <para>F-Spot uporablja podatkovno zbirko shranjeno v <filename>~/.config/f-spot/photos.db</filename>. Za dostop do nje uporabite ukaz sqlite3. Pot do podatkovne zbirke lahko ročno navedete z zagonom F-Spot z možnostjo <option>-b</option>.</para>
+ </tip>
+
+ <para>Po uvozu bo F-Spot prikazal le slike zadnjega uvoznega zvitka. Preberite <xref linkend="enjoying-search"/> za podrobnosti o upravljanju z uvoznimi zvitki.</para>
+ <para>Uvoziti je mogoče tudi neposredno iz Mozilla <ulink url="http://www.mozilla.com/en-US/firefox/">Firefox</ulink> in <ulink url="http://www.mozilla.com/en-US/thunderbird/">Thunderbird</ulink> z uporabo <ulink url="https://addons.mozilla.org/en-US/firefox/addon/7091">Firefox</ulink> in <ulink url="https://addons.mozilla.org/en-US/thunderbird/addon/7011">Thunderbird</ulink> razširitve F-Spot uvoznik, ki jo je napisal<ulink url="http://personalpages.tds.net/~cdovel/">Pizzach</ulink>.</para>
+ </sect1>
+
+ <sect1 id="edit">
+ <title>Urejanje</title>
+
+ <para>V primeru da dvojno kliknite ali pritisnete vnosno tipko, vstopite v način urejanje, kjer lahko odstranite rdeče oči, obrežete ter prilagodite svetlost in barve.</para>
+
+ <sect2 id="edit-versions">
+ <title>Različice</title>
+
+ <para>Ko urejate fotografije, je ustvarjena nova kopija (imenovana različica), tako izvorna fotografija ni nikoli spremenjena. Po prvem urejanju fotografije bodo naslednja urejanja spremenila isto različico. V primeru da želite ustvariti več različic fotografije, morda z drugim obrezovanjem ali barvami lahko to storite preko možnosti <menuchoice><guimenu>Fotografija</guimenu><guimenuitem>Ustvari novo različico</guimenuitem></menuchoice>.</para>
+ </sect2>
+
+ <sect2 id="edit-crop">
+ <title>Obreži</title>
+
+ <para>Obrezovanje slike je dober način za izboljšanje kakovosti slike s spremembo okvirjanja. Fotografijo lahko obrežete z izbiro dela fotografije, ki ga želite obdržati. V primeru da želite imeti fotografijo natančnih mer zahtevanih za določeno velikost tiskanja, lahko z izbiro primerne velikosti s spustnega menija omejitev omejite izbiro, ki vam jo bo dovolil narisati F-Spot. Za podrobnosti o izbiri na fotografiji si oglejte <xref linkend="edit-remove-red-eye"/> spodaj.</para>
+ <figure>
+ <title>Orodje obreži</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-crop.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Ko ste naredili izbor obreza, morate za končanje obrezovanja klikniti gumb pod sliko. V primeru da delate z izvorno fotografijo, obrezovanje ustvari novo različico vaše fotografije.</para>
+ </sect2>
+
+ <sect2 id="edit-straighten">
+ <title>Poravnava</title>
+
+ <para>Učinek poravnave je orodje za poravnanje fotografij, precej uporabno za sliko pokrajine posnete brez stativa, ko (navidezna) črta horizonta ni na 0°. To orodje zavrti sliko za določen kot in samodejno čarobno obreže nastalo sliko, tako da vedno vidite idealen pravokotnik.</para>
+ <figure>
+ <title>Orodje poravnave</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-straighten.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-adjust-colors">
+ <title>Prilagajanje barv</title>
+
+ <para>Za prilagajanje svetlosti, kontrasta in barv fotografije najprej kliknite ikono <guibutton>Prilagodi barve fotografije</guibutton> za odpiranje pogovornega okna prilagajanja. Spremenite nekaj nastavitev in jih shranite z <guibutton>V redu</guibutton>.</para>
+ <figure>
+ <title>Orodje prilagajanja barv</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-adjust-colors.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-auto-color">
+ <title>Samodejna barva</title>
+
+ <para>Ta učinek samodejno prilagodi barvne ravni za ustvarjanje barvno uravnotežene slike. Najboljše deluje za slike posnete s samodejnim ravnotežjem bele barve, ko fotoaparat ni uspel dobro opraviti dela. </para>
+ <figure>
+ <title>Samodejna barva</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-autocolor.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-desaturate">
+ <title>Zmanjšaj nasičenje</title>
+
+ <para>Za pretvorbo barve fotografije v črno belo odprite izbrano fotografijo iz pritisnite gumb <guibutton>Zmanjšaj nasičenje</guibutton>.</para>
+ <figure>
+ <title>Orodje zmanjšanja nasičenja</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-desaturate.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-sepia">
+ <title>Sepia</title>
+
+ <para>Za pretvorbo barvne fotografije v staro sliko sepia tonov odprite izbrano fotografijo in pritisnite gumb <guibutton>Sepia učinek staranja</guibutton>.</para>
+ <figure>
+ <title>Orodje zmanjšanja nasičenja</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-sepia.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-remove-red-eye">
+ <title>Odstranjevanje rdečih oči</title>
+
+ <para>Za odstranitev rdečih oči s fotografije morate izbrati področje, ki vsebuje oči. Pametno je povečati sliko za natančno izbiro oči v fotografiji. Naenkrat bi lahko popravite obe oči iste osebe ali celo oči več oseb na enkrat. V primeru da to ne deluje, ali izbrano področje vsebuje druge živo rdeče dele (ustnice, ...) boste najbrž morali popraviti eno oko na enkrat.</para>
+ <para>Za izbiranje kliknite en kot kvadrata, ki bo vaš izbor, povlecite vašo miško v diagonalni kot in jo spustite. Izboru lahko spremenite velikost z vlečenjem njegovih robom ali pa ga lahko premaknete s klikom v sredino izbora in ga povlečete kamor ga želite.</para>
+ <para>Ko ste izbrali področje, lahko rdeče oko odstranite s klikom na gumb rdeče-oko pod fotografijo.</para>
+ <figure>
+ <title>Orodje rdečih oči</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-red-eye.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <tip>
+ <para>Prag za zaznavanje rdečih oči lahko spremenite s spremembo gconf ključa ¸<filename class="directory">/apps/f-spot/edit/redeye_threshold</filename>.</para>
+ </tip>
+ </sect2>
+
+ <sect2 id="edit-soft-focus">
+ <title>Mehko žarišče</title>
+
+ <para>V fotografiji je izostritev enega predela slike in zameglitev vsega ostalega način za poudarjanje in pridobitev pozornosti. To je mogoče doseči z uporabo leče ki dovoli snemanje s kratko razdaljo pred in za predmetom, ki je videti v gorišču. Učinek mehkega gorišča je način za posnemanje takšne leče.</para>
+ <figure>
+ <title>Orodje mehkega žarišča</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-soft-focus.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Kliknite za izbor središča področja, ki naj bo v gorišču in prilagodite količino megljenja in nato kliknite <guibutton>V redu</guibutton>.</para>
+ </sect2>
+
+ <sect2 id="edit-sharpen">
+ <title>Izostritev</title>
+
+ <para>Fotografije izven gorišča in večina digitaliziranih slik pogosto potrebujejo popravek izostritve. Učinek maske odstranitve izostritve izostri robove elementov brez povečanja šuma ali napak. Za izostritev fotografije izberite <menuchoice><guimenu>Uredi</guimenu><guimenuitem>Izostri...</guimenuitem></menuchoice> in navedite naslednje vrednosti:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><parameter class="option">Količina</parameter> — moč izostritve.</para>
+ </listitem>
+ <listitem>
+ <para><parameter class="option">Polmer</parameter> — na koliko točk na vsaki strani roba bo vplivala izostritev. Slike z visoko ločljivostjo omogočijo večje polmere.</para>
+ </listitem>
+ <listitem>
+ <para><parameter class="option">Prag</parameter> — najmanjša razlika v vrednostih točk ki določiti rob, kjer mora biti uveljavljena izostritev. To pomaga pri izogibanju ustvarjanja napak v obrazu, nebu ali vodni površini.</para>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2 id="edit-describe">
+ <title>Opisovanje</title>
+
+ <para>Vpis slike lahko vnesete s klikom na polje besedilnega vnosa pod sliko in tipkanjem.</para>
+ <para>Ko ste naredili izbor obreza, morate za končanje obrezovanja klikniti gumb pod sliko. V primeru da delate z izvorno fotografijo, obrezovanje ustvari novo različico vaše fotografije.</para>
+ </sect2>
+
+ <sect2 id="edit-adjust-time">
+ <title>Prilagodi čas</title>
+
+ <para>Tako v načinu 'brskanje' kot 'urejanje' lahko prilagodite čas ene ali več slik (<menuchoice><guimenu>Uredi</guimenu><guimenuitem>Prilagodi čas</guimenuitem></menuchoice>). Prilagajanje časa več slik na enkrat vam pomaga premakniti celoten uvozni zvitek, na primer če je čas na vašem fotoaparatu slabo nastavljen in ste ali če ste ga pozabili spremeniti z/na poletni čas. </para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="tag">
+ <title>Oznaka</title>
+ <para>F-Spot vam omogoča organizacijo in uživanje v vaših fotografijah s povezavo z različnimi uporabniško prilagodljivimi oznakami. F-Spot za začetek vsebuje privzete oznake, lahko jih spremenite in dodate nove. Na primer, če želite ustvariti oznako za določen dogodek, lahko ustvarite oznako imenovano po dogodku pod oznako dogodki.</para>
+ <para>Obstaja več načinov za oznako fotografij:</para>
+ <itemizedlist>
+ <listitem>
+ <para>povlecite in spustite fotografij-o/e na oznako</para>
+ </listitem>
+ <listitem>
+ <para>povlecite in spustite oznako na fotografij-o/e</para>
+ </listitem>
+ <listitem>
+ <para>preko menija desnega klika fotografija</para>
+ </listitem>
+ <listitem>
+ <para>preko menijev Oznake in Uredi</para>
+ </listitem>
+ <listitem>
+ <para>s tipkanjem oznak. Pritisnite <keycap>t</keycap> za pojav vnosne vrstice oznak. Sem lahko vnesete oznake, ločene z vejicami.</para>
+ <para>V vnosni vrstici lahko uporabite samodejno dokončanje. Po vnosu začetka imena oznake pritisnite <keycap>Tabulator</keycap> za ogled prvega mogočega dokončanja. Med mogočimi dokončanji lahko krožite naprej s ponovnim pritiskom na <keycap>Tabulator</keycap> in nazaj s pritiskom na <keycombo action="simul"><keycap>Dvigalka</keycap><keycap>Tabulator</keycap></keycombo>. Za potrditev predlaganega dokončanja in vnos nove oznake pritisnite <keycap>,</keycap>. S pritiskom <keycap>Vnosna tipka</keycap> zapustite vnosno vrstico oznak in s tem morda potrdite trenutno dokončanje. Za preklic samodejnega dokončevanja tipkajte naprej. </para>
+ </listitem>
+ </itemizedlist>
+ <para>Prva fotografija, ki jo povežete z oznako, bo uporabljena za ikono oznake. Z desnim klikom na oznako in izbiro <guilabel>Uredi oznako</guilabel> lahko uredite ime oznake, nadrejeno oznako in ikono oznake.</para>
+ <para>Nadrejeni predmet oznake lahko spremenite tako, da ga povlečete in spustite kamor želite. Ime oznake lahko uredite tako, da jo izberete in pritisnete <keycap>F2</keycap>. V primeru da je gradnik drevesa oznak v žarišču, (na primer ste ravnokar kliknili na oznako) lahko začnete tipkati ime oznake, vse razširjene oznake na seznamu bodo preiskane in skočili boste na zadetke.</para>
+
+ <para>Velikost ikon značk v stranski vrstici lahko spremenite ali pa jih celo napravite nevidne z izbiro prednostne možnosti v meniju <menuchoice><guimenu>Pogled</guimenu><guimenuitem>Ikone oznak</guimenuitem></menuchoice>.</para>
+
+ <tip>
+ <para>F-Spot lahko oznake zapiše v datoteke JPEG kot polja metapodatkov. Oznake za različne RAW, PNG, TIFF in druge datoteke so zapisane v podatkovno zbirko F-Spot. Te datoteke boste morali ob ponovnem uvozu zbirke ponovno označiti.</para>
+ </tip>
+ </sect1>
+ </chapter>
+
+ <chapter id="enjoying">
+ <title>Uživanje v vaših fotografijah</title>
+ <sect1 id="enjoying-browse">
+ <title>Brskanje</title>
+ <para>Za brskanje po vaših fotografijah po mesecu ali po mapi lahko uporabite drsni gradnik. Za spremembo te nastavitve pojdite na <menuchoice><guimenu>Pogled</guimenu><guimenuitem>Urejeno po</guimenuitem></menuchoice>.</para>
+ </sect1>
+ <sect1 id="enjoying-search">
+ <title>Iskanje</title>
+
+ <para>F-Spot uporablja iskalne filtre za pomoč pri boljšem določanju iskalnih kriterijev.</para>
+
+ <sect2 id="enjoying-search-tags">
+ <title>Oznake</title>
+
+ <para>Iskanje lahko začnete z dvojnim klikom ali omogočanjem oznake iz seznama oznak. Dodatno lahko pokažete iskalno vrstico z <menuchoice><guimenu>Najdi</guimenu><guimenuitem>Pokaži iskalno vrstico</guimenuitem></menuchoice>. Ko je iskalna vrstica prikazana, lahko oznake povlečete iz pogleda oznak v iskalno vrstico.</para>
+ <para>Za iskanje fotografij, ki so označene z obema od dveh oznak, omogočite prvo v pogledu oznak ali jo povlecite v iskalno vrstico in nato povlecite drugo oznako in jo spustite na prvo. Lahko tudi desno kliknete na drugo oznako v pogledu oznak ali uporabite meni <guimenu>Najdi</guimenu> in izberite <guimenuitem>Najdi z...</guimenuitem> in izberite prvo oznako (ali skupino oznak).</para>
+ <para>Ikono oznake lahko povlečete na iskalno vrstico za spremembo iz iskanja te oznake in druge oznake v iskanje te oznake ali druge oznake. </para>
+ <para>Fotografije brez določene oznake lahko iščete z dvojnim klikom na oznako v iskalni vrstici. Dodatna možnost je desni klik na oznako v iskalni vrstici in izbira <guimenuitem>Izključi</guimenuitem>.</para>
+ <para>Za odstranitev oznake iz iskanja jo povlecite vstran od vrstice iskanja ali desno kliknite in izberite <guimenuitem>Odstrani</guimenuitem>.</para>
+ <para>Privzeto so fotografije označene <emphasis>Skrito</emphasis> skrite. Za iskanje takšnih fotografij morate eksplicitno vključiti oznako <emphasis>Skrito</emphasis>.</para>
+ </sect2>
+
+ <sect2 id="enjoying-search-import-rolls">
+ <title>Uvozni zvitki</title>
+ <para>F-Spot si vsake toliko časa zapomni katere slike so bile uvožene. Uporabite <menuchoice><guimenu>Najdi</guimenu><guisubmenu>Po uvoznem zvitku</guisubmenu><guimenuitem>Zadnji uvozni zvitek</guimenuitem></menuchoice> za omejitev iskanja na zadnjo sejo uvažanja ali uporabite <menuchoice><guimenu>Najdi</guimenu><guisubmenu>Po uvoznem zvitku</guisubmenu><guimenuitem>Izberi uvozne zvitke ...</guimenuitem></menuchoice> za fino izbiro uvoženih fotografij:</para>
+ <itemizedlist>
+ <listitem>
+ <para><parameter class="option">Ob</parameter> — za izbor fotografij iz določene seje uvažanja</para>
+ </listitem>
+ <listitem>
+ <para><parameter class="option">Za</parameter> — za izbor vseh uvoženih fotografij z začetkom pri določeni seji uvažanja</para>
+ </listitem>
+ <listitem>
+ <para><parameter class="option">Med</parameter> — za izbor vseh fotografij uvoženih med dvema določenima sejama uvažanja</para>
+ </listitem>
+ </itemizedlist>
+ <para>Vsakič ko spremenite nastavitve filtra, se količina izbranih fotografij pojavi na spodnjem delu pogovornega okna.</para>
+ <para>Ko boste uveljavili filter uvoznih zvitkov boste videli <guilabel>Najdi: Uvozni zvitek</guilabel>. Sedaj lahko dodate druge filtre za fino nastavljanje vašega izbora.</para>
+ <para>V primeru da filtra uvoznih zvitkov ne potrebujete več, za odstranitev uvoznih zvitkov iz iskalnih kriterijev izberite <menuchoice><guimenu>Najdi</guimenu><guisubmenu>Uvozni zvitek</guisubmenu><guimenuitem>Počisti filter uvoznih zvitkov</guimenuitem></menuchoice>. Za zavračanje vseh trenutnih možnosti iskanja lahko kliknete tudi na gumb zapri (<guibutton>X</guibutton>) v iskalni vrstici.</para>
+ <tip>
+ <para>Število prikazanih zvitkov v pogovornem oknu je določeno z gconf ključem <filename class="directory">/apps/f-spot/import/gui_roll_history</filename>. Privzeta vrednost je 10.</para>
+ </tip>
+ </sect2>
+
+ <sect2 id="enjoying-search-type-to-find">
+ <title>Tipkajte-za-iskanje</title>
+ <para>Obstaja tudi vnos tipkaj-za-iskanje. Za odpiranje pritisnite <keycap>/</keycap>. Vnosa ni mogoče uporabiti istočasno kot iskalne vrstice. Vtipkate lahko poizvedbe kot so "OznakaA and (OznakaB or (OznakaC and OznakaD)". V vsakem primeru bo F-Spot posodobil vaše iskanje, če zazna veljavno poizvedbo. Operator <emphasis>not</emphasis> še ni podprt.</para>
+
+ <para>Ta funkcija bo iskala tudi besedilo vneseno v komentarje fotografije in ime datoteke.</para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="enjoying-fullscreen-mode-and-slideshows">
+ <title>Celozaslonski način in diapredstavitve</title>
+ <para>Za manj motenj in večji prikaz si lahko ogledate fotografije v celozaslonskem načinu. Nadzirate lahko kdaj naj bo prikazana naslednja ali predhodna fotografija. V celozaslonski način lahko kadarkoli vstopite s pritiskom na <keycap>F11</keycap> ali s pritiskom gumba v orodni vrstici.</para>
+ <figure>
+ <title>Celozaslonski način</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-fullscreen.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>V načinu diapredstavitve se lahko usedete in si ogledate svoje fotografije medtem ko so vam predstavljene. Diapredstavitev lahko zaženete s pritiskom na gumb v orodni vrstici.</para>
+ <figure>
+ <title>Diapredstavitev</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-slideshow.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect1>
+ </chapter>
+
+ <chapter id="sharing">
+ <title>Souporaba vaših fotografij</title>
+
+ <abstract>
+ <para>Za souporabo vaših fotografij z F-Spot obstaja več načinov. Vse naslednje metode bodo dale v souporabo le fotografije, ki ste jih izbrali ob zagonu souporabe.</para>
+ </abstract>
+
+ <sect1 id="sharing-e-mail">
+ <title>E-pošta</title>
+ <para>Svoje fotografije lahko pošljete preko elektronske pošte neposredno iz F-Spot z uporabo menija <menuchoice><guimenu>Fotografija</guimenu><guimenuitem>Pošlji po pošti</guimenuitem></menuchoice>. </para>
+ <note>
+ <title>Opomba 1</title>
+ <para>Uporabljen bo e-poštni program, ki je določen na ravni GNOME. Privzeti e-poštni program lahko spremenite za svoj račun z uporabo orodja <application>Prednostni programi</application> v meniju <menuchoice><guimenu>Sistem</guimenu><guisubmenu>Nastavitve</guisubmenu></menuchoice>.</para>
+ </note>
+ <note>
+ <title>Opomba 2</title>
+ <para>V primeru da so fotografije, ki jih želite poslati preko elektronske pošte vrste, ki je F-Spot ne more zapisati (na primer slike RAW) bo pogovorno okno postalo neobčutljivo in bodo poslane izvorne fotografije.</para>
+ </note>
+ <tip>
+ <para>V primeru da pošiljate slike s spremenjenimi velikostmi, bo F-Spot obdržal spremenjene različice nekje v mapi <filename class="directory">/tmp</filename> za 30 sekund. To ne povzroča težav z evolution, ki naredi svojo krajevno kopijo prilog, toda bi lahko bilo malce krajše, če uporabljate Thunderbird. Zamik lahko spremenite z urejanjem gconf ključa <filename class="directory">/apps/f-spot/export/email/delete_timeout_seconds</filename>.</para>
+ </tip>
+ </sect1>
+
+ <sect1 id="sharing-print">
+ <title>Tisk</title>
+ <para>Fotografije lahko natisnite z menijem <menuchoice><guimenu>Datoteka</guimenu><guimenuitem>Natisni</guimenuitem></menuchoice>.</para>
+ </sect1>
+
+ <sect1 id="sharing-burn-to-cd">
+ <title>Zapisovanje na CD</title>
+ <para>Zapišite vaše fotografije z menijem <menuchoice><guimenu>Fotografija</guimenu><guisubmenu>Izvozi</guisubmenu><guimenuitem>Izvozi na CD</guimenuitem></menuchoice>.</para>
+ </sect1>
+
+ <sect1 id="website-gallery-folder">
+ <title>Ustvarjanje spletne galerije ali mape</title>
+ <para>Zmožnost <menuchoice><guimenu>Fotografija</guimenu><guimenuitem>Izvozi v</guimenuitem><guimenuitem>Izvozi v mapo</guimenuitem></menuchoice> vam poda tri načine za izvažanje vaših slik.</para>
+ <itemizedlist>
+ <listitem>
+ <para><guilabel>Uporabi izvorno</guilabel> izvozi vaše fotografije pripravljene za uporabo z brezplačnim programom Jakuba Steinerja <ulink url="http://jimmac.musichall.cz/original.php"> Original Photo Gallery</ulink>. V primeru da niste prepričani o tej možnosti, verjetno ni prava za vas.</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>Uporabi statične datoteke HTML</guilabel> izvozi vaše fotografije v interaktivno spletišče, pripravljeno na pošiljanje.</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>Običajne datoteke</guilabel> izvozi vaše slike kot datoteke v mape, brez pošiljanja v galerijo.</para>
+ </listitem>
+ </itemizedlist>
+ </sect1>
+
+ <sect1 id="sharing-flickr-or-php-gallery">
+ <title>Objavljanje v spletne galerije</title>
+ <para>V primeru da uporabljate Flickr, SmugMug, 23hq, Tabblo, Facebook, Zooomr ali Picasa spletne albume lahko svoje datoteke objavite neposredno iz F-Spot z uporabo menija <menuchoice><guimenu>Fotografija</guimenu><guisubmenu>Izvozi v</guisubmenu></menuchoice> in izbiro ustreznega predmeta podmenija.</para>
+ <para>V primeru da uporabljate PHP program poznan kot <ulink url="http://gallery.sourceforge.net/"> Gallery</ulink>, lahko svoje fotografije objavite v svoj obstoječ album z menijem <menuchoice><guimenu>Fotografija</guimenu><guimenuitem>Izvozi v</guimenuitem><guimenuitem>Izvozi v spletno galerijo</guimenuitem></menuchoice>. Najprej morate v namestitvi Gallery omogočiti modul Oddaljeno. </para>
+ <note>
+ <title>Opomba za uporabnike Gallery 2.2</title>
+ <para>Oddaljeni vstavek Gallery mora biti 1.0.8 ali novejši.</para>
+ </note>
+ <para><ulink url="http://pennave.sourceforge.net">PennAve</ulink> je spletni program v Pythonu, ki neposredno uporablja podatkovno zbirko F-Spot za predstavljanje dinamične galerije vaših fotografij in oznak.</para>
+ <para><ulink url="http://www.conduit-project.org">Conduit</ulink> je program, ki lahko uskladi fotografije z določeno oznako s spletno shrambo Flicker ali Picasa spletni albumi.</para>
+ </sect1>
+ </chapter>
+
+ <chapter id="cms">
+ <title>Upravljanje barv</title>
+
+ <sect1 id="cms-what-is-cms">
+ <title>Kaj je upravljanje barv</title>
+
+ <para>Fotografija je na zaslonu videti drugače kot na zaslonu predogleda fotoaparata ali kateremukoli drugemu zaslonu. Tudi natisnjena fotografija je videti drugačna. To se zgodi zato, ker ima vsaka barva edinstvene zmožnosti poustvaritve barv. </para>
+
+ <para>Sistem za upravljanje barv (CMS) je orodje za doseganje zanesljive poustvaritve barv tako za zaslon kot izhod (na primer tiskalnik). CMS se zanaša na barvne profile za preslikavo izvornih barv v barve, ki jih lahko poustvarijo naprave, tako, da so barve povsod videti enake - na računalniškem zaslonu LCD, natisnjene, itn.</para>
+ </sect1>
+
+ <sect1 id="cms-what-is-icc-profile">
+ <title>Kaj je barvni profil</title>
+
+ <para>Barvni profil je datoteka s pripono .icc (zato je pogosto imenovan profil ICC) ali .icm ki opiše kako barve naprave ustrezajo splošnemu opisu naprav.</para>
+
+ <para>Obstaja več vrst profilov:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Profil vhodne naprave. To je profil fotoaparata ali profil, ki ga lahko program kot je XSane vključi v skenirano sliko.</para>
+ </listitem>
+ <listitem>
+ <para>
+ Working space profile. It's a profile that describes color space in
+ which all operations are done inside an application. Usually very wide
+ gamut profiles like AdobeRGB1998 or ProPhotoRGB are used for that.
+ </para>
+ </listitem>
+ <listitem>
+ <para>Profil zaslona. To je profil za zaslon.</para>
+ </listitem>
+ <listitem>
+ <para>Izhodni profil. To je običajno profil za tiskalnik.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Trenutno F-Spot dovoli le nastavljanje profilov zaslona in izhoda. Vsa barvna opravila so narejena v barvnem prostoru sRGB.</para>
+ </sect1>
+
+ <sect1 id="cms-how-to-get-icc-profile">
+ <title>Kako dobiti barvni profil zaslona/tiskalnika</title>
+
+ <para>Obstaja več načinov za pridobivanje barvnega profila.</para>
+
+ <sect2 id="cms-icc-from-cd-or-internet">
+ <title>Iz CD-ja ali medmrežja</title>
+
+ <para>Veliko proizvajalcev strojene opreme priložijo CD z barvnimi profili. V primeru da ga imate (od zaslona ali tiskalnika) ga lahko uporabite. Lahko ga prejmete z medmrežja (običajno z odseka podpore na spletišču proizvajalca). Barvne profile zagotavljajo tudi nekateri proizvajalci fotoaparatov (Nikon, Canon).</para>
+ </sect2>
+
+ <sect2 id="cms-icc-from-calibrating-and-profiling">
+ <title>Umerjanje in profiliranje</title>
+
+ <para>Najboljše rezultate je mogoče doseči z umerjanjem in profiliranjem naprav z meritveno napravo. To ni težko, vendar pa je za izvajanje vseh meritev in ustvarjanje profila ICC potreben spektrofotometer.</para>
+
+ <para>V primeru da uporabljate Windows ali Mac OS X lahko uporabite program proizvajalca, ki je prispel s spektrofotometrom. Na Linuxu boste morali uporabiti <ulink url="http://www.argyllcms.com">Argyll</ulink>, ki je niz vsestranskih orodij ukazne vrstice ali <ulink url="http://lprof.sourceforge.net/">LProf</ulink>, ki ima grafični uporabniški vmesnik.</para>
+ <para>
+ Please refer to documentation of third party hardware and software
+ vendors for details.
+ </para>
+ </sect2>
+
+ <sect2 id="cms-icc-from-embedding">
+ <title>Vključevanje</title>
+
+ <para>Nekatere vrste slik (kot so TIFF, JPEG, PNG ...) lahko vsebujejo vključene barvne profile. V primeru da je upravljanje barv omogočeno, F-Spot poišče vključene profile in jih upošteva.</para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="cms-how-to-use">
+ <title>Kako uporabiti upravljanje barv v F-Spot</title>
+
+ <para>Upravljanje barv v F-Spot lahko trenutno uporabi le profile RGB (drugih profilov v F-Spot ni mogoče videti).</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Kopirajte svoje barvne profile v mapo <filename class="directory">/usr/share/color/icc</filename> ali <filename class="directory">/usr/local/share/color/icc</filename>.</para>
+ </listitem>
+ <listitem>
+ <para>Upravljanje barv omogočite z menijem <menuchoice><guimenu>Uredi</guimenu><guimenuitem>Možnosti</guimenuitem></menuchoice>.</para>
+ </listitem>
+ <listitem>
+ <para>Izberite profila <guilabel>Prikaz</guilabel> in <guilabel>Izhod</guilabel>.</para>
+ </listitem>
+ </itemizedlist>
+
+ <tip>
+ <para>Za nalaganje profila ICC za prikaz in uporabo naloženega profila iz F-Spot lahko uporabite <ulink url="http://burtonini.com/blog/computers/xicc">xicc</ulink>. Samo označite potrditveno polje <guilabel>Poskus uporabe sistemskega profila prikaza</guilabel>.</para>
+ </tip>
+ </sect1>
+ </chapter>
+
+ <chapter id="extend">
+ <title>Razširitev zmožnosti</title>
+
+ <sect1 id="extend-what-extensions-are">
+ <title>Kaj so razširitve</title>
+
+ <para>Razširitve F-Spot dajo programu nove zmožnosti. F-Spot podpira dve vrsti razširitev: izvoznike (omogočajo izvažanje fotografij na spletne storitve ali podatkovne shrambe) in orodja (omogočajo nove načine popravljanja barv, podvajanje fotografij, itn.). Razširitve so distribuirane v obliki paketov razširitev.</para>
+ <para>Z namenom zmanjšanja podvajanja dela lahko razširitve uporabijo druge razširitve, kar pomeni da lahko razširitev ne deluje, če ni nameščena druga razširitev. Ta koncept odvisnosti pomeni da</para>
+ <itemizedlist>
+ <listitem>
+ <para>ne morete namestiti razširitve, če je odvisna od druge razširitve, ki je ni na sistemu</para>
+ </listitem>
+ <listitem>
+ <para>ne morete odstraniti razširitve od katere je odvisna druga razširitev</para>
+ </listitem>
+ </itemizedlist>
+ </sect1>
+
+ <sect1 id="extend-managing-extensions">
+ <title>Upravljanje razširitev</title>
+
+ <para>Za upravljanje razširitev izberite predmet menija <menuchoice><guimenu>Uredi</guimenu><guimenuitem>Upravljanje razširitev</guimenuitem></menuchoice>.</para>
+
+ <sect2 id="extend-managing-extensions-managing-extension-repositories">
+ <title>Upravljanje s skladišči razširitev</title>
+
+ <para>Preprosto povedano so skladišča shrambe razširitev. Lahko so omrežna ali krajevna. Za dodajanje novega skladišča kliknite gumb Skladišča, izberite vrsto skladišča za dodajanje in vnesite URL ali pot. V primeru da navedeni URL ali pot ne vsebuje datoteke opisa (kazala) za razširitve, vas bo o tem obvestilo opozorilno sporočilo.</para>
+ <para>Za odstranitev skladišča ponovno kliknite gumb <guibutton>Skladišča</guibutton>, izberite skladišče za izbris in kliknite gumb <guibutton>Izbriši</guibutton>.</para>
+ </sect2>
+
+ <sect2 id="extend-managing-extensions-installing-and-updating-extensions">
+ <title>Nameščanje in posodabljanje razširitev</title>
+
+ <para>Za namestitev razširitve kliknite gumb <guibutton>Namesti razširitve ...</guibutton> . V novo predstavljenem pogovornem oknu</para>
+ <orderedlist>
+ <listitem>
+ <para>Izberite skladišče za namestitev iz vseh znanih skladišč ali razpoložljivih skladišč.</para>
+ </listitem>
+ <listitem>
+ <para>Izberite katere pakete razširitev želite videti: Vse, le nove, le posodobitve.</para>
+ </listitem>
+ <listitem>
+ <para>Kliknite gumb <guibutton>Posodobi</guibutton> za posodobitev seznama razpoložljivih paketov razširitev glede na dane kriterije.</para>
+ </listitem>
+ <listitem>
+ <para>Izberite razširitve, ki jih želite namestiti/posodobiti, ter kliknite <guibutton>Podrobnosti</guibutton> za ogled povzetka izbranega paketa, če želite.</para>
+ </listitem>
+ <listitem>
+ <para>Kliknite gumb <guibutton>Naprej</guibutton> za nadaljevanje z namestitvijo.</para>
+ </listitem>
+ </orderedlist>
+ </sect2>
+
+ <sect2 id="extend-managing-extensions-enabling-and-disabling-extensions">
+ <title>Omogočanje in onemogočanje razširitev </title>
+
+ <para>Morda želite začasno omogočiti ali onemogočiti določen paket razširitve, na primer če razširitev ni dovolj stabilna za upravljanje z veliko količino fotografij ali če so meniji preveč natrpani z razširitvami.</para>
+ <para>V pogovornem oknu <guilabel>Upravljanje razširitev</guilabel> izberite paket razširitev in kliknite gumb <guibutton>Omogoči</guibutton> ali <guibutton>Onemogoči</guibutton>. </para>
+ </sect2>
+
+ <sect2 id="extend-managing-extensions-removing-extensions">
+ <title>Odstranjevanje razširitev</title>
+
+ <para>V primeru da razširitve ne potrebujete, jo lahko popolnoma odstranite s sistema. V pogovornem oknu <guilabel>Upravljanje razširitev</guilabel> izberite paket razširitev, ki ga želite izbrisati in kliknite <guibutton>Izbriši</guibutton>.</para>
+ </sect2>
+
+ <sect2 id="extend-managing-extensions-reading-summary-of-extensions">
+ <title>Branje povzetka razširitev</title>
+
+ <para>Vsak paket razširitve vsebuje metapodatke, ki zagotavljajo naslednje podrobnosti o razširitvi:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Opis, ki običajno opiše namen razširitve</para>
+ </listitem>
+ <listitem>
+ <para>Različica</para>
+ </listitem>
+ <listitem>
+ <para>Avtor</para>
+ </listitem>
+ <listitem>
+ <para>Odvisnosti</para>
+ </listitem>
+ </orderedlist>
+
+ <para>V pogovornem oknu <guilabel>Upravljanje razširitev</guilabel> izberite paket razširitve katerega opis želite prebrati in kliknite <guibutton>Podrobnosti</guibutton>.</para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="extend-developing-extensions">
+ <title>Razvijanje razširitev</title>
+
+ <para>Dokument <ulink url="http://f-spot.org/Extend_F-Spot">razširite F-Spot</ulink> vsebuje navodila za razvijanje vaših lastnih razširitev za F-Spot.</para>
+ </sect1>
+ </chapter>
+
+ <chapter id="shortcuts">
+ <title>Bližnjice</title>
+
+ <sect1 id="Global-Shortcuts">
+ <title>Splošne bližnjice</title>
+ <informaltable frame="all">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Tipka</entry>
+ <entry>Dejanje</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <keycap>[</keycap>
+ </entry>
+ <entry>Vrtenje izbranih fotografij levo</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>]</keycap>
+ </entry>
+ <entry>Vrtenje izbranih fotografij desno</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>Del</keycap>
+ </entry>
+ <entry>Odstrani izbrane fotografije iz kataloga F-Spot</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Dvigalka</keycap><keycap>Del</keycap></keycombo>
+ </entry>
+ <entry>Trajno izbriše izbrane fotografije s pogona. V primeru, da je to mogoče, bodo premaknjene v smeti.</entry>
+ </row>
+
+ <row>
+ <entry>
+ <keycap>t</keycap>
+ </entry>
+ <entry>Ogled ali urejanje oznak za izbrane fotografije</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>F11</keycap>
+ </entry>
+ <entry>Celozaslonski pogled</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>I</keycap></keycombo>
+ </entry>
+ <entry>Prikaz podrobnosti o fotografiji</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>Je enako</keycap></keycombo>
+ </entry>
+ <entry>Približanje</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>Minus</keycap></keycombo>
+ </entry>
+ <entry>Oddaljevanje</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo>
+ </entry>
+ <entry>Uvoz fotografij</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Alt</keycap><keycap>0-5</keycap></keycombo>
+ </entry>
+ <entry>Alt in število od 0 do 5 za oceno izbran-e/ih slik(e)</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+
+ <sect1 id="shortcuts-browse-mode">
+ <title>Bližnjice načina brskanja</title>
+ <informaltable frame="all">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Tipka</entry>
+ <entry>Dejanje</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>
+ </entry>
+ <entry>Izbor vsega</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>Dvigalka</keycap>
+ <keycap>A</keycap></keycombo>
+ </entry>
+ <entry>Preklic izbora</entry>
+ </row>
+ <row>
+ <entry>Tipke puščice ali <keycap>H</keycap>, <keycap>J</keycap>, <keycap>K</keycap>, <keycap>L</keycap></entry>
+ <entry>Premakne žarišče</entry>
+ </row>
+ <row>
+ <entry><keycap>Ctrl</keycap>-Tipka puščice</entry>
+ <entry>Premakne žarišče brez spremembe izbora</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>Preslednica</keycap>
+ </entry>
+ <entry>Izbere ali prekliče izbor fotografije v žarišču</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Dvigalka</keycap>
+ <keycap>Tipka puščice</keycap></keycombo>
+ </entry>
+ <entry>Sprememba izbire fotografije</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>Dvigalka</keycap>
+ <keycap>Leva puščica ali desna puščica</keycap></keycombo>
+ </entry>
+ <entry>Doda/odstrani vse fotografije v vrstici v izbrani smeri do izbora</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>V</keycap>
+ </entry>
+ <entry>Pojavi večji predogled slike pokazane z miško</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Dvigalka</keycap><keycap>V</keycap></keycombo>
+ </entry>
+ <entry>Pojavi večji predogled in barvni histogram slike pokazane z miško</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+
+ <sect1 id="shortcuts-tag">
+ <title>Bližnjice oznak</title>
+ <informaltable frame="all">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Tipka</entry>
+ <entry>Dejanje</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <keycap>F2</keycap>
+ </entry>
+ <entry>Preimenovanje izbranih oznak</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>T</keycap></keycombo>
+ </entry>
+ <entry>Dodajanje oznak izbranim fotografijam</entry>
+ </row>
+ <row>
+ <entry>n/a</entry>
+ <entry>Za premikanje oznak jih povlecite in spustite</entry>
+ </row>
+ <row>
+ <entry>n/a</entry>
+ <entry>Vtipkajte ime oznake za skok nanjo (deluje le, če je oznaka prikazana/razširjena)</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+
+ <sect1 id="shortcuts-edit-mode">
+ <title>Bližnjice načina urejanja</title>
+ <informaltable frame="all">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Tipka</entry>
+ <entry>Dejanje</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><keycap>Stran navzgor</keycap>, <keycap>Povratna tipka</keycap>, <keycap>B</keycap></entry>
+ <entry>Pojdi na predhodno fotografijo</entry>
+ </row>
+ <row>
+ <entry><keycap>Stran navzdol</keycap>, <keycap>Preslednica</keycap>, <keycap>N</keycap></entry>
+ <entry>Pojdi na naslednjo fotografijo</entry>
+ </row>
+ <row>
+ <entry>Tipke puščice ali <keycap>H</keycap>, <keycap>J</keycap>, <keycap>K</keycap>, <keycap>L</keycap></entry>
+ <entry>Gre na predhodno/naslednjo fotografijo ali premakne naokoli povečano fotografijo</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>R</keycap>
+ </entry>
+ <entry>Pojdi na naključno fotografijo</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>f</keycap>
+ </entry>
+ <entry>Celozaslonski pogled</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>0</keycap>
+ </entry>
+ <entry>Prilagajanje slike zaslonu</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>1</keycap>
+ </entry>
+ <entry>Faktor povečave 1.0 (1 točka zaslona na točko slike)</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>2</keycap>
+ </entry>
+ <entry>Faktor povečave na 2.0 (4 točke zaslona na točko slike)</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>Ubežna tipka</keycap>
+ </entry>
+ <entry>Vrne v način brskalnika</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>V</keycap>
+ </entry>
+ <entry>Preučevanje fotografije s povečevalnim steklom. Za zaprtje povečevalnega stekla kliknite nanj ali vtipkajte <keycap>v</keycap>.</entry>
+ </row>
+ <row>
+ <entry><keycap>Dvigalka</keycap>-Miškino kolesce</entry>
+ <entry>Hitrejše drsenje filmskega traku</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>i</keycap>
+ </entry>
+ <entry>Preklop vidnosti polja podrobnosti "(le v celozaslonskem načinu)"</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+ </chapter>
+
+</book>
diff --git a/docs/sl/figures/f-spot-crop.png b/docs/sl/figures/f-spot-crop.png
new file mode 100644
index 0000000..eb1560d
Binary files /dev/null and b/docs/sl/figures/f-spot-crop.png differ
diff --git a/docs/sl/sl.po b/docs/sl/sl.po
new file mode 100644
index 0000000..ac9bee9
--- /dev/null
+++ b/docs/sl/sl.po
@@ -0,0 +1,1253 @@
+# Andrej Žnidaršič <andrej.znidarsic at gmail.com>, 2009 - 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: f-spot documentation\n"
+"POT-Creation-Date: 2010-02-28 09:00+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Andrej Žnidaršič <andrej.znidarsic at gmail.com>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/f-spot.xml:163(None)
+msgid "@@image: 'figures/f-spot-crop.png'; md5=63e18c96702aea4701024837a13ae2d9"
+msgstr "a"
+
+#. 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/f-spot.xml:187(None)
+msgid "@@image: 'figures/f-spot-straighten.png'; md5=ceeff0cac633d06599fa5760cc4bc568"
+msgstr "a"
+
+#. 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/f-spot.xml:206(None)
+msgid "@@image: 'figures/f-spot-adjust-colors.png'; md5=6a5d9eaaaaf238ccbf70552bc073898c"
+msgstr "a"
+
+#. 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/f-spot.xml:224(None)
+msgid "@@image: 'figures/f-spot-autocolor.png'; md5=240c4a86c95c9507755fe790bef0e24a"
+msgstr "a"
+
+#. 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/f-spot.xml:241(None)
+msgid "@@image: 'figures/f-spot-desaturate.png'; md5=fa54dfd08171658d720be71b6d367139"
+msgstr "a"
+
+#. 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/f-spot.xml:258(None)
+msgid "@@image: 'figures/f-spot-sepia.png'; md5=154d6e34903664dbd776f2bef405ce91"
+msgstr "a"
+
+#. 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/f-spot.xml:289(None)
+msgid "@@image: 'figures/f-spot-red-eye.png'; md5=743d0a2ccc9b2fa8fa314855c225cd31"
+msgstr "a"
+
+#. 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/f-spot.xml:316(None)
+msgid "@@image: 'figures/f-spot-soft-focus.png'; md5=14d1437ce49c83f3ebbcf70b7047ffbe"
+msgstr "a"
+
+#. 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/f-spot.xml:608(None)
+msgid "@@image: 'figures/f-spot-fullscreen.png'; md5=86040e20ebf1015f6489a56e9589f063"
+msgstr "a"
+
+#. 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/f-spot.xml:621(None)
+msgid "@@image: 'figures/f-spot-slideshow.png'; md5=84a69bc3bb7a1b8d04c967d3a66e6f23"
+msgstr "a"
+
+#: C/f-spot.xml:5(title)
+msgid "The F-Spot Manual"
+msgstr "F-Spot priročnik"
+
+#: C/f-spot.xml:7(para)
+#: C/f-spot.xml:9(subtitle)
+msgid "This is the user manual for F-Spot, a GNOME personal photo manager."
+msgstr "To je uporabniški priročnik za F-Spot, GNOME upravljalnik fotografij"
+
+#: C/f-spot.xml:11(year)
+msgid "2007-2009"
+msgstr "2007-2009"
+
+#: C/f-spot.xml:12(holder)
+msgid "Aaron Bockover, Gabriel Burt, Miguel de Icaza, Bengt Thuree"
+msgstr "Aaron Bockover, Gabriel Burt, Miguel de Icaza, Bengt Thuree"
+
+#: C/f-spot.xml:15(publishername)
+msgid "GNOME Documentation Project"
+msgstr "GNOME projekt dokumentacije"
+
+#: C/f-spot.xml:19(firstname)
+msgid "Miguel"
+msgstr "Miguel"
+
+#: C/f-spot.xml:20(surname)
+msgid "de Icaza"
+msgstr "de Icaza"
+
+#: C/f-spot.xml:23(firstname)
+msgid "Aaron"
+msgstr "Aaron"
+
+#: C/f-spot.xml:24(surname)
+msgid "Bockover"
+msgstr "Bockover"
+
+#: C/f-spot.xml:27(firstname)
+msgid "Bengt"
+msgstr "Bengt"
+
+#: C/f-spot.xml:28(surname)
+msgid "Thuree"
+msgstr "Thuree"
+
+#: C/f-spot.xml:31(firstname)
+msgid "Gabriel"
+msgstr "Gabriel"
+
+#: C/f-spot.xml:32(surname)
+msgid "Burt"
+msgstr "Burt"
+
+#: C/f-spot.xml:35(firstname)
+msgid "Alexandre"
+msgstr "Alexandre"
+
+#: C/f-spot.xml:36(surname)
+msgid "Prokoudine"
+msgstr "Prokoudine"
+
+#: C/f-spot.xml:39(firstname)
+msgid "Stephane"
+msgstr "Stephane"
+
+#: C/f-spot.xml:40(surname)
+msgid "Delcroix"
+msgstr "Delcroix"
+
+#: C/f-spot.xml:46(revnumber)
+msgid "0.5"
+msgstr "0,5"
+
+#: C/f-spot.xml:47(date)
+msgid "2008-09-25"
+msgstr "2008-09-25"
+
+#: C/f-spot.xml:50(revnumber)
+msgid "0.4"
+msgstr "0,4"
+
+#: C/f-spot.xml:51(date)
+msgid "2008-09-12"
+msgstr "2008-09-12"
+
+#: C/f-spot.xml:54(revnumber)
+msgid "0.3"
+msgstr "0,3"
+
+#: C/f-spot.xml:55(date)
+msgid "2007-07-26"
+msgstr "26-07-2007"
+
+#: C/f-spot.xml:61(title)
+msgid "Organizing your photos"
+msgstr "Organizacija vaših fotografij"
+
+#: C/f-spot.xml:64(title)
+msgid "Import"
+msgstr "Uvažanje"
+
+#: C/f-spot.xml:66(para)
+msgid "You can import photos from your hard drive or your camera. When you import your photos into F-Spot from your camera, it will always make a copy of them, leaving you free to clear your camera's memory. By default, F-Spot will make a copy of photos imported from your hard drive. Uncheck the <guilabel>Copy</guilabel> option on the import dialog or hold <keycap>Shift</keycap> when dragging photos into F-Spot if you do not wish to copy them from your hard drive."
+msgstr "Fotografije lahko uvozite s trdega diska ali fotoaparata. V primeru uvoza fotografij v F-Spot s fotoaparata, bo F-Spot vedno naredil njihovo kopijo in vam omogočil čiščenje pomnilnika vašega fotoaparata. Privzeto F-Spot naredi kopijo fotografij uvoženih s trdega diska. V primeru da datotek ne želite kopirati s trdega diska, odkljukajte možnost <guilabel>Kopiranje datotek v mapo fotografij</guilabel> v pogovornem oknu uvoza ali pa med vlečenjem fotografij v F-Spot držite tipko <keycap>Dvigalka</keycap>."
+
+#: C/f-spot.xml:76(para)
+msgid "By default, F-Spot copies your photos to the <filename class=\"directory\">~/Photos</filename> folder. You can change the folder F-Spot uses in <guilabel>Preferences</guilabel> dialog (<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>). You can also disable physical copying of images to that directory and make F-Spot only reference to existing files. For that you need to disable checkbox <guilabel>Copy files to the Photos folder</guilabel>."
+msgstr "Privzeto F-Spot kopira vaše fotografije v mapo <filename class=\"directory\">~/Slike</filename>. Mapo, ki jo uporablja F-Spot lahko spremenite v pogovornem oknu <guilabel>Možnosti</guilabel> (<menuchoice><guimenu>Uredi</guimenu><guimenuitem>Možnosti</guimenuitem></menuchoice>)."
+
+#: C/f-spot.xml:85(para)
+msgid "If there is a tiny chance that some of your photos are already imported from the chosen source, you can use <guilabel>Detect duplicates</guilabel> option. In this case F-Spot will try to find out if exactly this image is already present in the database and thus new copy of it should not be imported."
+msgstr "V primeru da ste morda nekatere fotografije iz izbranega vira že uvozili, lahko uporabite možnost <guilabel>Zaznavanje dvojnikov</guilabel>. F-Spot bo poskusil ugotoviti ali natanko ta slika že obstaja v podatkovni zbirki. V tem primeru kopija slike ne bo uvožena."
+
+#: C/f-spot.xml:92(para)
+msgid "If all the photos you are importing at one time are from a particular event, or have some other characteristic in common, you can create a tag for them so you can later find them with ease. To do this, follow the instructions from <xref linkend=\"tag\"/> to create a new tag, then when you are importing them, check the button for <guilabel>Attach Tag</guilabel> and choose the tag you created."
+msgstr "V primeru da so vse uvožene fotografije z določenega dogodka, ali imajo neko drugo skupno značilnost, lahko za njih ustvarite oznako zato da jih kasneje lahko najdete. Za to sledite navodilom z <xref linkend=\"tag\"/> za ustvarjanje nove oznake, nato med uvažanjem označite gumb <guilabel>Pripni oznako</guilabel> in izberite ustvarjeno oznako."
+
+#: C/f-spot.xml:102(para)
+msgid "F-Spot uses a database stored at <filename>~/.config/f-spot/photos.db</filename>. Note, to access it, use the sqlite3 command. You can also manually specify path to a database by running F-Spot with <option>-b</option> option."
+msgstr "F-Spot uporablja podatkovno zbirko shranjeno v <filename>~/.config/f-spot/photos.db</filename>. Za dostop do nje uporabite ukaz sqlite3. Pot do podatkovne zbirke lahko ročno navedete z zagonom F-Spot z možnostjo <option>-b</option>."
+
+#: C/f-spot.xml:110(para)
+msgid "After an import, F-Spot will display the pictures of the latest import roll only. Read <xref linkend=\"enjoying-search\"/> to learn how to deal with import rolls."
+msgstr "Po uvozu bo F-Spot prikazal le slike zadnjega uvoznega zvitka. Preberite <xref linkend=\"enjoying-search\"/> za podrobnosti o upravljanju z uvoznimi zvitki."
+
+#: C/f-spot.xml:115(para)
+msgid "You can also import directly from Mozilla <ulink url=\"http://www.mozilla.com/en-US/firefox/\">Firefox</ulink> and <ulink url=\"http://www.mozilla.com/en-US/thunderbird/\">Thunderbird</ulink> using <ulink url=\"https://addons.mozilla.org/en-US/firefox/addon/7091\">Firefox</ulink> and <ulink url=\"https://addons.mozilla.org/en-US/thunderbird/addon/7011\">Thunderbird</ulink> F-Spot importer extensions written by <ulink url=\"http://personalpages.tds.net/~cdovel/\">Pizzach</ulink>."
+msgstr "Uvoziti je mogoče tudi neposredno iz Mozilla <ulink url=\"http://www.mozilla.com/en-US/firefox/\">Firefox</ulink> in <ulink url=\"http://www.mozilla.com/en-US/thunderbird/\">Thunderbird</ulink> z uporabo <ulink url=\"https://addons.mozilla.org/en-US/firefox/addon/7091\">Firefox</ulink> in <ulink url=\"https://addons.mozilla.org/en-US/thunderbird/addon/7011\">Thunderbird</ulink> razširitve F-Spot uvoznik, ki jo je napisal<ulink url=\"http://personalpages.tds.net/~cdovel/\">Pizzach</ulink>."
+
+#: C/f-spot.xml:127(title)
+msgid "Edit"
+msgstr "Urejanje"
+
+#: C/f-spot.xml:129(para)
+msgid "If you double click or press enter on an image, you enter Edit mode, where you can remove red-eye, crop, and adjust brightness and colors."
+msgstr "V primeru da dvojno kliknite ali pritisnete vnosno tipko, vstopite v način urejanje, kjer lahko odstranite rdeče oči, obrežete ter prilagodite svetlost in barve."
+
+#: C/f-spot.xml:135(title)
+msgid "Versions"
+msgstr "Različice"
+
+#: C/f-spot.xml:137(para)
+msgid "When you edit your photos, a new copy (called a version) is created, so your original is never altered. After your first edit to a photo, subsequent edits will modify the same version. If you want to create multiple versions of your photo, perhaps with different cropping or coloring, you can do so via the <menuchoice><guimenu>File</guimenu><guimenuitem>Create new version</guimenuitem></menuchoice> option."
+msgstr "Ko urejate fotografije, je ustvarjena nova kopija (imenovana različica), tako izvorna fotografija ni nikoli spremenjena. Po prvem urejanju fotografije bodo naslednja urejanja spremenila isto različico. V primeru da želite ustvariti več različic fotografije, morda z drugim obrezovanjem ali barvami lahko to storite preko možnosti <menuchoice><guimenu>Fotografija</guimenu><guimenuitem>Ustvari novo različico</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:148(title)
+msgid "Crop"
+msgstr "Obreži"
+
+#: C/f-spot.xml:150(para)
+msgid "Cropping an image is a great way to improve the quality of a photograph by change how it is framed. You crop a photo by selecting the part of the photo you want to keep. If you want your photo to be the exact dimensions necessary for a certain print size, you can constrain the kind of selection F-Spot will allow you to draw by choosing the appropriate size from the constraint drop down. See the <xref linkend=\"edit-remove-red-eye\"/> below for details on making a selection on your photo."
+msgstr "Obrezovanje slike je dober način za izboljšanje kakovosti slike s spremembo okvirjanja. Fotografijo lahko obrežete z izbiro dela fotografije, ki ga želite obdržati. V primeru da želite imeti fotografijo natančnih mer zahtevanih za določeno velikost tiskanja, lahko z izbiro primerne velikosti s spustnega menija omejitev omejite izbiro, ki vam jo bo dovolil narisati F-Spot. Za podrobnosti o izbiri na fotografiji si oglejte <xref linkend=\"edit-remove-red-eye\"/> spodaj."
+
+#: C/f-spot.xml:160(title)
+msgid "Crop tool"
+msgstr "Orodje obreži"
+
+#: C/f-spot.xml:167(para)
+#: C/f-spot.xml:368(para)
+msgid "Once you have made your crop selection, you must click the crop button beneath the image to finalize the crop. If you are working with the original photo, cropping creates a new version your photo."
+msgstr "Ko ste naredili izbor obreza, morate za končanje obrezovanja klikniti gumb pod sliko. V primeru da delate z izvorno fotografijo, obrezovanje ustvari novo različico vaše fotografije."
+
+#: C/f-spot.xml:175(title)
+msgid "Straighten"
+msgstr "Poravnava"
+
+#: C/f-spot.xml:177(para)
+msgid "Straighten effect is a tool to level a photo, quite helpful for landscapes taken without a tripod, when (imaginary) line of horizon is not at 0°. This tool rotates an image by a specified angle and automagically crops the resulted image, so that you always see a perfect rectangle."
+msgstr "Učinek poravnave je orodje za poravnanje fotografij, precej uporabno za sliko pokrajine posnete brez stativa, ko (navidezna) črta horizonta ni na 0°. To orodje zavrti sliko za določen kot in samodejno čarobno obreže nastalo sliko, tako da vedno vidite idealen pravokotnik."
+
+#: C/f-spot.xml:184(title)
+msgid "Straighten tool"
+msgstr "Orodje poravnave"
+
+#: C/f-spot.xml:194(title)
+msgid "Adjust Colors"
+msgstr "Prilagajanje barv"
+
+#: C/f-spot.xml:196(para)
+msgid "To adjust the brightness, contrast, and colors of a photo, first click the <guibutton>Adjust the photo colors</guibutton> icon to open the adjustment dialog. Change then some settings and save them with <guibutton>OK</guibutton>."
+msgstr "Za prilagajanje svetlosti, kontrasta in barv fotografije najprej kliknite ikono <guibutton>Prilagodi barve fotografije</guibutton> za odpiranje pogovornega okna prilagajanja. Spremenite nekaj nastavitev in jih shranite z <guibutton>V redu</guibutton>."
+
+#: C/f-spot.xml:203(title)
+msgid "Adjust Colors tool"
+msgstr "Orodje prilagajanja barv"
+
+#: C/f-spot.xml:213(title)
+#: C/f-spot.xml:221(title)
+msgid "AutoColor"
+msgstr "Samodejna barva"
+
+#: C/f-spot.xml:215(para)
+msgid "This effect automatically adjusts color levels to make a pretty balanced picture color-wise. It serves best for pictures taken with automatical white balance, when camera didn't manage to do the job well."
+msgstr "Ta učinek samodejno prilagodi barvne ravni za ustvarjanje barvno uravnotežene slike. Najboljše deluje za slike posnete s samodejnim ravnotežjem bele barve, ko fotoaparat ni uspel dobro opraviti dela. "
+
+#: C/f-spot.xml:231(title)
+msgid "Desaturate"
+msgstr "Zmanjšaj nasičenje"
+
+#: C/f-spot.xml:233(para)
+msgid "To make a colorful photo a black and white one, open a photo of choice and press <guibutton>Desaturate</guibutton> button."
+msgstr "Za pretvorbo barve fotografije v črno belo odprite izbrano fotografijo iz pritisnite gumb <guibutton>Zmanjšaj nasičenje</guibutton>."
+
+#: C/f-spot.xml:238(title)
+#: C/f-spot.xml:255(title)
+msgid "Desaturation tool"
+msgstr "Orodje zmanjšanja nasičenja"
+
+#: C/f-spot.xml:248(title)
+msgid "Sepia"
+msgstr "Sepia"
+
+#: C/f-spot.xml:250(para)
+msgid "To make a colorful photo look like an old-style picture in sepia tones, open a photo of choice and press <guibutton>Sepia</guibutton> button."
+msgstr "Za pretvorbo barvne fotografije v staro sliko sepia tonov odprite izbrano fotografijo in pritisnite gumb <guibutton>Sepia učinek staranja</guibutton>."
+
+#: C/f-spot.xml:265(title)
+msgid "Remove Red-Eye"
+msgstr "Odstranjevanje rdečih oči"
+
+#: C/f-spot.xml:267(para)
+msgid "To remove redeye from a photo, you need to select a zone containing the eyes. You may want to zoom in on the image to accurately select the eyes in the photo. You should be able to correct both eyes on the same person in one shot, or even the eyes from multiple people at once. If this doesn't work for you, or the selected zone contains some vivid red parts (lips, ...) you'll probably have to correct one red eye at a time."
+msgstr "Za odstranitev rdečih oči s fotografije morate izbrati področje, ki vsebuje oči. Pametno je povečati sliko za natančno izbiro oči v fotografiji. Naenkrat bi lahko popravite obe oči iste osebe ali celo oči več oseb na enkrat. V primeru da to ne deluje, ali izbrano področje vsebuje druge živo rdeče dele (ustnice, ...) boste najbrž morali popraviti eno oko na enkrat."
+
+#: C/f-spot.xml:275(para)
+msgid "To make your selection, click one corner of the rectangle that will be your selection, and drag your mouse to the diagonal corner and release it. You can resize your selection by dragging its edges, and you can move it by clicking in the middle of it and dragging it to where you want it."
+msgstr "Za izbiranje kliknite en kot kvadrata, ki bo vaš izbor, povlecite vašo miško v diagonalni kot in jo spustite. Izboru lahko spremenite velikost z vlečenjem njegovih robom ali pa ga lahko premaknete s klikom v sredino izbora in ga povlečete kamor ga želite."
+
+#: C/f-spot.xml:281(para)
+msgid "Once you have selected a zone, you can remove the red from it by clicking the red-eye button beneath the photo."
+msgstr "Ko ste izbrali področje, lahko rdeče oko odstranite s klikom na gumb rdeče-oko pod fotografijo."
+
+#: C/f-spot.xml:286(title)
+msgid "Red-Eye tool"
+msgstr "Orodje rdečih oči"
+
+#: C/f-spot.xml:294(para)
+msgid "You can change the threshold for redeyes detection by changing the gconf key <filename class=\"directory\">/apps/f-spot/edit/redeye_threshold</filename>."
+msgstr "Prag za zaznavanje rdečih oči lahko spremenite s spremembo gconf ključa ¸<filename class=\"directory\">/apps/f-spot/edit/redeye_threshold</filename>."
+
+#: C/f-spot.xml:303(title)
+msgid "Soft Focus"
+msgstr "Mehko žarišče"
+
+#: C/f-spot.xml:305(para)
+msgid "In photography sharpening one region of a picture, while blurring all the rest, is a way to make an emphasis and grab attention. It is achieved by using a lens that allows shooting with a short distance in front of and beyond the subject that appears to be in focus. Soft focus effect is a way to emulate such a lens."
+msgstr "V fotografiji je izostritev enega predela slike in zameglitev vsega ostalega način za poudarjanje in pridobitev pozornosti. To je mogoče doseči z uporabo leče ki dovoli snemanje s kratko razdaljo pred in za predmetom, ki je videti v gorišču. Učinek mehkega gorišča je način za posnemanje takšne leče."
+
+#: C/f-spot.xml:313(title)
+msgid "Soft Focus tool"
+msgstr "Orodje mehkega žarišča"
+
+#: C/f-spot.xml:320(para)
+msgid "Click to choose central point of the area you want to be in focus and adjust amount of blurring, then click <guibutton>OK</guibutton>."
+msgstr "Kliknite za izbor središča področja, ki naj bo v gorišču in prilagodite količino megljenja in nato kliknite <guibutton>V redu</guibutton>."
+
+#: C/f-spot.xml:327(title)
+msgid "Sharpen"
+msgstr "Izostritev"
+
+#: C/f-spot.xml:329(para)
+msgid "Out-of-focus photographs and most digitized images often need a sharpness correction. The Unsharp Mask effect sharpens edges of the elements without increasing noise or blemish. To sharpen a photo choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Sharpen...</guimenuitem></menuchoice> and specify the following values:"
+msgstr "Fotografije izven gorišča in večina digitaliziranih slik pogosto potrebujejo popravek izostritve. Učinek maske odstranitve izostritve izostri robove elementov brez povečanja šuma ali napak. Za izostritev fotografije izberite <menuchoice><guimenu>Uredi</guimenu><guimenuitem>Izostri...</guimenuitem></menuchoice> in navedite naslednje vrednosti:"
+
+#: C/f-spot.xml:340(para)
+msgid "<parameter class=\"option\">Amount</parameter> — strength of sharpening."
+msgstr "<parameter class=\"option\">Količina</parameter> — moč izostritve."
+
+#: C/f-spot.xml:345(para)
+msgid "<parameter class=\"option\">Radius</parameter> — how many pixels on either side of an edge will be affected by sharpening. High resolution images allow higher radius."
+msgstr "<parameter class=\"option\">Polmer</parameter> — na koliko točk na vsaki strani roba bo vplivala izostritev. Slike z visoko ločljivostjo omogočijo večje polmere."
+
+#: C/f-spot.xml:352(para)
+msgid "<parameter class=\"option\">Threshold</parameter> — the minimum difference in pixel values that indicates an edge where sharpen must be applied. This helps avoiding creation of blemishes in face, sky or water surface."
+msgstr "<parameter class=\"option\">Prag</parameter> — najmanjša razlika v vrednostih točk ki določiti rob, kjer mora biti uveljavljena izostritev. To pomaga pri izogibanju ustvarjanja napak v obrazu, nebu ali vodni površini."
+
+#: C/f-spot.xml:362(title)
+msgid "Describe"
+msgstr "Opisovanje"
+
+#: C/f-spot.xml:364(para)
+msgid "You can also enter a description of the image by clicking on the text entry box below the image and typing."
+msgstr "Vpis slike lahko vnesete s klikom na polje besedilnega vnosa pod sliko in tipkanjem."
+
+#: C/f-spot.xml:376(title)
+msgid "Adjust Time"
+msgstr "Prilagodi čas"
+
+#: C/f-spot.xml:378(para)
+msgid "In both 'browse' or 'edit' modes, you can adjust the time of one or multiple pictures (<menuchoice><guimenu>Edit</guimenu><guimenuitem>Adjust Time</guimenuitem></menuchoice>). Adjusting the time of multiple pictures at once helps you shift all an import roll if, e.g. the time on your camera is badly set or if you forgot to change it according to DST."
+msgstr "Tako v načinu 'brskanje' kot 'urejanje' lahko prilagodite čas ene ali več slik (<menuchoice><guimenu>Uredi</guimenu><guimenuitem>Prilagodi čas</guimenuitem></menuchoice>). Prilagajanje časa več slik na enkrat vam pomaga premakniti celoten uvozni zvitek, na primer če je čas na vašem fotoaparatu slabo nastavljen in ste ali če ste ga pozabili spremeniti z/na poletni čas. "
+
+#: C/f-spot.xml:390(title)
+msgid "Tag"
+msgstr "Oznaka"
+
+#: C/f-spot.xml:391(para)
+msgid "F-Spot enables you to organize and enjoy your photos by associating them with various user-customizable tags. A tag is a merely a label. F-Spot comes with default tags to get you started; you are free to change them and add new ones. For example, if you want to create a tag for specific event, you can create a new tag named after that event under the Events tag."
+msgstr "F-Spot vam omogoča organizacijo in uživanje v vaših fotografijah s povezavo z različnimi uporabniško prilagodljivimi oznakami. F-Spot za začetek vsebuje privzete oznake, lahko jih spremenite in dodate nove. Na primer, če želite ustvariti oznako za določen dogodek, lahko ustvarite oznako imenovano po dogodku pod oznako dogodki."
+
+#: C/f-spot.xml:398(para)
+msgid "There are many ways to tag photos:"
+msgstr "Obstaja več načinov za oznako fotografij:"
+
+#: C/f-spot.xml:403(para)
+msgid "drag and drop the photo(s) onto the tag"
+msgstr "povlecite in spustite fotografij-o/e na oznako"
+
+#: C/f-spot.xml:408(para)
+msgid "drag and drop the tag onto the photo(s)"
+msgstr "povlecite in spustite oznako na fotografij-o/e"
+
+#: C/f-spot.xml:413(para)
+msgid "via the photo's right-click menu"
+msgstr "preko menija desnega klika fotografija"
+
+#: C/f-spot.xml:418(para)
+msgid "via the Tags and Edit menus"
+msgstr "preko menijev Oznake in Uredi"
+
+#: C/f-spot.xml:423(para)
+msgid "by typing them in. Press <keycap>t</keycap> to pop up the tag entry bar. Here you can enter the tags, separated by commas."
+msgstr "s tipkanjem oznak. Pritisnite <keycap>t</keycap> za pojav vnosne vrstice oznak. Sem lahko vnesete oznake, ločene z vejicami."
+
+#: C/f-spot.xml:427(para)
+msgid "You can also use auto-completion in this entry bar: After entering the beginning of a tag name, press <keycap>Tab</keycap> to see the first possible completion. You can cycle between other possible completions by pressing <keycap>Tab</keycap> again, and backwards with <keycombo action=\"simul\"><keycap>Shift</keycap><keycap>Tab</keycap></keycombo>. To confirm the suggested completion and enter a new tag, press <keycap>,</keycap>. By pressing <keycap>Enter</keycap> you leave the tag entry bar, possibly confirming the current completion. To abort the auto completion, just keep on typing."
+msgstr "V vnosni vrstici lahko uporabite samodejno dokončanje. Po vnosu začetka imena oznake pritisnite <keycap>Tabulator</keycap> za ogled prvega mogočega dokončanja. Med mogočimi dokončanji lahko krožite naprej s ponovnim pritiskom na <keycap>Tabulator</keycap> in nazaj s pritiskom na <keycombo action=\"simul\"><keycap>Dvigalka</keycap><keycap>Tabulator</keycap></keycombo>. Za potrditev predlaganega dokončanja in vnos nove oznake pritisnite <keycap>,</keycap>. S pritiskom <keycap>Vnosna tipka</keycap> zapustite vnosno vrstico oznak in s tem morda potrdite trenutno dokončanje. Za preklic samodejnega dokončevanja tipkajte naprej. "
+
+#: C/f-spot.xml:441(para)
+msgid "The first photo you associate with a tag will be used for that tag's icon. You can always edit a tag's name, parent tag, and icon by right clicking on it and choosing <guilabel>Edit tag</guilabel>."
+msgstr "Prva fotografija, ki jo povežete z oznako, bo uporabljena za ikono oznake. Z desnim klikom na oznako in izbiro <guilabel>Uredi oznako</guilabel> lahko uredite ime oznake, nadrejeno oznako in ikono oznake."
+
+#: C/f-spot.xml:446(para)
+msgid "You can change a tag's parent by dragging and dropping it where you like. Also, you can edit the name of a tag by selecting it and pressing <keycap>F2</keycap>. Lastly, if you have the tag tree widget focused (e.g. you just clicked on a tag), you can start typing the name of a tag, and all the expanded tags in the list will be searched and you'll jump to any matching ones."
+msgstr "Nadrejeni predmet oznake lahko spremenite tako, da ga povlečete in spustite kamor želite. Ime oznake lahko uredite tako, da jo izberete in pritisnete <keycap>F2</keycap>. V primeru da je gradnik drevesa oznak v žarišču, (na primer ste ravnokar kliknili na oznako) lahko začnete tipkati ime oznake, vse razširjene oznake na seznamu bodo preiskane in skočili boste na zadetke."
+
+#: C/f-spot.xml:455(para)
+msgid "You can also change size of tag icons in the sidebar or even make tag icons invisible by selecting preferred option from <menuchoice><guimenu>View</guimenu><guimenuitem>Tag Icons</guimenuitem></menuchoice> menu."
+msgstr "Velikost ikon značk v stranski vrstici lahko spremenite ali pa jih celo napravite nevidne z izbiro prednostne možnosti v meniju <menuchoice><guimenu>Pogled</guimenu><guimenuitem>Ikone oznak</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:463(para)
+msgid "F-Spot can write tags as metadata fields into JPEG files. Tags for various RAW files, PNG, TIFF, and others are written to F-Spot's database. You will have to re-tag these files if you re-import your collection."
+msgstr "F-Spot lahko oznake zapiše v datoteke JPEG kot polja metapodatkov. Oznake za različne RAW, PNG, TIFF in druge datoteke so zapisane v podatkovno zbirko F-Spot. Te datoteke boste morali ob ponovnem uvozu zbirke ponovno označiti."
+
+#: C/f-spot.xml:474(title)
+msgid "Enjoying your photos"
+msgstr "Uživanje v vaših fotografijah"
+
+#: C/f-spot.xml:476(title)
+msgid "Browse"
+msgstr "Brskanje"
+
+#: C/f-spot.xml:477(para)
+msgid "You can use the slider widget to browse your photos by month or by directory. To change this setting, go to <menuchoice><guimenu>View</guimenu><guimenuitem>Arranged By</guimenuitem></menuchoice>."
+msgstr "Za brskanje po vaših fotografijah po mesecu ali po mapi lahko uporabite drsni gradnik. Za spremembo te nastavitve pojdite na <menuchoice><guimenu>Pogled</guimenu><guimenuitem>Urejeno po</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:485(title)
+msgid "Search"
+msgstr "Iskanje"
+
+#: C/f-spot.xml:487(para)
+msgid "F-Spot uses search filters to help you better define search criteria."
+msgstr "F-Spot uporablja iskalne filtre za pomoč pri boljšem določanju iskalnih kriterijev."
+
+#: C/f-spot.xml:492(title)
+msgid "Tags"
+msgstr "Oznake"
+
+#: C/f-spot.xml:494(para)
+msgid "You can start a search by double clicking or activating a tag from the tag list. Alternatively, you can show the find bar with <menuchoice><guimenu>Find</guimenu><guimenuitem>Show Find Bar</guimenuitem></menuchoice>. With the find bar shown, you can drag tags from the tag view to the find bar."
+msgstr "Iskanje lahko začnete z dvojnim klikom ali omogočanjem oznake iz seznama oznak. Dodatno lahko pokažete iskalno vrstico z <menuchoice><guimenu>Najdi</guimenu><guimenuitem>Pokaži iskalno vrstico</guimenuitem></menuchoice>. Ko je iskalna vrstica prikazana, lahko oznake povlečete iz pogleda oznak v iskalno vrstico."
+
+#: C/f-spot.xml:500(para)
+msgid "To find photos that are tagged with both of two tags, activate the first in the tag view or drag it onto the find bar, then drag the second tag and drop it on top of the first. You can also right click on the second tag in the tag view, or use the <guimenu>Find</guimenu> menu, and choose <guimenuitem>Find With...</guimenuitem> and select the first tag (or group of tags)."
+msgstr "Za iskanje fotografij, ki so označene z obema od dveh oznak, omogočite prvo v pogledu oznak ali jo povlecite v iskalno vrstico in nato povlecite drugo oznako in jo spustite na prvo. Lahko tudi desno kliknete na drugo oznako v pogledu oznak ali uporabite meni <guimenu>Najdi</guimenu> in izberite <guimenuitem>Najdi z...</guimenuitem> in izberite prvo oznako (ali skupino oznak)."
+
+#: C/f-spot.xml:507(para)
+msgid "You can drag a tag icon around on the find bar to change from finding it and another tag to finding it or another tag."
+msgstr "Ikono oznake lahko povlečete na iskalno vrstico za spremembo iz iskanja te oznake in druge oznake v iskanje te oznake ali druge oznake. "
+
+#: C/f-spot.xml:511(para)
+msgid "You can search for photos that do not have a particular tag by double-clicking on a tag in the find bar. Alternatively, you can right-click a tag in the find bar and select <guimenuitem>Exclude</guimenuitem>."
+msgstr "Fotografije brez določene oznake lahko iščete z dvojnim klikom na oznako v iskalni vrstici. Dodatna možnost je desni klik na oznako v iskalni vrstici in izbira <guimenuitem>Izključi</guimenuitem>."
+
+#: C/f-spot.xml:516(para)
+msgid "To remove a tag from the search, drag it away from the find bar, or right click and select <guimenuitem>Remove</guimenuitem>."
+msgstr "Za odstranitev oznake iz iskanja jo povlecite vstran od vrstice iskanja ali desno kliknite in izberite <guimenuitem>Odstrani</guimenuitem>."
+
+#: C/f-spot.xml:520(para)
+msgid "By default, photos tagged <emphasis>Hidden</emphasis> will not be shown. You must explicitly include the <emphasis>Hidden</emphasis> tag in your search to show such photos."
+msgstr "Privzeto so fotografije označene <emphasis>Skrito</emphasis> skrite. Za iskanje takšnih fotografij morate eksplicitno vključiti oznako <emphasis>Skrito</emphasis>."
+
+#: C/f-spot.xml:528(title)
+msgid "Import Rolls"
+msgstr "Uvozni zvitki"
+
+#: C/f-spot.xml:529(para)
+msgid "F-Spot remembers what pictures were imported every now and then. Use <menuchoice><guimenu>Find</guimenu><guisubmenu>Import Roll</guisubmenu><guimenuitem>Last import roll</guimenuitem></menuchoice> to limit search to last importing session or use <menuchoice><guimenu>Find</guimenu><guisubmenu>Import Roll</guisubmenu><guimenuitem>Select Import Rolls...</guimenuitem></menuchoice> to make a finer selection of imported photos:"
+msgstr "F-Spot si vsake toliko časa zapomni katere slike so bile uvožene. Uporabite <menuchoice><guimenu>Najdi</guimenu><guisubmenu>Po uvoznem zvitku</guisubmenu><guimenuitem>Zadnji uvozni zvitek</guimenuitem></menuchoice> za omejitev iskanja na zadnjo sejo uvažanja ali uporabite <menuchoice><guimenu>Najdi</guimenu><guisubmenu>Po uvoznem zvitku</guisubmenu><guimenuitem>Izberi uvozne zvitke ...</guimenuitem></menuchoice> za fino izbiro uvoženih fotografij:"
+
+#: C/f-spot.xml:539(para)
+msgid "<parameter class=\"option\">At</parameter> — to select photos from a particular importing session"
+msgstr "<parameter class=\"option\">Ob</parameter> — za izbor fotografij iz določene seje uvažanja"
+
+#: C/f-spot.xml:544(para)
+msgid "<parameter class=\"option\">After</parameter> — to select all photos imported begining with a particular importing session"
+msgstr "<parameter class=\"option\">Za</parameter> — za izbor vseh uvoženih fotografij z začetkom pri določeni seji uvažanja"
+
+#: C/f-spot.xml:549(para)
+msgid "<parameter class=\"option\">Between</parameter> — to select all photos imported between two particular importing sessions"
+msgstr "<parameter class=\"option\">Med</parameter> — za izbor vseh fotografij uvoženih med dvema določenima sejama uvažanja"
+
+#: C/f-spot.xml:554(para)
+msgid "Every time you change settings of the filter, the amount of selected photos will appear in the bottom part of the dialog."
+msgstr "Vsakič ko spremenite nastavitve filtra, se količina izbranih fotografij pojavi na spodnjem delu pogovornega okna."
+
+#: C/f-spot.xml:558(para)
+msgid "When you apply Import Roll filter, in the Find bar you will see <guilabel>Find: Import Roll</guilabel>. Now you can add some other filter to finetune your selection."
+msgstr "Ko boste uveljavili filter uvoznih zvitkov boste videli <guilabel>Najdi: Uvozni zvitek</guilabel>. Sedaj lahko dodate druge filtre za fino nastavljanje vašega izbora."
+
+#: C/f-spot.xml:563(para)
+msgid "If you don't need the Import Roll filter anymore, choose <menuchoice><guimenu>Find</guimenu><guisubmenu>Import Roll</guisubmenu><guimenuitem>Clear roll filter</guimenuitem></menuchoice> to remove Import Roll from search criteria. You can also click the close button (<guibutton>X</guibutton>) of the search bar to discard all the current search options."
+msgstr "V primeru da filtra uvoznih zvitkov ne potrebujete več, za odstranitev uvoznih zvitkov iz iskalnih kriterijev izberite <menuchoice><guimenu>Najdi</guimenu><guisubmenu>Uvozni zvitek</guisubmenu><guimenuitem>Počisti filter uvoznih zvitkov</guimenuitem></menuchoice>. Za zavračanje vseh trenutnih možnosti iskanja lahko kliknete tudi na gumb zapri (<guibutton>X</guibutton>) v iskalni vrstici."
+
+#: C/f-spot.xml:572(para)
+msgid "The number of displayed rolls in the dialog is defined by the gconf key <filename class=\"directory\">/apps/f-spot/import/gui_roll_history</filename>. Default value is 10."
+msgstr "Število prikazanih zvitkov v pogovornem oknu je določeno z gconf ključem <filename class=\"directory\">/apps/f-spot/import/gui_roll_history</filename>. Privzeta vrednost je 10."
+
+#: C/f-spot.xml:581(title)
+msgid "Type-to-find"
+msgstr "Tipkajte-za-iskanje"
+
+# Govorimo o operatorjih, zato jih ne prevajamo ...
+#: C/f-spot.xml:582(para)
+msgid "There is also a type-to-find entry. Press <keycap>/</keycap> to open it. It cannot be used at the same time as the find bar. You can type queries such as \"TagA and (TagB or (TagC and TagD))\". At any point, if F-Spot recognizes what you've typed as a valid query, it will update your search. The <emphasis>not</emphasis> operator is not yet supported."
+msgstr "Obstaja tudi vnos tipkaj-za-iskanje. Za odpiranje pritisnite <keycap>/</keycap>. Vnosa ni mogoče uporabiti istočasno kot iskalne vrstice. Vtipkate lahko poizvedbe kot so \"OznakaA and (OznakaB or (OznakaC and OznakaD)\". V vsakem primeru bo F-Spot posodobil vaše iskanje, če zazna veljavno poizvedbo. Operator <emphasis>not</emphasis> še ni podprt."
+
+#: C/f-spot.xml:590(para)
+msgid "This function will also search for the typed text into photos comments and filename."
+msgstr "Ta funkcija bo iskala tudi besedilo vneseno v komentarje fotografije in ime datoteke."
+
+#: C/f-spot.xml:597(title)
+msgid "Fullscreen Mode and Slideshows"
+msgstr "Celozaslonski način in diapredstavitve"
+
+#: C/f-spot.xml:598(para)
+msgid "For fewer distractions and larger display, you can view your photos in full screen mode. You control when to show the next photo or to return to the previous. Enter fullscreen mode by pressing <keycap>F11</keycap> at any time or by pressing the button in the toolbar."
+msgstr "Za manj motenj in večji prikaz si lahko ogledate fotografije v celozaslonskem načinu. Nadzirate lahko kdaj naj bo prikazana naslednja ali predhodna fotografija. V celozaslonski način lahko kadarkoli vstopite s pritiskom na <keycap>F11</keycap> ali s pritiskom gumba v orodni vrstici."
+
+#: C/f-spot.xml:605(title)
+msgid "FullScreen"
+msgstr "Celozaslonski način"
+
+#: C/f-spot.xml:612(para)
+msgid "In slideshow mode, you can sit back and view your photos as they are presented to you. You can start a slideshow by pressing the button on the toolbar."
+msgstr "V načinu diapredstavitve se lahko usedete in si ogledate svoje fotografije medtem ko so vam predstavljene. Diapredstavitev lahko zaženete s pritiskom na gumb v orodni vrstici."
+
+#: C/f-spot.xml:618(title)
+msgid "SlideShow"
+msgstr "Diapredstavitev"
+
+#: C/f-spot.xml:629(title)
+msgid "Sharing your photos"
+msgstr "Souporaba vaših fotografij"
+
+#: C/f-spot.xml:632(para)
+msgid "There are many ways to share your photos using F-Spot. All of the following methods will only share the photos you have selected when you run them."
+msgstr "Za souporabo vaših fotografij z F-Spot obstaja več načinov. Vse naslednje metode bodo dale v souporabo le fotografije, ki ste jih izbrali ob zagonu souporabe."
+
+#: C/f-spot.xml:639(title)
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: C/f-spot.xml:640(para)
+msgid "E-mail your photos directly from F-Spot with the <menuchoice><guimenu>File</guimenu><guimenuitem>Send Mail</guimenuitem></menuchoice> menu."
+msgstr "Svoje fotografije lahko pošljete preko elektronske pošte neposredno iz F-Spot z uporabo menija <menuchoice><guimenu>Fotografija</guimenu><guimenuitem>Pošlji po pošti</guimenuitem></menuchoice>. "
+
+#: C/f-spot.xml:646(title)
+msgid "Note 1"
+msgstr "Opomba 1"
+
+#: C/f-spot.xml:647(para)
+msgid "The email program used for this is defined at the GNOME level. You can change the default e-mailer for your user using the <application>Preferred Applications</application> tool in <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice>."
+msgstr "Uporabljen bo e-poštni program, ki je določen na ravni GNOME. Privzeti e-poštni program lahko spremenite za svoj račun z uporabo orodja <application>Prednostni programi</application> v meniju <menuchoice><guimenu>Sistem</guimenu><guisubmenu>Nastavitve</guisubmenu></menuchoice>."
+
+#: C/f-spot.xml:656(title)
+msgid "Note 2"
+msgstr "Opomba 2"
+
+#: C/f-spot.xml:657(para)
+msgid "If some of the photos you'd like to send by email are in a format that F-Spot can't write (e.g. RAW images), the size selection dialog will become insensitive and the originals will be sent."
+msgstr "V primeru da so fotografije, ki jih želite poslati preko elektronske pošte vrste, ki je F-Spot ne more zapisati (na primer slike RAW) bo pogovorno okno postalo neobčutljivo in bodo poslane izvorne fotografije."
+
+#: C/f-spot.xml:664(para)
+msgid "If you're sending resized pictures, F-Spot will keep the modified versions somewhere in the <filename class=\"directory\">/tmp</filename> directory for 30 seconds. It's not an issue with evolution, which makes it's own local copy of the attachments, but could be a bit shorter if you're using Thunderbird. You can change the delay by editing the gconf key <filename class=\"directory\">/apps/f-spot/export/email/delete_timeout_seconds</filename>."
+msgstr "V primeru da pošiljate slike s spremenjenimi velikostmi, bo F-Spot obdržal spremenjene različice nekje v mapi <filename class=\"directory\">/tmp</filename> za 30 sekund. To ne povzroča težav z evolution, ki naredi svojo krajevno kopijo prilog, toda bi lahko bilo malce krajše, če uporabljate Thunderbird. Zamik lahko spremenite z urejanjem gconf ključa <filename class=\"directory\">/apps/f-spot/export/email/delete_timeout_seconds</filename>."
+
+#: C/f-spot.xml:676(title)
+msgid "Print"
+msgstr "Tisk"
+
+#: C/f-spot.xml:677(para)
+msgid "Print your photos with the <menuchoice><guimenu>File</guimenu><guimenuitem>Print</guimenuitem></menuchoice> menu."
+msgstr "Fotografije lahko natisnite z menijem <menuchoice><guimenu>Datoteka</guimenu><guimenuitem>Natisni</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:684(title)
+msgid "Burn to CD"
+msgstr "Zapisovanje na CD"
+
+#: C/f-spot.xml:685(para)
+msgid "Burn your photos to CD or DVD with the <menuchoice><guimenu>File</guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export to CD</guimenuitem></menuchoice> menu."
+msgstr "Zapišite vaše fotografije z menijem <menuchoice><guimenu>Fotografija</guimenu><guisubmenu>Izvozi</guisubmenu><guimenuitem>Izvozi na CD</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:693(title)
+msgid "Generate a Website Gallery or Folder"
+msgstr "Ustvarjanje spletne galerije ali mape"
+
+#: C/f-spot.xml:694(para)
+msgid "The <menuchoice><guimenu>File</guimenu><guimenuitem>Export</guimenuitem><guimenuitem>Export to Folder</guimenuitem></menuchoice> feature gives you three ways to export your images."
+msgstr "Zmožnost <menuchoice><guimenu>Fotografija</guimenu><guimenuitem>Izvozi v</guimenuitem><guimenuitem>Izvozi v mapo</guimenuitem></menuchoice> vam poda tri načine za izvažanje vaših slik."
+
+#: C/f-spot.xml:702(para)
+msgid "<guilabel>Use Original</guilabel> exports your photos ready for use with Jakub Steiner's free <ulink url=\"http://jimmac.musichall.cz/original.php\"> Original Photo Gallery</ulink> software. If you are unsure about this option, it is probably not the right one for you."
+msgstr "<guilabel>Uporabi izvorno</guilabel> izvozi vaše fotografije pripravljene za uporabo z brezplačnim programom Jakuba Steinerja <ulink url=\"http://jimmac.musichall.cz/original.php\"> Original Photo Gallery</ulink>. V primeru da niste prepričani o tej možnosti, verjetno ni prava za vas."
+
+#: C/f-spot.xml:710(para)
+msgid "<guilabel>Use static HTML files</guilabel> exports your photos to an interactive website, ready for you to upload."
+msgstr "<guilabel>Uporabi statične datoteke HTML</guilabel> izvozi vaše fotografije v interaktivno spletišče, pripravljeno na pošiljanje."
+
+#: C/f-spot.xml:716(para)
+msgid "<guilabel>Plain Files</guilabel> exports your images as files within directories, without putting them into a gallery."
+msgstr "<guilabel>Običajne datoteke</guilabel> izvozi vaše slike kot datoteke v mape, brez pošiljanja v galerijo."
+
+#: C/f-spot.xml:725(title)
+msgid "Post to your online galleries"
+msgstr "Objavljanje v spletne galerije"
+
+# V programu je fotografija, ni datoteka !!
+#: C/f-spot.xml:726(para)
+msgid "If you use Flickr, SmugMug, 23hq, Tabblo, Facebook, Zooomr or Picasa Web Album, you can post your files directly from F-Spot with the <menuchoice><guimenu>File</guimenu><guisubmenu>Export</guisubmenu></menuchoice> menu, choosing corresponding submenu item."
+msgstr "V primeru da uporabljate Flickr, SmugMug, 23hq, Tabblo, Facebook, Zooomr ali Picasa spletne albume lahko svoje datoteke objavite neposredno iz F-Spot z uporabo menija <menuchoice><guimenu>Fotografija</guimenu><guisubmenu>Izvozi v</guisubmenu></menuchoice> in izbiro ustreznega predmeta podmenija."
+
+# V programu je fotografija, ni datoteka !!
+#: C/f-spot.xml:731(para)
+msgid "If you use the PHP software known as <ulink url=\"http://gallery.sourceforge.net/\"> Gallery</ulink>, you can post your photos to your existing album with the <menuchoice><guimenu>File</guimenu><guimenuitem>Export</guimenuitem><guimenuitem>Export to Web Gallery</guimenuitem></menuchoice> menu. You must first enable the Remote module within your Gallery installation."
+msgstr "V primeru da uporabljate PHP program poznan kot <ulink url=\"http://gallery.sourceforge.net/\"> Gallery</ulink>, lahko svoje fotografije objavite v svoj obstoječ album z menijem <menuchoice><guimenu>Fotografija</guimenu><guimenuitem>Izvozi v</guimenuitem><guimenuitem>Izvozi v spletno galerijo</guimenuitem></menuchoice>. Najprej morate v namestitvi Gallery omogočiti modul Oddaljeno. "
+
+# To je ime programa ...
+#: C/f-spot.xml:739(title)
+msgid "Note for Gallery 2.2 users"
+msgstr "Opomba za uporabnike Gallery 2.2"
+
+#: C/f-spot.xml:740(para)
+msgid "The Remote plugin for Gallery should be 1.0.8 or newer."
+msgstr "Oddaljeni vstavek Gallery mora biti 1.0.8 ali novejši."
+
+#: C/f-spot.xml:744(para)
+msgid "<ulink url=\"http://pennave.sourceforge.net\">PennAve</ulink> is a Python web-application that directly uses F-Spot's database to present a dynamic gallery of your photos and tags."
+msgstr "<ulink url=\"http://pennave.sourceforge.net\">PennAve</ulink> je spletni program v Pythonu, ki neposredno uporablja podatkovno zbirko F-Spot za predstavljanje dinamične galerije vaših fotografij in oznak."
+
+#: C/f-spot.xml:749(para)
+msgid "<ulink url=\"http://www.conduit-project.org\">Conduit</ulink> is an application that can sync photos that have a particular tag with your Flickr or Picasa Web Album web storage."
+msgstr "<ulink url=\"http://www.conduit-project.org\">Conduit</ulink> je program, ki lahko uskladi fotografije z določeno oznako s spletno shrambo Flicker ali Picasa spletni albumi."
+
+#: C/f-spot.xml:758(title)
+msgid "Color management"
+msgstr "Upravljanje barv"
+
+#: C/f-spot.xml:761(title)
+msgid "What's color management"
+msgstr "Kaj je upravljanje barv"
+
+#: C/f-spot.xml:763(para)
+msgid "When you capture a photo and look at it on a display, it looks different than on a camera's preview display or on any other display. It will also look different when you print it. This is because every device has unique color reproduction capabilities."
+msgstr "Fotografija je na zaslonu videti drugače kot na zaslonu predogleda fotoaparata ali kateremukoli drugemu zaslonu. Tudi natisnjena fotografija je videti drugačna. To se zgodi zato, ker ima vsaka barva edinstvene zmožnosti poustvaritve barv. "
+
+#: C/f-spot.xml:770(para)
+msgid "Color management system (CMS) is a tool to achieve reliable color reproduction for both display and output (e.g. a printer). A CMS relies on color profiles to map original colors to the color that a device can reproduce so that colors will appear the same way everywhere — on a computer LCD monitor, on a print from your local photolab etc."
+msgstr "Sistem za upravljanje barv (CMS) je orodje za doseganje zanesljive poustvaritve barv tako za zaslon kot izhod (na primer tiskalnik). CMS se zanaša na barvne profile za preslikavo izvornih barv v barve, ki jih lahko poustvarijo naprave, tako, da so barve povsod videti enake - na računalniškem zaslonu LCD, natisnjene, itn."
+
+#: C/f-spot.xml:780(title)
+msgid "What's a color profile"
+msgstr "Kaj je barvni profil"
+
+#: C/f-spot.xml:782(para)
+msgid "A color profile is a file with either .icc (thus its is often called an ICC profile) or .icm extension that describes how device's colors correspond to a universal description of colors."
+msgstr "Barvni profil je datoteka s pripono .icc (zato je pogosto imenovan profil ICC) ali .icm ki opiše kako barve naprave ustrezajo splošnemu opisu naprav."
+
+#: C/f-spot.xml:788(para)
+msgid "There are several types of profiles:"
+msgstr "Obstaja več vrst profilov:"
+
+#: C/f-spot.xml:794(para)
+msgid "Input device profile. It's profile for a camera or a profile that an application like XSane embeds into a scanned image."
+msgstr "Profil vhodne naprave. To je profil fotoaparata ali profil, ki ga lahko program kot je XSane vključi v skenirano sliko."
+
+#: C/f-spot.xml:800(para)
+#, fuzzy
+msgid "Working space profile. It's a profile that describes color space in which all operations are done inside an application. Usually very wide gamut profiles like AdobeRGB1998 or ProPhotoRGB are used for that."
+msgstr "Profil delovnega prostora. To je profil, ki opiše barvni prostor, v katerem so vsa opravila narejena znotraj programa. Običajno so za to uporabljeni zelo široki XXX profili kot AdobeRGB1998 ali ProPhotoRGB."
+
+#: C/f-spot.xml:807(para)
+msgid "Display profile. It's a profile for a monitor."
+msgstr "Profil zaslona. To je profil za zaslon."
+
+#: C/f-spot.xml:812(para)
+msgid "Output profile. This is usually a profile for you printer."
+msgstr "Izhodni profil. To je običajno profil za tiskalnik."
+
+#: C/f-spot.xml:818(para)
+msgid "Currently F-Spot allows setting only display and output profiles. All color operations are done in sRGB color space."
+msgstr "Trenutno F-Spot dovoli le nastavljanje profilov zaslona in izhoda. Vsa barvna opravila so narejena v barvnem prostoru sRGB."
+
+#: C/f-spot.xml:825(title)
+msgid "How to get my screen/printer color profile"
+msgstr "Kako dobiti barvni profil zaslona/tiskalnika"
+
+#: C/f-spot.xml:827(para)
+msgid "There are few ways to get a color profile."
+msgstr "Obstaja več načinov za pridobivanje barvnega profila."
+
+#: C/f-spot.xml:832(title)
+msgid "From CD or Internet"
+msgstr "Iz CD-ja ali medmrežja"
+
+#: C/f-spot.xml:834(para)
+msgid "Many hardware manufacturers put color profiles into CD in the bundle. If you have one (from monitor or printer), you can use it. Or you can download it from the Internet (usually, from support section of the manufacturer's web site). Some camera manufacturers (Nikon, Canon) also provide ICC profiles."
+msgstr "Veliko proizvajalcev strojene opreme priložijo CD z barvnimi profili. V primeru da ga imate (od zaslona ali tiskalnika) ga lahko uporabite. Lahko ga prejmete z medmrežja (običajno z odseka podpore na spletišču proizvajalca). Barvne profile zagotavljajo tudi nekateri proizvajalci fotoaparatov (Nikon, Canon)."
+
+#: C/f-spot.xml:844(title)
+msgid "Calibrating and profiling"
+msgstr "Umerjanje in profiliranje"
+
+#: C/f-spot.xml:846(para)
+msgid "Best results can be achieved by calibrating and profiling devices with a measurement device. It is not so difficult, but it means that you need a spectrophotometer to do all measurements and create an ICC profile."
+msgstr "Najboljše rezultate je mogoče doseči z umerjanjem in profiliranjem naprav z meritveno napravo. To ni težko, vendar pa je za izvajanje vseh meritev in ustvarjanje profila ICC potreben spektrofotometer."
+
+#: C/f-spot.xml:852(para)
+msgid "If you are on Windows or Mac OS X, you can use manufacturer's software coming with a spectrophotometer. On Linux you will have to use either <ulink url=\"http://www.argyllcms.com\">Argyll</ulink>, which is a set of versatile command line tools, or <ulink url=\"http://lprof.sourceforge.net/\">LProf</ulink>, which has a graphical user interface."
+msgstr "V primeru da uporabljate Windows ali Mac OS X lahko uporabite program proizvajalca, ki je prispel s spektrofotometrom. Na Linuxu boste morali uporabiti <ulink url=\"http://www.argyllcms.com\">Argyll</ulink>, ki je niz vsestranskih orodij ukazne vrstice ali <ulink url=\"http://lprof.sourceforge.net/\">LProf</ulink>, ki ima grafični uporabniški vmesnik."
+
+#: C/f-spot.xml:860(para)
+#, fuzzy
+msgid "Please refer to documentation of third party hardware and software vendors for details."
+msgstr "Za podrobnosti si oglede dokumentacijo za "
+
+#: C/f-spot.xml:867(title)
+msgid "Embedding"
+msgstr "Vključevanje"
+
+#: C/f-spot.xml:869(para)
+msgid "Image formats themselves (such as TIFF, JPEG, PNG...) may contain embedded color profiles. If color management is enabled, F-Spot looks for such embedded profiles and takes them into consideration."
+msgstr "Nekatere vrste slik (kot so TIFF, JPEG, PNG ...) lahko vsebujejo vključene barvne profile. V primeru da je upravljanje barv omogočeno, F-Spot poišče vključene profile in jih upošteva."
+
+#: C/f-spot.xml:878(title)
+msgid "How to use color management in F-Spot"
+msgstr "Kako uporabiti upravljanje barv v F-Spot"
+
+#: C/f-spot.xml:880(para)
+msgid "Color management in F-Spot can use only RGB profiles at this time (and you can't see other profiles in the F-Spot)."
+msgstr "Upravljanje barv v F-Spot lahko trenutno uporabi le profile RGB (drugih profilov v F-Spot ni mogoče videti)."
+
+#: C/f-spot.xml:887(para)
+msgid "Copy your color profiles into the <filename class=\"directory\">/usr/share/color/icc</filename> or <filename class=\"directory\">/usr/local/share/color/icc</filename> directory."
+msgstr "Kopirajte svoje barvne profile v mapo <filename class=\"directory\">/usr/share/color/icc</filename> ali <filename class=\"directory\">/usr/local/share/color/icc</filename>."
+
+#: C/f-spot.xml:895(para)
+msgid "Enable the color management with the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> menu."
+msgstr "Upravljanje barv omogočite z menijem <menuchoice><guimenu>Uredi</guimenu><guimenuitem>Možnosti</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:902(para)
+msgid "Select <guilabel>Display</guilabel> and <guilabel>Output</guilabel> profiles."
+msgstr "Izberite profila <guilabel>Prikaz</guilabel> in <guilabel>Izhod</guilabel>."
+
+#: C/f-spot.xml:910(para)
+msgid "You can use <ulink url=\"http://burtonini.com/blog/computers/xicc\">xicc</ulink> to load ICC profile to display and use the loaded profile from F-Spot. Just mark the checkbox <guilabel>Try to use the system display profile</guilabel>."
+msgstr "Za nalaganje profila ICC za prikaz in uporabo naloženega profila iz F-Spot lahko uporabite <ulink url=\"http://burtonini.com/blog/computers/xicc\">xicc</ulink>. Samo označite potrditveno polje <guilabel>Poskus uporabe sistemskega profila prikaza</guilabel>."
+
+#: C/f-spot.xml:921(title)
+msgid "Extend functionality"
+msgstr "Razširitev zmožnosti"
+
+#: C/f-spot.xml:924(title)
+msgid "What extensions are"
+msgstr "Kaj so razširitve"
+
+#: C/f-spot.xml:926(para)
+msgid "F-Spot extensions are means to add new functionality to the application. F-Spot supports two types of extension: exporters (which allow exporting photos to new web services or data storages) and tools (which allow new ways of color correction, duplicate photos finders etc.). Extensions are distributed in form of extension packages."
+msgstr "Razširitve F-Spot dajo programu nove zmožnosti. F-Spot podpira dve vrsti razširitev: izvoznike (omogočajo izvažanje fotografij na spletne storitve ali podatkovne shrambe) in orodja (omogočajo nove načine popravljanja barv, podvajanje fotografij, itn.). Razširitve so distribuirane v obliki paketov razširitev."
+
+#: C/f-spot.xml:933(para)
+msgid "In the best traditions of not reinventing the wheel extensions can use other extensions, which means that one extension cannot work, if another extension is not installed. This concept of dependance actually means that"
+msgstr "Z namenom zmanjšanja podvajanja dela lahko razširitve uporabijo druge razširitve, kar pomeni da lahko razširitev ne deluje, če ni nameščena druga razširitev. Ta koncept odvisnosti pomeni da"
+
+#: C/f-spot.xml:940(para)
+msgid "you cannot install an extension, if the extension it depends on, is not present in the system"
+msgstr "ne morete namestiti razširitve, če je odvisna od druge razširitve, ki je ni na sistemu"
+
+#: C/f-spot.xml:945(para)
+msgid "you cannot remove an extension on which some other extension depends"
+msgstr "ne morete odstraniti razširitve od katere je odvisna druga razširitev"
+
+#: C/f-spot.xml:953(title)
+msgid "Managing extensions"
+msgstr "Upravljanje razširitev"
+
+#: C/f-spot.xml:955(para)
+msgid "To manage extensions choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Manage Extensions</guimenuitem></menuchoice> menu item."
+msgstr "Za upravljanje razširitev izberite predmet menija <menuchoice><guimenu>Uredi</guimenu><guimenuitem>Upravljanje razširitev</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:961(title)
+msgid "Managing extension repositories"
+msgstr "Upravljanje s skladišči razširitev"
+
+#: C/f-spot.xml:963(para)
+msgid "Simply put, repositories are extension storages. They can be either network or local. To add a new repository click Repositories button, choose type of the repository you are about to add and provide either URL or path. If the URL or path you specified doesn't contain a description (index) file for extensions, a warning message will pop up to tell you that."
+msgstr "Preprosto povedano so skladišča shrambe razširitev. Lahko so omrežna ali krajevna. Za dodajanje novega skladišča kliknite gumb Skladišča, izberite vrsto skladišča za dodajanje in vnesite URL ali pot. V primeru da navedeni URL ali pot ne vsebuje datoteke opisa (kazala) za razširitve, vas bo o tem obvestilo opozorilno sporočilo."
+
+#: C/f-spot.xml:970(para)
+msgid "To remove a repository click <guibutton>Repositories</guibutton> button again, choose the repository you are about to delete and click <guibutton>Delete</guibutton> button."
+msgstr "Za odstranitev skladišča ponovno kliknite gumb <guibutton>Skladišča</guibutton>, izberite skladišče za izbris in kliknite gumb <guibutton>Izbriši</guibutton>."
+
+#: C/f-spot.xml:978(title)
+msgid "Installing and updating extensions"
+msgstr "Nameščanje in posodabljanje razširitev"
+
+#: C/f-spot.xml:980(para)
+msgid "To install an extension click <guibutton>Install extensions...</guibutton> button. In the newly presented dialog"
+msgstr "Za namestitev razširitve kliknite gumb <guibutton>Namesti razširitve ...</guibutton> . V novo predstavljenem pogovornem oknu"
+
+#: C/f-spot.xml:986(para)
+msgid "Choose repository to install from all known repositories or just one of available repositories."
+msgstr "Izberite skladišče za namestitev iz vseh znanih skladišč ali razpoložljivih skladišč."
+
+#: C/f-spot.xml:992(para)
+msgid "Choose, what extension packages you want to see: All, Only new, Only updates."
+msgstr "Izberite katere pakete razširitev želite videti: Vse, le nove, le posodobitve."
+
+#: C/f-spot.xml:997(para)
+msgid "Click the <guibutton>Update</guibutton> button to update list of available extension packages by given criteria."
+msgstr "Kliknite gumb <guibutton>Posodobi</guibutton> za posodobitev seznama razpoložljivih paketov razširitev glede na dane kriterije."
+
+#: C/f-spot.xml:1003(para)
+msgid "Choose extensions you want to install/update, click <guibutton>Information</guibutton> to see summary on selected package, if you want to."
+msgstr "Izberite razširitve, ki jih želite namestiti/posodobiti, ter kliknite <guibutton>Podrobnosti</guibutton> za ogled povzetka izbranega paketa, če želite."
+
+#: C/f-spot.xml:1009(para)
+msgid "Click <guibutton>Forward</guibutton> to proceed with installation."
+msgstr "Kliknite gumb <guibutton>Naprej</guibutton> za nadaljevanje z namestitvijo."
+
+#: C/f-spot.xml:1017(title)
+msgid "Enabling and disabling extensions"
+msgstr "Omogočanje in onemogočanje razširitev "
+
+#: C/f-spot.xml:1019(para)
+msgid "You might want to temporarily enable or disable a particular extension package, for example, if the extension is not stable enough to handle a large amount of photos or if menus get crowded with extensions."
+msgstr "Morda želite začasno omogočiti ali onemogočiti določen paket razširitve, na primer če razširitev ni dovolj stabilna za upravljanje z veliko količino fotografij ali če so meniji preveč natrpani z razširitvami."
+
+#: C/f-spot.xml:1024(para)
+msgid "In the <guilabel>Manage Extensions</guilabel> dialog select the extension package and click <guibutton>Enable</guibutton> or <guibutton>Disable</guibutton>."
+msgstr "V pogovornem oknu <guilabel>Upravljanje razširitev</guilabel> izberite paket razširitev in kliknite gumb <guibutton>Omogoči</guibutton> ali <guibutton>Onemogoči</guibutton>. "
+
+#: C/f-spot.xml:1031(title)
+msgid "Removing extensions"
+msgstr "Odstranjevanje razširitev"
+
+#: C/f-spot.xml:1033(para)
+msgid "If you don't need an extension you can remove it from the system completely. In the <guilabel>Manage Extensions</guilabel> dialog select the extension package you want to remove and click <guibutton>Delete</guibutton>."
+msgstr "V primeru da razširitve ne potrebujete, jo lahko popolnoma odstranite s sistema. V pogovornem oknu <guilabel>Upravljanje razširitev</guilabel> izberite paket razširitev, ki ga želite izbrisati in kliknite <guibutton>Izbriši</guibutton>."
+
+#: C/f-spot.xml:1041(title)
+msgid "Reading summary of extensions"
+msgstr "Branje povzetka razširitev"
+
+#: C/f-spot.xml:1043(para)
+msgid "Every extension package contains metadata that provides the following information about the extension:"
+msgstr "Vsak paket razširitve vsebuje metapodatke, ki zagotavljajo naslednje podrobnosti o razširitvi:"
+
+#: C/f-spot.xml:1049(para)
+msgid "Description, which usually covers puprose of the extension"
+msgstr "Opis, ki običajno opiše namen razširitve"
+
+#: C/f-spot.xml:1054(para)
+msgid "Version"
+msgstr "Različica"
+
+#: C/f-spot.xml:1059(para)
+msgid "Author"
+msgstr "Avtor"
+
+#: C/f-spot.xml:1064(para)
+msgid "Dependencies"
+msgstr "Odvisnosti"
+
+#: C/f-spot.xml:1070(para)
+msgid "In the <guilabel>Manage Extensions</guilabel> dialog select the extension package you want to read summary of and click <guibutton>Information</guibutton>."
+msgstr "V pogovornem oknu <guilabel>Upravljanje razširitev</guilabel> izberite paket razširitve katerega opis želite prebrati in kliknite <guibutton>Podrobnosti</guibutton>."
+
+#: C/f-spot.xml:1078(title)
+msgid "Developing extensions"
+msgstr "Razvijanje razširitev"
+
+#: C/f-spot.xml:1080(para)
+msgid "<ulink url=\"http://f-spot.org/Extend_F-Spot\">Extend F-Spot</ulink> document gives instructions on developing your own extensions for F-Spot."
+msgstr "Dokument <ulink url=\"http://f-spot.org/Extend_F-Spot\">razširite F-Spot</ulink> vsebuje navodila za razvijanje vaših lastnih razširitev za F-Spot."
+
+#: C/f-spot.xml:1088(title)
+msgid "Shortcuts"
+msgstr "Bližnjice"
+
+#: C/f-spot.xml:1091(title)
+msgid "Global Shortcuts"
+msgstr "Splošne bližnjice"
+
+#: C/f-spot.xml:1096(entry)
+#: C/f-spot.xml:1205(entry)
+#: C/f-spot.xml:1301(entry)
+#: C/f-spot.xml:1353(entry)
+msgid "Key"
+msgstr "Tipka"
+
+#: C/f-spot.xml:1099(entry)
+#: C/f-spot.xml:1208(entry)
+#: C/f-spot.xml:1304(entry)
+#: C/f-spot.xml:1356(entry)
+msgid "Action"
+msgstr "Dejanje"
+
+#: C/f-spot.xml:1107(keycap)
+msgid "["
+msgstr "["
+
+#: C/f-spot.xml:1109(entry)
+msgid "Rotate the selected photos to the left"
+msgstr "Vrtenje izbranih fotografij levo"
+
+#: C/f-spot.xml:1115(keycap)
+msgid "]"
+msgstr "]"
+
+#: C/f-spot.xml:1117(entry)
+msgid "Rotate the selected photos to the right"
+msgstr "Vrtenje izbranih fotografij desno"
+
+#: C/f-spot.xml:1123(keycap)
+#: C/f-spot.xml:1131(keycap)
+msgid "Del"
+msgstr "Del"
+
+#: C/f-spot.xml:1125(entry)
+msgid "Remove selected photos from F-Spot's catalogue"
+msgstr "Odstrani izbrane fotografije iz kataloga F-Spot"
+
+#: C/f-spot.xml:1131(keycap)
+#: C/f-spot.xml:1224(keycap)
+#: C/f-spot.xml:1258(keycap)
+#: C/f-spot.xml:1267(keycap)
+#: C/f-spot.xml:1284(keycap)
+#: C/f-spot.xml:1446(keycap)
+msgid "Shift"
+msgstr "Dvigalka"
+
+#: C/f-spot.xml:1133(entry)
+msgid "Delete selected photos permanently from the drive. If possible, they will moved to trash."
+msgstr "Trajno izbriše izbrane fotografije s pogona. V primeru, da je to mogoče, bodo premaknjene v smeti."
+
+#: C/f-spot.xml:1140(keycap)
+msgid "t"
+msgstr "t"
+
+#: C/f-spot.xml:1142(entry)
+msgid "View or edit tags for selected photos"
+msgstr "Ogled ali urejanje oznak za izbrane fotografije"
+
+#: C/f-spot.xml:1148(keycap)
+msgid "F11"
+msgstr "F11"
+
+#: C/f-spot.xml:1150(entry)
+#: C/f-spot.xml:1399(entry)
+msgid "Full screen view"
+msgstr "Celozaslonski pogled"
+
+#: C/f-spot.xml:1156(keycap)
+#: C/f-spot.xml:1164(keycap)
+#: C/f-spot.xml:1172(keycap)
+#: C/f-spot.xml:1180(keycap)
+#: C/f-spot.xml:1216(keycap)
+#: C/f-spot.xml:1224(keycap)
+#: C/f-spot.xml:1242(keycap)
+#: C/f-spot.xml:1267(keycap)
+#: C/f-spot.xml:1320(keycap)
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: C/f-spot.xml:1156(keycap)
+msgid "I"
+msgstr "I"
+
+#: C/f-spot.xml:1158(entry)
+msgid "Displays information about the photo"
+msgstr "Prikaz podrobnosti o fotografiji"
+
+#: C/f-spot.xml:1164(keycap)
+msgid "Equals"
+msgstr "Je enako"
+
+#: C/f-spot.xml:1166(entry)
+msgid "Zoom-in"
+msgstr "Približanje"
+
+#: C/f-spot.xml:1172(keycap)
+msgid "Minus"
+msgstr "Minus"
+
+#: C/f-spot.xml:1174(entry)
+msgid "Zoom-out"
+msgstr "Oddaljevanje"
+
+#: C/f-spot.xml:1180(keycap)
+#: C/f-spot.xml:1372(keycap)
+msgid "N"
+msgstr "N"
+
+#: C/f-spot.xml:1182(entry)
+msgid "Import photos"
+msgstr "Uvoz fotografij"
+
+#: C/f-spot.xml:1188(keycap)
+msgid "Alt"
+msgstr "Alt"
+
+#: C/f-spot.xml:1188(keycap)
+msgid "0-5"
+msgstr "0-5"
+
+#: C/f-spot.xml:1190(entry)
+msgid "Alt plus a number from 0 to 5 rate the selected picture(s)"
+msgstr "Alt in število od 0 do 5 za oceno izbran-e/ih slik(e)"
+
+#: C/f-spot.xml:1200(title)
+msgid "Browse Mode Shortcuts"
+msgstr "Bližnjice načina brskanja"
+
+#: C/f-spot.xml:1216(keycap)
+#: C/f-spot.xml:1225(keycap)
+msgid "A"
+msgstr "A"
+
+#: C/f-spot.xml:1218(entry)
+msgid "Select all"
+msgstr "Izbor vsega"
+
+#: C/f-spot.xml:1227(entry)
+msgid "Unselect all"
+msgstr "Preklic izbora"
+
+#: C/f-spot.xml:1233(keycap)
+#: C/f-spot.xml:1380(keycap)
+msgid "H"
+msgstr "H"
+
+#: C/f-spot.xml:1233(keycap)
+#: C/f-spot.xml:1380(keycap)
+msgid "J"
+msgstr "J"
+
+#: C/f-spot.xml:1234(keycap)
+#: C/f-spot.xml:1381(keycap)
+msgid "K"
+msgstr "K"
+
+#: C/f-spot.xml:1234(keycap)
+#: C/f-spot.xml:1381(keycap)
+msgid "L"
+msgstr "L"
+
+#: C/f-spot.xml:1232(entry)
+#: C/f-spot.xml:1379(entry)
+msgid "Arrow keys or <placeholder-1/>, <placeholder-2/>, <placeholder-3/>, <placeholder-4/>"
+msgstr "Tipke puščice ali <placeholder-1/>, <placeholder-2/>, <placeholder-3/>, <placeholder-4/>"
+
+#: C/f-spot.xml:1236(entry)
+msgid "Move focus"
+msgstr "Premakne žarišče"
+
+#: C/f-spot.xml:1241(entry)
+msgid "<placeholder-1/>-Arrow key"
+msgstr "<placeholder-1/>-Tipka puščice"
+
+#: C/f-spot.xml:1244(entry)
+msgid "Move the focus without changing the selection"
+msgstr "Premakne žarišče brez spremembe izbora"
+
+#: C/f-spot.xml:1250(keycap)
+#: C/f-spot.xml:1372(keycap)
+msgid "Spacebar"
+msgstr "Preslednica"
+
+#: C/f-spot.xml:1252(entry)
+msgid "Select or unselect the focused photo"
+msgstr "Izbere ali prekliče izbor fotografije v žarišču"
+
+#: C/f-spot.xml:1259(keycap)
+msgid "Arrow key"
+msgstr "Tipka puščice"
+
+#: C/f-spot.xml:1261(entry)
+msgid "Change the photo selection"
+msgstr "Sprememba izbire fotografije"
+
+#: C/f-spot.xml:1268(keycap)
+msgid "Left arrow or Right arrow"
+msgstr "Leva puščica ali desna puščica"
+
+#: C/f-spot.xml:1270(entry)
+msgid "Add/Remove all photos in the row, in the direction pressed, to the selection"
+msgstr "Doda/odstrani vse fotografije v vrstici v izbrani smeri do izbora"
+
+#: C/f-spot.xml:1276(keycap)
+#: C/f-spot.xml:1284(keycap)
+#: C/f-spot.xml:1437(keycap)
+msgid "V"
+msgstr "V"
+
+#: C/f-spot.xml:1278(entry)
+msgid "Pops up a larger preview of the picture pointed by the mouse"
+msgstr "Pojavi večji predogled slike pokazane z miško"
+
+#: C/f-spot.xml:1286(entry)
+msgid "Pops up a larger preview and a color histogram of the picture pointed by the mouse"
+msgstr "Pojavi večji predogled in barvni histogram slike pokazane z miško"
+
+#: C/f-spot.xml:1296(title)
+msgid "Tag Shortcuts"
+msgstr "Bližnjice oznak"
+
+#: C/f-spot.xml:1312(keycap)
+msgid "F2"
+msgstr "F2"
+
+#: C/f-spot.xml:1314(entry)
+msgid "Rename selected tag"
+msgstr "Preimenovanje izbranih oznak"
+
+#: C/f-spot.xml:1320(keycap)
+msgid "T"
+msgstr "T"
+
+#: C/f-spot.xml:1322(entry)
+msgid "Add tags to selected photos"
+msgstr "Dodajanje oznak izbranim fotografijam"
+
+#: C/f-spot.xml:1327(entry)
+#: C/f-spot.xml:1335(entry)
+msgid "n/a"
+msgstr "n/a"
+
+#: C/f-spot.xml:1330(entry)
+msgid "Drag and drop tags to move them"
+msgstr "Za premikanje oznak jih povlecite in spustite"
+
+#: C/f-spot.xml:1338(entry)
+msgid "Type a tag's name to jump to it (only works if tag is shown/expanded)"
+msgstr "Vtipkajte ime oznake za skok nanjo (deluje le, če je oznaka prikazana/razširjena)"
+
+#: C/f-spot.xml:1348(title)
+msgid "Edit Mode Shortcuts"
+msgstr "Bližnjice načina urejanja"
+
+#: C/f-spot.xml:1364(keycap)
+msgid "Page Up"
+msgstr "Stran navzgor"
+
+#: C/f-spot.xml:1364(keycap)
+msgid "Backspace"
+msgstr "Povratna tipka"
+
+#: C/f-spot.xml:1364(keycap)
+msgid "B"
+msgstr "B"
+
+#: C/f-spot.xml:1363(entry)
+#: C/f-spot.xml:1371(entry)
+msgid "<placeholder-1/>, <placeholder-2/>, <placeholder-3/>"
+msgstr "<placeholder-1/>, <placeholder-2/>, <placeholder-3/>"
+
+#: C/f-spot.xml:1366(entry)
+msgid "Go to Previous Photo"
+msgstr "Pojdi na predhodno fotografijo"
+
+#: C/f-spot.xml:1372(keycap)
+msgid "Page Down"
+msgstr "Stran navzdol"
+
+#: C/f-spot.xml:1374(entry)
+msgid "Go to Next Photo"
+msgstr "Pojdi na naslednjo fotografijo"
+
+#: C/f-spot.xml:1383(entry)
+msgid "Go to Previous/Next photo or move around a zoomed photo"
+msgstr "Gre na predhodno/naslednjo fotografijo ali premakne naokoli povečano fotografijo"
+
+#: C/f-spot.xml:1389(keycap)
+msgid "R"
+msgstr "R"
+
+#: C/f-spot.xml:1391(entry)
+msgid "Go to a random photo"
+msgstr "Pojdi na naključno fotografijo"
+
+#: C/f-spot.xml:1397(keycap)
+msgid "f"
+msgstr "f"
+
+#: C/f-spot.xml:1405(keycap)
+msgid "0"
+msgstr "0"
+
+#: C/f-spot.xml:1407(entry)
+msgid "Fit the image to the screen"
+msgstr "Prilagajanje slike zaslonu"
+
+#: C/f-spot.xml:1413(keycap)
+msgid "1"
+msgstr "1"
+
+#: C/f-spot.xml:1415(entry)
+msgid "Zoom Factor to 1.0 (1 screen pixel per image pixel)"
+msgstr "Faktor povečave 1.0 (1 točka zaslona na točko slike)"
+
+#: C/f-spot.xml:1421(keycap)
+msgid "2"
+msgstr "2"
+
+#: C/f-spot.xml:1423(entry)
+msgid "Zoom Factor to 2.0 (4 screen pixels per image pixel)"
+msgstr "Faktor povečave na 2.0 (4 točke zaslona na točko slike)"
+
+#: C/f-spot.xml:1429(keycap)
+msgid "Escape"
+msgstr "Ubežna tipka"
+
+#: C/f-spot.xml:1431(entry)
+msgid "Returns to Browser mode"
+msgstr "Vrne v način brskalnika"
+
+#: C/f-spot.xml:1441(keycap)
+msgid "v"
+msgstr "v"
+
+#: C/f-spot.xml:1439(entry)
+msgid "Examine photo with magnifying glass (Loupe). Doubleclick on the Loupe, or type <placeholder-1/> again to close it."
+msgstr "Preučevanje fotografije s povečevalnim steklom. Za zaprtje povečevalnega stekla kliknite nanj ali vtipkajte <placeholder-1/>."
+
+#: C/f-spot.xml:1445(entry)
+msgid "<placeholder-1/>-Mousewheel"
+msgstr "<placeholder-1/>-Miškino kolesce"
+
+#: C/f-spot.xml:1448(entry)
+msgid "Faster filmstrip scrolling"
+msgstr "Hitrejše drsenje filmskega traku"
+
+#: C/f-spot.xml:1454(keycap)
+msgid "i"
+msgstr "i"
+
+#: C/f-spot.xml:1456(entry)
+msgid "Toggle infobox visibility ''(only when in full screen)''"
+msgstr "Preklop vidnosti polja podrobnosti \"(le v celozaslonskem načinu)\""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/f-spot.xml:0(None)
+msgid "translator-credits"
+msgstr "Andrej Žnidaršič <andrej.znidarsic at gmail.com>"
+
diff --git a/docs/uk/f-spot.xml b/docs/uk/f-spot.xml
new file mode 100644
index 0000000..f6c2367
--- /dev/null
+++ b/docs/uk/f-spot.xml
@@ -0,0 +1,867 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="f-spot" lang="uk">
+ <bookinfo>
+ <title>Посібник з F-Spot</title>
+ <abstract role="description">
+ <para>Посібник користувача з F-Spot — менеджера особистих фото для GNOME.</para>
+ </abstract>
+ <subtitle>Посібник користувача з F-Spot — менеджера особистих фото для GNOME.</subtitle>
+ <copyright>
+ <year>2007-2009</year>
+ <holder>Aaron Bockover, Gabriel Burt, Miguel de Icaza, Bengt Thuree</holder>
+ </copyright><copyright><year>2010.</year><holder>Sergiy Gavrylov (sergiovana at bigmir.net)</holder></copyright>
+ <publisher>
+ <publishername>Проект документування GNOME</publishername>
+ </publisher>
+ <authorgroup>
+ <author>
+ <firstname>Miguel</firstname>
+ <surname>de Icaza</surname>
+ </author>
+ <author>
+ <firstname>Aaron</firstname>
+ <surname>Bockover</surname>
+ </author>
+ <author>
+ <firstname>Bengt</firstname>
+ <surname>Thuree</surname>
+ </author>
+ <author>
+ <firstname>Gabriel</firstname>
+ <surname>Burt</surname>
+ </author>
+ <author>
+ <firstname>Alexandre</firstname>
+ <surname>Prokoudine</surname>
+ </author>
+ <author role="maintainer">
+ <firstname>Stephane</firstname>
+ <surname>Delcroix</surname>
+ </author>
+ </authorgroup>
+ <!--<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>-->
+ <revhistory>
+ <revision>
+ <revnumber>0.5</revnumber>
+ <date>25-09-2008</date>
+ </revision>
+ <revision>
+ <revnumber>0.4</revnumber>
+ <date>12-09-2008</date>
+ </revision>
+ <revision>
+ <revnumber>0.3</revnumber>
+ <date>26-07-2007</date>
+ </revision>
+ </revhistory>
+ </bookinfo>
+
+ <chapter id="organizing">
+ <title>Упорядкування фотографій</title>
+
+ <sect1 id="import">
+ <title>Імпорт</title>
+
+ <para>Фотографії можна імпортувати з твердого диска або з камери. Під час імпорту фотографій в F-Spot з камери, у всіх випадках робитимуться їх копії, даючи змогу очистити пам'ять камери. Типово, F-Spot робитиме копії фотографій, які імпортуються з твердого диска. Зніміть прапорець <guilabel>Копіювати</guilabel> в діалозі імпорту або утримуйте клавішу <keycap>Shift</keycap> під час перетягування фотографії в F-Spot, якщо не хочете копіювати їх з твердого диска.</para>
+
+ <para>Типово, F-Spot копіює фотографії до теки <filename class="directory">~/Фотографії</filename>. Теку призначення F-Spot можна змінити в діалозі <guilabel>Параметри</guilabel> (<menuchoice><guimenu>Правка</guimenu><guimenuitem>Параметри</guimenuitem></menuchoice>). Також можна вимкнути фізичне копіювання зображень в цей каталог і створити лише посилання в F-Spot на існуючі файли. Для цього потрібно зняти прапорець <guilabel>Копіювати файли до теки «Фотографії»</guilabel>.</para>
+ <para>Якщо є вірогідність, що деякі з ваших фотографій вже імпортовано з вибраного джерела, використовуйте функцію <guilabel>Виявлення дублікатів</guilabel>. У цьому випадку F-Spot спробує з'ясувати чи це зображення вже є в базі даних і, якщо є, нова копія не буде імпортована.</para>
+ <para>Якщо всі фотографії, які імпортуються за один раз, мають відношення до певної події чи мають інші загальні характеристики, ви можете створити позначку для них, щоб пізніше з легкістю знайти їх. Щоб зробити це, дивіться <xref linkend="tag"/> зробіть нову позначку, потім, під час імпортування фото, натисніть кнопку <guilabel>Додати позначку</guilabel> і виберіть створену вами позначку.</para>
+
+ <tip>
+ <para>F-Spot використовує базу даних розташовану в каталозі <filename>~/.config/f-spot/photos.db</filename>. Зверніть увагу, щоб отримати доступ до нього, потрібно використовувати команду sqlite3. Ви також можете вручну вказати шлях до бази даних, запустивши F-Spot з параметром <option>-b</option>.</para>
+ </tip>
+
+ <para>Після імпорту, F-Spot покаже фотографії лише з останнього сеансу імпорту. Щоб дізнатися, як мати справу з сеансами імпорту, дивіться <xref linkend="enjoying-search"/>.</para>
+ <para>Імпортувати можна прямо з Mozilla <ulink url="http://www.mozilla.com/en-US/firefox/">Firefox</ulink> та <ulink url="http://www.mozilla.com/en-US/thunderbird/">Thunderbird</ulink> використовуючи розширення <ulink url="https://addons.mozilla.org/en-US/firefox/addon/7091">Firefox</ulink> та <ulink url="https://addons.mozilla.org/en-US/thunderbird/addon/7011">Thunderbird</ulink> F-Spot для імпортування фото, написане <ulink url="http://personalpages.tds.net/~cdovel/">Pizzach</ulink>.</para>
+ </sect1>
+
+ <sect1 id="edit">
+ <title>Редагування</title>
+
+ <para>Двічі клацніть кнопкою миші з вказівником на зображені або натисніть клавішу ENTER, щоб перейти в режим редагування, де можна вилучити ефект червоних очей, зробити кадрування та налаштувати яскравість та кольори.</para>
+
+ <sect2 id="edit-versions">
+ <title>Версії</title>
+
+ <para>Під час редагування фотографій, створюється нова копія (або варіант), так що ваші оригінальні фото ніколи не змінюються. Після першого редагування, наступні виправлення вноситимуться в ту ж версію. Якщо потрібно створити декілька версій фотографії, можливо, різних розмірів і забарвлення, зробити це можна вибравши в меню <menuchoice><guimenu>Файл</guimenu><guimenuitem>Створити нову версію</guimenuitem></menuchoice>.</para>
+ </sect2>
+
+ <sect2 id="edit-crop">
+ <title>Кадрування</title>
+
+ <para>Кадрування зображення — відмінний спосіб поліпшити якість фотографії змінивши її оформлення. Щоб виконати кадрування фото, виберіть частину фотографії, яку хотіли б зберегти. Якщо потрібно, щоб фотографія мала точні розміри необхідні для друку, можна вибрати готовий варіант. F-Spot дає змогу вибрати відповідний розмір зі спадного списку варіантів кадрування. Докладніше дивіться <xref linkend="edit-remove-red-eye"/> про внесення змін до фотографій.</para>
+ <figure>
+ <title>Кадрування</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-crop.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Як тільки буде вибраний варіант кадрування, необхідно натиснути кнопку «Кадрувати» під зображенням, щоб завершити кадрування. Якщо ви працюєте з оригіналом фотографії, операція кадрування створить нову версію цієї фотографії.</para>
+ </sect2>
+
+ <sect2 id="edit-straighten">
+ <title>Вирівнювання</title>
+
+ <para>Ефект вирівнювання — це інструмент для вирівнювання зображення на фото, досить корисний для фотографування пейзажів без штатива, коли (уявна) лінія горизонту не дорівнює 0°. Цей інструмент дає змогу зробити поворот зображення на заданий кут і автоматично кадрувати виникле зображення, отже, ви завжди бачитимете досконалий прямокутник.</para>
+ <figure>
+ <title>Вирівнювання</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-straighten.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-adjust-colors">
+ <title>Коригування кольорів</title>
+
+ <para>Щоб відкоригувати яскравість, контрастність і кольори фотографії, натисніть кнопку <guibutton>Коригувати кольори</guibutton>, щоб відкрити діалог коригування. Змініть потрібні параметри і збережіть їх натиснувши кнопку <guibutton>Гаразд</guibutton>.</para>
+ <figure>
+ <title>Коригувати кольори</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-adjust-colors.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-auto-color">
+ <title>Автокорекція кольорів</title>
+
+ <para>Цей ефект автоматично коригує рівні яскравості та кольору, щоб зробити зображення з приємно-збалансованими кольорами. Найкраще його використовувати для фотографій, зроблених з автоматичним балансом білого, коли камері не вдалося зробити знімок добре.</para>
+ <figure>
+ <title>Автокорекція кольорів</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-autocolor.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-desaturate">
+ <title>Знебарвлення</title>
+
+ <para>Щоб зробити кольорову фотографію чорно-білою, відкрийте потрібну фотографію та натисніть кнопку <guibutton>Знебарвлення</guibutton>.</para>
+ <figure>
+ <title>Знебарвлення</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-desaturate.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-sepia">
+ <title>Сепія</title>
+
+ <para>Щоб зробити кольорову фотографію, як зображення у старому стилі з відтінками у сепії, відкрийте потрібну фотографію та натисніть кнопку <guibutton>Тонувати у сепію</guibutton>.</para>
+ <figure>
+ <title>Знебарвлення</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-sepia.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="edit-remove-red-eye">
+ <title>Вилучення ефекту червоних очей</title>
+
+ <para>Щоб вилучити ефект червоних очей з фотографії, необхідно вибрати область, яка містить очі. Якщо потрібно, збільшіть зображення, щоб вибрати точне розташування очей на фотографії. Необхідно відкоригувати обидва ока однієї і тієї ж особи або навіть очі кількох людей за один раз. Якщо не вдасться це зробити, або вибрана область містить яскраві червоні елементи (губи тощо) вам, ймовірно, прийдеться усувати ефект червоних очей для кожного ока окремо.</para>
+ <para>Щоб вибрати область очей, натисніть ліву кнопку миші з вказівником в одному кутку майбутнього прямокутника і перетягніть мишу по діагоналі в протилежний кут і відпустіть кнопку. Змінювати розмір прямокутника можна шляхом перетягування його країв. Щоб перемістити прямокутник, потрібно натиснути ліву кнопку миші з вказівником в його середині і перетягнути його в потрібне місце.</para>
+ <para>Після виділення області червоних очей, вилучіть ефект, натиснувши кнопку «Корекція червоних очей», розташовану під фотографією.</para>
+ <figure>
+ <title>Корекція червоних очей</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-red-eye.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <tip>
+ <para>Ви можете змінити поріг виявлення ефекту червоних очей змінивши ключ gconf <filename class="directory">/apps/f-spot/edit/redeye_threshold</filename>.</para>
+ </tip>
+ </sect2>
+
+ <sect2 id="edit-soft-focus">
+ <title>М’який фокус</title>
+
+ <para>У фотографії, збільшення різкості однієї області зображення, в той час як інша залишається нечіткою — спосіб зробити акцент та привернути увагу. Цей ефект досягається шляхом використання лінз, які дають змогу фотографувати з короткої відстані перед і за об'єктом, в той час як він залишається у фокусі. Способом для імітації таких лінз і є ефект «М'який фокус».</para>
+ <figure>
+ <title>М’який фокус</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-soft-focus.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Натисніть, щоб вибрати центральну точку області, яку хочете мати у фокусі та встановіть величину нечіткого зображення і натисніть кнопку <guibutton>Гаразд</guibutton>.</para>
+ </sect2>
+
+ <sect2 id="edit-sharpen">
+ <title>Різкість</title>
+
+ <para>Фотографії не у фокусі та більшість оцифрованих зображень часто потребують корекції різкості. Ефект «Unsharp Mask» надає різкості краям елементів без збільшення кількості вад чи плям. Щоб збільшити різкість фото виберіть в меню <menuchoice><guimenu>Правка</guimenu><guimenuitem>Підвищити різкість...</guimenuitem></menuchoice> і деталізуйте такі значення:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><parameter class="option">Величина</parameter> — інтенсивність різкості.</para>
+ </listitem>
+ <listitem>
+ <para><parameter class="option">Радіус</parameter> — відстань в пікселях з кожного боку лінії, на яку впливатиме збільшення різкості. Зображення з високою роздільною здатністю допускають більший радіус.</para>
+ </listitem>
+ <listitem>
+ <para><parameter class="option">Поріг</parameter> — мінімальна різниця в пікселях, яка показує ширину лінії до якої буде застосоване збільшення різкості. Дає змогу уникнути створення плям на обличчі, небі або поверхні води.</para>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2 id="edit-describe">
+ <title>Опис</title>
+
+ <para>Ви можете також зробити опис зображення клацнувши на полі введення тексту під зображенням і ввести потрібний текст.</para>
+ <para>Як тільки буде вибраний варіант кадрування, необхідно натиснути кнопку «Кадрувати» під зображенням, щоб завершити кадрування. Якщо ви працюєте з оригіналом фотографії, операція кадрування створить нову версію цієї фотографії.</para>
+ </sect2>
+
+ <sect2 id="edit-adjust-time">
+ <title>Коригування часу</title>
+
+ <para>Як в режимі перегляду так і в режимі редагування, можна скоригувати час для одного або багатьох зображень (<menuchoice><guimenu>Правка</guimenu><guimenuitem>Коригувати час</guimenuitem></menuchoice>). Коригування часу для багатьох фотографій одночасно дає змогу змістити час на всіх фото з сеансу імпорту, наприклад, якщо час на вашій камері невірно встановлений, або якщо ви забули змінити його у відповідності до DST.</para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="tag">
+ <title>Позначка</title>
+ <para>F-Spot дає змогу упорядкувати і користуватись фотографіями, пов’язуючи їх різними користувацькими позначками. Позначка це всього лише ярлик. F-Spot поставляється з типовими позначками, щоб ви могли розпочати працювати з ними. Їх можна змінювати або додавати нові. Наприклад, якщо ви хочете створити позначку для особливої події, дайте їй назву цієї події під позначкою «Події».</para>
+ <para>Є багато способів позначати фотографії:</para>
+ <itemizedlist>
+ <listitem>
+ <para>перетягнути фото на позначку</para>
+ </listitem>
+ <listitem>
+ <para>перетягнути позначку на фото</para>
+ </listitem>
+ <listitem>
+ <para>через контекстне меню фото</para>
+ </listitem>
+ <listitem>
+ <para>через меню «Позначки» та «Правка»</para>
+ </listitem>
+ <listitem>
+ <para>просто введіть їх. Натисніть клавішу <keycap>t</keycap>, щоб викликати поле введення позначки і введіть текст позначок, відокремлюючи їх комами.</para>
+ <para>В цьому полі введення можна використовувати авто-завершення. Після введення початку назви позначки, натисніть клавішу <keycap>Tab</keycap>, щоб побачити перший можливий варіант завершення. Циклічно натискайте клавішу <keycap>Tab</keycap>, щоб переходити між варіантами завершення або комбінацію клавіш <keycombo action="simul"><keycap>Shift</keycap><keycap>Tab</keycap></keycombo>, щоб переходити у зворотньому напрямку. Для підтвердження запропонованого завершення і введення нової позначки, натисніть клавішу <keycap>,</keycap>. Натиснувши клавішу <keycap>Enter</keycap> ви залишаєте поле введення, підтвердивши чинне завершення. Щоб скасувати авто-завершення, просто продовжуйте вводити текст.</para>
+ </listitem>
+ </itemizedlist>
+ <para>Перше фото, яке пов’язане з позначкою, буде використовуватися як значок для цієї позначки. Ви завжди можете змінити назву позначки, батьківську позначку та значок, вибравши в контекстному меню пункт <guilabel>Редагувати позначку</guilabel>.</para>
+ <para>Ви можете змінити батька позначки, перетягнувши її в будь-яке місце. Крім того, можна змінити назву позначки виділивши її та натиснувши <keycap>F2</keycap>. І нарешті, якщо віджет дерева позначок у фокусі (наприклад, ви тільки що натиснули на позначку), ви можете просто почати вводити назву позначки і пошук вестиметься по всьому списку позначок і ви перейдете у відповідну.</para>
+
+ <para>Щоб змінити розмір значка позначки в бічній панелі, або навіть зробити його невидимим, виберіть потрібний варіант в меню <menuchoice><guimenu>Вигляд</guimenu><guimenuitem>Значки позначок</guimenuitem></menuchoice>.</para>
+
+ <tip>
+ <para>F-Spot може записувати позначки як поля метаданих у файли JPEG. Позначки для різних форматів файлів: RAW, PNG, TIFF та інших, записуються у базу даних F-Spot. Вам доведеться заново позначати ці файли, якщо ви повторно імпортуватимете колекцію.</para>
+ </tip>
+ </sect1>
+ </chapter>
+
+ <chapter id="enjoying">
+ <title>Перегляд фотографій</title>
+ <sect1 id="enjoying-browse">
+ <title>Перегляд</title>
+ <para>Використовуйте повзунок для перегляду фотографій за датою створення або за каталогом. Щоб змінити цей параметр, перейдіть до меню <menuchoice><guimenu>Вигляд</guimenu><guimenuitem>Упорядкувати за</guimenuitem></menuchoice>.</para>
+ </sect1>
+ <sect1 id="enjoying-search">
+ <title>Пошук</title>
+
+ <para>F-Spot використовує пошукові фільтри, щоб допомогти вам краще визначити критерії пошуку.</para>
+
+ <sect2 id="enjoying-search-tags">
+ <title>Позначки</title>
+
+ <para>Почати пошук можна за допомогою подвійного натискання або активувавши позначку в списку позначок. Як альтернатива, відкрийте панель пошуку через меню <menuchoice><guimenu>Знайти</guimenu><guimenuitem>Показати панель пошуку</guimenuitem></menuchoice> та перетягніть позначку з бічної панелі на панель пошуку.</para>
+ <para>Щоб знайти фото помічені двома позначками, активуйте першу в бічній панелі або перетягніть її на панель пошуку, потім перетягніть другу і помістіть її поверх першої. Також можна натиснути праву кнопку миші з вказівником на другій позначці в бічній панелі або через меню <guimenu>Знайти</guimenu>, і в контекстному меню вибрати пункт <guimenuitem>Шукати з...</guimenuitem> і вибрати першу позначку (чи групу позначок).</para>
+ <para>Щоб знайти фотографію з певною позначкою, перетягніть її значок на панель пошуку.</para>
+ <para>Можна шукати фото, які не мають окремої позначки, двічі клацнувши на позначці в панелі пошуку. Як альтернатива, натисніть праву кнопку миші з вказівником на позначці в панелі пошуку і виберіть <guimenuitem>Виключаючи знімки з позначкою</guimenuitem>.</para>
+ <para>Щоб вилучити позначку з пошуку, перетягніть її з панелі пошуку, або натисніть праву кнопку миші з вказівником на ній і виберіть в контекстному меню пункт <guimenuitem>Вилучити з пошуку</guimenuitem>.</para>
+ <para>Типово, фото під позначкою <emphasis>Приховане</emphasis> не будуть показані. Ви маєте явно включити позначку <emphasis>Приховане</emphasis> у пошук, щоб побачити ці фото.</para>
+ </sect2>
+
+ <sect2 id="enjoying-search-import-rolls">
+ <title>Сеанси імпорту</title>
+ <para>F-Spot пам’ятає які зображення імпортуються час від часу. Скористайтесь меню <menuchoice><guimenu>Знайти</guimenu><guisubmenu>Сеанс імпорту</guisubmenu><guimenuitem>Останній сеанс імпорту</guimenuitem></menuchoice>, щоб обмежити пошук лише останнім сеансом імпорту, або меню <menuchoice><guimenu>Знайти</guimenu><guisubmenu>Сеанс імпорту</guisubmenu><guimenuitem>Вибрати сеанс імпорту...</guimenuitem></menuchoice>, щоб зробити детальний відбір імпортованих фотографій:</para>
+ <itemizedlist>
+ <listitem>
+ <para><parameter class="option">Під час</parameter> — щоб вибрати фотографії з конкретного сеансу імпорту</para>
+ </listitem>
+ <listitem>
+ <para><parameter class="option">Після</parameter> — щоб вибрати всі фотографії, імпортовані починаючи з конкретного сеансу імпорту</para>
+ </listitem>
+ <listitem>
+ <para><parameter class="option">Між</parameter> — щоб вибрати всі фотографії, імпортовані між двома конкретними сеансами імпорту</para>
+ </listitem>
+ </itemizedlist>
+ <para>Під час кожної зміни параметрів фільтра, кількість вибраних фотографій з'являтиметься в нижній частині діалогового вікна.</para>
+ <para>Коли ви підтвердите вибір даних у фільтрі сеансу імпорту, в панелі пошуку з’явиться рядок <guilabel>Знайти: Сеанс імпорту</guilabel>. Тепер ви можете додати інші фільтри, щоб деталізувати критерії пошуку.</para>
+ <para>Якщо ви більше не потребуєте фільтра сеансу імпорту, виберіть в меню <menuchoice><guimenu>Знайти</guimenu><guisubmenu>Сеанс імпорту</guisubmenu><guimenuitem>Прибрати фільтр сеансів імпорту</guimenuitem></menuchoice>, щоб вилучити сеанс імпорту з критеріїв пошуку. Також можна натиснути кнопку закривання (<guibutton>X</guibutton>) панелі пошуку, щоб відкинути всі наявні варіанти пошуку.</para>
+ <tip>
+ <para>Кількість сеансів, які будуть показані у діалоговому вікні визначається ключем gconf <filename class="directory">/apps/f-spot/import/gui_roll_history</filename>. Типове значення — 10.</para>
+ </tip>
+ </sect2>
+
+ <sect2 id="enjoying-search-type-to-find">
+ <title>Пошук під час введення</title>
+ <para>Існує також поле для пошуку під час введення. Натисніть клавішу <keycap>/</keycap>, щоб його відкрити. Це поле не можна використовувати одночасно з панеллю пошуку. Введіть запит таким чином: позначкаA та (позначкаB або (позначкаC та позначкаD)). Як тільки F-Spot розпізнає введене як правильний запит, результат пошуку з'явиться у вікні. Оператор <emphasis>not</emphasis> поки що не підтримується.</para>
+
+ <para>За допомогою цієї функції, пошук введеного тексту вестиметься також у коментарях та у назвах файлів фотографій.</para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="enjoying-fullscreen-mode-and-slideshows">
+ <title>Повноекранний режим та показ слайдів</title>
+ <para>Щоб менше відволікатися і побачити зображення більшими, фотографії можна переглядати в повноекранному режимі. У цьому режимі доступний перехід до наступного фото або повернення до попереднього. Щоб перейти у повноекранний режим, натисніть клавішу <keycap>F11</keycap> або кнопку на панелі інструментів.</para>
+ <figure>
+ <title>На весь екран</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-fullscreen.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>У режимі перегляду слайдів, ви можете сидіти склавши руки і переглядати фотографії одну за іншою. Щоб запустити показ слайдів, натисніть кнопку на панелі інструментів.</para>
+ <figure>
+ <title>Показ слайдів</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/f-spot-slideshow.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </sect1>
+ </chapter>
+
+ <chapter id="sharing">
+ <title>Спільне користування фотографіями</title>
+
+ <abstract>
+ <para>Існує багато способів, спільного користування фотографіями у F-Spot. Усі наступні методи спільного користування фотографіями доступні лише, якщо ви виберете їх під час запуску.</para>
+ </abstract>
+
+ <sect1 id="sharing-e-mail">
+ <title>Пересилка електронною поштою</title>
+ <para>Надіслати свої фото електронною поштою можна прямо з F-Spot через меню <menuchoice><guimenu>Файл</guimenu><guimenuitem>Надіслати поштою</guimenuitem></menuchoice>.</para>
+ <note>
+ <title>Зауваження 1</title>
+ <para>Поштова програма, що використовується для цього, залежить від налаштувань середовища GNOME. Ви можете змінити типову поштову програму використовуючи інструмент <application>Стандартні програми</application> в меню <menuchoice><guimenu>Система</guimenu><guisubmenu>Параметри</guisubmenu></menuchoice>.</para>
+ </note>
+ <note>
+ <title>Зауваження 2</title>
+ <para>Якщо деякі фотографії, які ви хочете надіслати електронною поштою, мають формат, в який F-Spot не вміє зберігати (наприклад, зображення RAW), діалог вибору розміру стане нечутливим і будуть відправлені оригінали фото.</para>
+ </note>
+ <tip>
+ <para>Якщо ви відсилаєте зображення зі зміненими розмірами, F-Spot збереже змінені версії десь у каталозі <filename class="directory">/tmp</filename> на 30 секунд. Це не важливо для програми Evolution, яка створює власні локальні копії вкладень, однак це допоможе дещо спростити роботу з Thunderbird. Встановити потрібний час затримки можна, змінюючи значення ключа gconf <filename class="directory">/apps/f-spot/export/email/delete_timeout_seconds</filename>.</para>
+ </tip>
+ </sect1>
+
+ <sect1 id="sharing-print">
+ <title>Друк</title>
+ <para>Щоб надрукувати фото, використовуйте меню <menuchoice><guimenu>Файл</guimenu><guimenuitem>Друк</guimenuitem></menuchoice>.</para>
+ </sect1>
+
+ <sect1 id="sharing-burn-to-cd">
+ <title>Запис на CD</title>
+ <para>Щоб записати фото на CD або DVD, використовуйте меню <menuchoice><guimenu>Файл</guimenu><guisubmenu>Експорт</guisubmenu><guimenuitem>Експорт до CD</guimenuitem></menuchoice>.</para>
+ </sect1>
+
+ <sect1 id="website-gallery-folder">
+ <title>Створення веб-галереї або теки</title>
+ <para>Функція <menuchoice><guimenu>Файл</guimenu><guimenuitem>Експортувати до</guimenuitem><guimenuitem>У теку</guimenuitem></menuchoice> надає три способи експорту зображень.</para>
+ <itemizedlist>
+ <listitem>
+ <para><guilabel>Використовувати Original</guilabel> — експортує фотографії вже готовими для використання у вільній програмі Якуба Штайнера (Jakub Steiner) <ulink url="http://jimmac.musichall.cz/original.php"> Original Photo Gallery</ulink>. Якщо ви не знаєте, що це таке, цей вибір навряд чи буде вдалим.</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>Використовувати статичні файли HTML</guilabel> — експортує фотографії до інтерактивного веб-сайту, готового до вивантаження від вас.</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>Прості файли</guilabel> — експортує зображення як файли в межах каталогів, не включаючи їх у галерею.</para>
+ </listitem>
+ </itemizedlist>
+ </sect1>
+
+ <sect1 id="sharing-flickr-or-php-gallery">
+ <title>Публікація в онлайн-галереях</title>
+ <para>Для користувачів Flickr, SmugMug, 23hq, Tabblo, Facebook, Zooomr або Picasa Web Album, надається можливість публікувати зображення прямо з F-Spot, через меню <menuchoice><guimenu>Файл</guimenu><guisubmenu>Експортувати до</guisubmenu></menuchoice>, вибравши в підменю відповідний пункт.</para>
+ <para>Користувачі програмного забезпечення, відомого як <ulink url="http://gallery.sourceforge.net/"> Gallery</ulink>, можуть публікувати свої фото у наявному альбомі через меню <menuchoice><guimenu>Файл</guimenu><guimenuitem>Експортувати до</guimenuitem><guimenuitem>Web Gallery</guimenuitem></menuchoice>. Під час встановлення Gallery потрібно увімкнути модуль віддаленого керування (Remote plugin).</para>
+ <note>
+ <title>Примітка для користувачів Gallery 2.2</title>
+ <para>Модуль Remote plugin для Gallery має бути версії 1.0.8 або новіший.</para>
+ </note>
+ <para><ulink url="http://pennave.sourceforge.net">PennAve</ulink> — веб-програма, написана мовою Python, яка на пряму використовує базу даних F-Spot для презентації динамічної галереї ваших фотографій та позначок.</para>
+ <para><ulink url="http://www.conduit-project.org">Conduit</ulink> — програма, яка здатна синхронізувати фотографії, які мають певні позначки, з веб-сховищами Flickr і Picasa Web Album.</para>
+ </sect1>
+ </chapter>
+
+ <chapter id="cms">
+ <title>Керування кольором</title>
+
+ <sect1 id="cms-what-is-cms">
+ <title>Що це — керування кольором?</title>
+
+ <para>Під час перегляду фотографії на дисплеї комп'ютера, вона виглядатиме дещо інакше, ніж на дисплеї фотокамери або на будь-якому іншому дисплеї. Також інакше вона виглядатиме і після друку на принтері. Тому, що кожний такий пристрій має свої власні характеристики відтворення кольору.</para>
+
+ <para>Система керування кольором (CMS) — це інструмент для досягнення достовірного відтворення кольорів як на дисплеї, так і на пристрої виведення, наприклад принтері. В основі CMS лежать колірні профілі, які порівнюють оригінальні кольори та кольори, які зможе відтворити пристрій, тому кольори виглядають однаково на всіх пристроях: на рідкокристалічному моніторі, на знімку надрукованому у фотолабораторії тощо.</para>
+ </sect1>
+
+ <sect1 id="cms-what-is-icc-profile">
+ <title>Що це — колірний профіль?</title>
+
+ <para>Колірний профіль — це або файл з розширенням .icc (часто його називають ICC-профілем), або файл з розширенням .icm, який описує, як кольори пристрою, відповідають універсального опису кольорів.</para>
+
+ <para>Існує кілька типів профілів:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Профіль пристрою введення. Цей профіль для фотокамери або профіль для таких програм, як XSane, який вбудовується в скановане зображення.</para>
+ </listitem>
+ <listitem>
+ <para>Профіль робочого простору. Цей профіль описує колірний простір в якому виконуються всі операції у програмі. Зазвичай, для цього використовуються профілі досить широкого діапазону — AdobeRGB1998 або ProPhotoRGB.</para>
+ </listitem>
+ <listitem>
+ <para>Профіль дисплея — це профіль для відеомонітора.</para>
+ </listitem>
+ <listitem>
+ <para>Профіль виведення. Зазвичай, це профіль для принтера.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>На цей час, F-Spot дає змогу налаштовувати лише профілі дисплея та виведення. Всі операції з кольором виконуються в колірному просторі sRGB.</para>
+ </sect1>
+
+ <sect1 id="cms-how-to-get-icc-profile">
+ <title>Як отримати колірний профіль дисплея або принтера?</title>
+
+ <para>Існує кілька способів отримати колірний профіль.</para>
+
+ <sect2 id="cms-icc-from-cd-or-internet">
+ <title>З компакт-диска або з Інтернету</title>
+
+ <para>Багато виробників апаратного забезпечення надають колірні профілі на компакт-дисках, що йдуть в комплекті з пристроями. Якщо у вас є такий диск (для монітора або принтера), ви можете його використовувати. Або можете завантажити профілі з Інтернету (зазвичай, з розділу підтримки на веб-сайті виробника). Деякі виробники камер (Nikon, Canon) також надають профілі ICC.</para>
+ </sect2>
+
+ <sect2 id="cms-icc-from-calibrating-and-profiling">
+ <title>Калібрування та створення профілю</title>
+
+ <para>Найкращих результатів можна досягнути через калібрування та створення профілів пристроїв за допомогою вимірювального приладу. Це не так уже й складно, проте вам буде необхідний спектрофотометр, щоб зробити всі вимірювання та створити профіль МУС.</para>
+
+ <para>Якщо ви працюєте у Windows або Mac OS X, використовуйте програмне забезпечення виробника спектрофотометра. В Linux — використовуйте, або набір багатоцільових інструментів для роботи у командному рядку <ulink url="http://www.argyllcms.com">Argyll</ulink>, або графічний інтерфейс користувача <ulink url="http://lprof.sourceforge.net/">LProf</ulink>.</para>
+ <para>За додатковою інформацією звертайтеся до документації постачальників стороннього апаратного та програмного забезпечення.</para>
+ </sect2>
+
+ <sect2 id="cms-icc-from-embedding">
+ <title>Вкладення</title>
+
+ <para>Формати файлів зображень (такі як TIFF, JPEG, PNG тощо) самі можуть містити вкладені колірні профілі. Якщо керування кольором увімкнено, F-Spot шукатиме такі профілі і прийматиме їх до уваги.</para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="cms-how-to-use">
+ <title>Як використовувати керування кольором в F-Spot</title>
+
+ <para>На цей час, керування кольором в F-Spot, використовує лише профілі RGB (в F-Spot ви не можете бачити інші профілі).</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Скопіюйте колірні профілі у каталог <filename class="directory">/usr/share/color/icc</filename> або <filename class="directory">/usr/local/share/color/icc</filename>.</para>
+ </listitem>
+ <listitem>
+ <para>Увімкніть керування кольором в меню <menuchoice><guimenu>Правка</guimenu><guimenuitem>Параметри</guimenuitem></menuchoice>.</para>
+ </listitem>
+ <listitem>
+ <para>Виберіть профілі для <guilabel>Монітора</guilabel> та для <guilabel>Друку</guilabel>.</para>
+ </listitem>
+ </itemizedlist>
+
+ <tip>
+ <para>Використовуйте веб-сайт <ulink url="http://burtonini.com/blog/computers/xicc">xicc</ulink>, щоб завантажити профіль ICC для монітора і працювати з ним в F-Spot. Просто поставте прапорець <guilabel>Спробувати використовувати системний профіль</guilabel>.</para>
+ </tip>
+ </sect1>
+ </chapter>
+
+ <chapter id="extend">
+ <title>Розширення функціональності</title>
+
+ <sect1 id="extend-what-extensions-are">
+ <title>Що це — розширення?</title>
+
+ <para>Розширення F-Spot додають програмі нові функціональні можливості. F-Spot підтримує два види розширень: програми експорту (дають змогу експортувати фотографії до нових веб-служб або сховищ даних) та інструменти (надають нові методи корекції кольору, пошук дублікатів фотографій тощо). Розширення розповсюджуються у вигляді пакунків розширень.</para>
+ <para>Одні розширення можуть використовувати інші розширення, а це означає, що одне не може працювати, якщо інше не встановлено. Ця концепція залежностей фактично означає, що:</para>
+ <itemizedlist>
+ <listitem>
+ <para>не можна встановити розширення, залежне від іншого, не встановленого в системі</para>
+ </listitem>
+ <listitem>
+ <para>не можна вилучити розширення, від якого залежать інші</para>
+ </listitem>
+ </itemizedlist>
+ </sect1>
+
+ <sect1 id="extend-managing-extensions">
+ <title>Керування розширеннями</title>
+
+ <para>Щоб налаштувати розширення, відкрийте пункт меню <menuchoice><guimenu>Правка</guimenu><guimenuitem>Налаштування розширень</guimenuitem></menuchoice>.</para>
+
+ <sect2 id="extend-managing-extensions-managing-extension-repositories">
+ <title>Керування репозиторіями розширень</title>
+
+ <para>Простіше кажучи, репозиторії — це сховища розширень. Вони бувають або мережевими, або локальними. Щоб додати новий репозиторій натисніть кнопку «Джерела», виберіть тип репозиторію, який збираєтеся додати, його URL або шлях до нього. Якщо вказаний URL або шлях не містять опису (індексу) файла розширення, з'явиться попереджувальне повідомлення.</para>
+ <para>Щоб вилучити репозиторій, знову натисніть кнопку <guibutton>Джерела...</guibutton> виділіть репозиторій, який хочете вилучити, і натисніть кнопку <guibutton>Вилучити</guibutton>.</para>
+ </sect2>
+
+ <sect2 id="extend-managing-extensions-installing-and-updating-extensions">
+ <title>Встановлення та оновлення розширень</title>
+
+ <para>Щоб встановити розширення, натисніть кнопку <guibutton>Встановити розширення...</guibutton>. У діалоговому вікні, яке з’явиться:</para>
+ <orderedlist>
+ <listitem>
+ <para>Виберіть репозиторій для встановлення, з усіх відомих або один з доступних.</para>
+ </listitem>
+ <listitem>
+ <para>Виберіть пакунки розширень, які хочете бачити: всі, лише нові, лише оновлені.</para>
+ </listitem>
+ <listitem>
+ <para>Натисніть кнопку <guibutton>Оновити</guibutton>, щоб оновити список доступних пакунків розширення за визначеними критеріями.</para>
+ </listitem>
+ <listitem>
+ <para>Виберіть розширення для встановлення або оновлення. Якщо хочете побачити короткий опис вибраного пакунку, натисніть кнопку <guibutton>Інформація</guibutton>.</para>
+ </listitem>
+ <listitem>
+ <para>Натисніть кнопку <guibutton>Вперед</guibutton>, щоб перейти до встановлення.</para>
+ </listitem>
+ </orderedlist>
+ </sect2>
+
+ <sect2 id="extend-managing-extensions-enabling-and-disabling-extensions">
+ <title>Увімкнення та вимкнення розширень</title>
+
+ <para>Можливо, виникне необхідність тимчасово увімкнути або вимкнути певний пакунок розширень. Наприклад, якщо розширення не достатньо стабільне, щоб ним можна було без ризику обробити велику кількість фотографій, або якщо меню переповнені розширеннями.</para>
+ <para>В діалоговому вікні <guilabel>Керування розширеннями</guilabel>, виберіть потрібний пакунок і натисніть кнопку <guibutton>Увімкнути</guibutton> або <guibutton>Вимкнути</guibutton>.</para>
+ </sect2>
+
+ <sect2 id="extend-managing-extensions-removing-extensions">
+ <title>Вилучення розширень</title>
+
+ <para>Якщо розширення більше не потрібне, його можна вилучити з системи повністю. В діалоговому вікні <guilabel>Керування розширеннями</guilabel>, виберіть пакунок розширення, який хочете вилучити і натисніть кнопку <guibutton>Вилучити</guibutton>.</para>
+ </sect2>
+
+ <sect2 id="extend-managing-extensions-reading-summary-of-extensions">
+ <title>Короткий опис розширень</title>
+
+ <para>Кожен пакунок розширення містить метадані, які дають змогу отримати таку інформацію:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Опис, у якому, зазвичай, описане призначення розширення</para>
+ </listitem>
+ <listitem>
+ <para>Версія</para>
+ </listitem>
+ <listitem>
+ <para>Автор</para>
+ </listitem>
+ <listitem>
+ <para>Залежності</para>
+ </listitem>
+ </orderedlist>
+
+ <para>В діалоговому вікні <guilabel>Керування розширеннями</guilabel>, виберіть пакунок розширення, опис до якого хочете прочитати, і натисніть кнопку <guibutton>Інформація</guibutton>.</para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="extend-developing-extensions">
+ <title>Розробка розширень</title>
+
+ <para>Документ <ulink url="http://f-spot.org/Extend_F-Spot">Extend F-Spot</ulink> надає інструкції з розробки своїх власних розширень для F-Spot.</para>
+ </sect1>
+ </chapter>
+
+ <chapter id="shortcuts">
+ <title>Клавіатурні скорочення</title>
+
+ <sect1 id="Global-Shortcuts">
+ <title>Глобальні скорочення</title>
+ <informaltable frame="all">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Клавіша</entry>
+ <entry>Дія</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <keycap>[</keycap>
+ </entry>
+ <entry>Повернути виділені фото ліворуч</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>]</keycap>
+ </entry>
+ <entry>Повернути виділені фото праворуч</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>Del</keycap>
+ </entry>
+ <entry>Вилучити виділені фото з каталогу F-Spot</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Shift</keycap><keycap>Del</keycap></keycombo>
+ </entry>
+ <entry>Вилучити назавжди виділені фото з диска. Якщо можливо, помістити їх у смітник.</entry>
+ </row>
+
+ <row>
+ <entry>
+ <keycap>t</keycap>
+ </entry>
+ <entry>Перегляд або редагування позначок для виділених фото</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>F11</keycap>
+ </entry>
+ <entry>Перегляд на весь екран</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>I</keycap></keycombo>
+ </entry>
+ <entry>Показати інформацію про фото</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>Дорівнює (=)</keycap></keycombo>
+ </entry>
+ <entry>Наблизити</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>Мінус (-)</keycap></keycombo>
+ </entry>
+ <entry>Віддалити</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo>
+ </entry>
+ <entry>Імпорт фотографій</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Alt</keycap><keycap>0-5</keycap></keycombo>
+ </entry>
+ <entry>Alt + цифра від 0 до 5 — оцінка вибраного знімка(ів)</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+
+ <sect1 id="shortcuts-browse-mode">
+ <title>Скорочення для режиму перегляду</title>
+ <informaltable frame="all">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Клавіша</entry>
+ <entry>Дія</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>
+ </entry>
+ <entry>Виділити все</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap>
+ <keycap>A</keycap></keycombo>
+ </entry>
+ <entry>Скасувати виділення всього</entry>
+ </row>
+ <row>
+ <entry>Клавіші зі стрілками або клавіші <keycap>H</keycap>, <keycap>J</keycap>, <keycap>K</keycap>, <keycap>L</keycap></entry>
+ <entry>Перемістити фокус</entry>
+ </row>
+ <row>
+ <entry><keycap>Ctrl</keycap> + Клавіша зі стрілкою</entry>
+ <entry>Перемістити фокус не змінюючи виділення</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>Spacebar</keycap>
+ </entry>
+ <entry>Виділити або скасувати виділення зі сфокусованого фото</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Shift</keycap>
+ <keycap>Клавіша зі стрілкою</keycap></keycombo>
+ </entry>
+ <entry>Змінити виділене фото</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap>
+ <keycap>Стрілка ліворуч або праворуч</keycap></keycombo>
+ </entry>
+ <entry>Додати або скасувати виділення усіх фото в рядку у вибраному напрямку</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>V</keycap>
+ </entry>
+ <entry>Збільшений перегляд частини зображення, на яку вказує вказівник миші</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Shift</keycap><keycap>V</keycap></keycombo>
+ </entry>
+ <entry>Збільшений перегляд частини зображення, на яку вказує вказівник миші та колірна гістограма</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+
+ <sect1 id="shortcuts-tag">
+ <title>Скорочення для позначок</title>
+ <informaltable frame="all">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Клавіша</entry>
+ <entry>Дія</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <keycap>F2</keycap>
+ </entry>
+ <entry>Перейменувати виділену позначку</entry>
+ </row>
+ <row>
+ <entry>
+ <keycombo><keycap>Ctrl</keycap><keycap>T</keycap></keycombo>
+ </entry>
+ <entry>Додати позначку до виділених фото</entry>
+ </row>
+ <row>
+ <entry>немає</entry>
+ <entry>Перетягнути позначки, щоб перемістити їх</entry>
+ </row>
+ <row>
+ <entry>немає</entry>
+ <entry>Ввести назву позначки, щоб перейти до неї (працює лише якщо позначка видима)</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+
+ <sect1 id="shortcuts-edit-mode">
+ <title>Скорочення для режиму редагування</title>
+ <informaltable frame="all">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Клавіша</entry>
+ <entry>Дія</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><keycap>Page Up</keycap>, <keycap>Backspace</keycap>, <keycap>B</keycap></entry>
+ <entry>Перейти до попереднього фото</entry>
+ </row>
+ <row>
+ <entry><keycap>Page Down</keycap>, <keycap>Spacebar</keycap>, <keycap>N</keycap></entry>
+ <entry>Перейти до наступного фото</entry>
+ </row>
+ <row>
+ <entry>Клавіші зі стрілками або клавіші <keycap>H</keycap>, <keycap>J</keycap>, <keycap>K</keycap>, <keycap>L</keycap></entry>
+ <entry>Перейти до попереднього або наступного фото чи переміщатись по збільшеному фото</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>R</keycap>
+ </entry>
+ <entry>Перейти до випадкового фото</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>f</keycap>
+ </entry>
+ <entry>Перегляд на весь екран</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>0</keycap>
+ </entry>
+ <entry>Припасувати зображення до розміру екрана</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>1</keycap>
+ </entry>
+ <entry>Коефіцієнт масштабування до 1.0 (1 піксель екрана на піксель зображення)</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>2</keycap>
+ </entry>
+ <entry>Коефіцієнт масштабування до 2.0 (4 пікселя екрана на піксель зображення)</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>Escape</keycap>
+ </entry>
+ <entry>Повернутись до режиму перегляду</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>V</keycap>
+ </entry>
+ <entry>Розглянути фотографію через збільшувальне скло (лупу). Щоб закрити його, двічі клацніть на ньому, або знову натисніть <keycap>v</keycap>.</entry>
+ </row>
+ <row>
+ <entry><keycap>Shift</keycap> + коліщатко миші</entry>
+ <entry>Прискорена прокрутка фотострічки</entry>
+ </row>
+ <row>
+ <entry>
+ <keycap>i</keycap>
+ </entry>
+ <entry>Увімкнути або вимкнути видимість панелі інформації «(лише в повноекранному режимі)»</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+ </chapter>
+
+</book>
diff --git a/docs/uk/uk.po b/docs/uk/uk.po
new file mode 100644
index 0000000..6930a14
--- /dev/null
+++ b/docs/uk/uk.po
@@ -0,0 +1,2006 @@
+# Ukrainian translation for f-spot.
+# Copyright (C) 2010 f-spot's COPYRIGHT HOLDER
+# This file is distributed under the same license as the f-spot package.
+# Sergiy Gavrylov <sergiovana at bigmir.net>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: f-spot master\n"
+"POT-Creation-Date: 2010-04-01 07:05+0000\n"
+"PO-Revision-Date: 2010-04-01 21:28+0300\n"
+"Last-Translator: Sergiy Gavrylov <sergiovana at bigmir.net>\n"
+"Language-Team: Ukrainian <uk at li.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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/f-spot.xml:163(None)
+msgid ""
+"@@image: 'figures/f-spot-crop.png'; md5=63e18c96702aea4701024837a13ae2d9"
+msgstr ""
+"@@image: 'figures/f-spot-crop.png'; md5=63e18c96702aea4701024837a13ae2d9"
+
+#. 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/f-spot.xml:187(None)
+msgid ""
+"@@image: 'figures/f-spot-straighten.png'; "
+"md5=ceeff0cac633d06599fa5760cc4bc568"
+msgstr ""
+"@@image: 'figures/f-spot-straighten.png'; "
+"md5=ceeff0cac633d06599fa5760cc4bc568"
+
+#. 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/f-spot.xml:206(None)
+msgid ""
+"@@image: 'figures/f-spot-adjust-colors.png'; "
+"md5=6a5d9eaaaaf238ccbf70552bc073898c"
+msgstr ""
+"@@image: 'figures/f-spot-adjust-colors.png'; "
+"md5=6a5d9eaaaaf238ccbf70552bc073898c"
+
+#. 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/f-spot.xml:224(None)
+msgid ""
+"@@image: 'figures/f-spot-autocolor.png'; md5=240c4a86c95c9507755fe790bef0e24a"
+msgstr ""
+"@@image: 'figures/f-spot-autocolor.png'; md5=240c4a86c95c9507755fe790bef0e24a"
+
+#. 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/f-spot.xml:241(None)
+msgid ""
+"@@image: 'figures/f-spot-desaturate.png'; "
+"md5=fa54dfd08171658d720be71b6d367139"
+msgstr ""
+"@@image: 'figures/f-spot-desaturate.png'; "
+"md5=fa54dfd08171658d720be71b6d367139"
+
+#. 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/f-spot.xml:258(None)
+msgid ""
+"@@image: 'figures/f-spot-sepia.png'; md5=154d6e34903664dbd776f2bef405ce91"
+msgstr ""
+"@@image: 'figures/f-spot-sepia.png'; md5=154d6e34903664dbd776f2bef405ce91"
+
+#. 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/f-spot.xml:289(None)
+msgid ""
+"@@image: 'figures/f-spot-red-eye.png'; md5=743d0a2ccc9b2fa8fa314855c225cd31"
+msgstr ""
+"@@image: 'figures/f-spot-red-eye.png'; md5=743d0a2ccc9b2fa8fa314855c225cd31"
+
+#. 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/f-spot.xml:316(None)
+msgid ""
+"@@image: 'figures/f-spot-soft-focus.png'; "
+"md5=14d1437ce49c83f3ebbcf70b7047ffbe"
+msgstr ""
+"@@image: 'figures/f-spot-soft-focus.png'; "
+"md5=14d1437ce49c83f3ebbcf70b7047ffbe"
+
+#. 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/f-spot.xml:608(None)
+msgid ""
+"@@image: 'figures/f-spot-fullscreen.png'; "
+"md5=86040e20ebf1015f6489a56e9589f063"
+msgstr ""
+"@@image: 'figures/f-spot-fullscreen.png'; "
+"md5=86040e20ebf1015f6489a56e9589f063"
+
+#. 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/f-spot.xml:621(None)
+msgid ""
+"@@image: 'figures/f-spot-slideshow.png'; md5=84a69bc3bb7a1b8d04c967d3a66e6f23"
+msgstr ""
+"@@image: 'figures/f-spot-slideshow.png'; md5=84a69bc3bb7a1b8d04c967d3a66e6f23"
+
+#: C/f-spot.xml:5(title)
+msgid "The F-Spot Manual"
+msgstr "Посібник з F-Spot"
+
+#: C/f-spot.xml:7(para) C/f-spot.xml:9(subtitle)
+msgid "This is the user manual for F-Spot, a GNOME personal photo manager."
+msgstr "Посібник користувача з F-Spot — менеджера особистих фото для GNOME."
+
+#: C/f-spot.xml:11(year)
+msgid "2007-2009"
+msgstr "2007-2009"
+
+#: C/f-spot.xml:12(holder)
+msgid "Aaron Bockover, Gabriel Burt, Miguel de Icaza, Bengt Thuree"
+msgstr "Aaron Bockover, Gabriel Burt, Miguel de Icaza, Bengt Thuree"
+
+#: C/f-spot.xml:15(publishername)
+msgid "GNOME Documentation Project"
+msgstr "Проект документування GNOME"
+
+#: C/f-spot.xml:19(firstname)
+msgid "Miguel"
+msgstr "Miguel"
+
+#: C/f-spot.xml:20(surname)
+msgid "de Icaza"
+msgstr "de Icaza"
+
+#: C/f-spot.xml:23(firstname)
+msgid "Aaron"
+msgstr "Aaron"
+
+#: C/f-spot.xml:24(surname)
+msgid "Bockover"
+msgstr "Bockover"
+
+#: C/f-spot.xml:27(firstname)
+msgid "Bengt"
+msgstr "Bengt"
+
+#: C/f-spot.xml:28(surname)
+msgid "Thuree"
+msgstr "Thuree"
+
+#: C/f-spot.xml:31(firstname)
+msgid "Gabriel"
+msgstr "Gabriel"
+
+#: C/f-spot.xml:32(surname)
+msgid "Burt"
+msgstr "Burt"
+
+#: C/f-spot.xml:35(firstname)
+msgid "Alexandre"
+msgstr "Alexandre"
+
+#: C/f-spot.xml:36(surname)
+msgid "Prokoudine"
+msgstr "Prokoudine"
+
+#: C/f-spot.xml:39(firstname)
+msgid "Stephane"
+msgstr "Stephane"
+
+#: C/f-spot.xml:40(surname)
+msgid "Delcroix"
+msgstr "Delcroix"
+
+#: C/f-spot.xml:46(revnumber)
+msgid "0.5"
+msgstr "0.5"
+
+#: C/f-spot.xml:47(date)
+msgid "2008-09-25"
+msgstr "25-09-2008"
+
+#: C/f-spot.xml:50(revnumber)
+msgid "0.4"
+msgstr "0.4"
+
+#: C/f-spot.xml:51(date)
+msgid "2008-09-12"
+msgstr "12-09-2008"
+
+#: C/f-spot.xml:54(revnumber)
+msgid "0.3"
+msgstr "0.3"
+
+#: C/f-spot.xml:55(date)
+msgid "2007-07-26"
+msgstr "26-07-2007"
+
+#: C/f-spot.xml:61(title)
+msgid "Organizing your photos"
+msgstr "Упорядкування фотографій"
+
+#: C/f-spot.xml:64(title)
+msgid "Import"
+msgstr "Імпорт"
+
+#: C/f-spot.xml:66(para)
+msgid ""
+"You can import photos from your hard drive or your camera. When you import "
+"your photos into F-Spot from your camera, it will always make a copy of "
+"them, leaving you free to clear your camera's memory. By default, F-Spot "
+"will make a copy of photos imported from your hard drive. Uncheck the "
+"<guilabel>Copy</guilabel> option on the import dialog or hold <keycap>Shift</"
+"keycap> when dragging photos into F-Spot if you do not wish to copy them "
+"from your hard drive."
+msgstr ""
+"Фотографії можна імпортувати з твердого диска або з камери. Під час імпорту "
+"фотографій в F-Spot з камери, у всіх випадках робитимуться їх копії, даючи "
+"змогу очистити пам'ять камери. Типово, F-Spot робитиме копії фотографій, які "
+"імпортуються з твердого диска. Зніміть прапорець <guilabel>Копіювати</"
+"guilabel> в діалозі імпорту або утримуйте клавішу <keycap>Shift</keycap> під "
+"час перетягування фотографії в F-Spot, якщо не хочете копіювати їх з "
+"твердого диска."
+
+#: C/f-spot.xml:76(para)
+msgid ""
+"By default, F-Spot copies your photos to the <filename class=\"directory\">~/"
+"Photos</filename> folder. You can change the folder F-Spot uses in "
+"<guilabel>Preferences</guilabel> dialog (<menuchoice><guimenu>Edit</"
+"guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>). You can also "
+"disable physical copying of images to that directory and make F-Spot only "
+"reference to existing files. For that you need to disable checkbox "
+"<guilabel>Copy files to the Photos folder</guilabel>."
+msgstr ""
+"Типово, F-Spot копіює фотографії до теки <filename class=\"directory\">~/"
+"Фотографії</filename>. Теку призначення F-Spot можна змінити в діалозі "
+"<guilabel>Параметри</guilabel> (<menuchoice><guimenu>Правка</"
+"guimenu><guimenuitem>Параметри</guimenuitem></menuchoice>). Також можна "
+"вимкнути фізичне копіювання зображень в цей каталог і створити лише "
+"посилання в F-Spot на існуючі файли. Для цього потрібно зняти прапорець "
+"<guilabel>Копіювати файли до теки «Фотографії»</guilabel>."
+
+#: C/f-spot.xml:85(para)
+msgid ""
+"If there is a tiny chance that some of your photos are already imported from "
+"the chosen source, you can use <guilabel>Detect duplicates</guilabel> "
+"option. In this case F-Spot will try to find out if exactly this image is "
+"already present in the database and thus new copy of it should not be "
+"imported."
+msgstr ""
+"Якщо є вірогідність, що деякі з ваших фотографій вже імпортовано з вибраного "
+"джерела, використовуйте функцію <guilabel>Виявлення дублікатів</guilabel>. У "
+"цьому випадку F-Spot спробує з'ясувати чи це зображення вже є в базі даних "
+"і, якщо є, нова копія не буде імпортована."
+
+#: C/f-spot.xml:92(para)
+msgid ""
+"If all the photos you are importing at one time are from a particular event, "
+"or have some other characteristic in common, you can create a tag for them "
+"so you can later find them with ease. To do this, follow the instructions "
+"from <xref linkend=\"tag\"/> to create a new tag, then when you are "
+"importing them, check the button for <guilabel>Attach Tag</guilabel> and "
+"choose the tag you created."
+msgstr ""
+"Якщо всі фотографії, які імпортуються за один раз, мають відношення до "
+"певної події чи мають інші загальні характеристики, ви можете створити "
+"позначку для них, щоб пізніше з легкістю знайти їх. Щоб зробити це, дивіться "
+"<xref linkend=\"tag\"/> зробіть нову позначку, потім, під час імпортування "
+"фото, натисніть кнопку <guilabel>Додати позначку</guilabel> і виберіть "
+"створену вами позначку."
+
+#: C/f-spot.xml:102(para)
+msgid ""
+"F-Spot uses a database stored at <filename>~/.config/f-spot/photos.db</"
+"filename>. Note, to access it, use the sqlite3 command. You can also "
+"manually specify path to a database by running F-Spot with <option>-b</"
+"option> option."
+msgstr ""
+"F-Spot використовує базу даних розташовану в каталозі <filename>~/.config/f-"
+"spot/photos.db</filename>. Зверніть увагу, щоб отримати доступ до нього, "
+"потрібно використовувати команду sqlite3. Ви також можете вручну вказати "
+"шлях до бази даних, запустивши F-Spot з параметром <option>-b</option>."
+
+#: C/f-spot.xml:110(para)
+msgid ""
+"After an import, F-Spot will display the pictures of the latest import roll "
+"only. Read <xref linkend=\"enjoying-search\"/> to learn how to deal with "
+"import rolls."
+msgstr ""
+"Після імпорту, F-Spot покаже фотографії лише з останнього сеансу імпорту. "
+"Щоб дізнатися, як мати справу з сеансами імпорту, дивіться <xref linkend="
+"\"enjoying-search\"/>."
+
+#: C/f-spot.xml:115(para)
+msgid ""
+"You can also import directly from Mozilla <ulink url=\"http://www.mozilla."
+"com/en-US/firefox/\">Firefox</ulink> and <ulink url=\"http://www.mozilla.com/"
+"en-US/thunderbird/\">Thunderbird</ulink> using <ulink url=\"https://addons."
+"mozilla.org/en-US/firefox/addon/7091\">Firefox</ulink> and <ulink url="
+"\"https://addons.mozilla.org/en-US/thunderbird/addon/7011\">Thunderbird</"
+"ulink> F-Spot importer extensions written by <ulink url=\"http://"
+"personalpages.tds.net/~cdovel/\">Pizzach</ulink>."
+msgstr ""
+"Імпортувати можна прямо з Mozilla <ulink url=\"http://www.mozilla.com/en-US/"
+"firefox/\">Firefox</ulink> та <ulink url=\"http://www.mozilla.com/en-US/"
+"thunderbird/\">Thunderbird</ulink> використовуючи розширення <ulink url="
+"\"https://addons.mozilla.org/en-US/firefox/addon/7091\">Firefox</ulink> та "
+"<ulink url=\"https://addons.mozilla.org/en-US/thunderbird/addon/7011"
+"\">Thunderbird</ulink> F-Spot для імпортування фото, написане <ulink url="
+"\"http://personalpages.tds.net/~cdovel/\">Pizzach</ulink>."
+
+#: C/f-spot.xml:127(title)
+msgid "Edit"
+msgstr "Редагування"
+
+#: C/f-spot.xml:129(para)
+msgid ""
+"If you double click or press enter on an image, you enter Edit mode, where "
+"you can remove red-eye, crop, and adjust brightness and colors."
+msgstr ""
+"Двічі клацніть кнопкою миші з вказівником на зображені або натисніть клавішу "
+"ENTER, щоб перейти в режим редагування, де можна вилучити ефект червоних "
+"очей, зробити кадрування та налаштувати яскравість та кольори."
+
+#: C/f-spot.xml:135(title)
+msgid "Versions"
+msgstr "Версії"
+
+#: C/f-spot.xml:137(para)
+msgid ""
+"When you edit your photos, a new copy (called a version) is created, so your "
+"original is never altered. After your first edit to a photo, subsequent "
+"edits will modify the same version. If you want to create multiple versions "
+"of your photo, perhaps with different cropping or coloring, you can do so "
+"via the <menuchoice><guimenu>File</guimenu><guimenuitem>Create new version</"
+"guimenuitem></menuchoice> option."
+msgstr ""
+"Під час редагування фотографій, створюється нова копія (або варіант), так що "
+"ваші оригінальні фото ніколи не змінюються. Після першого редагування, "
+"наступні виправлення вноситимуться в ту ж версію. Якщо потрібно створити "
+"декілька версій фотографії, можливо, різних розмірів і забарвлення, зробити "
+"це можна вибравши в меню <menuchoice><guimenu>Файл</"
+"guimenu><guimenuitem>Створити нову версію</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:148(title)
+msgid "Crop"
+msgstr "Кадрування"
+
+#: C/f-spot.xml:150(para)
+msgid ""
+"Cropping an image is a great way to improve the quality of a photograph by "
+"change how it is framed. You crop a photo by selecting the part of the photo "
+"you want to keep. If you want your photo to be the exact dimensions "
+"necessary for a certain print size, you can constrain the kind of selection "
+"F-Spot will allow you to draw by choosing the appropriate size from the "
+"constraint drop down. See the <xref linkend=\"edit-remove-red-eye\"/> below "
+"for details on making a selection on your photo."
+msgstr ""
+"Кадрування зображення — відмінний спосіб поліпшити якість фотографії "
+"змінивши її оформлення. Щоб виконати кадрування фото, виберіть частину "
+"фотографії, яку хотіли б зберегти. Якщо потрібно, щоб фотографія мала точні "
+"розміри необхідні для друку, можна вибрати готовий варіант. F-Spot дає змогу "
+"вибрати відповідний розмір зі спадного списку варіантів кадрування. "
+"Докладніше дивіться <xref linkend=\"edit-remove-red-eye\"/> про внесення "
+"змін до фотографій."
+
+#: C/f-spot.xml:160(title)
+msgid "Crop tool"
+msgstr "Кадрування"
+
+#: C/f-spot.xml:167(para) C/f-spot.xml:368(para)
+msgid ""
+"Once you have made your crop selection, you must click the crop button "
+"beneath the image to finalize the crop. If you are working with the original "
+"photo, cropping creates a new version your photo."
+msgstr ""
+"Як тільки буде вибраний варіант кадрування, необхідно натиснути кнопку "
+"«Кадрувати» під зображенням, щоб завершити кадрування. Якщо ви працюєте з "
+"оригіналом фотографії, операція кадрування створить нову версію цієї "
+"фотографії."
+
+#: C/f-spot.xml:175(title)
+msgid "Straighten"
+msgstr "Вирівнювання"
+
+#: C/f-spot.xml:177(para)
+msgid ""
+"Straighten effect is a tool to level a photo, quite helpful for landscapes "
+"taken without a tripod, when (imaginary) line of horizon is not at 0°. This "
+"tool rotates an image by a specified angle and automagically crops the "
+"resulted image, so that you always see a perfect rectangle."
+msgstr ""
+"Ефект вирівнювання — це інструмент для вирівнювання зображення на фото, "
+"досить корисний для фотографування пейзажів без штатива, коли (уявна) лінія "
+"горизонту не дорівнює 0°. Цей інструмент дає змогу зробити поворот "
+"зображення на заданий кут і автоматично кадрувати виникле зображення, отже, "
+"ви завжди бачитимете досконалий прямокутник."
+
+#: C/f-spot.xml:184(title)
+msgid "Straighten tool"
+msgstr "Вирівнювання"
+
+#: C/f-spot.xml:194(title)
+msgid "Adjust Colors"
+msgstr "Коригування кольорів"
+
+#: C/f-spot.xml:196(para)
+msgid ""
+"To adjust the brightness, contrast, and colors of a photo, first click the "
+"<guibutton>Adjust the photo colors</guibutton> icon to open the adjustment "
+"dialog. Change then some settings and save them with <guibutton>OK</"
+"guibutton>."
+msgstr ""
+"Щоб відкоригувати яскравість, контрастність і кольори фотографії, натисніть "
+"кнопку <guibutton>Коригувати кольори</guibutton>, щоб відкрити діалог "
+"коригування. Змініть потрібні параметри і збережіть їх натиснувши кнопку "
+"<guibutton>Гаразд</guibutton>."
+
+#: C/f-spot.xml:203(title)
+msgid "Adjust Colors tool"
+msgstr "Коригувати кольори"
+
+#: C/f-spot.xml:213(title) C/f-spot.xml:221(title)
+msgid "AutoColor"
+msgstr "Автокорекція кольорів"
+
+#: C/f-spot.xml:215(para)
+msgid ""
+"This effect automatically adjusts color levels to make a pretty balanced "
+"picture color-wise. It serves best for pictures taken with automatical white "
+"balance, when camera didn't manage to do the job well."
+msgstr ""
+"Цей ефект автоматично коригує рівні яскравості та кольору, щоб зробити "
+"зображення з приємно-збалансованими кольорами. Найкраще його використовувати "
+"для фотографій, зроблених з автоматичним балансом білого, коли камері не "
+"вдалося зробити знімок добре."
+
+#: C/f-spot.xml:231(title)
+msgid "Desaturate"
+msgstr "Знебарвлення"
+
+#: C/f-spot.xml:233(para)
+msgid ""
+"To make a colorful photo a black and white one, open a photo of choice and "
+"press <guibutton>Desaturate</guibutton> button."
+msgstr ""
+"Щоб зробити кольорову фотографію чорно-білою, відкрийте потрібну фотографію "
+"та натисніть кнопку <guibutton>Знебарвлення</guibutton>."
+
+#: C/f-spot.xml:238(title) C/f-spot.xml:255(title)
+msgid "Desaturation tool"
+msgstr "Знебарвлення"
+
+#: C/f-spot.xml:248(title)
+msgid "Sepia"
+msgstr "Сепія"
+
+#: C/f-spot.xml:250(para)
+msgid ""
+"To make a colorful photo look like an old-style picture in sepia tones, open "
+"a photo of choice and press <guibutton>Sepia</guibutton> button."
+msgstr ""
+"Щоб зробити кольорову фотографію, як зображення у старому стилі з відтінками "
+"у сепії, відкрийте потрібну фотографію та натисніть кнопку "
+"<guibutton>Тонувати у сепію</guibutton>."
+
+#: C/f-spot.xml:265(title)
+msgid "Remove Red-Eye"
+msgstr "Вилучення ефекту червоних очей"
+
+#: C/f-spot.xml:267(para)
+msgid ""
+"To remove redeye from a photo, you need to select a zone containing the "
+"eyes. You may want to zoom in on the image to accurately select the eyes in "
+"the photo. You should be able to correct both eyes on the same person in one "
+"shot, or even the eyes from multiple people at once. If this doesn't work "
+"for you, or the selected zone contains some vivid red parts (lips, ...) "
+"you'll probably have to correct one red eye at a time."
+msgstr ""
+"Щоб вилучити ефект червоних очей з фотографії, необхідно вибрати область, "
+"яка містить очі. Якщо потрібно, збільшіть зображення, щоб вибрати точне "
+"розташування очей на фотографії. Необхідно відкоригувати обидва ока однієї і "
+"тієї ж особи або навіть очі кількох людей за один раз. Якщо не вдасться це "
+"зробити, або вибрана область містить яскраві червоні елементи (губи тощо) "
+"вам, ймовірно, прийдеться усувати ефект червоних очей для кожного ока окремо."
+
+#: C/f-spot.xml:275(para)
+msgid ""
+"To make your selection, click one corner of the rectangle that will be your "
+"selection, and drag your mouse to the diagonal corner and release it. You "
+"can resize your selection by dragging its edges, and you can move it by "
+"clicking in the middle of it and dragging it to where you want it."
+msgstr ""
+"Щоб вибрати область очей, натисніть ліву кнопку миші з вказівником в одному "
+"кутку майбутнього прямокутника і перетягніть мишу по діагоналі в протилежний "
+"кут і відпустіть кнопку. Змінювати розмір прямокутника можна шляхом "
+"перетягування його країв. Щоб перемістити прямокутник, потрібно натиснути "
+"ліву кнопку миші з вказівником в його середині і перетягнути його в потрібне "
+"місце."
+
+#: C/f-spot.xml:281(para)
+msgid ""
+"Once you have selected a zone, you can remove the red from it by clicking "
+"the red-eye button beneath the photo."
+msgstr ""
+"Після виділення області червоних очей, вилучіть ефект, натиснувши кнопку "
+"«Корекція червоних очей», розташовану під фотографією."
+
+#: C/f-spot.xml:286(title)
+msgid "Red-Eye tool"
+msgstr "Корекція червоних очей"
+
+#: C/f-spot.xml:294(para)
+msgid ""
+"You can change the threshold for redeyes detection by changing the gconf key "
+"<filename class=\"directory\">/apps/f-spot/edit/redeye_threshold</filename>."
+msgstr ""
+"Ви можете змінити поріг виявлення ефекту червоних очей змінивши ключ gconf "
+"<filename class=\"directory\">/apps/f-spot/edit/redeye_threshold</filename>."
+
+#: C/f-spot.xml:303(title)
+msgid "Soft Focus"
+msgstr "М’який фокус"
+
+#: C/f-spot.xml:305(para)
+msgid ""
+"In photography sharpening one region of a picture, while blurring all the "
+"rest, is a way to make an emphasis and grab attention. It is achieved by "
+"using a lens that allows shooting with a short distance in front of and "
+"beyond the subject that appears to be in focus. Soft focus effect is a way "
+"to emulate such a lens."
+msgstr ""
+"У фотографії, збільшення різкості однієї області зображення, в той час як "
+"інша залишається нечіткою — спосіб зробити акцент та привернути увагу. Цей "
+"ефект досягається шляхом використання лінз, які дають змогу фотографувати з "
+"короткої відстані перед і за об'єктом, в той час як він залишається у "
+"фокусі. Способом для імітації таких лінз і є ефект «М'який фокус»."
+
+#: C/f-spot.xml:313(title)
+msgid "Soft Focus tool"
+msgstr "М’який фокус"
+
+#: C/f-spot.xml:320(para)
+msgid ""
+"Click to choose central point of the area you want to be in focus and adjust "
+"amount of blurring, then click <guibutton>OK</guibutton>."
+msgstr ""
+"Натисніть, щоб вибрати центральну точку області, яку хочете мати у фокусі та "
+"встановіть величину нечіткого зображення і натисніть кнопку "
+"<guibutton>Гаразд</guibutton>."
+
+#: C/f-spot.xml:327(title)
+msgid "Sharpen"
+msgstr "Різкість"
+
+#: C/f-spot.xml:329(para)
+msgid ""
+"Out-of-focus photographs and most digitized images often need a sharpness "
+"correction. The Unsharp Mask effect sharpens edges of the elements without "
+"increasing noise or blemish. To sharpen a photo choose "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Sharpen...</guimenuitem></"
+"menuchoice> and specify the following values:"
+msgstr ""
+"Фотографії не у фокусі та більшість оцифрованих зображень часто потребують "
+"корекції різкості. Ефект «Unsharp Mask» надає різкості краям елементів без "
+"збільшення кількості вад чи плям. Щоб збільшити різкість фото виберіть в "
+"меню <menuchoice><guimenu>Правка</guimenu><guimenuitem>Підвищити різкість..."
+"</guimenuitem></menuchoice> і деталізуйте такі значення:"
+
+#: C/f-spot.xml:340(para)
+msgid ""
+"<parameter class=\"option\">Amount</parameter> — strength of sharpening."
+msgstr ""
+"<parameter class=\"option\">Величина</parameter> — інтенсивність різкості."
+
+#: C/f-spot.xml:345(para)
+msgid ""
+"<parameter class=\"option\">Radius</parameter> — how many pixels on either "
+"side of an edge will be affected by sharpening. High resolution images allow "
+"higher radius."
+msgstr ""
+"<parameter class=\"option\">Радіус</parameter> — відстань в пікселях з "
+"кожного боку лінії, на яку впливатиме збільшення різкості. Зображення з "
+"високою роздільною здатністю допускають більший радіус."
+
+#: C/f-spot.xml:352(para)
+msgid ""
+"<parameter class=\"option\">Threshold</parameter> — the minimum difference "
+"in pixel values that indicates an edge where sharpen must be applied. This "
+"helps avoiding creation of blemishes in face, sky or water surface."
+msgstr ""
+"<parameter class=\"option\">Поріг</parameter> — мінімальна різниця в "
+"пікселях, яка показує ширину лінії до якої буде застосоване збільшення "
+"різкості. Дає змогу уникнути створення плям на обличчі, небі або поверхні "
+"води."
+
+#: C/f-spot.xml:362(title)
+msgid "Describe"
+msgstr "Опис"
+
+#: C/f-spot.xml:364(para)
+msgid ""
+"You can also enter a description of the image by clicking on the text entry "
+"box below the image and typing."
+msgstr ""
+"Ви можете також зробити опис зображення клацнувши на полі введення тексту "
+"під зображенням і ввести потрібний текст."
+
+#: C/f-spot.xml:376(title)
+msgid "Adjust Time"
+msgstr "Коригування часу"
+
+#: C/f-spot.xml:378(para)
+msgid ""
+"In both 'browse' or 'edit' modes, you can adjust the time of one or multiple "
+"pictures (<menuchoice><guimenu>Edit</guimenu><guimenuitem>Adjust Time</"
+"guimenuitem></menuchoice>). Adjusting the time of multiple pictures at once "
+"helps you shift all an import roll if, e.g. the time on your camera is badly "
+"set or if you forgot to change it according to DST."
+msgstr ""
+"Як в режимі перегляду так і в режимі редагування, можна скоригувати час для "
+"одного або багатьох зображень (<menuchoice><guimenu>Правка</"
+"guimenu><guimenuitem>Коригувати час</guimenuitem></menuchoice>). Коригування "
+"часу для багатьох фотографій одночасно дає змогу змістити час на всіх фото з "
+"сеансу імпорту, наприклад, якщо час на вашій камері невірно встановлений, "
+"або якщо ви забули змінити його у відповідності до DST."
+
+#: C/f-spot.xml:390(title)
+msgid "Tag"
+msgstr "Позначка"
+
+#: C/f-spot.xml:391(para)
+msgid ""
+"F-Spot enables you to organize and enjoy your photos by associating them "
+"with various user-customizable tags. A tag is a merely a label. F-Spot comes "
+"with default tags to get you started; you are free to change them and add "
+"new ones. For example, if you want to create a tag for specific event, you "
+"can create a new tag named after that event under the Events tag."
+msgstr ""
+"F-Spot дає змогу упорядкувати і користуватись фотографіями, пов’язуючи їх "
+"різними користувацькими позначками. Позначка це всього лише ярлик. F-Spot "
+"поставляється з типовими позначками, щоб ви могли розпочати працювати з "
+"ними. Їх можна змінювати або додавати нові. Наприклад, якщо ви хочете "
+"створити позначку для особливої події, дайте їй назву цієї події під "
+"позначкою «Події»."
+
+#: C/f-spot.xml:398(para)
+msgid "There are many ways to tag photos:"
+msgstr "Є багато способів позначати фотографії:"
+
+#: C/f-spot.xml:403(para)
+msgid "drag and drop the photo(s) onto the tag"
+msgstr "перетягнути фото на позначку"
+
+#: C/f-spot.xml:408(para)
+msgid "drag and drop the tag onto the photo(s)"
+msgstr "перетягнути позначку на фото"
+
+#: C/f-spot.xml:413(para)
+msgid "via the photo's right-click menu"
+msgstr "через контекстне меню фото"
+
+#: C/f-spot.xml:418(para)
+msgid "via the Tags and Edit menus"
+msgstr "через меню «Позначки» та «Правка»"
+
+#: C/f-spot.xml:423(para)
+msgid ""
+"by typing them in. Press <keycap>t</keycap> to pop up the tag entry bar. "
+"Here you can enter the tags, separated by commas."
+msgstr ""
+"просто введіть їх. Натисніть клавішу <keycap>t</keycap>, щоб викликати поле "
+"введення позначки і введіть текст позначок, відокремлюючи їх комами."
+
+#: C/f-spot.xml:427(para)
+msgid ""
+"You can also use auto-completion in this entry bar: After entering the "
+"beginning of a tag name, press <keycap>Tab</keycap> to see the first "
+"possible completion. You can cycle between other possible completions by "
+"pressing <keycap>Tab</keycap> again, and backwards with <keycombo action="
+"\"simul\"><keycap>Shift</keycap><keycap>Tab</keycap></keycombo>. To confirm "
+"the suggested completion and enter a new tag, press <keycap>,</keycap>. By "
+"pressing <keycap>Enter</keycap> you leave the tag entry bar, possibly "
+"confirming the current completion. To abort the auto completion, just keep "
+"on typing."
+msgstr ""
+"В цьому полі введення можна використовувати авто-завершення. Після введення "
+"початку назви позначки, натисніть клавішу <keycap>Tab</keycap>, щоб побачити "
+"перший можливий варіант завершення. Циклічно натискайте клавішу <keycap>Tab</"
+"keycap>, щоб переходити між варіантами завершення або комбінацію клавіш "
+"<keycombo action=\"simul\"><keycap>Shift</keycap><keycap>Tab</keycap></"
+"keycombo>, щоб переходити у зворотньому напрямку. Для підтвердження "
+"запропонованого завершення і введення нової позначки, натисніть клавішу "
+"<keycap>,</keycap>. Натиснувши клавішу <keycap>Enter</keycap> ви залишаєте "
+"поле введення, підтвердивши чинне завершення. Щоб скасувати авто-завершення, "
+"просто продовжуйте вводити текст."
+
+#: C/f-spot.xml:441(para)
+msgid ""
+"The first photo you associate with a tag will be used for that tag's icon. "
+"You can always edit a tag's name, parent tag, and icon by right clicking on "
+"it and choosing <guilabel>Edit tag</guilabel>."
+msgstr ""
+"Перше фото, яке пов’язане з позначкою, буде використовуватися як значок для "
+"цієї позначки. Ви завжди можете змінити назву позначки, батьківську позначку "
+"та значок, вибравши в контекстному меню пункт <guilabel>Редагувати позначку</"
+"guilabel>."
+
+#: C/f-spot.xml:446(para)
+msgid ""
+"You can change a tag's parent by dragging and dropping it where you like. "
+"Also, you can edit the name of a tag by selecting it and pressing "
+"<keycap>F2</keycap>. Lastly, if you have the tag tree widget focused (e.g. "
+"you just clicked on a tag), you can start typing the name of a tag, and all "
+"the expanded tags in the list will be searched and you'll jump to any "
+"matching ones."
+msgstr ""
+"Ви можете змінити батька позначки, перетягнувши її в будь-яке місце. Крім "
+"того, можна змінити назву позначки виділивши її та натиснувши <keycap>F2</"
+"keycap>. І нарешті, якщо віджет дерева позначок у фокусі (наприклад, ви "
+"тільки що натиснули на позначку), ви можете просто почати вводити назву "
+"позначки і пошук вестиметься по всьому списку позначок і ви перейдете у "
+"відповідну."
+
+#: C/f-spot.xml:455(para)
+msgid ""
+"You can also change size of tag icons in the sidebar or even make tag icons "
+"invisible by selecting preferred option from <menuchoice><guimenu>View</"
+"guimenu><guimenuitem>Tag Icons</guimenuitem></menuchoice> menu."
+msgstr ""
+"Щоб змінити розмір значка позначки в бічній панелі, або навіть зробити його "
+"невидимим, виберіть потрібний варіант в меню <menuchoice><guimenu>Вигляд</"
+"guimenu><guimenuitem>Значки позначок</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:463(para)
+msgid ""
+"F-Spot can write tags as metadata fields into JPEG files. Tags for various "
+"RAW files, PNG, TIFF, and others are written to F-Spot's database. You will "
+"have to re-tag these files if you re-import your collection."
+msgstr ""
+"F-Spot може записувати позначки як поля метаданих у файли JPEG. Позначки для "
+"різних форматів файлів: RAW, PNG, TIFF та інших, записуються у базу даних F-"
+"Spot. Вам доведеться заново позначати ці файли, якщо ви повторно "
+"імпортуватимете колекцію."
+
+#: C/f-spot.xml:474(title)
+msgid "Enjoying your photos"
+msgstr "Перегляд фотографій"
+
+#: C/f-spot.xml:476(title)
+msgid "Browse"
+msgstr "Перегляд"
+
+#: C/f-spot.xml:477(para)
+msgid ""
+"You can use the slider widget to browse your photos by month or by "
+"directory. To change this setting, go to <menuchoice><guimenu>View</"
+"guimenu><guimenuitem>Arranged By</guimenuitem></menuchoice>."
+msgstr ""
+"Використовуйте повзунок для перегляду фотографій за датою створення або за "
+"каталогом. Щоб змінити цей параметр, перейдіть до меню "
+"<menuchoice><guimenu>Вигляд</guimenu><guimenuitem>Упорядкувати за</"
+"guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:485(title)
+msgid "Search"
+msgstr "Пошук"
+
+#: C/f-spot.xml:487(para)
+msgid "F-Spot uses search filters to help you better define search criteria."
+msgstr ""
+"F-Spot використовує пошукові фільтри, щоб допомогти вам краще визначити "
+"критерії пошуку."
+
+#: C/f-spot.xml:492(title)
+msgid "Tags"
+msgstr "Позначки"
+
+#: C/f-spot.xml:494(para)
+msgid ""
+"You can start a search by double clicking or activating a tag from the tag "
+"list. Alternatively, you can show the find bar with "
+"<menuchoice><guimenu>Find</guimenu><guimenuitem>Show Find Bar</guimenuitem></"
+"menuchoice>. With the find bar shown, you can drag tags from the tag view to "
+"the find bar."
+msgstr ""
+"Почати пошук можна за допомогою подвійного натискання або активувавши "
+"позначку в списку позначок. Як альтернатива, відкрийте панель пошуку через "
+"меню <menuchoice><guimenu>Знайти</guimenu><guimenuitem>Показати панель "
+"пошуку</guimenuitem></menuchoice> та перетягніть позначку з бічної панелі на "
+"панель пошуку."
+
+#: C/f-spot.xml:500(para)
+msgid ""
+"To find photos that are tagged with both of two tags, activate the first in "
+"the tag view or drag it onto the find bar, then drag the second tag and drop "
+"it on top of the first. You can also right click on the second tag in the "
+"tag view, or use the <guimenu>Find</guimenu> menu, and choose "
+"<guimenuitem>Find With...</guimenuitem> and select the first tag (or group "
+"of tags)."
+msgstr ""
+"Щоб знайти фото помічені двома позначками, активуйте першу в бічній панелі "
+"або перетягніть її на панель пошуку, потім перетягніть другу і помістіть її "
+"поверх першої. Також можна натиснути праву кнопку миші з вказівником на "
+"другій позначці в бічній панелі або через меню <guimenu>Знайти</guimenu>, і "
+"в контекстному меню вибрати пункт <guimenuitem>Шукати з...</guimenuitem> і "
+"вибрати першу позначку (чи групу позначок)."
+
+#: C/f-spot.xml:507(para)
+msgid ""
+"You can drag a tag icon around on the find bar to change from finding it and "
+"another tag to finding it or another tag."
+msgstr ""
+"Щоб знайти фотографію з певною позначкою, перетягніть її значок на панель "
+"пошуку."
+
+#: C/f-spot.xml:511(para)
+msgid ""
+"You can search for photos that do not have a particular tag by double-"
+"clicking on a tag in the find bar. Alternatively, you can right-click a tag "
+"in the find bar and select <guimenuitem>Exclude</guimenuitem>."
+msgstr ""
+"Можна шукати фото, які не мають окремої позначки, двічі клацнувши на "
+"позначці в панелі пошуку. Як альтернатива, натисніть праву кнопку миші з "
+"вказівником на позначці в панелі пошуку і виберіть <guimenuitem>Виключаючи "
+"знімки з позначкою</guimenuitem>."
+
+#: C/f-spot.xml:516(para)
+msgid ""
+"To remove a tag from the search, drag it away from the find bar, or right "
+"click and select <guimenuitem>Remove</guimenuitem>."
+msgstr ""
+"Щоб вилучити позначку з пошуку, перетягніть її з панелі пошуку, або "
+"натисніть праву кнопку миші з вказівником на ній і виберіть в контекстному "
+"меню пункт <guimenuitem>Вилучити з пошуку</guimenuitem>."
+
+#: C/f-spot.xml:520(para)
+msgid ""
+"By default, photos tagged <emphasis>Hidden</emphasis> will not be shown. You "
+"must explicitly include the <emphasis>Hidden</emphasis> tag in your search "
+"to show such photos."
+msgstr ""
+"Типово, фото під позначкою <emphasis>Приховане</emphasis> не будуть "
+"показані. Ви маєте явно включити позначку <emphasis>Приховане</emphasis> у "
+"пошук, щоб побачити ці фото."
+
+#: C/f-spot.xml:528(title)
+msgid "Import Rolls"
+msgstr "Сеанси імпорту"
+
+#: C/f-spot.xml:529(para)
+msgid ""
+"F-Spot remembers what pictures were imported every now and then. Use "
+"<menuchoice><guimenu>Find</guimenu><guisubmenu>Import Roll</"
+"guisubmenu><guimenuitem>Last import roll</guimenuitem></menuchoice> to limit "
+"search to last importing session or use <menuchoice><guimenu>Find</"
+"guimenu><guisubmenu>Import Roll</guisubmenu><guimenuitem>Select Import "
+"Rolls...</guimenuitem></menuchoice> to make a finer selection of imported "
+"photos:"
+msgstr ""
+"F-Spot пам’ятає які зображення імпортуються час від часу. Скористайтесь меню "
+"<menuchoice><guimenu>Знайти</guimenu><guisubmenu>Сеанс імпорту</"
+"guisubmenu><guimenuitem>Останній сеанс імпорту</guimenuitem></menuchoice>, "
+"щоб обмежити пошук лише останнім сеансом імпорту, або меню "
+"<menuchoice><guimenu>Знайти</guimenu><guisubmenu>Сеанс імпорту</"
+"guisubmenu><guimenuitem>Вибрати сеанс імпорту...</guimenuitem></menuchoice>, "
+"щоб зробити детальний відбір імпортованих фотографій:"
+
+#: C/f-spot.xml:539(para)
+msgid ""
+"<parameter class=\"option\">At</parameter> — to select photos from a "
+"particular importing session"
+msgstr ""
+"<parameter class=\"option\">Під час</parameter> — щоб вибрати фотографії з "
+"конкретного сеансу імпорту"
+
+#: C/f-spot.xml:544(para)
+msgid ""
+"<parameter class=\"option\">After</parameter> — to select all photos "
+"imported begining with a particular importing session"
+msgstr ""
+"<parameter class=\"option\">Після</parameter> — щоб вибрати всі фотографії, "
+"імпортовані починаючи з конкретного сеансу імпорту"
+
+#: C/f-spot.xml:549(para)
+msgid ""
+"<parameter class=\"option\">Between</parameter> — to select all photos "
+"imported between two particular importing sessions"
+msgstr ""
+"<parameter class=\"option\">Між</parameter> — щоб вибрати всі фотографії, "
+"імпортовані між двома конкретними сеансами імпорту"
+
+#: C/f-spot.xml:554(para)
+msgid ""
+"Every time you change settings of the filter, the amount of selected photos "
+"will appear in the bottom part of the dialog."
+msgstr ""
+"Під час кожної зміни параметрів фільтра, кількість вибраних фотографій "
+"з'являтиметься в нижній частині діалогового вікна."
+
+#: C/f-spot.xml:558(para)
+msgid ""
+"When you apply Import Roll filter, in the Find bar you will see "
+"<guilabel>Find: Import Roll</guilabel>. Now you can add some other filter to "
+"finetune your selection."
+msgstr ""
+"Коли ви підтвердите вибір даних у фільтрі сеансу імпорту, в панелі пошуку "
+"з’явиться рядок <guilabel>Знайти: Сеанс імпорту</guilabel>. Тепер ви можете "
+"додати інші фільтри, щоб деталізувати критерії пошуку."
+
+#: C/f-spot.xml:563(para)
+msgid ""
+"If you don't need the Import Roll filter anymore, choose "
+"<menuchoice><guimenu>Find</guimenu><guisubmenu>Import Roll</"
+"guisubmenu><guimenuitem>Clear roll filter</guimenuitem></menuchoice> to "
+"remove Import Roll from search criteria. You can also click the close button "
+"(<guibutton>X</guibutton>) of the search bar to discard all the current "
+"search options."
+msgstr ""
+"Якщо ви більше не потребуєте фільтра сеансу імпорту, виберіть в меню "
+"<menuchoice><guimenu>Знайти</guimenu><guisubmenu>Сеанс імпорту</"
+"guisubmenu><guimenuitem>Прибрати фільтр сеансів імпорту</guimenuitem></"
+"menuchoice>, щоб вилучити сеанс імпорту з критеріїв пошуку. Також можна "
+"натиснути кнопку закривання (<guibutton>X</guibutton>) панелі пошуку, щоб "
+"відкинути всі наявні варіанти пошуку."
+
+#: C/f-spot.xml:572(para)
+msgid ""
+"The number of displayed rolls in the dialog is defined by the gconf key "
+"<filename class=\"directory\">/apps/f-spot/import/gui_roll_history</"
+"filename>. Default value is 10."
+msgstr ""
+"Кількість сеансів, які будуть показані у діалоговому вікні визначається "
+"ключем gconf <filename class=\"directory\">/apps/f-spot/import/"
+"gui_roll_history</filename>. Типове значення — 10."
+
+#: C/f-spot.xml:581(title)
+msgid "Type-to-find"
+msgstr "Пошук під час введення"
+
+#: C/f-spot.xml:582(para)
+msgid ""
+"There is also a type-to-find entry. Press <keycap>/</keycap> to open it. It "
+"cannot be used at the same time as the find bar. You can type queries such "
+"as \"TagA and (TagB or (TagC and TagD))\". At any point, if F-Spot "
+"recognizes what you've typed as a valid query, it will update your search. "
+"The <emphasis>not</emphasis> operator is not yet supported."
+msgstr ""
+"Існує також поле для пошуку під час введення. Натисніть клавішу <keycap>/</"
+"keycap>, щоб його відкрити. Це поле не можна використовувати одночасно з "
+"панеллю пошуку. Введіть запит таким чином: позначкаA та (позначкаB або "
+"(позначкаC та позначкаD)). Як тільки F-Spot розпізнає введене як правильний "
+"запит, результат пошуку з'явиться у вікні. Оператор <emphasis>not</emphasis> "
+"поки що не підтримується."
+
+#: C/f-spot.xml:590(para)
+msgid ""
+"This function will also search for the typed text into photos comments and "
+"filename."
+msgstr ""
+"За допомогою цієї функції, пошук введеного тексту вестиметься також у "
+"коментарях та у назвах файлів фотографій."
+
+#: C/f-spot.xml:597(title)
+msgid "Fullscreen Mode and Slideshows"
+msgstr "Повноекранний режим та показ слайдів"
+
+#: C/f-spot.xml:598(para)
+msgid ""
+"For fewer distractions and larger display, you can view your photos in full "
+"screen mode. You control when to show the next photo or to return to the "
+"previous. Enter fullscreen mode by pressing <keycap>F11</keycap> at any time "
+"or by pressing the button in the toolbar."
+msgstr ""
+"Щоб менше відволікатися і побачити зображення більшими, фотографії можна "
+"переглядати в повноекранному режимі. У цьому режимі доступний перехід до "
+"наступного фото або повернення до попереднього. Щоб перейти у повноекранний "
+"режим, натисніть клавішу <keycap>F11</keycap> або кнопку на панелі "
+"інструментів."
+
+#: C/f-spot.xml:605(title)
+msgid "FullScreen"
+msgstr "На весь екран"
+
+#: C/f-spot.xml:612(para)
+msgid ""
+"In slideshow mode, you can sit back and view your photos as they are "
+"presented to you. You can start a slideshow by pressing the button on the "
+"toolbar."
+msgstr ""
+"У режимі перегляду слайдів, ви можете сидіти склавши руки і переглядати "
+"фотографії одну за іншою. Щоб запустити показ слайдів, натисніть кнопку на "
+"панелі інструментів."
+
+#: C/f-spot.xml:618(title)
+msgid "SlideShow"
+msgstr "Показ слайдів"
+
+#: C/f-spot.xml:629(title)
+msgid "Sharing your photos"
+msgstr "Спільне користування фотографіями"
+
+#: C/f-spot.xml:632(para)
+msgid ""
+"There are many ways to share your photos using F-Spot. All of the following "
+"methods will only share the photos you have selected when you run them."
+msgstr ""
+"Існує багато способів, спільного користування фотографіями у F-Spot. Усі "
+"наступні методи спільного користування фотографіями доступні лише, якщо ви "
+"виберете їх під час запуску."
+
+#: C/f-spot.xml:639(title)
+msgid "E-mail"
+msgstr "Пересилка електронною поштою"
+
+#: C/f-spot.xml:640(para)
+msgid ""
+"E-mail your photos directly from F-Spot with the <menuchoice><guimenu>File</"
+"guimenu><guimenuitem>Send Mail</guimenuitem></menuchoice> menu."
+msgstr ""
+"Надіслати свої фото електронною поштою можна прямо з F-Spot через меню "
+"<menuchoice><guimenu>Файл</guimenu><guimenuitem>Надіслати поштою</"
+"guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:646(title)
+msgid "Note 1"
+msgstr "Зауваження 1"
+
+#: C/f-spot.xml:647(para)
+msgid ""
+"The email program used for this is defined at the GNOME level. You can "
+"change the default e-mailer for your user using the <application>Preferred "
+"Applications</application> tool in <menuchoice><guimenu>System</"
+"guimenu><guisubmenu>Preferences</guisubmenu></menuchoice>."
+msgstr ""
+"Поштова програма, що використовується для цього, залежить від налаштувань "
+"середовища GNOME. Ви можете змінити типову поштову програму використовуючи "
+"інструмент <application>Стандартні програми</application> в меню "
+"<menuchoice><guimenu>Система</guimenu><guisubmenu>Параметри</guisubmenu></"
+"menuchoice>."
+
+#: C/f-spot.xml:656(title)
+msgid "Note 2"
+msgstr "Зауваження 2"
+
+#: C/f-spot.xml:657(para)
+msgid ""
+"If some of the photos you'd like to send by email are in a format that F-"
+"Spot can't write (e.g. RAW images), the size selection dialog will become "
+"insensitive and the originals will be sent."
+msgstr ""
+"Якщо деякі фотографії, які ви хочете надіслати електронною поштою, мають "
+"формат, в який F-Spot не вміє зберігати (наприклад, зображення RAW), діалог "
+"вибору розміру стане нечутливим і будуть відправлені оригінали фото."
+
+#: C/f-spot.xml:664(para)
+msgid ""
+"If you're sending resized pictures, F-Spot will keep the modified versions "
+"somewhere in the <filename class=\"directory\">/tmp</filename> directory for "
+"30 seconds. It's not an issue with evolution, which makes it's own local "
+"copy of the attachments, but could be a bit shorter if you're using "
+"Thunderbird. You can change the delay by editing the gconf key <filename "
+"class=\"directory\">/apps/f-spot/export/email/delete_timeout_seconds</"
+"filename>."
+msgstr ""
+"Якщо ви відсилаєте зображення зі зміненими розмірами, F-Spot збереже змінені "
+"версії десь у каталозі <filename class=\"directory\">/tmp</filename> на 30 "
+"секунд. Це не важливо для програми Evolution, яка створює власні локальні "
+"копії вкладень, однак це допоможе дещо спростити роботу з Thunderbird. "
+"Встановити потрібний час затримки можна, змінюючи значення ключа gconf "
+"<filename class=\"directory\">/apps/f-spot/export/email/"
+"delete_timeout_seconds</filename>."
+
+#: C/f-spot.xml:676(title)
+msgid "Print"
+msgstr "Друк"
+
+#: C/f-spot.xml:677(para)
+msgid ""
+"Print your photos with the <menuchoice><guimenu>File</"
+"guimenu><guimenuitem>Print</guimenuitem></menuchoice> menu."
+msgstr ""
+"Щоб надрукувати фото, використовуйте меню <menuchoice><guimenu>Файл</"
+"guimenu><guimenuitem>Друк</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:684(title)
+msgid "Burn to CD"
+msgstr "Запис на CD"
+
+#: C/f-spot.xml:685(para)
+msgid ""
+"Burn your photos to CD or DVD with the <menuchoice><guimenu>File</"
+"guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export to CD</"
+"guimenuitem></menuchoice> menu."
+msgstr ""
+"Щоб записати фото на CD або DVD, використовуйте меню "
+"<menuchoice><guimenu>Файл</guimenu><guisubmenu>Експорт</"
+"guisubmenu><guimenuitem>Експорт до CD</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:693(title)
+msgid "Generate a Website Gallery or Folder"
+msgstr "Створення веб-галереї або теки"
+
+#: C/f-spot.xml:694(para)
+msgid ""
+"The <menuchoice><guimenu>File</guimenu><guimenuitem>Export</"
+"guimenuitem><guimenuitem>Export to Folder</guimenuitem></menuchoice> feature "
+"gives you three ways to export your images."
+msgstr ""
+"Функція <menuchoice><guimenu>Файл</guimenu><guimenuitem>Експортувати до</"
+"guimenuitem><guimenuitem>У теку</guimenuitem></menuchoice> надає три способи "
+"експорту зображень."
+
+#: C/f-spot.xml:702(para)
+msgid ""
+"<guilabel>Use Original</guilabel> exports your photos ready for use with "
+"Jakub Steiner's free <ulink url=\"http://jimmac.musichall.cz/original.php\"> "
+"Original Photo Gallery</ulink> software. If you are unsure about this "
+"option, it is probably not the right one for you."
+msgstr ""
+"<guilabel>Використовувати Original</guilabel> — експортує фотографії вже "
+"готовими для використання у вільній програмі Якуба Штайнера (Jakub Steiner) "
+"<ulink url=\"http://jimmac.musichall.cz/original.php\"> Original Photo "
+"Gallery</ulink>. Якщо ви не знаєте, що це таке, цей вибір навряд чи буде "
+"вдалим."
+
+#: C/f-spot.xml:710(para)
+msgid ""
+"<guilabel>Use static HTML files</guilabel> exports your photos to an "
+"interactive website, ready for you to upload."
+msgstr ""
+"<guilabel>Використовувати статичні файли HTML</guilabel> — експортує "
+"фотографії до інтерактивного веб-сайту, готового до вивантаження від вас."
+
+#: C/f-spot.xml:716(para)
+msgid ""
+"<guilabel>Plain Files</guilabel> exports your images as files within "
+"directories, without putting them into a gallery."
+msgstr ""
+"<guilabel>Прості файли</guilabel> — експортує зображення як файли в межах "
+"каталогів, не включаючи їх у галерею."
+
+#: C/f-spot.xml:725(title)
+msgid "Post to your online galleries"
+msgstr "Публікація в онлайн-галереях"
+
+#: C/f-spot.xml:726(para)
+msgid ""
+"If you use Flickr, SmugMug, 23hq, Tabblo, Facebook, Zooomr or Picasa Web "
+"Album, you can post your files directly from F-Spot with the "
+"<menuchoice><guimenu>File</guimenu><guisubmenu>Export</guisubmenu></"
+"menuchoice> menu, choosing corresponding submenu item."
+msgstr ""
+"Для користувачів Flickr, SmugMug, 23hq, Tabblo, Facebook, Zooomr або Picasa "
+"Web Album, надається можливість публікувати зображення прямо з F-Spot, через "
+"меню <menuchoice><guimenu>Файл</guimenu><guisubmenu>Експортувати до</"
+"guisubmenu></menuchoice>, вибравши в підменю відповідний пункт."
+
+#: C/f-spot.xml:731(para)
+msgid ""
+"If you use the PHP software known as <ulink url=\"http://gallery.sourceforge."
+"net/\"> Gallery</ulink>, you can post your photos to your existing album "
+"with the <menuchoice><guimenu>File</guimenu><guimenuitem>Export</"
+"guimenuitem><guimenuitem>Export to Web Gallery</guimenuitem></menuchoice> "
+"menu. You must first enable the Remote module within your Gallery "
+"installation."
+msgstr ""
+"Користувачі програмного забезпечення, відомого як <ulink url=\"http://"
+"gallery.sourceforge.net/\"> Gallery</ulink>, можуть публікувати свої фото у "
+"наявному альбомі через меню <menuchoice><guimenu>Файл</"
+"guimenu><guimenuitem>Експортувати до</guimenuitem><guimenuitem>Web Gallery</"
+"guimenuitem></menuchoice>. Під час встановлення Gallery потрібно увімкнути "
+"модуль віддаленого керування (Remote plugin)."
+
+#: C/f-spot.xml:739(title)
+msgid "Note for Gallery 2.2 users"
+msgstr "Примітка для користувачів Gallery 2.2"
+
+#: C/f-spot.xml:740(para)
+msgid "The Remote plugin for Gallery should be 1.0.8 or newer."
+msgstr "Модуль Remote plugin для Gallery має бути версії 1.0.8 або новіший."
+
+#: C/f-spot.xml:744(para)
+msgid ""
+"<ulink url=\"http://pennave.sourceforge.net\">PennAve</ulink> is a Python "
+"web-application that directly uses F-Spot's database to present a dynamic "
+"gallery of your photos and tags."
+msgstr ""
+"<ulink url=\"http://pennave.sourceforge.net\">PennAve</ulink> — веб-"
+"програма, написана мовою Python, яка на пряму використовує базу даних F-Spot "
+"для презентації динамічної галереї ваших фотографій та позначок."
+
+#: C/f-spot.xml:749(para)
+msgid ""
+"<ulink url=\"http://www.conduit-project.org\">Conduit</ulink> is an "
+"application that can sync photos that have a particular tag with your Flickr "
+"or Picasa Web Album web storage."
+msgstr ""
+"<ulink url=\"http://www.conduit-project.org\">Conduit</ulink> — програма, "
+"яка здатна синхронізувати фотографії, які мають певні позначки, з веб-"
+"сховищами Flickr і Picasa Web Album."
+
+#: C/f-spot.xml:758(title)
+msgid "Color management"
+msgstr "Керування кольором"
+
+#: C/f-spot.xml:761(title)
+msgid "What's color management"
+msgstr "Що це — керування кольором?"
+
+#: C/f-spot.xml:763(para)
+msgid ""
+"When you capture a photo and look at it on a display, it looks different "
+"than on a camera's preview display or on any other display. It will also "
+"look different when you print it. This is because every device has unique "
+"color reproduction capabilities."
+msgstr ""
+"Під час перегляду фотографії на дисплеї комп'ютера, вона виглядатиме дещо "
+"інакше, ніж на дисплеї фотокамери або на будь-якому іншому дисплеї. Також "
+"інакше вона виглядатиме і після друку на принтері. Тому, що кожний такий "
+"пристрій має свої власні характеристики відтворення кольору."
+
+#: C/f-spot.xml:770(para)
+msgid ""
+"Color management system (CMS) is a tool to achieve reliable color "
+"reproduction for both display and output (e.g. a printer). A CMS relies on "
+"color profiles to map original colors to the color that a device can "
+"reproduce so that colors will appear the same way everywhere — on a computer "
+"LCD monitor, on a print from your local photolab etc."
+msgstr ""
+"Система керування кольором (CMS) — це інструмент для досягнення достовірного "
+"відтворення кольорів як на дисплеї, так і на пристрої виведення, наприклад "
+"принтері. В основі CMS лежать колірні профілі, які порівнюють оригінальні "
+"кольори та кольори, які зможе відтворити пристрій, тому кольори виглядають "
+"однаково на всіх пристроях: на рідкокристалічному моніторі, на знімку "
+"надрукованому у фотолабораторії тощо."
+
+#: C/f-spot.xml:780(title)
+msgid "What's a color profile"
+msgstr "Що це — колірний профіль?"
+
+#: C/f-spot.xml:782(para)
+msgid ""
+"A color profile is a file with either .icc (thus its is often called an ICC "
+"profile) or .icm extension that describes how device's colors correspond to "
+"a universal description of colors."
+msgstr ""
+"Колірний профіль — це або файл з розширенням .icc (часто його називають ICC-"
+"профілем), або файл з розширенням .icm, який описує, як кольори пристрою, "
+"відповідають універсального опису кольорів."
+
+#: C/f-spot.xml:788(para)
+msgid "There are several types of profiles:"
+msgstr "Існує кілька типів профілів:"
+
+#: C/f-spot.xml:794(para)
+msgid ""
+"Input device profile. It's profile for a camera or a profile that an "
+"application like XSane embeds into a scanned image."
+msgstr ""
+"Профіль пристрою введення. Цей профіль для фотокамери або профіль для таких "
+"програм, як XSane, який вбудовується в скановане зображення."
+
+#: C/f-spot.xml:800(para)
+msgid ""
+"Working space profile. It's a profile that describes color space in which "
+"all operations are done inside an application. Usually very wide gamut "
+"profiles like AdobeRGB1998 or ProPhotoRGB are used for that."
+msgstr ""
+"Профіль робочого простору. Цей профіль описує колірний простір в якому "
+"виконуються всі операції у програмі. Зазвичай, для цього використовуються "
+"профілі досить широкого діапазону — AdobeRGB1998 або ProPhotoRGB."
+
+#: C/f-spot.xml:807(para)
+msgid "Display profile. It's a profile for a monitor."
+msgstr "Профіль дисплея — це профіль для відеомонітора."
+
+#: C/f-spot.xml:812(para)
+msgid "Output profile. This is usually a profile for you printer."
+msgstr "Профіль виведення. Зазвичай, це профіль для принтера."
+
+#: C/f-spot.xml:818(para)
+msgid ""
+"Currently F-Spot allows setting only display and output profiles. All color "
+"operations are done in sRGB color space."
+msgstr ""
+"На цей час, F-Spot дає змогу налаштовувати лише профілі дисплея та "
+"виведення. Всі операції з кольором виконуються в колірному просторі sRGB."
+
+#: C/f-spot.xml:825(title)
+msgid "How to get my screen/printer color profile"
+msgstr "Як отримати колірний профіль дисплея або принтера?"
+
+#: C/f-spot.xml:827(para)
+msgid "There are few ways to get a color profile."
+msgstr "Існує кілька способів отримати колірний профіль."
+
+#: C/f-spot.xml:832(title)
+msgid "From CD or Internet"
+msgstr "З компакт-диска або з Інтернету"
+
+#: C/f-spot.xml:834(para)
+msgid ""
+"Many hardware manufacturers put color profiles into CD in the bundle. If you "
+"have one (from monitor or printer), you can use it. Or you can download it "
+"from the Internet (usually, from support section of the manufacturer's web "
+"site). Some camera manufacturers (Nikon, Canon) also provide ICC profiles."
+msgstr ""
+"Багато виробників апаратного забезпечення надають колірні профілі на компакт-"
+"дисках, що йдуть в комплекті з пристроями. Якщо у вас є такий диск (для "
+"монітора або принтера), ви можете його використовувати. Або можете "
+"завантажити профілі з Інтернету (зазвичай, з розділу підтримки на веб-сайті "
+"виробника). Деякі виробники камер (Nikon, Canon) також надають профілі ICC."
+
+#: C/f-spot.xml:844(title)
+msgid "Calibrating and profiling"
+msgstr "Калібрування та створення профілю"
+
+#: C/f-spot.xml:846(para)
+msgid ""
+"Best results can be achieved by calibrating and profiling devices with a "
+"measurement device. It is not so difficult, but it means that you need a "
+"spectrophotometer to do all measurements and create an ICC profile."
+msgstr ""
+"Найкращих результатів можна досягнути через калібрування та створення "
+"профілів пристроїв за допомогою вимірювального приладу. Це не так уже й "
+"складно, проте вам буде необхідний спектрофотометр, щоб зробити всі "
+"вимірювання та створити профіль МУС."
+
+#: C/f-spot.xml:852(para)
+msgid ""
+"If you are on Windows or Mac OS X, you can use manufacturer's software "
+"coming with a spectrophotometer. On Linux you will have to use either <ulink "
+"url=\"http://www.argyllcms.com\">Argyll</ulink>, which is a set of versatile "
+"command line tools, or <ulink url=\"http://lprof.sourceforge.net/\">LProf</"
+"ulink>, which has a graphical user interface."
+msgstr ""
+"Якщо ви працюєте у Windows або Mac OS X, використовуйте програмне "
+"забезпечення виробника спектрофотометра. В Linux — використовуйте, або набір "
+"багатоцільових інструментів для роботи у командному рядку <ulink url="
+"\"http://www.argyllcms.com\">Argyll</ulink>, або графічний інтерфейс "
+"користувача <ulink url=\"http://lprof.sourceforge.net/\">LProf</ulink>."
+
+#: C/f-spot.xml:860(para)
+msgid ""
+"Please refer to documentation of third party hardware and software vendors "
+"for details."
+msgstr ""
+"За додатковою інформацією звертайтеся до документації постачальників "
+"стороннього апаратного та програмного забезпечення."
+
+#: C/f-spot.xml:867(title)
+msgid "Embedding"
+msgstr "Вкладення"
+
+#: C/f-spot.xml:869(para)
+msgid ""
+"Image formats themselves (such as TIFF, JPEG, PNG...) may contain embedded "
+"color profiles. If color management is enabled, F-Spot looks for such "
+"embedded profiles and takes them into consideration."
+msgstr ""
+"Формати файлів зображень (такі як TIFF, JPEG, PNG тощо) самі можуть містити "
+"вкладені колірні профілі. Якщо керування кольором увімкнено, F-Spot шукатиме "
+"такі профілі і прийматиме їх до уваги."
+
+#: C/f-spot.xml:878(title)
+msgid "How to use color management in F-Spot"
+msgstr "Як використовувати керування кольором в F-Spot"
+
+#: C/f-spot.xml:880(para)
+msgid ""
+"Color management in F-Spot can use only RGB profiles at this time (and you "
+"can't see other profiles in the F-Spot)."
+msgstr ""
+"На цей час, керування кольором в F-Spot, використовує лише профілі RGB (в F-"
+"Spot ви не можете бачити інші профілі)."
+
+#: C/f-spot.xml:887(para)
+msgid ""
+"Copy your color profiles into the <filename class=\"directory\">/usr/share/"
+"color/icc</filename> or <filename class=\"directory\">/usr/local/share/color/"
+"icc</filename> directory."
+msgstr ""
+"Скопіюйте колірні профілі у каталог <filename class=\"directory\">/usr/share/"
+"color/icc</filename> або <filename class=\"directory\">/usr/local/share/"
+"color/icc</filename>."
+
+#: C/f-spot.xml:895(para)
+msgid ""
+"Enable the color management with the <menuchoice><guimenu>Edit</"
+"guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> menu."
+msgstr ""
+"Увімкніть керування кольором в меню <menuchoice><guimenu>Правка</"
+"guimenu><guimenuitem>Параметри</guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:902(para)
+msgid ""
+"Select <guilabel>Display</guilabel> and <guilabel>Output</guilabel> profiles."
+msgstr ""
+"Виберіть профілі для <guilabel>Монітора</guilabel> та для <guilabel>Друку</"
+"guilabel>."
+
+#: C/f-spot.xml:910(para)
+msgid ""
+"You can use <ulink url=\"http://burtonini.com/blog/computers/xicc\">xicc</"
+"ulink> to load ICC profile to display and use the loaded profile from F-"
+"Spot. Just mark the checkbox <guilabel>Try to use the system display "
+"profile</guilabel>."
+msgstr ""
+"Використовуйте веб-сайт <ulink url=\"http://burtonini.com/blog/computers/xicc"
+"\">xicc</ulink>, щоб завантажити профіль ICC для монітора і працювати з ним "
+"в F-Spot. Просто поставте прапорець <guilabel>Спробувати використовувати "
+"системний профіль</guilabel>."
+
+#: C/f-spot.xml:921(title)
+msgid "Extend functionality"
+msgstr "Розширення функціональності"
+
+#: C/f-spot.xml:924(title)
+msgid "What extensions are"
+msgstr "Що це — розширення?"
+
+#: C/f-spot.xml:926(para)
+msgid ""
+"F-Spot extensions are means to add new functionality to the application. F-"
+"Spot supports two types of extension: exporters (which allow exporting "
+"photos to new web services or data storages) and tools (which allow new ways "
+"of color correction, duplicate photos finders etc.). Extensions are "
+"distributed in form of extension packages."
+msgstr ""
+"Розширення F-Spot додають програмі нові функціональні можливості. F-Spot "
+"підтримує два види розширень: програми експорту (дають змогу експортувати "
+"фотографії до нових веб-служб або сховищ даних) та інструменти (надають нові "
+"методи корекції кольору, пошук дублікатів фотографій тощо). Розширення "
+"розповсюджуються у вигляді пакунків розширень."
+
+#: C/f-spot.xml:933(para)
+msgid ""
+"In the best traditions of not reinventing the wheel extensions can use other "
+"extensions, which means that one extension cannot work, if another extension "
+"is not installed. This concept of dependance actually means that"
+msgstr ""
+"Одні розширення можуть використовувати інші розширення, а це означає, що "
+"одне не може працювати, якщо інше не встановлено. Ця концепція залежностей "
+"фактично означає, що:"
+
+#: C/f-spot.xml:940(para)
+msgid ""
+"you cannot install an extension, if the extension it depends on, is not "
+"present in the system"
+msgstr ""
+"не можна встановити розширення, залежне від іншого, не встановленого в "
+"системі"
+
+#: C/f-spot.xml:945(para)
+msgid "you cannot remove an extension on which some other extension depends"
+msgstr "не можна вилучити розширення, від якого залежать інші"
+
+#: C/f-spot.xml:953(title)
+msgid "Managing extensions"
+msgstr "Керування розширеннями"
+
+#: C/f-spot.xml:955(para)
+msgid ""
+"To manage extensions choose <menuchoice><guimenu>Edit</"
+"guimenu><guimenuitem>Manage Extensions</guimenuitem></menuchoice> menu item."
+msgstr ""
+"Щоб налаштувати розширення, відкрийте пункт меню "
+"<menuchoice><guimenu>Правка</guimenu><guimenuitem>Налаштування розширень</"
+"guimenuitem></menuchoice>."
+
+#: C/f-spot.xml:961(title)
+msgid "Managing extension repositories"
+msgstr "Керування репозиторіями розширень"
+
+#: C/f-spot.xml:963(para)
+msgid ""
+"Simply put, repositories are extension storages. They can be either network "
+"or local. To add a new repository click Repositories button, choose type of "
+"the repository you are about to add and provide either URL or path. If the "
+"URL or path you specified doesn't contain a description (index) file for "
+"extensions, a warning message will pop up to tell you that."
+msgstr ""
+"Простіше кажучи, репозиторії — це сховища розширень. Вони бувають або "
+"мережевими, або локальними. Щоб додати новий репозиторій натисніть кнопку "
+"«Джерела», виберіть тип репозиторію, який збираєтеся додати, його URL або "
+"шлях до нього. Якщо вказаний URL або шлях не містять опису (індексу) файла "
+"розширення, з'явиться попереджувальне повідомлення."
+
+#: C/f-spot.xml:970(para)
+msgid ""
+"To remove a repository click <guibutton>Repositories</guibutton> button "
+"again, choose the repository you are about to delete and click "
+"<guibutton>Delete</guibutton> button."
+msgstr ""
+"Щоб вилучити репозиторій, знову натисніть кнопку <guibutton>Джерела...</"
+"guibutton> виділіть репозиторій, який хочете вилучити, і натисніть кнопку "
+"<guibutton>Вилучити</guibutton>."
+
+#: C/f-spot.xml:978(title)
+msgid "Installing and updating extensions"
+msgstr "Встановлення та оновлення розширень"
+
+#: C/f-spot.xml:980(para)
+msgid ""
+"To install an extension click <guibutton>Install extensions...</guibutton> "
+"button. In the newly presented dialog"
+msgstr ""
+"Щоб встановити розширення, натисніть кнопку <guibutton>Встановити "
+"розширення...</guibutton>. У діалоговому вікні, яке з’явиться:"
+
+#: C/f-spot.xml:986(para)
+msgid ""
+"Choose repository to install from all known repositories or just one of "
+"available repositories."
+msgstr ""
+"Виберіть репозиторій для встановлення, з усіх відомих або один з доступних."
+
+#: C/f-spot.xml:992(para)
+msgid ""
+"Choose, what extension packages you want to see: All, Only new, Only updates."
+msgstr ""
+"Виберіть пакунки розширень, які хочете бачити: всі, лише нові, лише оновлені."
+
+#: C/f-spot.xml:997(para)
+msgid ""
+"Click the <guibutton>Update</guibutton> button to update list of available "
+"extension packages by given criteria."
+msgstr ""
+"Натисніть кнопку <guibutton>Оновити</guibutton>, щоб оновити список "
+"доступних пакунків розширення за визначеними критеріями."
+
+#: C/f-spot.xml:1003(para)
+msgid ""
+"Choose extensions you want to install/update, click <guibutton>Information</"
+"guibutton> to see summary on selected package, if you want to."
+msgstr ""
+"Виберіть розширення для встановлення або оновлення. Якщо хочете побачити "
+"короткий опис вибраного пакунку, натисніть кнопку <guibutton>Інформація</"
+"guibutton>."
+
+#: C/f-spot.xml:1009(para)
+msgid "Click <guibutton>Forward</guibutton> to proceed with installation."
+msgstr ""
+"Натисніть кнопку <guibutton>Вперед</guibutton>, щоб перейти до встановлення."
+
+#: C/f-spot.xml:1017(title)
+msgid "Enabling and disabling extensions"
+msgstr "Увімкнення та вимкнення розширень"
+
+#: C/f-spot.xml:1019(para)
+msgid ""
+"You might want to temporarily enable or disable a particular extension "
+"package, for example, if the extension is not stable enough to handle a "
+"large amount of photos or if menus get crowded with extensions."
+msgstr ""
+"Можливо, виникне необхідність тимчасово увімкнути або вимкнути певний "
+"пакунок розширень. Наприклад, якщо розширення не достатньо стабільне, щоб "
+"ним можна було без ризику обробити велику кількість фотографій, або якщо "
+"меню переповнені розширеннями."
+
+#: C/f-spot.xml:1024(para)
+msgid ""
+"In the <guilabel>Manage Extensions</guilabel> dialog select the extension "
+"package and click <guibutton>Enable</guibutton> or <guibutton>Disable</"
+"guibutton>."
+msgstr ""
+"В діалоговому вікні <guilabel>Керування розширеннями</guilabel>, виберіть "
+"потрібний пакунок і натисніть кнопку <guibutton>Увімкнути</guibutton> або "
+"<guibutton>Вимкнути</guibutton>."
+
+#: C/f-spot.xml:1031(title)
+msgid "Removing extensions"
+msgstr "Вилучення розширень"
+
+#: C/f-spot.xml:1033(para)
+msgid ""
+"If you don't need an extension you can remove it from the system completely. "
+"In the <guilabel>Manage Extensions</guilabel> dialog select the extension "
+"package you want to remove and click <guibutton>Delete</guibutton>."
+msgstr ""
+"Якщо розширення більше не потрібне, його можна вилучити з системи повністю. "
+"В діалоговому вікні <guilabel>Керування розширеннями</guilabel>, виберіть "
+"пакунок розширення, який хочете вилучити і натисніть кнопку "
+"<guibutton>Вилучити</guibutton>."
+
+#: C/f-spot.xml:1041(title)
+msgid "Reading summary of extensions"
+msgstr "Короткий опис розширень"
+
+#: C/f-spot.xml:1043(para)
+msgid ""
+"Every extension package contains metadata that provides the following "
+"information about the extension:"
+msgstr ""
+"Кожен пакунок розширення містить метадані, які дають змогу отримати таку "
+"інформацію:"
+
+#: C/f-spot.xml:1049(para)
+msgid "Description, which usually covers puprose of the extension"
+msgstr "Опис, у якому, зазвичай, описане призначення розширення"
+
+#: C/f-spot.xml:1054(para)
+msgid "Version"
+msgstr "Версія"
+
+#: C/f-spot.xml:1059(para)
+msgid "Author"
+msgstr "Автор"
+
+#: C/f-spot.xml:1064(para)
+msgid "Dependencies"
+msgstr "Залежності"
+
+#: C/f-spot.xml:1070(para)
+msgid ""
+"In the <guilabel>Manage Extensions</guilabel> dialog select the extension "
+"package you want to read summary of and click <guibutton>Information</"
+"guibutton>."
+msgstr ""
+"В діалоговому вікні <guilabel>Керування розширеннями</guilabel>, виберіть "
+"пакунок розширення, опис до якого хочете прочитати, і натисніть кнопку "
+"<guibutton>Інформація</guibutton>."
+
+#: C/f-spot.xml:1078(title)
+msgid "Developing extensions"
+msgstr "Розробка розширень"
+
+#: C/f-spot.xml:1080(para)
+msgid ""
+"<ulink url=\"http://f-spot.org/Extend_F-Spot\">Extend F-Spot</ulink> "
+"document gives instructions on developing your own extensions for F-Spot."
+msgstr ""
+"Документ <ulink url=\"http://f-spot.org/Extend_F-Spot\">Extend F-Spot</"
+"ulink> надає інструкції з розробки своїх власних розширень для F-Spot."
+
+#: C/f-spot.xml:1088(title)
+msgid "Shortcuts"
+msgstr "Клавіатурні скорочення"
+
+#: C/f-spot.xml:1091(title)
+msgid "Global Shortcuts"
+msgstr "Глобальні скорочення"
+
+#: C/f-spot.xml:1096(entry) C/f-spot.xml:1205(entry) C/f-spot.xml:1301(entry)
+#: C/f-spot.xml:1353(entry)
+msgid "Key"
+msgstr "Клавіша"
+
+#: C/f-spot.xml:1099(entry) C/f-spot.xml:1208(entry) C/f-spot.xml:1304(entry)
+#: C/f-spot.xml:1356(entry)
+msgid "Action"
+msgstr "Дія"
+
+#: C/f-spot.xml:1107(keycap)
+msgid "["
+msgstr "["
+
+#: C/f-spot.xml:1109(entry)
+msgid "Rotate the selected photos to the left"
+msgstr "Повернути виділені фото ліворуч"
+
+#: C/f-spot.xml:1115(keycap)
+msgid "]"
+msgstr "]"
+
+#: C/f-spot.xml:1117(entry)
+msgid "Rotate the selected photos to the right"
+msgstr "Повернути виділені фото праворуч"
+
+#: C/f-spot.xml:1123(keycap) C/f-spot.xml:1131(keycap)
+msgid "Del"
+msgstr "Del"
+
+#: C/f-spot.xml:1125(entry)
+msgid "Remove selected photos from F-Spot's catalogue"
+msgstr "Вилучити виділені фото з каталогу F-Spot"
+
+#: C/f-spot.xml:1131(keycap) C/f-spot.xml:1224(keycap)
+#: C/f-spot.xml:1258(keycap) C/f-spot.xml:1267(keycap)
+#: C/f-spot.xml:1284(keycap) C/f-spot.xml:1446(keycap)
+msgid "Shift"
+msgstr "Shift"
+
+#: C/f-spot.xml:1133(entry)
+msgid ""
+"Delete selected photos permanently from the drive. If possible, they will "
+"moved to trash."
+msgstr ""
+"Вилучити назавжди виділені фото з диска. Якщо можливо, помістити їх у "
+"смітник."
+
+#: C/f-spot.xml:1140(keycap)
+msgid "t"
+msgstr "t"
+
+#: C/f-spot.xml:1142(entry)
+msgid "View or edit tags for selected photos"
+msgstr "Перегляд або редагування позначок для виділених фото"
+
+#: C/f-spot.xml:1148(keycap)
+msgid "F11"
+msgstr "F11"
+
+#: C/f-spot.xml:1150(entry) C/f-spot.xml:1399(entry)
+msgid "Full screen view"
+msgstr "Перегляд на весь екран"
+
+#: C/f-spot.xml:1156(keycap) C/f-spot.xml:1164(keycap)
+#: C/f-spot.xml:1172(keycap) C/f-spot.xml:1180(keycap)
+#: C/f-spot.xml:1216(keycap) C/f-spot.xml:1224(keycap)
+#: C/f-spot.xml:1242(keycap) C/f-spot.xml:1267(keycap)
+#: C/f-spot.xml:1320(keycap)
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: C/f-spot.xml:1156(keycap)
+msgid "I"
+msgstr "I"
+
+#: C/f-spot.xml:1158(entry)
+msgid "Displays information about the photo"
+msgstr "Показати інформацію про фото"
+
+#: C/f-spot.xml:1164(keycap)
+msgid "Equals"
+msgstr "Дорівнює (=)"
+
+#: C/f-spot.xml:1166(entry)
+msgid "Zoom-in"
+msgstr "Наблизити"
+
+#: C/f-spot.xml:1172(keycap)
+msgid "Minus"
+msgstr "Мінус (-)"
+
+#: C/f-spot.xml:1174(entry)
+msgid "Zoom-out"
+msgstr "Віддалити"
+
+#: C/f-spot.xml:1180(keycap) C/f-spot.xml:1372(keycap)
+msgid "N"
+msgstr "N"
+
+#: C/f-spot.xml:1182(entry)
+msgid "Import photos"
+msgstr "Імпорт фотографій"
+
+#: C/f-spot.xml:1188(keycap)
+msgid "Alt"
+msgstr "Alt"
+
+#: C/f-spot.xml:1188(keycap)
+msgid "0-5"
+msgstr "0-5"
+
+#: C/f-spot.xml:1190(entry)
+msgid "Alt plus a number from 0 to 5 rate the selected picture(s)"
+msgstr "Alt + цифра від 0 до 5 — оцінка вибраного знімка(ів)"
+
+#: C/f-spot.xml:1200(title)
+msgid "Browse Mode Shortcuts"
+msgstr "Скорочення для режиму перегляду"
+
+#: C/f-spot.xml:1216(keycap) C/f-spot.xml:1225(keycap)
+msgid "A"
+msgstr "A"
+
+#: C/f-spot.xml:1218(entry)
+msgid "Select all"
+msgstr "Виділити все"
+
+#: C/f-spot.xml:1227(entry)
+msgid "Unselect all"
+msgstr "Скасувати виділення всього"
+
+#: C/f-spot.xml:1233(keycap) C/f-spot.xml:1380(keycap)
+msgid "H"
+msgstr "H"
+
+#: C/f-spot.xml:1233(keycap) C/f-spot.xml:1380(keycap)
+msgid "J"
+msgstr "J"
+
+#: C/f-spot.xml:1234(keycap) C/f-spot.xml:1381(keycap)
+msgid "K"
+msgstr "K"
+
+#: C/f-spot.xml:1234(keycap) C/f-spot.xml:1381(keycap)
+msgid "L"
+msgstr "L"
+
+#: C/f-spot.xml:1232(entry) C/f-spot.xml:1379(entry)
+msgid ""
+"Arrow keys or <placeholder-1/>, <placeholder-2/>, <placeholder-3/>, "
+"<placeholder-4/>"
+msgstr ""
+"Клавіші зі стрілками або клавіші <placeholder-1/>, <placeholder-2/>, "
+"<placeholder-3/>, <placeholder-4/>"
+
+#: C/f-spot.xml:1236(entry)
+msgid "Move focus"
+msgstr "Перемістити фокус"
+
+#: C/f-spot.xml:1241(entry)
+msgid "<placeholder-1/>-Arrow key"
+msgstr "<placeholder-1/> + Клавіша зі стрілкою"
+
+#: C/f-spot.xml:1244(entry)
+msgid "Move the focus without changing the selection"
+msgstr "Перемістити фокус не змінюючи виділення"
+
+#: C/f-spot.xml:1250(keycap) C/f-spot.xml:1372(keycap)
+msgid "Spacebar"
+msgstr "Spacebar"
+
+#: C/f-spot.xml:1252(entry)
+msgid "Select or unselect the focused photo"
+msgstr "Виділити або скасувати виділення зі сфокусованого фото"
+
+#: C/f-spot.xml:1259(keycap)
+msgid "Arrow key"
+msgstr "Клавіша зі стрілкою"
+
+#: C/f-spot.xml:1261(entry)
+msgid "Change the photo selection"
+msgstr "Змінити виділене фото"
+
+#: C/f-spot.xml:1268(keycap)
+msgid "Left arrow or Right arrow"
+msgstr "Стрілка ліворуч або праворуч"
+
+#: C/f-spot.xml:1270(entry)
+msgid ""
+"Add/Remove all photos in the row, in the direction pressed, to the selection"
+msgstr "Додати або скасувати виділення усіх фото в рядку у вибраному напрямку"
+
+#: C/f-spot.xml:1276(keycap) C/f-spot.xml:1284(keycap)
+#: C/f-spot.xml:1437(keycap)
+msgid "V"
+msgstr "V"
+
+#: C/f-spot.xml:1278(entry)
+msgid "Pops up a larger preview of the picture pointed by the mouse"
+msgstr "Збільшений перегляд частини зображення, на яку вказує вказівник миші"
+
+#: C/f-spot.xml:1286(entry)
+msgid ""
+"Pops up a larger preview and a color histogram of the picture pointed by the "
+"mouse"
+msgstr ""
+"Збільшений перегляд частини зображення, на яку вказує вказівник миші та "
+"колірна гістограма"
+
+#: C/f-spot.xml:1296(title)
+msgid "Tag Shortcuts"
+msgstr "Скорочення для позначок"
+
+#: C/f-spot.xml:1312(keycap)
+msgid "F2"
+msgstr "F2"
+
+#: C/f-spot.xml:1314(entry)
+msgid "Rename selected tag"
+msgstr "Перейменувати виділену позначку"
+
+#: C/f-spot.xml:1320(keycap)
+msgid "T"
+msgstr "T"
+
+#: C/f-spot.xml:1322(entry)
+msgid "Add tags to selected photos"
+msgstr "Додати позначку до виділених фото"
+
+#: C/f-spot.xml:1327(entry) C/f-spot.xml:1335(entry)
+msgid "n/a"
+msgstr "немає"
+
+#: C/f-spot.xml:1330(entry)
+msgid "Drag and drop tags to move them"
+msgstr "Перетягнути позначки, щоб перемістити їх"
+
+#: C/f-spot.xml:1338(entry)
+msgid "Type a tag's name to jump to it (only works if tag is shown/expanded)"
+msgstr ""
+"Ввести назву позначки, щоб перейти до неї (працює лише якщо позначка видима)"
+
+#: C/f-spot.xml:1348(title)
+msgid "Edit Mode Shortcuts"
+msgstr "Скорочення для режиму редагування"
+
+#: C/f-spot.xml:1364(keycap)
+msgid "Page Up"
+msgstr "Page Up"
+
+#: C/f-spot.xml:1364(keycap)
+msgid "Backspace"
+msgstr "Backspace"
+
+#: C/f-spot.xml:1364(keycap)
+msgid "B"
+msgstr "B"
+
+#: C/f-spot.xml:1363(entry) C/f-spot.xml:1371(entry)
+msgid "<placeholder-1/>, <placeholder-2/>, <placeholder-3/>"
+msgstr "<placeholder-1/>, <placeholder-2/>, <placeholder-3/>"
+
+#: C/f-spot.xml:1366(entry)
+msgid "Go to Previous Photo"
+msgstr "Перейти до попереднього фото"
+
+#: C/f-spot.xml:1372(keycap)
+msgid "Page Down"
+msgstr "Page Down"
+
+#: C/f-spot.xml:1374(entry)
+msgid "Go to Next Photo"
+msgstr "Перейти до наступного фото"
+
+#: C/f-spot.xml:1383(entry)
+msgid "Go to Previous/Next photo or move around a zoomed photo"
+msgstr ""
+"Перейти до попереднього або наступного фото чи переміщатись по збільшеному "
+"фото"
+
+#: C/f-spot.xml:1389(keycap)
+msgid "R"
+msgstr "R"
+
+#: C/f-spot.xml:1391(entry)
+msgid "Go to a random photo"
+msgstr "Перейти до випадкового фото"
+
+#: C/f-spot.xml:1397(keycap)
+msgid "f"
+msgstr "f"
+
+#: C/f-spot.xml:1405(keycap)
+msgid "0"
+msgstr "0"
+
+#: C/f-spot.xml:1407(entry)
+msgid "Fit the image to the screen"
+msgstr "Припасувати зображення до розміру екрана"
+
+#: C/f-spot.xml:1413(keycap)
+msgid "1"
+msgstr "1"
+
+#: C/f-spot.xml:1415(entry)
+msgid "Zoom Factor to 1.0 (1 screen pixel per image pixel)"
+msgstr ""
+"Коефіцієнт масштабування до 1.0 (1 піксель екрана на піксель зображення)"
+
+#: C/f-spot.xml:1421(keycap)
+msgid "2"
+msgstr "2"
+
+#: C/f-spot.xml:1423(entry)
+msgid "Zoom Factor to 2.0 (4 screen pixels per image pixel)"
+msgstr ""
+"Коефіцієнт масштабування до 2.0 (4 пікселя екрана на піксель зображення)"
+
+#: C/f-spot.xml:1429(keycap)
+msgid "Escape"
+msgstr "Escape"
+
+#: C/f-spot.xml:1431(entry)
+msgid "Returns to Browser mode"
+msgstr "Повернутись до режиму перегляду"
+
+#: C/f-spot.xml:1441(keycap)
+msgid "v"
+msgstr "v"
+
+#: C/f-spot.xml:1439(entry)
+msgid ""
+"Examine photo with magnifying glass (Loupe). Doubleclick on the Loupe, or "
+"type <placeholder-1/> again to close it."
+msgstr ""
+"Розглянути фотографію через збільшувальне скло (лупу). Щоб закрити його, "
+"двічі клацніть на ньому, або знову натисніть <placeholder-1/>."
+
+#: C/f-spot.xml:1445(entry)
+msgid "<placeholder-1/>-Mousewheel"
+msgstr "<placeholder-1/> + коліщатко миші"
+
+#: C/f-spot.xml:1448(entry)
+msgid "Faster filmstrip scrolling"
+msgstr "Прискорена прокрутка фотострічки"
+
+#: C/f-spot.xml:1454(keycap)
+msgid "i"
+msgstr "i"
+
+#: C/f-spot.xml:1456(entry)
+msgid "Toggle infobox visibility ''(only when in full screen)''"
+msgstr ""
+"Увімкнути або вимкнути видимість панелі інформації «(лише в повноекранному "
+"режимі)»"
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/f-spot.xml:0(None)
+msgid "translator-credits"
+msgstr "Sergiy Gavrylov <sergiovana at bigmir.net>, 2010."
diff --git a/extensions/Editors/BWEditor/BWEditor.addin.xml b/extensions/Editors/BWEditor/BWEditor.addin.xml
new file mode 100644
index 0000000..50e6cad
--- /dev/null
+++ b/extensions/Editors/BWEditor/BWEditor.addin.xml
@@ -0,0 +1,15 @@
+<Addin namespace="FSpot"
+ id="BWEditor"
+ version="0.7.0.0"
+ name="BWEditor"
+ description="Convert to B/W with control. Require Mono 2.2."
+ author="Stephane Delcroix"
+ url="http://f-spot.org/Extensions"
+ category="Editors">
+ <Dependencies>
+ <Addin id="Core" version="0.7"/>
+ </Dependencies>
+ <Extension path = "/FSpot/Editors">
+ <Editor editor_type = "BWEditor.BWEditor"/>
+ </Extension>
+</Addin>
diff --git a/extensions/Editors/BWEditor/BWEditor.cs b/extensions/Editors/BWEditor/BWEditor.cs
new file mode 100644
index 0000000..bd4dcda
--- /dev/null
+++ b/extensions/Editors/BWEditor/BWEditor.cs
@@ -0,0 +1,126 @@
+/*
+ * BWEditor.cs
+ *
+ * Author(s)
+ * Stephane Delcroix (stephane at delcroix.org)
+ *
+ * Copyright (c) 2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+using FSpot;
+using FSpot.Editors;
+using Gtk;
+using Gdk;
+using Mono.Unix;
+using Mono.Simd;
+
+namespace BWEditor {
+ class BWEditor : Editor {
+ public BWEditor () : base (Catalog.GetString ("Convert to B/W"), null) {
+ CanHandleMultiple = false;
+ HasSettings = true;
+ ApplyLabel = Catalog.GetString ("Apply");
+ }
+
+ static bool enhanced_support = EnhancedSimdSupport ();
+ static bool EnhancedSimdSupport () { //require sse3
+ return SimdRuntime.IsMethodAccelerated (typeof (VectorOperations), "HorizontalAdd", new Type[] {typeof (Vector4f), typeof (Vector4f)})
+ && SimdRuntime.IsMethodAccelerated (typeof (Vector4f), "op_Multiply");
+ }
+
+ protected override Pixbuf Process (Pixbuf input, Cms.Profile input_profile)
+ {
+ uint timer = FSpot.Utils.Log.DebugTimerStart ();
+ if (input.BitsPerSample != 8) {
+ FSpot.Utils.Log.Warning ("unsupported pixbuf format");
+ return (Pixbuf)input.Clone ();
+ }
+ Pixbuf output = new Pixbuf (input.Colorspace, input.HasAlpha, input.BitsPerSample, input.Width, input.Height);
+ Vector4f multiply = new Vector4f ((float)(r.Value/100.0), (float)(g.Value/100.0), (float)(b.Value/100.0), 0);
+ Normalize (ref multiply);
+
+ bool has_alpha = input.HasAlpha;
+ int chan = input.NChannels;
+ int rowstride_in = input.Rowstride;
+ int rowstride_out = output.Rowstride;
+ Vector4f v_in;
+ Vector4f v_out = new Vector4f (0);
+ float[] fcurve = new float [256];
+ c.GetVector (fcurve.Length, fcurve);
+ byte[] curve = new byte [fcurve.Length];
+ for (int i = 0; i < fcurve.Length; i++)
+ curve[i] = (byte)fcurve[i];
+ unsafe {
+ byte *pix_in = (byte *)input.Pixels;
+ byte *pix_out = (byte *)output.Pixels;
+ for (int i=0; i < input.Height; i++)
+ for (int j=0; j<input.Width; j++) {
+ v_in = new Vector4f (pix_in[i*rowstride_in + j*chan],
+ pix_in[i*rowstride_in + j*chan + 1],
+ pix_in[i*rowstride_in + j*chan + 2],
+ 0);
+ Desaturate (ref v_in, ref multiply, ref v_out);
+ pix_out[i*rowstride_out + j*chan] = curve [unchecked ((byte)v_out.X)];
+ pix_out[i*rowstride_out + j*chan + 1] = curve [unchecked ((byte)v_out.Y)];
+ pix_out[i*rowstride_out + j*chan + 2] = curve [unchecked ((byte)v_out.Z)];
+ if (has_alpha)
+ pix_out[i*rowstride_out + j*chan + 3] = pix_in[i*rowstride_in + j*chan + 3];
+ }
+ }
+ FSpot.Utils.Log.DebugTimerPrint (timer, "Processing took {0}");
+ return output;
+ }
+
+ static void Desaturate (ref Vector4f input, ref Vector4f chan_multiplier, ref Vector4f output)
+ {
+ Vector4f temp = input * chan_multiplier; //(r1,g1,b1,0) = (r,g,b,a) * (rx, gx, bx, 0)
+ temp = temp.HorizontalAdd (temp); //(r1+g1, b1+0, r1+g1, b1+0)
+ output = temp.HorizontalAdd (temp); //(r1+g1+b1+0, r1+g1+b1+0, ..., ...)
+ }
+
+ static void Normalize (ref Vector4f v)
+ {
+ float sum = v.X + v.Y + v.Z;
+ v /= new Vector4f (sum);
+ }
+
+ HScale r, g, b;
+ Curve c;
+
+ public override Widget ConfigurationWidget ()
+ {
+ VBox h = new VBox ();
+ r = new HScale (0, 100, 1);
+ r.ModifyBg (StateType.Selected, new Color (0xff, 0, 0));
+ r.Value = 80;
+ r.ValueChanged += SettingsChanged;
+ h.Add (r);
+ g = new HScale (0, 100, 1);
+ g.ModifyBg (StateType.Selected, new Color (0, 0xff, 0));
+ g.Value = 10;
+ g.ValueChanged += SettingsChanged;
+ h.Add (g);
+ b = new HScale (0, 100, 1);
+ b.ModifyBg (StateType.Selected, new Color (0, 0, 0xff));
+ b.Value = 10;
+ b.ValueChanged += SettingsChanged;
+ h.Add (b);
+ c = new Curve ();
+ c.CurveType = CurveType.Spline;
+ c.SetRange (0, 255, 0, 255);
+ h.Add (c);
+ Button btn = new Button (Gtk.Stock.Refresh);
+ btn.Clicked += delegate {UpdatePreview ();};
+ h.Add (btn);
+ return h;
+ }
+
+ void SettingsChanged (object sender, EventArgs e)
+ {
+ UpdatePreview ();
+ }
+ }
+}
diff --git a/extensions/Editors/BWEditor/Makefile.am b/extensions/Editors/BWEditor/Makefile.am
new file mode 100644
index 0000000..744de85
--- /dev/null
+++ b/extensions/Editors/BWEditor/Makefile.am
@@ -0,0 +1,21 @@
+addin = BWEditor
+
+addin_manifest = $(addin).addin.xml
+
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix \
+ Mono.Simd
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags = -unsafe
+addin_extradist =
+
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/BWEditor/Makefile.in b/extensions/Editors/BWEditor/Makefile.in
new file mode 100644
index 0000000..7b943b7
--- /dev/null
+++ b/extensions/Editors/BWEditor/Makefile.in
@@ -0,0 +1,579 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
+subdir = extensions/Editors/BWEditor
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+addin = BWEditor
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix \
+ Mono.Simd
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags = -unsafe
+addin_extradist =
+ASSEMBLY = $(addin).dll
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+EXTRA_DIST = \
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Editors/BWEditor/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign extensions/Editors/BWEditor/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-addinDATA: $(addin_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
+ done
+
+uninstall-addinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(addindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-addinDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-addinDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-addinDATA uninstall-am
+
+
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extensions/Editors/BlackoutEditor/BlackoutEditor.addin.xml b/extensions/Editors/BlackoutEditor/BlackoutEditor.addin.xml
new file mode 100644
index 0000000..2961f43
--- /dev/null
+++ b/extensions/Editors/BlackoutEditor/BlackoutEditor.addin.xml
@@ -0,0 +1,15 @@
+<Addin namespace="FSpot"
+ id="BlackoutEditor"
+ version="0.7"
+ name="BlackoutEditor"
+ description="Blacks out an area of the image."
+ author="Brian J. Murrell"
+ url="http://f-spot.org/Extensions"
+ category="Editors">
+ <Dependencies>
+ <Addin id="Core" version="0.7"/>
+ </Dependencies>
+ <Extension path = "/FSpot/Editors">
+ <Editor editor_type = "FSpot.Addins.Editors.BlackoutEditor"/>
+ </Extension>
+</Addin>
diff --git a/extensions/Editors/BlackoutEditor/BlackoutEditor.cs b/extensions/Editors/BlackoutEditor/BlackoutEditor.cs
new file mode 100644
index 0000000..07b8251
--- /dev/null
+++ b/extensions/Editors/BlackoutEditor/BlackoutEditor.cs
@@ -0,0 +1,42 @@
+/*
+ * BlackoutEditor.cs
+ *
+ * Author(s)
+ * Brian J. Murrell <brian at interlinx.bc.ca>
+ *
+ * This is free software. See COPYING for details.
+ */
+
+using FSpot;
+using FSpot.Editors;
+using Gdk;
+using Gtk;
+using Mono.Unix;
+
+namespace FSpot.Addins.Editors {
+ class BlackoutEditor : Editor {
+ public BlackoutEditor () : base (Catalog.GetString ("Blackout"), null) {
+ CanHandleMultiple = false;
+ NeedsSelection = true;
+ }
+
+ public override Widget ConfigurationWidget () {
+ VBox vbox = new VBox ();
+
+ Label info = new Label (Catalog.GetString ("Select the area that you want blacked out."));
+
+ vbox.Add (info);
+
+ return vbox;
+ }
+
+ protected override Pixbuf Process (Pixbuf input, Cms.Profile input_profile) {
+ Pixbuf output = input.Copy ();
+
+ Pixbuf sub = new Pixbuf (output, State.Selection.X, State.Selection.Y,
+ State.Selection.Width, State.Selection.Height);
+ sub.Fill (0x00000000);
+ return output;
+ }
+ }
+}
diff --git a/extensions/Editors/BlackoutEditor/Makefile.am b/extensions/Editors/BlackoutEditor/Makefile.am
new file mode 100644
index 0000000..a200b81
--- /dev/null
+++ b/extensions/Editors/BlackoutEditor/Makefile.am
@@ -0,0 +1,20 @@
+addin = BlackoutEditor
+
+addin_manifest = $(addin).addin.xml
+
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/BlackoutEditor/Makefile.in b/extensions/Editors/BlackoutEditor/Makefile.in
new file mode 100644
index 0000000..b3db4bf
--- /dev/null
+++ b/extensions/Editors/BlackoutEditor/Makefile.in
@@ -0,0 +1,578 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
+subdir = extensions/Editors/BlackoutEditor
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+addin = BlackoutEditor
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+ASSEMBLY = $(addin).dll
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+EXTRA_DIST = \
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Editors/BlackoutEditor/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign extensions/Editors/BlackoutEditor/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-addinDATA: $(addin_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
+ done
+
+uninstall-addinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(addindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-addinDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-addinDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-addinDATA uninstall-am
+
+
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extensions/Editors/FlipEditor/FlipEditor.addin.xml b/extensions/Editors/FlipEditor/FlipEditor.addin.xml
new file mode 100644
index 0000000..9cc9448
--- /dev/null
+++ b/extensions/Editors/FlipEditor/FlipEditor.addin.xml
@@ -0,0 +1,15 @@
+<Addin namespace="FSpot"
+ id="FlipEditor"
+ version="0.7"
+ name="FlipEditor"
+ description="Flips the image horizontally."
+ author="Ruben Vermeersch"
+ url="http://f-spot.org/Extensions"
+ category="Editors">
+ <Dependencies>
+ <Addin id="Core" version="0.7"/>
+ </Dependencies>
+ <Extension path = "/FSpot/Editors">
+ <Editor editor_type = "FSpot.Addins.Editors.FlipEditor"/>
+ </Extension>
+</Addin>
diff --git a/extensions/Editors/FlipEditor/FlipEditor.cs b/extensions/Editors/FlipEditor/FlipEditor.cs
new file mode 100644
index 0000000..f6627d9
--- /dev/null
+++ b/extensions/Editors/FlipEditor/FlipEditor.cs
@@ -0,0 +1,26 @@
+/*
+ * FlipEditor.cs
+ *
+ * Author(s)
+ * Ruben Vermeersch <ruben at savanne.be>
+ *
+ * This is free software. See COPYING for details.
+ */
+
+using FSpot;
+using FSpot.Editors;
+using Gdk;
+using Mono.Unix;
+
+namespace FSpot.Addins.Editors {
+ class FlipEditor : Editor {
+ public FlipEditor () : base (Catalog.GetString ("Flip"), "object-flip-horizontal") {
+ CanHandleMultiple = true;
+ }
+
+ protected override Pixbuf Process (Pixbuf input, Cms.Profile input_profile) {
+ Pixbuf output = (Pixbuf) input.Clone ();
+ return output.Flip (true);
+ }
+ }
+}
diff --git a/extensions/Editors/FlipEditor/Makefile.am b/extensions/Editors/FlipEditor/Makefile.am
new file mode 100644
index 0000000..e8dae23
--- /dev/null
+++ b/extensions/Editors/FlipEditor/Makefile.am
@@ -0,0 +1,20 @@
+addin = FlipEditor
+
+addin_manifest = $(addin).addin.xml
+
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/FlipEditor/Makefile.in b/extensions/Editors/FlipEditor/Makefile.in
new file mode 100644
index 0000000..787917f
--- /dev/null
+++ b/extensions/Editors/FlipEditor/Makefile.in
@@ -0,0 +1,578 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
+subdir = extensions/Editors/FlipEditor
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+addin = FlipEditor
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+ASSEMBLY = $(addin).dll
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+EXTRA_DIST = \
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Editors/FlipEditor/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign extensions/Editors/FlipEditor/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-addinDATA: $(addin_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
+ done
+
+uninstall-addinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(addindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-addinDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-addinDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-addinDATA uninstall-am
+
+
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extensions/Editors/Makefile.am b/extensions/Editors/Makefile.am
new file mode 100644
index 0000000..edd2541
--- /dev/null
+++ b/extensions/Editors/Makefile.am
@@ -0,0 +1,6 @@
+DIST_SUBDIRS = \
+ BlackoutEditor \
+ BWEditor \
+ FlipEditor \
+ PixelateEditor \
+ ResizeEditor
diff --git a/extensions/Editors/Makefile.in b/extensions/Editors/Makefile.in
new file mode 100644
index 0000000..264fba1
--- /dev/null
+++ b/extensions/Editors/Makefile.in
@@ -0,0 +1,658 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = extensions/Editors
+SUBDIRS =
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+DIST_SUBDIRS = \
+ BlackoutEditor \
+ BWEditor \
+ FlipEditor \
+ PixelateEditor \
+ ResizeEditor
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Editors/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign extensions/Editors/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extensions/Editors/PixelateEditor/Makefile.am b/extensions/Editors/PixelateEditor/Makefile.am
new file mode 100644
index 0000000..c91ff68
--- /dev/null
+++ b/extensions/Editors/PixelateEditor/Makefile.am
@@ -0,0 +1,20 @@
+addin = PixelateEditor
+
+addin_manifest = $(addin).addin.xml
+
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/PixelateEditor/Makefile.in b/extensions/Editors/PixelateEditor/Makefile.in
new file mode 100644
index 0000000..20adbd5
--- /dev/null
+++ b/extensions/Editors/PixelateEditor/Makefile.in
@@ -0,0 +1,578 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
+subdir = extensions/Editors/PixelateEditor
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+addin = PixelateEditor
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+ASSEMBLY = $(addin).dll
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+EXTRA_DIST = \
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Editors/PixelateEditor/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign extensions/Editors/PixelateEditor/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-addinDATA: $(addin_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
+ done
+
+uninstall-addinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(addindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-addinDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-addinDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-addinDATA uninstall-am
+
+
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extensions/Editors/PixelateEditor/PixelateEditor.addin.xml b/extensions/Editors/PixelateEditor/PixelateEditor.addin.xml
new file mode 100644
index 0000000..6cf375e
--- /dev/null
+++ b/extensions/Editors/PixelateEditor/PixelateEditor.addin.xml
@@ -0,0 +1,15 @@
+<Addin namespace="FSpot"
+ id="PixelateEditor"
+ version="0.7"
+ name="PixelateEditor"
+ description="Pixelates an area of the image."
+ author="Brian J. Murrell"
+ url="http://f-spot.org/Extensions"
+ category="Editors">
+ <Dependencies>
+ <Addin id="Core" version="0.7"/>
+ </Dependencies>
+ <Extension path = "/FSpot/Editors">
+ <Editor editor_type = "FSpot.Addins.Editors.PixelateEditor"/>
+ </Extension>
+</Addin>
diff --git a/extensions/Editors/PixelateEditor/PixelateEditor.cs b/extensions/Editors/PixelateEditor/PixelateEditor.cs
new file mode 100644
index 0000000..fd2bc94
--- /dev/null
+++ b/extensions/Editors/PixelateEditor/PixelateEditor.cs
@@ -0,0 +1,47 @@
+/*
+ * PixelateEditor.cs
+ *
+ * Author(s)
+ * Brian J. Murrell <brian at interlinx.bc.ca>
+ *
+ * This is free software. See COPYING for details.
+ */
+
+using FSpot;
+using FSpot.Editors;
+using Gdk;
+using Gtk;
+using Mono.Unix;
+
+namespace FSpot.Addins.Editors {
+ class PixelateEditor : Editor {
+ public PixelateEditor () : base (Catalog.GetString ("Pixelate"), null) {
+ CanHandleMultiple = false;
+ NeedsSelection = true;
+ }
+
+ public override Widget ConfigurationWidget () {
+ VBox vbox = new VBox ();
+
+ Label info = new Label (Catalog.GetString ("Select the area that you want pixelated."));
+
+ vbox.Add (info);
+
+ return vbox;
+ }
+
+ protected override Pixbuf Process (Pixbuf input, Cms.Profile input_profile) {
+ Pixbuf output = input.Copy ();
+
+ Pixbuf sub = new Pixbuf (output, State.Selection.X, State.Selection.Y,
+ State.Selection.Width, State.Selection.Height);
+ /* lazy man's pixelate: scale down and then back up */
+ Pixbuf down = sub.ScaleSimple (State.Selection.Width/75, State.Selection.Height/75,
+ InterpType.Nearest);
+ Pixbuf up = down.ScaleSimple (State.Selection.Width, State.Selection.Height,
+ InterpType.Nearest);
+ up.CopyArea (0, 0, State.Selection.Width, State.Selection.Height, sub, 0, 0);
+ return output;
+ }
+ }
+}
diff --git a/extensions/Editors/ResizeEditor/Makefile.am b/extensions/Editors/ResizeEditor/Makefile.am
new file mode 100644
index 0000000..cb77879
--- /dev/null
+++ b/extensions/Editors/ResizeEditor/Makefile.am
@@ -0,0 +1,20 @@
+addin = ResizeEditor
+
+addin_manifest = $(addin).addin.xml
+
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/ResizeEditor/Makefile.in b/extensions/Editors/ResizeEditor/Makefile.in
new file mode 100644
index 0000000..4fb8c28
--- /dev/null
+++ b/extensions/Editors/ResizeEditor/Makefile.in
@@ -0,0 +1,578 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
+subdir = extensions/Editors/ResizeEditor
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+addin = ResizeEditor
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+ASSEMBLY = $(addin).dll
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+EXTRA_DIST = \
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Editors/ResizeEditor/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign extensions/Editors/ResizeEditor/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-addinDATA: $(addin_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
+ done
+
+uninstall-addinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(addindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-addinDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-addinDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-addinDATA uninstall-am
+
+
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extensions/Editors/ResizeEditor/ResizeEditor.addin.xml b/extensions/Editors/ResizeEditor/ResizeEditor.addin.xml
new file mode 100644
index 0000000..c0a97d2
--- /dev/null
+++ b/extensions/Editors/ResizeEditor/ResizeEditor.addin.xml
@@ -0,0 +1,15 @@
+<Addin namespace="FSpot"
+ id="ResizeEditor"
+ version="0.7"
+ name="ResizeEditor"
+ description="Resize the image"
+ author="Stephane Delcroix"
+ url="http://f-spot.org/Extensions"
+ category="Editors">
+ <Dependencies>
+ <Addin id="Core" version="0.7"/>
+ </Dependencies>
+ <Extension path = "/FSpot/Editors">
+ <Editor editor_type = "FSpot.Addins.Editors.ResizeEditor"/>
+ </Extension>
+</Addin>
diff --git a/extensions/Editors/ResizeEditor/ResizeEditor.cs b/extensions/Editors/ResizeEditor/ResizeEditor.cs
new file mode 100644
index 0000000..e49f0b3
--- /dev/null
+++ b/extensions/Editors/ResizeEditor/ResizeEditor.cs
@@ -0,0 +1,45 @@
+/*
+ * ResizeEditor.cs
+ *
+ * Author(s)
+ * Stephane Delcroix (stephane at delcroix.org)
+ *
+ * This is free software. See COPYING for details.
+ */
+
+using System;
+using FSpot;
+using FSpot.Editors;
+using Gtk;
+using Gdk;
+using Mono.Unix;
+
+namespace FSpot.Addins.Editors {
+ class ResizeEditor : Editor {
+ SpinButton size;
+
+ public ResizeEditor () : base (Catalog.GetString ("Resize"), null) {
+ CanHandleMultiple = false;
+ HasSettings = true;
+ }
+
+ protected override Pixbuf Process (Pixbuf input, Cms.Profile input_profile)
+ {
+ Pixbuf output = (Pixbuf) input.Clone ();
+ double ratio = (double)size.Value / Math.Max (output.Width, output.Height);
+ return output.ScaleSimple ((int)(output.Width * ratio), (int)(output.Height * ratio), InterpType.Bilinear);
+ }
+
+ public override Widget ConfigurationWidget ()
+ {
+ int max;
+ using (ImageFile img = ImageFile.Create (State.Items[0].DefaultVersionUri))
+ using (Pixbuf p = img.Load ())
+ max = Math.Max (p.Width, p.Height);
+
+ size = new SpinButton (128, max, 10);
+ size.Value = max;
+ return size;
+ }
+ }
+}
diff --git a/extensions/Exporters/CDExport/CDExport.addin.xml b/extensions/Exporters/CDExport/CDExport.addin.xml
index 4feba36..9a5bdab 100644
--- a/extensions/Exporters/CDExport/CDExport.addin.xml
+++ b/extensions/Exporters/CDExport/CDExport.addin.xml
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="0.6.0.3"
+ version="0.7.0.0"
name="CD Export"
description="This extension allows you to burn your photos to CD."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
diff --git a/extensions/Exporters/CDExport/Makefile.am b/extensions/Exporters/CDExport/Makefile.am
index 8c93ce2..4e84085 100644
--- a/extensions/Exporters/CDExport/Makefile.am
+++ b/extensions/Exporters/CDExport/Makefile.am
@@ -1,52 +1,21 @@
-include $(top_srcdir)/Makefile.include
+addin = CDExport
-PLUGIN_NAME = CDExport
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ $(addin).cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ $(addin_manifest) \
+ $(addin).ui
-PLUGIN_SOURCES = \
- $(srcdir)/CDExport.cs
+addin_references = \
+ Mono.Posix
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GPHOTO2) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- -r:Mono.Posix
+addin_packages = \
+ gtk-sharp-2.0
-PKGS = \
- -pkg:gtk-sharp-2.0
+addin_extraflags =
+addin_extradist =
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).ui
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST) $(PLUGIN_NAME).ui
- $(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- $(PLUGIN_NAME).ui
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Exporters/CDExport/Makefile.in b/extensions/Exporters/CDExport/Makefile.in
index 033be8f..e3bae10 100644
--- a/extensions/Exporters/CDExport/Makefile.in
+++ b/extensions/Exporters/CDExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Exporters/CDExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,33 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = CDExport
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest) \
+ $(addin).ui
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags =
+addin_extradist =
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,65 +313,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = CDExport
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/CDExport.cs
-
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GPHOTO2) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- -r:Mono.Posix
-
-PKGS = \
- -pkg:gtk-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).ui
-
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- $(PLUGIN_NAME).ui
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -348,9 +370,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/CDExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/CDExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/CDExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/CDExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -375,26 +397,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -436,7 +458,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -485,7 +507,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -529,30 +551,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST) $(PLUGIN_NAME).ui
- $(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Exporters/DefaultExporters/DefaultExporters.addin.xml b/extensions/Exporters/DefaultExporters/DefaultExporters.addin.xml
deleted file mode 100644
index c1d8bc5..0000000
--- a/extensions/Exporters/DefaultExporters/DefaultExporters.addin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Addin namespace="FSpot"
- version="1.9"
- name="Default Exporters"
- description="This extension contains all the default exporters for f-spot. Most of them will be moved out of this extension in the future, and, at that time, this extension will be deprecated."
- author="F-Spot team"
- url="http://f-spot.org"
- defaultEnabled="true"
- category="Export">
-
- <Dependencies>
- <Addin id="Core" version="0.6"/>
- </Dependencies>
-
- <Extension path = "/FSpot/Menus/Exports">
- </Extension>
-</Addin>
diff --git a/extensions/Exporters/DefaultExporters/Makefile.am b/extensions/Exporters/DefaultExporters/Makefile.am
deleted file mode 100644
index e37c8a8..0000000
--- a/extensions/Exporters/DefaultExporters/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/Makefile.include
-
-PLUGIN_MANIFEST = DefaultExporters.addin.xml
-
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_MANIFEST)
-
-EXTRA_DIST = \
- $(PLUGIN_MANIFEST)
diff --git a/extensions/Exporters/DefaultExporters/Makefile.in b/extensions/Exporters/DefaultExporters/Makefile.in
deleted file mode 100644
index acfc35e..0000000
--- a/extensions/Exporters/DefaultExporters/Makefile.in
+++ /dev/null
@@ -1,519 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
-subdir = extensions/Exporters/DefaultExporters
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
-DIR_DOCS = $(top_builddir)/docs
-DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
-DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
-DIR_SEMWEB = $(top_builddir)/lib/semweb
-DIR_SRC = $(top_builddir)/src
-DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
-LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
-LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-CSC_FLAGS = -debug
-CSC = $(MCS) $(CSC_FLAGS) -target:exe
-CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
-MONO_DEBUGFLAGS = --debug
-RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_MANIFEST = DefaultExporters.addin.xml
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_MANIFEST)
-
-EXTRA_DIST = \
- $(PLUGIN_MANIFEST)
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/DefaultExporters/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/DefaultExporters/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
- done
-
-uninstall-pluginDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
index 612dea3..f7999bf 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
+++ b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
@@ -1,6 +1,6 @@
<Addin namespace="FSpot"
id="FacebookExport"
- version="0.6.0.9"
+ version="0.7.0.0"
name="FacebookExport"
description="Export pictures to facebook"
author="George Talusan, Jim Ramsay, Stephane Delcroix"
@@ -8,7 +8,7 @@
category="Export"
defaultEnabled="false">
<Dependencies>
- <Addin id="Core" version="0.6.1.5"/>
+ <Addin id="Core" version="0.7.0.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
<ExportMenuItem id="Facebook" _label = "F_acebook..." class = "FSpot.Exporter.Facebook.FacebookExport" />
diff --git a/extensions/Exporters/FacebookExport/Makefile.am b/extensions/Exporters/FacebookExport/Makefile.am
index 1dceab8..16786b8 100644
--- a/extensions/Exporters/FacebookExport/Makefile.am
+++ b/extensions/Exporters/FacebookExport/Makefile.am
@@ -30,19 +30,18 @@ PLUGIN_SOURCES = \
$(srcdir)/Mono.Facebook/User.cs \
$(srcdir)/Mono.Facebook/Util.cs
-REFS = \
+REFS = \
-r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
-r:$(top_builddir)/src/FSpot.Platform.dll \
-r:$(top_builddir)/src/FSpot.Widgets.dll \
$(LINK_GTKSHARPBEANS) \
- $(LINK_KEYRING) \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
+ $(LINK_KEYRING) \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
-r:Mono.Posix
PKGS = \
diff --git a/extensions/Exporters/FacebookExport/Makefile.in b/extensions/Exporters/FacebookExport/Makefile.in
index aee0806..3f66cb0 100644
--- a/extensions/Exporters/FacebookExport/Makefile.in
+++ b/extensions/Exporters/FacebookExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/FacebookExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -326,17 +336,16 @@ PLUGIN_SOURCES = \
REFS = \
-r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
-r:$(top_builddir)/src/FSpot.Platform.dll \
-r:$(top_builddir)/src/FSpot.Widgets.dll \
$(LINK_GTKSHARPBEANS) \
- $(LINK_KEYRING) \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
+ $(LINK_KEYRING) \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
-r:Mono.Posix
PKGS = \
@@ -372,9 +381,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/FacebookExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/FacebookExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/FacebookExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/FacebookExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/extensions/Exporters/FlickrExport/FlickrExport.addin.xml b/extensions/Exporters/FlickrExport/FlickrExport.addin.xml
index 5a3447a..192f120 100644
--- a/extensions/Exporters/FlickrExport/FlickrExport.addin.xml
+++ b/extensions/Exporters/FlickrExport/FlickrExport.addin.xml
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="0.6.0.1"
+ version="0.7.0.0"
name="Flickr Export"
description="This extension allows you to export your photos to Flickr and 23hq."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
diff --git a/extensions/Exporters/FlickrExport/FlickrExport.cs b/extensions/Exporters/FlickrExport/FlickrExport.cs
index a677505..6bb4727 100644
--- a/extensions/Exporters/FlickrExport/FlickrExport.cs
+++ b/extensions/Exporters/FlickrExport/FlickrExport.cs
@@ -357,8 +357,8 @@ namespace FSpotFlickrExport {
string id = fr.Upload (photo, stack, is_public, is_family, is_friend);
ids.Add (id);
- if (Core.Database != null && photo is FSpot.Photo)
- Core.Database.Exports.Create ((photo as FSpot.Photo).Id,
+ if (App.Instance.Database != null && photo is FSpot.Photo)
+ App.Instance.Database.Exports.Create ((photo as FSpot.Photo).Id,
(photo as FSpot.Photo).DefaultVersionId,
ExportStore.FlickrExportType,
auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id);
diff --git a/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in b/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in
index c3109a2..085eaac 100644
--- a/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in
+++ b/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/FlickrExport/FlickrNet
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -381,9 +391,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/FlickrExport/FlickrNet/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/FlickrExport/FlickrNet/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/FlickrExport/FlickrNet/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/FlickrExport/FlickrNet/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/extensions/Exporters/FlickrExport/FlickrRemote.cs b/extensions/Exporters/FlickrExport/FlickrRemote.cs
index fbe42c1..bb84d6e 100644
--- a/extensions/Exporters/FlickrExport/FlickrRemote.cs
+++ b/extensions/Exporters/FlickrExport/FlickrRemote.cs
@@ -159,9 +159,9 @@ public class FlickrRemote {
// Go through the tag parents
if (ExportTagHierarchy) {
tag_iter = t[i].Category;
- while (tag_iter != Core.Database.Tags.RootCategory && tag_iter != null) {
+ while (tag_iter != App.Instance.Database.Tags.RootCategory && tag_iter != null) {
// Skip top level tags because they have no meaning in a linear tag database
- if (ExportIgnoreTopLevel && tag_iter.Category == Core.Database.Tags.RootCategory) {
+ if (ExportIgnoreTopLevel && tag_iter.Category == App.Instance.Database.Tags.RootCategory) {
break;
}
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 6457ffd..e75a9f8 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -10,16 +10,15 @@ PLUGIN_SOURCES = \
$(srcdir)/FlickrExport.cs \
$(srcdir)/FlickrRemote.cs
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+REFS = \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
$(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_DBUS) \
+ $(LINK_GIOSHARP) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_UNIQUESHARP) \
-r:FlickrNet/FlickrNet.dll \
-r:Mono.Posix
@@ -43,7 +42,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
plugindir = $(pkglibdir)/extensions
install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+ if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
plugin_DATA = \
$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/FlickrExport/Makefile.in b/extensions/Exporters/FlickrExport/Makefile.in
index 2ecbfc6..8a44f9c 100644
--- a/extensions/Exporters/FlickrExport/Makefile.in
+++ b/extensions/Exporters/FlickrExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/FlickrExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -113,16 +116,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -139,8 +143,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -153,9 +156,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -204,16 +212,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -224,6 +234,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -234,21 +245,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -276,6 +291,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -300,18 +317,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -321,17 +335,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -345,15 +355,14 @@ PLUGIN_SOURCES = \
$(srcdir)/FlickrRemote.cs
REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
$(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_DBUS) \
+ $(LINK_GIOSHARP) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_UNIQUESHARP) \
-r:FlickrNet/FlickrNet.dll \
-r:Mono.Posix
@@ -394,9 +403,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/FlickrExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/FlickrExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/FlickrExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/FlickrExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -449,7 +458,7 @@ uninstall-pluginDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -474,7 +483,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -762,7 +771,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+ if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Exporters/FolderExport/FolderExport.addin.xml b/extensions/Exporters/FolderExport/FolderExport.addin.xml
index 31cab19..d98e734 100644
--- a/extensions/Exporters/FolderExport/FolderExport.addin.xml
+++ b/extensions/Exporters/FolderExport/FolderExport.addin.xml
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="0.6.0.1"
+ version="0.7.0.0"
name="Folder Export"
description="This extension allows you to export your photos to HTML galleries, Original galleries or just to a folder."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
diff --git a/extensions/Exporters/FolderExport/FolderExport.cs b/extensions/Exporters/FolderExport/FolderExport.cs
index 4bdc338..60b5305 100644
--- a/extensions/Exporters/FolderExport/FolderExport.cs
+++ b/extensions/Exporters/FolderExport/FolderExport.cs
@@ -409,7 +409,11 @@ namespace FSpotFolderExport {
break;
case SIZE_KEY:
- size_spin.Value = (double) Preferences.Get<int> (key);
+ int size;
+ if (Preferences.TryGet<int> (key, out size))
+ size_spin.Value = (double) size;
+ else
+ size_spin.Value = 400;
break;
case OPEN_KEY:
@@ -532,8 +536,8 @@ namespace FSpotFolderExport {
else
File.Copy (request.Current.LocalPath, path, true);
- if (photo != null && photo is Photo && Core.Database != null) {
- Core.Database.Exports.Create ((photo as Photo).Id, (photo as Photo).DefaultVersionId,
+ if (photo != null && photo is Photo && App.Instance.Database != null) {
+ App.Instance.Database.Exports.Create ((photo as Photo).Id, (photo as Photo).DefaultVersionId,
ExportStore.FolderExportType,
// FIXME this is wrong, the final path is the one
// after the Xfer.
diff --git a/extensions/Exporters/FolderExport/Makefile.am b/extensions/Exporters/FolderExport/Makefile.am
index 8cacf9e..6d16ba8 100644
--- a/extensions/Exporters/FolderExport/Makefile.am
+++ b/extensions/Exporters/FolderExport/Makefile.am
@@ -14,11 +14,10 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
$(LINK_GPHOTO2) \
$(LINK_GIOSHARP) \
$(LINK_GTKSHARPBEANS) \
- $(LINK_DBUS) \
+ $(LINK_UNIQUESHARP) \
-r:System.Web \
-r:ICSharpCode.SharpZipLib \
-r:Mono.Posix
diff --git a/extensions/Exporters/FolderExport/Makefile.in b/extensions/Exporters/FolderExport/Makefile.in
index 8cf5b7b..2fc1bc7 100644
--- a/extensions/Exporters/FolderExport/Makefile.in
+++ b/extensions/Exporters/FolderExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/FolderExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -308,11 +318,10 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
$(LINK_GPHOTO2) \
$(LINK_GIOSHARP) \
$(LINK_GTKSHARPBEANS) \
- $(LINK_DBUS) \
+ $(LINK_UNIQUESHARP) \
-r:System.Web \
-r:ICSharpCode.SharpZipLib \
-r:Mono.Posix
@@ -358,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/FolderExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/FolderExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/FolderExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/FolderExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/extensions/Exporters/GalleryExport/GalleryExport.addin.xml b/extensions/Exporters/GalleryExport/GalleryExport.addin.xml
index 744a5b4..d1998e4 100644
--- a/extensions/Exporters/GalleryExport/GalleryExport.addin.xml
+++ b/extensions/Exporters/GalleryExport/GalleryExport.addin.xml
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="0.6.0.1"
+ version="0.7.0.0"
name="Gallery Export"
description="This extension allows you to export your photos to PHP Gallery (http://gallery.menalto.com)."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
diff --git a/extensions/Exporters/GalleryExport/GalleryExport.cs b/extensions/Exporters/GalleryExport/GalleryExport.cs
index 48474b5..01ef34e 100644
--- a/extensions/Exporters/GalleryExport/GalleryExport.cs
+++ b/extensions/Exporters/GalleryExport/GalleryExport.cs
@@ -787,8 +787,8 @@ namespace G2Export {
try {
int id = album.Add (item, req.Current.LocalPath);
- if (item != null && item is Photo && Core.Database != null && id != 0) {
- Core.Database.Exports.Create ((item as Photo).Id, (item as Photo).DefaultVersionId,
+ if (item != null && item is Photo && App.Instance.Database != null && id != 0) {
+ App.Instance.Database.Exports.Create ((item as Photo).Id, (item as Photo).DefaultVersionId,
ExportStore.Gallery2ExportType,
String.Format("{0}:{1}",album.Gallery.Uri.ToString (), id.ToString ()));
}
diff --git a/extensions/Exporters/GalleryExport/Makefile.am b/extensions/Exporters/GalleryExport/Makefile.am
index 5cc9247..a09a0d0 100644
--- a/extensions/Exporters/GalleryExport/Makefile.am
+++ b/extensions/Exporters/GalleryExport/Makefile.am
@@ -10,16 +10,15 @@ PLUGIN_SOURCES = \
$(srcdir)/GalleryExport.cs \
$(srcdir)/GalleryRemote.cs
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+REFS = \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
$(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_DBUS) \
+ $(LINK_GIOSHARP) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_UNIQUESHARP) \
-r:Mono.Posix
PKGS = \
diff --git a/extensions/Exporters/GalleryExport/Makefile.in b/extensions/Exporters/GalleryExport/Makefile.in
index b27a028..e89c5d4 100644
--- a/extensions/Exporters/GalleryExport/Makefile.in
+++ b/extensions/Exporters/GalleryExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/GalleryExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -305,15 +315,14 @@ PLUGIN_SOURCES = \
$(srcdir)/GalleryRemote.cs
REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
$(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_DBUS) \
+ $(LINK_GIOSHARP) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_UNIQUESHARP) \
-r:Mono.Posix
PKGS = \
@@ -350,9 +359,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/GalleryExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/GalleryExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/GalleryExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/GalleryExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/extensions/Exporters/Makefile.am b/extensions/Exporters/Makefile.am
index 832b607..d68e439 100644
--- a/extensions/Exporters/Makefile.am
+++ b/extensions/Exporters/Makefile.am
@@ -1,6 +1,5 @@
SUBDIRS = \
CDExport \
- DefaultExporters \
FacebookExport \
FlickrExport \
FolderExport \
diff --git a/extensions/Exporters/Makefile.in b/extensions/Exporters/Makefile.in
index 7b672d7..0dbebc1 100644
--- a/extensions/Exporters/Makefile.in
+++ b/extensions/Exporters/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,11 +36,14 @@ host_triplet = @host@
subdir = extensions/Exporters
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -88,16 +91,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -114,8 +118,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -128,9 +131,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -179,16 +187,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -199,6 +209,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -209,21 +220,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -251,6 +266,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -275,6 +292,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -283,7 +301,6 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = \
CDExport \
- DefaultExporters \
FacebookExport \
FlickrExport \
FolderExport \
@@ -305,9 +322,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -340,7 +357,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -365,7 +382,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index b617fc8..b5bfd9f 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -9,18 +9,17 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
PLUGIN_SOURCES = \
$(srcdir)/PicasaWebExport.cs
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+REFS = \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_SEMWEB) \
- -r:google-sharp/Mono.Google.dll \
- $(LINK_KEYRING) \
- $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ -r:google-sharp/Mono.Google.dll \
+ $(LINK_KEYRING) \
$(LINK_GIOSHARP) \
- $(LINK_GPHOTO2) \
- $(LINK_DBUS) \
- -r:System.Web \
+ $(LINK_GPHOTO2) \
+ $(LINK_UNIQUESHARP) \
+ -r:System.Web \
-r:Mono.Posix
PKGS = \
@@ -44,7 +43,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
plugindir = $(pkglibdir)/extensions
install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+ if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
plugin_DATA = \
$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.in b/extensions/Exporters/PicasaWebExport/Makefile.in
index 8c287bd..ae17d2a 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.in
+++ b/extensions/Exporters/PicasaWebExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/PicasaWebExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -113,16 +116,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -139,8 +143,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -153,9 +156,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -204,16 +212,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -224,6 +234,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -234,21 +245,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -276,6 +291,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -300,18 +317,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -321,17 +335,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -344,17 +354,16 @@ PLUGIN_SOURCES = \
$(srcdir)/PicasaWebExport.cs
REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_SEMWEB) \
- -r:google-sharp/Mono.Google.dll \
- $(LINK_KEYRING) \
- $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ -r:google-sharp/Mono.Google.dll \
+ $(LINK_KEYRING) \
$(LINK_GIOSHARP) \
- $(LINK_GPHOTO2) \
- $(LINK_DBUS) \
- -r:System.Web \
+ $(LINK_GPHOTO2) \
+ $(LINK_UNIQUESHARP) \
+ -r:System.Web \
-r:Mono.Posix
PKGS = \
@@ -395,9 +404,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/PicasaWebExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/PicasaWebExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/PicasaWebExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/PicasaWebExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -450,7 +459,7 @@ uninstall-pluginDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -475,7 +484,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -763,7 +772,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+ if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml b/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
index dea05ec..880cedf 100644
--- a/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
+++ b/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="0.6.0.3"
+ version="0.7.0.0"
name="PicasaWeb Export"
description="This extension allows you to export your photos to PicasaWeb."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
diff --git a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
index 000144b..4c12a69 100644
--- a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
+++ b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
@@ -674,8 +674,8 @@ namespace FSpotGoogleExport {
picture = album.UploadPicture (request.Current.LocalPath, Path.ChangeExtension (item.Name, "jpg"), item.Description);
sent_bytes += file_info.Length;
}
- if (Core.Database != null && item is Photo)
- Core.Database.Exports.Create ((item as Photo).Id,
+ if (App.Instance.Database != null && item is Photo)
+ App.Instance.Database.Exports.Create ((item as Photo).Id,
(item as Photo).DefaultVersionId,
ExportStore.PicasaExportType,
picture.Link);
diff --git a/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in b/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in
index fc4972c..d6ad0ee 100644
--- a/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in
+++ b/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/PicasaWebExport/google-sharp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -342,9 +352,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/PicasaWebExport/google-sharp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/PicasaWebExport/google-sharp/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/PicasaWebExport/google-sharp/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/PicasaWebExport/google-sharp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index f96d603..166de02 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -9,18 +9,17 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
PLUGIN_SOURCES = \
$(srcdir)/SmugMugExport.cs
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+REFS = \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:SmugMugNet/SmugMugNet.dll \
+ -r:SmugMugNet/SmugMugNet.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GIOSHARP) \
+ $(LINK_GIOSHARP) \
$(LINK_GPHOTO2) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_KEYRING) \
- $(LINK_DBUS) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_KEYRING) \
+ $(LINK_UNIQUESHARP) \
-r:Mono.Posix
PKGS = \
@@ -43,7 +42,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
plugindir = $(pkglibdir)/extensions
install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+ if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
plugin_DATA = \
$(PLUGIN_ASSEMBLY)
diff --git a/extensions/Exporters/SmugMugExport/Makefile.in b/extensions/Exporters/SmugMugExport/Makefile.in
index eb8d021..857fbbd 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.in
+++ b/extensions/Exporters/SmugMugExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/SmugMugExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -113,16 +116,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -139,8 +143,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -153,9 +156,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -204,16 +212,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -224,6 +234,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -234,21 +245,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -276,6 +291,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -300,18 +317,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -321,17 +335,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -344,17 +354,16 @@ PLUGIN_SOURCES = \
$(srcdir)/SmugMugExport.cs
REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:SmugMugNet/SmugMugNet.dll \
+ -r:SmugMugNet/SmugMugNet.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GIOSHARP) \
+ $(LINK_GIOSHARP) \
$(LINK_GPHOTO2) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_KEYRING) \
- $(LINK_DBUS) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_KEYRING) \
+ $(LINK_UNIQUESHARP) \
-r:Mono.Posix
PKGS = \
@@ -394,9 +403,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/SmugMugExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/SmugMugExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/SmugMugExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/SmugMugExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -449,7 +458,7 @@ uninstall-pluginDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -474,7 +483,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -762,7 +771,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+ if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml b/extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml
index e7a2c09..3b624d9 100644
--- a/extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml
+++ b/extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="0.6.0.2"
+ version="0.7.0.0"
name="SmugMug Export"
description="This extension allows you to export your photos to SmugMug."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
diff --git a/extensions/Exporters/SmugMugExport/SmugMugExport.cs b/extensions/Exporters/SmugMugExport/SmugMugExport.cs
index c0987ea..7c935ea 100644
--- a/extensions/Exporters/SmugMugExport/SmugMugExport.cs
+++ b/extensions/Exporters/SmugMugExport/SmugMugExport.cs
@@ -580,8 +580,8 @@ namespace FSpotSmugMugExport {
approx_size = sent_bytes * items.Length / (photo_index - 1);
int image_id = account.SmugMug.Upload (request.Current.LocalPath, album.AlbumID);
- if (Core.Database != null && item is Photo && image_id >= 0)
- Core.Database.Exports.Create ((item as Photo).Id,
+ if (App.Instance.Database != null && item is Photo && image_id >= 0)
+ App.Instance.Database.Exports.Create ((item as Photo).Id,
(item as Photo).DefaultVersionId,
ExportStore.SmugMugExportType,
account.SmugMug.GetAlbumUrl (image_id).ToString ());
diff --git a/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in b/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in
index decf3de..0e5fab2 100644
--- a/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in
+++ b/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/SmugMugExport/SmugMugNet
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -327,9 +337,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/SmugMugExport/SmugMugNet/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/SmugMugExport/SmugMugNet/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/SmugMugExport/SmugMugNet/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/SmugMugExport/SmugMugNet/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/extensions/Exporters/TabbloExport/AssemblyInfo.cs b/extensions/Exporters/TabbloExport/AssemblyInfo.cs
index 776edc6..2a99d5e 100644
--- a/extensions/Exporters/TabbloExport/AssemblyInfo.cs
+++ b/extensions/Exporters/TabbloExport/AssemblyInfo.cs
@@ -29,4 +29,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion ("0.3.*")]
+[assembly: AssemblyVersion ("0.3.1.*")]
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index 915a95f..056be8d 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -17,6 +17,12 @@ PLUGIN_SOURCES = \
$(srcdir)/TabbloExportView.cs \
$(srcdir)/UserDecisionCertificatePolicy.cs
+PLUGIN_INPUT = \
+ $(PLUGIN_SOURCES) \
+ $(PLUGIN_MANIFEST) \
+ ui/$(PLUGIN_NAME).ui \
+ ui/TrustError.ui
+
REFS = \
-r:$(top_builddir)/src/f-spot.exe \
@@ -24,45 +30,39 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Utils.dll \
-r:Tabblo/Mono.Tabblo.dll \
$(LINK_KEYRING) \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GIOSHARP) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GPHOTO2) \
- $(LINK_DBUS) \
+ $(LINK_SEMWEB) \
+ $(LINK_GIOSHARP) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_GPHOTO2) \
+ $(LINK_UNIQUESHARP) \
-r:Mono.Posix.dll
PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
+ -pkg:gtk-sharp-2.0
SUBDIRS = \
Tabblo
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).glade \
- -resource:$(srcdir)/TrustError.glade
+ -resource:$(srcdir)/ui/$(PLUGIN_NAME).ui \
+ -resource:$(srcdir)/ui/TrustError.ui
mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+$(PLUGIN_ASSEMBLY): $(PLUGIN_INPUT)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+ if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
plugin_DATA = \
$(PLUGIN_ASSEMBLY)
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- TrustError.glade \
- $(PLUGIN_NAME).glade
+EXTRA_DIST = $(PLUGIN_INPUT)
CLEANFILES = \
$(PLUGIN_ASSEMBLY) \
diff --git a/extensions/Exporters/TabbloExport/Makefile.in b/extensions/Exporters/TabbloExport/Makefile.in
index 5694327..04dde6d 100644
--- a/extensions/Exporters/TabbloExport/Makefile.in
+++ b/extensions/Exporters/TabbloExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/TabbloExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -113,16 +116,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -139,8 +143,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -153,9 +156,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -204,16 +212,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -224,6 +234,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -234,21 +245,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -276,6 +291,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -300,18 +317,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -321,17 +335,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -351,42 +361,41 @@ PLUGIN_SOURCES = \
$(srcdir)/TabbloExportView.cs \
$(srcdir)/UserDecisionCertificatePolicy.cs
+PLUGIN_INPUT = \
+ $(PLUGIN_SOURCES) \
+ $(PLUGIN_MANIFEST) \
+ ui/$(PLUGIN_NAME).ui \
+ ui/TrustError.ui
+
REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
-r:Tabblo/Mono.Tabblo.dll \
$(LINK_KEYRING) \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GIOSHARP) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GPHOTO2) \
- $(LINK_DBUS) \
+ $(LINK_SEMWEB) \
+ $(LINK_GIOSHARP) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_GPHOTO2) \
+ $(LINK_UNIQUESHARP) \
-r:Mono.Posix.dll
PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
+ -pkg:gtk-sharp-2.0
SUBDIRS = \
Tabblo
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).glade \
- -resource:$(srcdir)/TrustError.glade
+ -resource:$(srcdir)/ui/$(PLUGIN_NAME).ui \
+ -resource:$(srcdir)/ui/TrustError.ui
plugindir = $(pkglibdir)/extensions
plugin_DATA = \
$(PLUGIN_ASSEMBLY)
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- TrustError.glade \
- $(PLUGIN_NAME).glade
-
+EXTRA_DIST = $(PLUGIN_INPUT)
CLEANFILES = \
$(PLUGIN_ASSEMBLY) \
$(PLUGIN_ASSEMBLY).mdb \
@@ -404,9 +413,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/TabbloExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/TabbloExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/TabbloExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/TabbloExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -459,7 +468,7 @@ uninstall-pluginDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -484,7 +493,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -768,11 +777,11 @@ uninstall-am: uninstall-pluginDATA
mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+$(PLUGIN_ASSEMBLY): $(PLUGIN_INPUT)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+ if [ -w $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml ] ; then rm -f $(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Exporters/TabbloExport/Tabblo/Makefile.in b/extensions/Exporters/TabbloExport/Tabblo/Makefile.in
index a49d8f3..28aabe3 100644
--- a/extensions/Exporters/TabbloExport/Tabblo/Makefile.in
+++ b/extensions/Exporters/TabbloExport/Tabblo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/TabbloExport/Tabblo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -337,9 +347,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/TabbloExport/Tabblo/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/TabbloExport/Tabblo/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/TabbloExport/Tabblo/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/TabbloExport/Tabblo/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/extensions/Exporters/TabbloExport/TabbloExport.addin.xml b/extensions/Exporters/TabbloExport/TabbloExport.addin.xml
index 7e33457..04e3307 100644
--- a/extensions/Exporters/TabbloExport/TabbloExport.addin.xml
+++ b/extensions/Exporters/TabbloExport/TabbloExport.addin.xml
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="0.6.1.2"
+ version="0.7.0.0"
name="Tabblo Export"
description="This extension allows you to export your photos to Tabblo."
author="Wojciech Dzierżanowski"
@@ -7,7 +7,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
diff --git a/extensions/Exporters/TabbloExport/TabbloExport.cs b/extensions/Exporters/TabbloExport/TabbloExport.cs
index 51b81f3..6d05ba8 100644
--- a/extensions/Exporters/TabbloExport/TabbloExport.cs
+++ b/extensions/Exporters/TabbloExport/TabbloExport.cs
@@ -82,6 +82,8 @@ namespace FSpotTabbloExport {
// focus (it can be invalid, and hence disabled, for a
// moment).
main_dialog.ResetFocus ();
+
+ main_dialog.Show ();
}
@@ -90,8 +92,7 @@ namespace FSpotTabbloExport {
Debug.Assert (null != model);
Debug.Assert (null != main_dialog);
- main_dialog.tabblo_export_dialog.Response +=
- HandleResponse;
+ main_dialog.Response += HandleResponse;
// Account data
model.UsernameChanged += HandleUsernameChanged;
@@ -251,10 +252,9 @@ namespace FSpotTabbloExport {
private FSpot.Tag [] SelectTags ()
{
- TagStore tag_store = FSpot.Core.Database.Tags;
- FSpot.UI.Dialog.TagSelectionDialog tagDialog =
- new FSpot.UI.Dialog.TagSelectionDialog (
- tag_store);
+ TagStore tag_store = FSpot.App.Instance.Database.Tags;
+ TagSelectionDialog tagDialog =
+ new TagSelectionDialog (tag_store);
FSpot.Tag [] tags = tagDialog.Run ();
tagDialog.Hide ();
@@ -371,7 +371,7 @@ namespace FSpotTabbloExport {
return;
}
- PhotoStore photo_store = FSpot.Core.Database.Photos;
+ PhotoStore photo_store = FSpot.App.Instance.Database.Photos;
FSpot.Photo photo = photo_store.GetByUri (
item.DefaultVersionUri);
Debug.Assert (null != photo);
diff --git a/extensions/Exporters/TabbloExport/TabbloExport.glade b/extensions/Exporters/TabbloExport/TabbloExport.glade
deleted file mode 100644
index 3deb54c..0000000
--- a/extensions/Exporters/TabbloExport/TabbloExport.glade
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
- <requires lib="canvas"/>
- <requires lib="gnome"/>
- <widget class="GtkDialog" id="tabblo_export_dialog">
- <property name="title" translatable="yes">Export</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox11">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox17">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <child>
- <widget class="GtkFrame" id="frame8">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkScrolledWindow" id="thumb_scrolled_window">
- <property name="width_request">180</property>
- <property name="height_request">180</property>
- <property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="photo_frame">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Photos</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox11">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkFrame" id="frame9">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkLabel" id="label44">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Tabblo account</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table10">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">7</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="password_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">_Password:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="password_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">*</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="username_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">_Username:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">username_entry</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="username_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame10">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkTable" id="table11">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">7</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><small><i>F-Spot tags can help you track the export status of photos. Example: Use one tag for the photos that you plan to export, and another one for those already exported. Here, you can tell F-Spot to automatically replace these tags as appropriate.</i></small></property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="width_chars">42</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="removed_tags_alignment">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="attached_tags_alignment">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="removed_tags_select_button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Select...</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="attached_tags_select_button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Select...</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="remove_tags_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Rem_ove from exported photos:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="attach_tags_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Attach to exported photos:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>F-Spot tags</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area11">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkButton" id="cancel_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="export_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="can_default">True</property>
- <property name="label" translatable="yes">_Export</property>
- <property name="use_underline">True</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
diff --git a/extensions/Exporters/TabbloExport/TabbloExportModel.cs b/extensions/Exporters/TabbloExport/TabbloExportModel.cs
index 6c0eab7..aca8abf 100644
--- a/extensions/Exporters/TabbloExport/TabbloExportModel.cs
+++ b/extensions/Exporters/TabbloExport/TabbloExportModel.cs
@@ -362,7 +362,7 @@ namespace FSpotTabbloExport {
List <FSpot.Tag> tags =
new List <FSpot.Tag> (ids.Length);
foreach (int id in ids) {
- FSpot.Tag tag = FSpot.Core.Database.Tags
+ FSpot.Tag tag = FSpot.App.Instance.Database.Tags
.GetTagById (id);
if (null != tag) {
tags.Add (tag);
diff --git a/extensions/Exporters/TabbloExport/TabbloExportView.cs b/extensions/Exporters/TabbloExport/TabbloExportView.cs
index 89e9e4d..77659dd 100644
--- a/extensions/Exporters/TabbloExport/TabbloExportView.cs
+++ b/extensions/Exporters/TabbloExport/TabbloExportView.cs
@@ -29,43 +29,55 @@
using System;
using System.Diagnostics;
+using System.Reflection;
namespace FSpotTabbloExport {
- class TabbloExportView {
+ class TabbloExportView : FSpot.UI.Dialog.BuilderDialog {
private const string DialogName = "tabblo_export_dialog";
- [Glade.Widget] internal Gtk.Dialog tabblo_export_dialog;
+ [GtkBeans.Builder.Object]
+ private Gtk.ScrolledWindow thumb_scrolled_window;
- [Glade.Widget] private Gtk.ScrolledWindow thumb_scrolled_window;
+ [GtkBeans.Builder.Object]
+ internal Gtk.Entry username_entry;
- [Glade.Widget] internal Gtk.Entry username_entry;
- [Glade.Widget] internal Gtk.Entry password_entry;
+ [GtkBeans.Builder.Object]
+ internal Gtk.Entry password_entry;
+
+ [GtkBeans.Builder.Object]
+ internal Gtk.CheckButton attach_tags_button;
+
+ [GtkBeans.Builder.Object]
+ private Gtk.Alignment attached_tags_alignment;
- [Glade.Widget] internal Gtk.CheckButton attach_tags_button;
- [Glade.Widget] private Gtk.Alignment attached_tags_alignment;
internal FSpot.Widgets.TagView attached_tags_view;
- [Glade.Widget] internal Gtk.Button attached_tags_select_button;
- [Glade.Widget] internal Gtk.CheckButton remove_tags_button;
- [Glade.Widget] private Gtk.Alignment removed_tags_alignment;
+ [GtkBeans.Builder.Object]
+ internal Gtk.Button attached_tags_select_button;
+
+ [GtkBeans.Builder.Object]
+ internal Gtk.CheckButton remove_tags_button;
+
+ [GtkBeans.Builder.Object]
+ private Gtk.Alignment removed_tags_alignment;
+
internal FSpot.Widgets.TagView removed_tags_view;
- [Glade.Widget] internal Gtk.Button removed_tags_select_button;
- [Glade.Widget] private Gtk.Button export_button;
+ [GtkBeans.Builder.Object]
+ internal Gtk.Button removed_tags_select_button;
+
+ [GtkBeans.Builder.Object]
+ private Gtk.Button export_button;
- // The dialog is constructed and shown.
internal TabbloExportView (FSpot.IBrowsableCollection photos)
+ : base (Assembly.GetExecutingAssembly (),
+ "TabbloExport.ui", DialogName)
{
- Glade.XML glade_xml = new Glade.XML (
- null, "TabbloExport.glade", DialogName,
- "f-spot");
- glade_xml.Autoconnect (this);
-
// Thumbnails
FSpot.Widgets.IconView icon_view =
new FSpot.Widgets.IconView (photos);
@@ -83,15 +95,6 @@ namespace FSpotTabbloExport {
removed_tags_view = new FSpot.Widgets.TagView ();
removed_tags_alignment.Add (removed_tags_view);
removed_tags_view.Show ();
-
- tabblo_export_dialog.Show ();
- }
-
-
- internal void Destroy ()
- {
- Debug.Assert (null != tabblo_export_dialog);
- tabblo_export_dialog.Destroy ();
}
diff --git a/extensions/Exporters/TabbloExport/TrustError.glade b/extensions/Exporters/TabbloExport/TrustError.glade
deleted file mode 100644
index 57c4c8d..0000000
--- a/extensions/Exporters/TabbloExport/TrustError.glade
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Sep 7 21:22:13 2008 -->
-<glade-interface>
- <widget class="GtkDialog" id="trust_error_dialog">
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Trust Error</property>
- <property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="deletable">False</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkLabel" id="label0">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">A trust error occured while attempting to access</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="url_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes"><b>{0}</b>.</property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">-1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Do you wish to:</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkRadioButton" id="abort_radiobutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Abort this session</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkRadioButton" id="once_radiobutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Trust the site's certificate this once</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">abort_radiobutton</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="always_radiobutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Always trust this site's certificate</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">once_radiobutton</property>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="ok_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
diff --git a/extensions/Exporters/TabbloExport/UserDecisionCertificatePolicy.cs b/extensions/Exporters/TabbloExport/UserDecisionCertificatePolicy.cs
index ccda10d..fb5bce9 100644
--- a/extensions/Exporters/TabbloExport/UserDecisionCertificatePolicy.cs
+++ b/extensions/Exporters/TabbloExport/UserDecisionCertificatePolicy.cs
@@ -30,6 +30,7 @@
using System;
using System.Diagnostics;
using System.Net;
+using System.Reflection;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
@@ -41,11 +42,11 @@ namespace FSpotTabbloExport {
: ApplicationCentricCertificatePolicy {
private const string DialogName = "trust_error_dialog";
- [Glade.Widget] Gtk.Dialog dialog;
- [Glade.Widget] Gtk.Label url_label;
- [Glade.Widget] Gtk.RadioButton abort_radiobutton;
- [Glade.Widget] Gtk.RadioButton once_radiobutton;
- [Glade.Widget] Gtk.RadioButton always_radiobutton;
+ [GtkBeans.Builder.Object] Gtk.Dialog dialog;
+ [GtkBeans.Builder.Object] Gtk.Label url_label;
+ [GtkBeans.Builder.Object] Gtk.RadioButton abort_radiobutton;
+ [GtkBeans.Builder.Object] Gtk.RadioButton once_radiobutton;
+ [GtkBeans.Builder.Object] Gtk.RadioButton always_radiobutton;
private X509Certificate certificate;
private WebRequest request;
@@ -73,12 +74,11 @@ namespace FSpotTabbloExport {
private bool DoGetDecision ()
{
- Glade.XML glade_xml = new Glade.XML (
- null, "TrustError.glade", DialogName,
- "f-spot");
- glade_xml.Autoconnect (this);
-
- dialog = (Gtk.Dialog) glade_xml.GetWidget (DialogName);
+ GtkBeans.Builder builder = new GtkBeans.Builder (
+ Assembly.GetExecutingAssembly (),
+ "TrustError.ui", null);
+ builder.Autoconnect (this);
+ dialog = (Gtk.Dialog) builder.GetObject (DialogName);
url_label.Markup = String.Format (
url_label.Text, String.Format (
diff --git a/extensions/Exporters/TabbloExport/ui/TabbloExport.ui b/extensions/Exporters/TabbloExport/ui/TabbloExport.ui
new file mode 100644
index 0000000..527ab0c
--- /dev/null
+++ b/extensions/Exporters/TabbloExport/ui/TabbloExport.ui
@@ -0,0 +1,335 @@
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="tabblo_export_dialog">
+ <property name="title" translatable="yes">Export</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox11">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkHBox" id="hbox17">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <child>
+ <object class="GtkFrame" id="frame8">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="thumb_scrolled_window">
+ <property name="width_request">180</property>
+ <property name="height_request">180</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="photo_frame">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Photos</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox11">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame9">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkTable" id="table10">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">7</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="password_label">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="username_label">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Username:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">username_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="username_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Tabblo account</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame10">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkTable" id="table11">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">7</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes"><small><i>F-Spot tags can help you track the export status of photos. Example: Use one tag for the photos that you plan to export, and another one for those already exported. Here, you can tell F-Spot to automatically replace these tags as appropriate.</i></small></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">42</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="removed_tags_alignment">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="attached_tags_alignment">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="removed_tags_select_button">
+ <property name="label" translatable="yes">Select...</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="attached_tags_select_button">
+ <property name="label" translatable="yes">Select...</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="remove_tags_button">
+ <property name="label" translatable="yes">Rem_ove from exported photos:</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>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="attach_tags_button">
+ <property name="label" translatable="yes">_Attach to exported photos:</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>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>F-Spot tags</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area11">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="export_button">
+ <property name="label" translatable="yes">_Export</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancel_button</action-widget>
+ <action-widget response="-5">export_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/extensions/Exporters/TabbloExport/ui/TrustError.ui b/extensions/Exporters/TabbloExport/ui/TrustError.ui
new file mode 100644
index 0000000..280d1c9
--- /dev/null
+++ b/extensions/Exporters/TabbloExport/ui/TrustError.ui
@@ -0,0 +1,166 @@
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires gtk+ 2.10 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="trust_error_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Trust Error</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="deletable">False</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label0">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">A trust error occured while attempting to access</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="url_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes"><b>{0}</b>.</property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">-1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Do you wish to:</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVButtonBox" id="vbuttonbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="abort_radiobutton">
+ <property name="label" translatable="yes">Abort this session</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="once_radiobutton">
+ <property name="label" translatable="yes">Trust the site's certificate this once</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">abort_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="always_radiobutton">
+ <property name="label" translatable="yes">Always trust this site's certificate</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">once_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/extensions/Exporters/ZipExport/Makefile.am b/extensions/Exporters/ZipExport/Makefile.am
index 8a2584f..52b0378 100644
--- a/extensions/Exporters/ZipExport/Makefile.am
+++ b/extensions/Exporters/ZipExport/Makefile.am
@@ -9,23 +9,23 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
PLUGIN_SOURCES = \
$(srcdir)/ZipExport.cs
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+REFS = \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
$(LINK_GPHOTO2) \
- $(LINK_DBUS) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- -r:System.Web \
- -r:ICSharpCode.SharpZipLib \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ -r:System.Web \
+ -r:ICSharpCode.SharpZipLib \
-r:Mono.Posix
PKGS = \
-pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
+ -pkg:glade-sharp-2.0 \
+ -pkg:mono-addins
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
diff --git a/extensions/Exporters/ZipExport/Makefile.in b/extensions/Exporters/ZipExport/Makefile.in
index b6fac73..b659af7 100644
--- a/extensions/Exporters/ZipExport/Makefile.in
+++ b/extensions/Exporters/ZipExport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = extensions/Exporters/ZipExport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -304,22 +314,22 @@ PLUGIN_SOURCES = \
$(srcdir)/ZipExport.cs
REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
$(LINK_GPHOTO2) \
- $(LINK_DBUS) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- -r:System.Web \
- -r:ICSharpCode.SharpZipLib \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ -r:System.Web \
+ -r:ICSharpCode.SharpZipLib \
-r:Mono.Posix
PKGS = \
-pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
+ -pkg:glade-sharp-2.0 \
+ -pkg:mono-addins
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
@@ -351,9 +361,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Exporters/ZipExport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Exporters/ZipExport/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Exporters/ZipExport/Makefile
+ $(AUTOMAKE) --foreign extensions/Exporters/ZipExport/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/extensions/Exporters/ZipExport/ZipExport.addin.xml b/extensions/Exporters/ZipExport/ZipExport.addin.xml
index 9f484a8..e1bdb50 100644
--- a/extensions/Exporters/ZipExport/ZipExport.addin.xml
+++ b/extensions/Exporters/ZipExport/ZipExport.addin.xml
@@ -1,6 +1,6 @@
<Addin namespace="FSpot"
id="ZipExport"
- version="0.6.0.2"
+ version="0.7.0.0"
name="Zip export"
description="Simple export to Zip file"
author="Lorenzo Milesi"
@@ -8,7 +8,7 @@
category="Export"
defaultEnabled="false">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
<ExportMenuItem id="ZipExport" _label = "Compressed fil_e..." class = "ZipExport.Zip" />
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index c400ea6..6b51acf 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,6 +1,7 @@
SUBDIRS = \
- Services \
+ Editors \
Exporters \
+ Services \
Tools \
Transitions
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 513e4a5..73a7a95 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,11 +37,14 @@ host_triplet = @host@
subdir = extensions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -112,16 +115,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -138,8 +142,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -152,9 +155,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -203,16 +211,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -223,6 +233,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -233,21 +244,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -275,6 +290,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -299,6 +316,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -306,8 +324,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = \
- Services \
+ Editors \
Exporters \
+ Services \
Tools \
Transitions
@@ -326,9 +345,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Makefile
+ $(AUTOMAKE) --foreign extensions/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -381,7 +400,7 @@ uninstall-addinsDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -406,7 +425,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/extensions/Services/BeagleService/BeagleNotifier.cs b/extensions/Services/BeagleService/BeagleNotifier.cs
deleted file mode 100644
index dfc7ac3..0000000
--- a/extensions/Services/BeagleService/BeagleNotifier.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-#if ENABLE_BEAGLE
-using Beagle;
-
-namespace FSpot {
- public static class BeagleNotifier {
- public static void SendUpdate (IBrowsableItem item)
- {
- Indexable indexable = new Indexable (item.DefaultVersionUri);
- indexable.Type = IndexableType.PropertyChange;
- Beagle.Property prop;
-
- // Clear the existing tags
- prop = Beagle.Property.NewKeyword ("fspot:Tag", "");
- prop.IsMutable = true;
- prop.IsPersistent = true;
- indexable.AddProperty (prop);
- prop = Beagle.Property.NewKeyword ("image:Tag", "");
- prop.IsMutable = true;
- prop.IsPersistent = true;
- indexable.AddProperty (prop);
-
- foreach (Tag t in item.Tags) {
- prop = Beagle.Property.NewKeyword ("fspot:Tag", t.Name);
- prop.IsMutable = true;
- prop.IsPersistent = true;
- indexable.AddProperty (prop);
- prop = Beagle.Property.NewKeyword ("image:Tag", t.Name);
- prop.IsMutable = true;
- prop.IsPersistent = true;
- indexable.AddProperty (prop);
- }
-
- prop = Beagle.Property.New ("fspot:Description", item.Description);
- prop.IsMutable = true;
- prop.IsPersistent = true;
- indexable.AddProperty (prop);
-
- // Create a message to send to the daemon with this information.
- // The source tells it what index the existing "/home/joe/test.txt" document lives.
- IndexingServiceRequest req = new IndexingServiceRequest ();
- req.Keepalive = false;
- req.Source = "Files";
- req.Add (indexable);
-
- req.SendAsync ();
- }
- }
-}
-#endif
diff --git a/extensions/Services/BeagleService/BeagleService.addin.xml b/extensions/Services/BeagleService/BeagleService.addin.xml
deleted file mode 100644
index 3349c25..0000000
--- a/extensions/Services/BeagleService/BeagleService.addin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Addin namespace="FSpot"
- id="BeagleService"
- version="0.6.1"
- name="Beagle Service"
- description="Notify Beagle on image changes"
- author="Stephane Delcroix"
- url="http://f-spot.org/Extensions"
- category="Services">
- <Dependencies>
- <Addin id="Core" version="0.6"/>
- </Dependencies>
- <Extension path = "/FSpot/Services">
- <Service class="BeagleService.BeagleService"/>
- </Extension>
-</Addin>
diff --git a/extensions/Services/BeagleService/BeagleService.cs b/extensions/Services/BeagleService/BeagleService.cs
deleted file mode 100644
index c858cfb..0000000
--- a/extensions/Services/BeagleService/BeagleService.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * BeagleService.BeagleService.cs
- *
- * Author(s):
- * Stephane Delcroix <stephane at delcroix.org>
- *
- * This is free software. See COPYING for details.
- *
- */
-
-using System;
-using FSpot;
-using FSpot.Extensions;
-using FSpot.Utils;
-
-namespace BeagleService {
- public class BeagleService : IService
- {
- public bool Start ()
- {
- uint timer = Log.InformationTimerStart ("Starting BeagleService");
- try {
- Core.Database.Photos.ItemsChanged += HandleDbItemsChanged;
- } catch {
- Log.Warning ("unable to hook the BeagleNotifier. are you running --view mode?");
- }
- Log.DebugTimerPrint (timer, "BeagleService startup took {0}");
- return true;
- }
-
- public bool Stop ()
- {
- uint timer = Log.InformationTimerStart ("Stopping BeagleService");
- Log.DebugTimerPrint (timer, "BeagleService shutdown took {0}");
- return true;
- }
-
- private void HandleDbItemsChanged (object sender, DbItemEventArgs<Photo> args)
- {
-#if ENABLE_BEAGLE
- Log.Debug ("Notifying beagle");
- foreach (DbItem item in args.Items) {
- if (item as Photo != null)
- try {
- BeagleNotifier.SendUpdate (item as Photo);
- } catch (Exception e) {
- Log.Debug ("BeagleNotifier.SendUpdate failed with {0}", e.Message);
- }
- }
-#endif
- }
- }
-}
diff --git a/extensions/Services/BeagleService/Makefile.am b/extensions/Services/BeagleService/Makefile.am
deleted file mode 100644
index ca96442..0000000
--- a/extensions/Services/BeagleService/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-include $(top_srcdir)/Makefile.include
-
-PLUGIN_NAME = BeagleService
-
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-
-PLUGIN_SOURCES = \
- $(srcdir)/BeagleService.cs \
- $(srcdir)/BeagleNotifier.cs
-
-
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_BEAGLE)
-
-PKGS =
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
diff --git a/extensions/Services/BeagleService/Makefile.in b/extensions/Services/BeagleService/Makefile.in
deleted file mode 100644
index 46ce695..0000000
--- a/extensions/Services/BeagleService/Makefile.in
+++ /dev/null
@@ -1,555 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
-subdir = extensions/Services/BeagleService
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
-DIR_DOCS = $(top_builddir)/docs
-DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
-DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
-DIR_SEMWEB = $(top_builddir)/lib/semweb
-DIR_SRC = $(top_builddir)/src
-DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
-LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
-LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-CSC_FLAGS = -debug
-CSC = $(MCS) $(CSC_FLAGS) -target:exe
-CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
-MONO_DEBUGFLAGS = --debug
-RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = BeagleService
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/BeagleService.cs \
- $(srcdir)/BeagleNotifier.cs
-
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_BEAGLE)
-
-PKGS =
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Services/BeagleService/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Services/BeagleService/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
- done
-
-uninstall-pluginDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/extensions/Services/DBusService/DBusProxy.cs b/extensions/Services/DBusService/DBusProxy.cs
index 549c5f8..d8036c0 100644
--- a/extensions/Services/DBusService/DBusProxy.cs
+++ b/extensions/Services/DBusService/DBusProxy.cs
@@ -241,7 +241,7 @@ namespace DBusService {
try {
// remove tags from photos first
- Core.Database.Photos.Remove (new Tag [] { t });
+ App.Instance.Database.Photos.Remove (new Tag [] { t });
// then remove tag
tag_store.Remove (t);
return true;
diff --git a/extensions/Services/DBusService/DBusService.addin.xml b/extensions/Services/DBusService/DBusService.addin.xml
index 919b5c7..73ca21f 100644
--- a/extensions/Services/DBusService/DBusService.addin.xml
+++ b/extensions/Services/DBusService/DBusService.addin.xml
@@ -1,6 +1,6 @@
<Addin namespace="FSpot"
id="DBusService"
- version="0.6"
+ version="0.7"
name="DBus Service"
description="Expose F-Spot Photos over DBus"
author="Thomas Van Machelen"
@@ -8,7 +8,7 @@
defaultEnabled="false"
category="Services">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Services">
<Service class="DBusService.DBusService"/>
diff --git a/extensions/Services/DBusService/DBusService.cs b/extensions/Services/DBusService/DBusService.cs
index 3d333a4..b7374db 100644
--- a/extensions/Services/DBusService/DBusService.cs
+++ b/extensions/Services/DBusService/DBusService.cs
@@ -20,7 +20,7 @@ namespace DBusService {
{
uint timer = Log.InformationTimerStart ("Starting DBusService");
try {
- DBusProxyFactory.Load (Core.Database);
+ DBusProxyFactory.Load (App.Instance.Database);
} catch {
Log.Warning ("unable init DBus service");
}
diff --git a/extensions/Services/DBusService/Makefile.am b/extensions/Services/DBusService/Makefile.am
index ddd59c8..cd633c9 100644
--- a/extensions/Services/DBusService/Makefile.am
+++ b/extensions/Services/DBusService/Makefile.am
@@ -1,51 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = DBusService
-PLUGIN_NAME = DBusService
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ $(addin).cs \
+ DBusProxy.cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ $(addin_manifest)
-PLUGIN_SOURCES = \
- $(srcdir)/DBusService.cs \
- $(srcdir)/DBusProxy.cs
+addin_references =
+addin_packages = \
+ gtk-sharp-2.0
+addin_extraflags = \
+ $(NDESK_DBUS_LIBS)
+addin_extradist =
-REFS = \
- -pkg:gtk-sharp-2.0 \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_DBUS) \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GIOSHARP) \
- $(LINK_GPHOTO2)
-
-PKGS =
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Services/DBusService/Makefile.in b/extensions/Services/DBusService/Makefile.in
index daede34..90ab8fb 100644
--- a/extensions/Services/DBusService/Makefile.in
+++ b/extensions/Services/DBusService/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Services/DBusService
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,33 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = DBusService
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs \
+ DBusProxy.cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references =
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extraflags = \
+ $(NDESK_DBUS_LIBS)
+
+addin_extradist =
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,62 +313,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = DBusService
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/DBusService.cs \
- $(srcdir)/DBusProxy.cs
-
-REFS = \
- -pkg:gtk-sharp-2.0 \
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
-r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_DBUS) \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
$(LINK_GIOSHARP) \
- $(LINK_GPHOTO2)
-
-PKGS =
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
+addin_SOURCES = \
+ $(build_sources)
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -345,9 +370,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Services/DBusService/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Services/DBusService/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Services/DBusService/Makefile
+ $(AUTOMAKE) --foreign extensions/Services/DBusService/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -372,26 +397,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -433,7 +458,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -482,7 +507,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -526,30 +551,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Services/Makefile.am b/extensions/Services/Makefile.am
index 27ea46f..a6f990e 100644
--- a/extensions/Services/Makefile.am
+++ b/extensions/Services/Makefile.am
@@ -1,3 +1,2 @@
SUBDIRS = \
- BeagleService \
DBusService
diff --git a/extensions/Services/Makefile.in b/extensions/Services/Makefile.in
index 6ef1239..a3b8a6e 100644
--- a/extensions/Services/Makefile.in
+++ b/extensions/Services/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,11 +36,14 @@ host_triplet = @host@
subdir = extensions/Services
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -88,16 +91,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -114,8 +118,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -128,9 +131,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -179,16 +187,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -199,6 +209,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -209,21 +220,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -251,6 +266,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -275,6 +292,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -282,7 +300,6 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = \
- BeagleService \
DBusService
all: all-recursive
@@ -297,9 +314,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Services/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Services/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Services/Makefile
+ $(AUTOMAKE) --foreign extensions/Services/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -332,7 +349,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -357,7 +374,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/extensions/Tools/ChangePhotoPath/ChangePhotoPath.addin.xml b/extensions/Tools/ChangePhotoPath/ChangePhotoPath.addin.xml
index a0127bf..f8e134b 100644
--- a/extensions/Tools/ChangePhotoPath/ChangePhotoPath.addin.xml
+++ b/extensions/Tools/ChangePhotoPath/ChangePhotoPath.addin.xml
@@ -1,6 +1,6 @@
<Addin namespace="FSpot"
id="ChangePath"
- version="0.6"
+ version="0.7"
name="ChangePath"
description="UNSTABLE - Please ensure you have a backup of your photos.db before you test this extension. This extension will allow you to change the base path to the your photos. It is very handy if you move your photos from ~/Photos to /OurPhotos for instance. Just ensure you let SqLite continue to process the changes for up to a few hours after f-spot reports finished. It will only change the path to photos which are located under the Photo directory."
author="Bengt Thuree"
@@ -8,7 +8,7 @@
category="Tools"
defaultEnabled="false">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
<Command id="FileList" _label = "Change path to photos" command_type = "ChangePhotoPath.Dump" />
diff --git a/extensions/Tools/ChangePhotoPath/ChangePhotoPathController.cs b/extensions/Tools/ChangePhotoPath/ChangePhotoPathController.cs
index 093671f..01d78be 100644
--- a/extensions/Tools/ChangePhotoPath/ChangePhotoPathController.cs
+++ b/extensions/Tools/ChangePhotoPath/ChangePhotoPathController.cs
@@ -39,7 +39,7 @@ namespace ChangePhotoPath
public class ChangePathController
{
- PhotoStore photo_store = FSpot.Core.Database.Photos;
+ PhotoStore photo_store = FSpot.App.Instance.Database.Photos;
ArrayList photo_id_array, version_id_array;
StringCollection old_path_array, new_path_array;
int total_photos;
diff --git a/extensions/Tools/ChangePhotoPath/Makefile.am b/extensions/Tools/ChangePhotoPath/Makefile.am
index 25f84f9..86a7386 100755
--- a/extensions/Tools/ChangePhotoPath/Makefile.am
+++ b/extensions/Tools/ChangePhotoPath/Makefile.am
@@ -1,55 +1,24 @@
-include $(top_srcdir)/Makefile.include
+addin = ChangePhotoPath
-PLUGIN_NAME = ChangePhotoPath
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ ChangePhotoPathController.cs \
+ ChangePhotoPathGui.cs \
+ IChangePhotoPathGui.cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ $(addin_manifest) \
+ ChangePhotoPath.glade
-PLUGIN_SOURCES = \
- $(srcdir)/ChangePhotoPathController.cs \
- $(srcdir)/ChangePhotoPathGui.cs \
- $(srcdir)/IChangePhotoPathGui.cs
+addin_references = \
+ Mono.Posix
-REFS = \
- -r:Mono.Posix \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
+addin_packages = \
+ gtk-sharp-2.0 \
+ glade-sharp-2.0
-PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
+addin_extradist = \
+ ChangePhotoPath.glade
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).glade
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST) $(PLUGIN_NAME).glade
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- $(PLUGIN_NAME).glade
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/ChangePhotoPath/Makefile.in b/extensions/Tools/ChangePhotoPath/Makefile.in
index bc83701..09aea16 100644
--- a/extensions/Tools/ChangePhotoPath/Makefile.in
+++ b/extensions/Tools/ChangePhotoPath/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Tools/ChangePhotoPath
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,37 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = ChangePhotoPath
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ ChangePhotoPathController.cs \
+ ChangePhotoPathGui.cs \
+ IChangePhotoPathGui.cs
+
+addin_resources = \
+ $(addin_manifest) \
+ ChangePhotoPath.glade
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0 \
+ glade-sharp-2.0
+
+addin_extradist = \
+ ChangePhotoPath.glade
+
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,68 +317,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = ChangePhotoPath
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/ChangePhotoPathController.cs \
- $(srcdir)/ChangePhotoPathGui.cs \
- $(srcdir)/IChangePhotoPathGui.cs
-
-REFS = \
- -r:Mono.Posix \
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
-r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
-
-PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).glade
-
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- $(PLUGIN_NAME).glade
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -351,9 +374,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Tools/ChangePhotoPath/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/ChangePhotoPath/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Tools/ChangePhotoPath/Makefile
+ $(AUTOMAKE) --foreign extensions/Tools/ChangePhotoPath/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -378,26 +401,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -439,7 +462,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -488,7 +511,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -532,30 +555,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST) $(PLUGIN_NAME).glade
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.addin.xml b/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.addin.xml
index ad6a7e0..56381aa 100644
--- a/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.addin.xml
+++ b/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.addin.xml
@@ -1,6 +1,6 @@
<Addin namespace="FSpot"
id="DevelopInUFraw"
- version="0.6.0.1"
+ version="0.7.0.0"
name="DevelopInUFRaw"
description="Develop the image in UFRaw, saves the result as a new version\n\nNote: Require ufraw 0.13 or CVS version newer than 2007-09-06 !!!"
author="Stephane Delcroix"
@@ -8,7 +8,7 @@
category="Tools"
defaultEnabled="false">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/PhotoPopup">
<Command id = "DevelopInUFRaw" _label = "Develop in UFRaw" command_type = "DevelopInUFRawExtension.DevelopInUFRaw" insertbefore="OpenWith"/>
diff --git a/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs b/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
index e7d350c..97ad4da 100644
--- a/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
+++ b/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
@@ -150,7 +150,7 @@ namespace DevelopInUFRawExtension
p.DefaultVersionId = p.AddVersion (developed, name, true);
p.Changes.DataChanged = true;
- Core.Database.Photos.Commit (p);
+ App.Instance.Database.Photos.Commit (p);
}
private static string GetVersionName (Photo p)
diff --git a/extensions/Tools/DevelopInUFraw/Makefile.am b/extensions/Tools/DevelopInUFraw/Makefile.am
index 0401059..1880cd8 100644
--- a/extensions/Tools/DevelopInUFraw/Makefile.am
+++ b/extensions/Tools/DevelopInUFraw/Makefile.am
@@ -1,51 +1,19 @@
-include $(top_srcdir)/Makefile.include
+addin = DevelopInUFRaw
-PLUGIN_NAME = DevelopInUFRaw
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ $(addin).cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ $(addin_manifest)
-PLUGIN_SOURCES = \
- $(srcdir)/DevelopInUFRaw.cs
+addin_references = \
+ Mono.Posix
-REFS = \
- -r:Mono.Posix \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
+addin_packages = \
+ gtk-sharp-2.0
-PKGS = \
- -pkg:gtk-sharp-2.0
+addin_extradist =
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/DevelopInUFraw/Makefile.in b/extensions/Tools/DevelopInUFraw/Makefile.in
index c227996..cbd8adf 100644
--- a/extensions/Tools/DevelopInUFraw/Makefile.in
+++ b/extensions/Tools/DevelopInUFraw/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Tools/DevelopInUFraw
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,31 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = DevelopInUFRaw
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extradist =
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,64 +311,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = DevelopInUFRaw
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/DevelopInUFRaw.cs
-
-REFS = \
- -r:Mono.Posix \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
-
-PKGS = \
- -pkg:gtk-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -347,9 +368,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Tools/DevelopInUFraw/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/DevelopInUFraw/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Tools/DevelopInUFraw/Makefile
+ $(AUTOMAKE) --foreign extensions/Tools/DevelopInUFraw/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -374,26 +395,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -435,7 +456,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -484,7 +505,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -528,30 +549,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Tools/HashJob/HashJob.addin.xml b/extensions/Tools/HashJob/HashJob.addin.xml
index afa6be7..74558f0 100644
--- a/extensions/Tools/HashJob/HashJob.addin.xml
+++ b/extensions/Tools/HashJob/HashJob.addin.xml
@@ -1,15 +1,15 @@
<Addin namespace="FSpot"
id="HashJob"
- version="0.6"
+ version="0.7"
description="Process your photo collection for duplicate detection"
author="Stephane Delcroix"
url="http://f-spot.org/Extensions"
- name="Hash for Duplicates"
+ name="Check for Duplicates"
category="Tools">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
- <Command id = "HashDupes" _label = "Hash for Duplicates" command_type = "HashJobExtension.HashJob" />
+ <Command id = "HashDupes" _label = "Check for Duplicates..." command_type = "HashJobExtension.HashJob" />
</Extension>
</Addin>
diff --git a/extensions/Tools/HashJob/HashJob.cs b/extensions/Tools/HashJob/HashJob.cs
index 613b140..477aa0b 100644
--- a/extensions/Tools/HashJob/HashJob.cs
+++ b/extensions/Tools/HashJob/HashJob.cs
@@ -35,7 +35,7 @@ namespace HashJobExtension {
public void ShowDialog ()
{
// This query is not very fast, but it's a 'one-time' so don't care much...
- SqliteDataReader reader = FSpot.Core.Database.Database.Query (
+ SqliteDataReader reader = FSpot.App.Instance.Database.Database.Query (
"SELECT COUNT(*) FROM photos p WHERE md5_sum IS NULL OR md5_sum = '' OR EXISTS " +
"(SELECT * FROM photo_versions pv WHERE p.id=pv.photo_id AND version_id <> '1' AND " +
"(pv.md5_sum IS NULL OR pv.md5_sum = ''))");
@@ -43,7 +43,7 @@ namespace HashJobExtension {
uint missing_md5 = Convert.ToUInt32 (reader[0]);
reader.Close ();
- reader = FSpot.Core.Database.Database.Query (String.Format (
+ reader = FSpot.App.Instance.Database.Database.Query (String.Format (
"SELECT COUNT(*) FROM jobs WHERE job_type = '{0}' ", typeof(FSpot.Jobs.CalculateHashJob).ToString ()));
reader.Read ();
uint active_jobs = Convert.ToUInt32 (reader[0]);
@@ -90,21 +90,21 @@ namespace HashJobExtension {
void HandleExecuteClicked (object o, EventArgs e)
{
- SqliteDataReader reader = FSpot.Core.Database.Database.Query (
+ SqliteDataReader reader = FSpot.App.Instance.Database.Database.Query (
"SELECT id FROM photos p WHERE md5_sum IS NULL OR md5_sum = '' OR EXISTS " +
"(SELECT * FROM photo_versions pv WHERE p.id=pv.photo_id AND version_id <> '1' AND " +
"(pv.md5_sum IS NULL OR pv.md5_sum = '') )");
- FSpot.Core.Database.Database.BeginTransaction ();
+ FSpot.App.Instance.Database.Database.BeginTransaction ();
while (reader.Read ())
- FSpot.Jobs.CalculateHashJob.Create (FSpot.Core.Database.Jobs, Convert.ToUInt32 (reader[0]));
+ FSpot.Jobs.CalculateHashJob.Create (FSpot.App.Instance.Database.Jobs, Convert.ToUInt32 (reader[0]));
reader.Close ();
- FSpot.Core.Database.Database.CommitTransaction ();
+ FSpot.App.Instance.Database.Database.CommitTransaction ();
status_label.Text = Catalog.GetString ("Processing images...");
}
void HandleStopClicked (object o, EventArgs e)
{
- FSpot.Core.Database.Database.ExecuteNonQuery (String.Format ("DELETE FROM jobs WHERE job_type = '{0}'", typeof(FSpot.Jobs.CalculateHashJob).ToString ()));
+ FSpot.App.Instance.Database.Database.ExecuteNonQuery (String.Format ("DELETE FROM jobs WHERE job_type = '{0}'", typeof(FSpot.Jobs.CalculateHashJob).ToString ()));
status_label.Text = Catalog.GetString ("Stopped");
}
diff --git a/extensions/Tools/HashJob/Makefile.am b/extensions/Tools/HashJob/Makefile.am
index 7e65c49..b936065 100644
--- a/extensions/Tools/HashJob/Makefile.am
+++ b/extensions/Tools/HashJob/Makefile.am
@@ -1,51 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = HashJob
-PLUGIN_NAME = HashJob
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ $(addin).cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ $(addin_manifest)
-PLUGIN_SOURCES = \
- $(srcdir)/HashJob.cs
+addin_references = \
+ Mono.Posix \
+ Mono.Data.SqliteClient
-REFS = \
- -r:Mono.Posix \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- -r:Mono.Data.SqliteClient \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
+addin_packages = \
+ gtk-sharp-2.0
-PKGS = \
- -pkg:gtk-sharp-2.0
+addin_extra_dist =
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/HashJob/Makefile.in b/extensions/Tools/HashJob/Makefile.in
index 46c42fb..59cfe81 100644
--- a/extensions/Tools/HashJob/Makefile.in
+++ b/extensions/Tools/HashJob/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Tools/HashJob
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,32 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = HashJob
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix \
+ Mono.Data.SqliteClient
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extra_dist =
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,64 +312,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = HashJob
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/HashJob.cs
-
-REFS = \
- -r:Mono.Posix \
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
-r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- -r:Mono.Data.SqliteClient \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
-
-PKGS = \
- -pkg:gtk-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -347,9 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Tools/HashJob/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/HashJob/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Tools/HashJob/Makefile
+ $(AUTOMAKE) --foreign extensions/Tools/HashJob/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -374,26 +396,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -435,7 +457,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -484,7 +506,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -528,30 +550,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs b/extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs
new file mode 100644
index 0000000..40f77d0
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs
@@ -0,0 +1,227 @@
+/*
+ * LiveWebGalleryExtension.GalleryRequestHandler.cs
+ *
+ * Author(s):
+ * Anton Keks <anton at azib.net>
+ *
+ * This is free software. See COPYING for details
+ */
+
+using System;
+using System.IO;
+using System.Text;
+using System.Reflection;
+
+using FSpot;
+using Mono.Unix;
+
+namespace LiveWebGalleryExtension
+{
+ public abstract class PhotoAwareRequestHandler : RequestHandler
+ {
+ protected string TagsToString (Photo photo)
+ {
+ string tags = "";
+ foreach (Tag tag in photo.Tags) {
+ tags += ", " + tag.Name;
+ }
+ return tags.Length > 1 ? tags.Substring (2) : tags;
+ }
+
+ }
+
+ public abstract class TemplateRequestHandler : PhotoAwareRequestHandler
+ {
+ protected string template;
+
+ public TemplateRequestHandler (string name)
+ {
+ template = LoadTemplate (name);
+ }
+
+ protected string GetSubTemplate (StringBuilder s, string begin, string end)
+ {
+ int start_pos = template.IndexOf (begin);
+ string sub = template.Substring (start_pos, template.IndexOf (end, start_pos) - start_pos - 1);
+ s.Replace (sub, "");
+ return sub.Substring (begin.Length, sub.Length - begin.Length);
+ }
+
+ protected string LoadTemplate (string name)
+ {
+ using (TextReader s = new StreamReader (Assembly.GetCallingAssembly ().GetManifestResourceStream (name))) {
+ return s.ReadToEnd ();
+ }
+ }
+
+ protected string Escape (string s) {
+ // javascript-proof
+ return s.Replace ("\"", "\\\"");
+ }
+ }
+
+ public class GalleryRequestHandler : TemplateRequestHandler, ILiveWebGalleryOptions
+ {
+ private QueryType query_type = QueryType.ByTag;
+ public QueryType QueryType {
+ get { return query_type; }
+ set { query_type = value; }
+ }
+
+ private Tag query_tag;
+ public Tag QueryTag {
+ get { return query_tag; }
+ set { query_tag = value; }
+ }
+
+ private bool limit_max_photos = true;
+ public bool LimitMaxPhotos {
+ get { return limit_max_photos; }
+ set { limit_max_photos = value; }
+ }
+
+ private int max_photos = 1000;
+ public int MaxPhotos {
+ get { return max_photos; }
+ set { max_photos = value; }
+ }
+
+ private bool tagging_allowed = false;
+ public bool TaggingAllowed {
+ get { return tagging_allowed; }
+ set { tagging_allowed = value; }
+ }
+
+ private Tag editable_tag;
+ public Tag EditableTag {
+ get { return editable_tag; }
+ set { editable_tag = value; }
+ }
+
+ private LiveWebGalleryStats stats;
+
+ public GalleryRequestHandler (LiveWebGalleryStats stats)
+ : base ("gallery.html")
+ {
+ this.stats = stats;
+ template = template.Replace ("TITLE", Catalog.GetString("F-Spot Gallery"));
+ template = template.Replace ("OFFLINE_MESSAGE", Catalog.GetString("The web gallery seems to be offline now"));
+ template = template.Replace ("SHOW_ALL", Catalog.GetString("Show All"));
+ }
+
+ public override void Handle (string requested, Stream stream)
+ {
+ Photo[] photos = GetChosenPhotos ();
+
+ StringBuilder s = new StringBuilder (4096);
+ s.Append (template);
+ int num_photos = limit_max_photos ? Math.Min (photos.Length, max_photos) : photos.Length;
+ s.Replace ("NUM_PHOTOS", String.Format(Catalog.GetPluralString("{0} photo", "{0} photos", num_photos), num_photos));
+ s.Replace ("QUERY_TYPE", QueryTypeToString ());
+ s.Replace ("EDITABLE_TAG_NAME", tagging_allowed ? Escape (editable_tag.Name) : "");
+
+ string photo_template = GetSubTemplate (s, "BEGIN_PHOTO", "END_PHOTO");
+ StringBuilder photos_s = new StringBuilder (4096);
+
+ num_photos = 0;
+ foreach (Photo photo in photos) {
+ photos_s.Append (PreparePhoto (photo_template, photo));
+
+ if (++num_photos >= max_photos && limit_max_photos)
+ break;
+ }
+ s.Replace ("END_PHOTO", photos_s.ToString ());
+
+ SendHeadersAndStartContent(stream, "Content-Type: text/html; charset=UTF-8");
+ SendLine (stream, s.ToString ());
+
+ stats.BytesSent += s.Length;
+ stats.GalleryViews++;
+ }
+
+ private Photo[] GetChosenPhotos ()
+ {
+ switch (query_type) {
+ case QueryType.ByTag:
+ return App.Instance.Database.Photos.Query (new Tag[] {query_tag});
+ case QueryType.CurrentView:
+ return MainWindow.Toplevel.Query.Photos;
+ case QueryType.Selected:
+ default:
+ return MainWindow.Toplevel.SelectedPhotos ();
+ }
+ }
+
+ private string QueryTypeToString ()
+ {
+ switch (query_type) {
+ case QueryType.ByTag:
+ return query_tag.Name;
+ case QueryType.CurrentView:
+ return Catalog.GetString ("Current View");
+ case QueryType.Selected:
+ default:
+ return Catalog.GetString ("Selected");
+ }
+ }
+
+ private string PreparePhoto (string template, Photo photo)
+ {
+ string photo_s = template.Replace ("PHOTO_ID", photo.Id.ToString ())
+ .Replace ("PHOTO_NAME", Escape (photo.Name))
+ .Replace ("PHOTO_DESCRIPTION", Escape (photo.Description))
+ .Replace ("VERSION_NAME", Escape (photo.DefaultVersion.Name));
+ string tags = TagsToString(photo);
+ photo_s = photo_s.Replace ("PHOTO_TAGS", Escape (tags));
+
+ return photo_s;
+ }
+ }
+
+ public class PingRequestHandler : RequestHandler
+ {
+ public override void Handle (string requested, Stream stream)
+ {
+ SendHeadersAndStartContent (stream);
+ }
+ }
+
+ public class TagAddRemoveRequestHandler : PhotoAwareRequestHandler
+ {
+ private ILiveWebGalleryOptions options;
+
+ public TagAddRemoveRequestHandler (ILiveWebGalleryOptions options)
+ {
+ this.options = options;
+ }
+
+ public override void Handle (string requested, Stream stream)
+ {
+ bool addTag = requested.StartsWith ("add");
+ if (!addTag && !requested.StartsWith ("remove")) {
+ SendError (stream, "400 Bad request " + requested);
+ return;
+ }
+ int slash_pos = requested.IndexOf ('/');
+ requested = requested.Substring (slash_pos + 1);
+ slash_pos = requested.IndexOf ('/');
+ uint photo_id = uint.Parse (requested.Substring (0, slash_pos));
+ string tag_name = requested.Substring (slash_pos + 1);
+
+ if (!options.TaggingAllowed || !options.EditableTag.Name.Equals (tag_name)) {
+ SendError (stream, "403 Forbidden to change tag " + tag_name);
+ return;
+ }
+
+ Photo photo = App.Instance.Database.Photos.Get (photo_id);
+ if (addTag)
+ photo.AddTag (options.EditableTag);
+ else
+ photo.RemoveTag (options.EditableTag);
+ App.Instance.Database.Photos.Commit (photo);
+
+ SendHeadersAndStartContent (stream, "Content-type: text/plain;charset=UTF-8");
+ SendLine (stream, TagsToString (photo));
+ }
+ }
+}
diff --git a/extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml b/extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml
new file mode 100644
index 0000000..aa254c7
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml
@@ -0,0 +1,16 @@
+<Addin namespace="FSpot"
+ id="LiveWebGallery"
+ name="LiveWebGallery"
+ version="0.7.0.0"
+ description="Share photos with other people on the same network via Web Browser"
+ author="Anton Keks"
+ url="http://blog.azib.net/2009/08/announcing-f-spot-live-web-gallery.html"
+ category="Tools"
+ defaultEnabled="false">
+ <Dependencies>
+ <Addin id="Core" version="0.7"/>
+ </Dependencies>
+ <Extension path = "/FSpot/Menus/Tools">
+ <Command id = "LiveWebGallery" _label = "Live Web Gallery" command_type = "LiveWebGalleryExtension.LiveWebGallery" />
+ </Extension>
+</Addin>
diff --git a/extensions/Tools/LiveWebGallery/LiveWebGallery.cs b/extensions/Tools/LiveWebGallery/LiveWebGallery.cs
new file mode 100644
index 0000000..e0208a3
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/LiveWebGallery.cs
@@ -0,0 +1,107 @@
+/*
+ * LiveWebGalleryExtension.LiveWebGallery.cs
+ *
+ * Author(s):
+ * Anton Keks <anton at azib.net>
+ *
+ * This is free software. See COPYING for details
+ */
+
+using System;
+using System.IO;
+using System.Net;
+using System.Collections.Generic;
+
+using Gtk;
+
+using FSpot;
+using FSpot.Extensions;
+using FSpot.Utils;
+using FSpot.Query;
+using FSpot.UI.Dialog;
+using Mono.Unix;
+
+namespace LiveWebGalleryExtension
+{
+ public class LiveWebGallery : ICommand
+ {
+ private static SimpleWebServer web_server;
+ private static ILiveWebGalleryOptions options;
+ private static LiveWebGalleryStats stats;
+ private LiveWebGalleryDialog dialog;
+
+ public LiveWebGallery ()
+ {
+ }
+
+ public void Run (object o, EventArgs e)
+ {
+ if (web_server == null) {
+ stats = new LiveWebGalleryStats ();
+ RequestHandler gallery = new GalleryRequestHandler (stats);
+ options = gallery as ILiveWebGalleryOptions;
+
+ web_server = new SimpleWebServer ();
+ web_server.Stats = stats;
+ web_server.RegisterHandler ("", gallery);
+ web_server.RegisterHandler ("gallery", gallery);
+ web_server.RegisterHandler ("ui", new ResourceRequestHandler ());
+ web_server.RegisterHandler ("ping", new PingRequestHandler ());
+ web_server.RegisterHandler ("photo", new PhotoRequestHandler (stats));
+ web_server.RegisterHandler ("thumb", new ThumbnailRequestHandler (stats));
+ web_server.RegisterHandler ("tag", new TagAddRemoveRequestHandler (options));
+ }
+
+ dialog = new LiveWebGalleryDialog (web_server, options, stats);
+ dialog.Response += HandleResponse;
+ dialog.ShowAll ();
+ }
+
+ void HandleResponse (object obj, ResponseArgs args)
+ {
+ dialog.Destroy ();
+ }
+ }
+
+ public enum QueryType {ByTag, CurrentView, Selected}
+
+ public interface ILiveWebGalleryOptions
+ {
+ QueryType QueryType {get; set;}
+ Tag QueryTag {get; set;}
+ bool LimitMaxPhotos {get; set;}
+ int MaxPhotos {get; set;}
+ bool TaggingAllowed {get; set;}
+ Tag EditableTag {get; set;}
+ }
+
+ public class LiveWebGalleryStats : IWebStats
+ {
+ public event EventHandler StatsChanged;
+
+ private int gallery_views;
+ public int GalleryViews {
+ get { return gallery_views; }
+ set { gallery_views = value; StatsChanged(this, null); }
+ }
+
+ private int photo_views;
+ public int PhotoViews {
+ get { return photo_views; }
+ set { photo_views = value; StatsChanged(this, null); }
+ }
+
+ private IPAddress last_ip;
+ public IPAddress LastIP {
+ get { return last_ip; }
+ set { last_ip = value; StatsChanged(this, null); }
+ }
+
+ public int BytesSent;
+
+ public void IncomingRequest (IPAddress ip)
+ {
+ LastIP = ip;
+ }
+ }
+}
diff --git a/extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs b/extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs
new file mode 100644
index 0000000..6244757
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs
@@ -0,0 +1,201 @@
+/*
+ * LiveWebGalleryExtension.LiveWebGalleryDialog.cs
+ *
+ * Author(s):
+ * Anton Keks <anton at azib.net>
+ *
+ * This is free software. See COPYING for details
+ */
+
+using System;
+using System.Net;
+using System.Reflection;
+using FSpot;
+using FSpot.Extensions;
+using FSpot.Query;
+using Gtk;
+using Mono.Unix;
+
+namespace LiveWebGalleryExtension
+{
+ internal class LiveWebGalleryDialog : FSpot.UI.Dialog.BuilderDialog
+ {
+ [GtkBeans.Builder.Object] Gtk.LinkButton url_button;
+ [GtkBeans.Builder.Object] Gtk.ToggleButton activate_button;
+ [GtkBeans.Builder.Object] Gtk.Button copy_button;
+ [GtkBeans.Builder.Object] Gtk.Label stats_label;
+ [GtkBeans.Builder.Object] Gtk.RadioButton current_view_radio;
+ [GtkBeans.Builder.Object] Gtk.RadioButton tagged_radio;
+ [GtkBeans.Builder.Object] Gtk.RadioButton selected_radio;
+ [GtkBeans.Builder.Object] Gtk.Button tag_button;
+ [GtkBeans.Builder.Object] Gtk.CheckButton limit_checkbox;
+ [GtkBeans.Builder.Object] Gtk.SpinButton limit_spin;
+ [GtkBeans.Builder.Object] Gtk.CheckButton allow_tagging_checkbox;
+ [GtkBeans.Builder.Object] Gtk.Button tag_edit_button;
+
+ private SimpleWebServer server;
+ private ILiveWebGalleryOptions options;
+ private LiveWebGalleryStats stats;
+ private IPAddress last_ip;
+ private string last_client;
+
+ public LiveWebGalleryDialog (SimpleWebServer server, ILiveWebGalleryOptions options, LiveWebGalleryStats stats)
+ : base (Assembly.GetExecutingAssembly (), "LiveWebGallery.ui", "live_web_gallery_dialog")
+ {
+ this.server = server;
+ this.options = options;
+ this.stats = stats;
+ Modal = false;
+
+ activate_button.Active = server.Active;
+ UpdateGalleryURL ();
+ limit_checkbox.Active = options.LimitMaxPhotos;
+ limit_spin.Sensitive = options.LimitMaxPhotos;
+ limit_spin.Value = options.MaxPhotos;
+ UpdateQueryRadios ();
+ HandleQueryTagSelected (options.QueryTag != null ? options.QueryTag : App.Instance.Database.Tags.GetTagById(1));
+ allow_tagging_checkbox.Active = options.TaggingAllowed;
+ tag_edit_button.Sensitive = options.TaggingAllowed;
+ HandleEditableTagSelected (options.EditableTag != null ? options.EditableTag : App.Instance.Database.Tags.GetTagById(3));
+ HandleStatsChanged (null, null);
+
+ activate_button.Toggled += HandleActivated;
+ copy_button.Clicked +=HandleCopyClicked;
+ current_view_radio.Toggled += HandleRadioChanged;
+ tagged_radio.Toggled += HandleRadioChanged;
+ selected_radio.Toggled += HandleRadioChanged;
+ tag_button.Clicked += HandleQueryTagClicked;
+ limit_checkbox.Toggled += HandleLimitToggled;
+ limit_spin.ValueChanged += HandleLimitValueChanged;
+ allow_tagging_checkbox.Toggled += HandleAllowTaggingToggled;
+ tag_edit_button.Clicked += HandleTagForEditClicked;
+ stats.StatsChanged += HandleStatsChanged;
+ }
+
+ void HandleCopyClicked(object sender, EventArgs e)
+ {
+ Clipboard.Get(Gdk.Atom.Intern("CLIPBOARD", true)).Text = url_button.Uri;
+ }
+
+ void HandleStatsChanged (object sender, EventArgs e)
+ {
+ Gtk.Application.Invoke (delegate {
+ if (last_ip == null || !last_ip.Equals (stats.LastIP)) {
+ last_ip = stats.LastIP;
+ try {
+ last_client = Dns.GetHostEntry (last_ip).HostName;
+ }
+ catch (Exception) {
+ last_client = last_ip != null ? last_ip.ToString () : Catalog.GetString ("none");
+ }
+ }
+ stats_label.Text = string.Format(Catalog.GetString (" Gallery: {0}, Photos: {1}, Last client: {3}"),
+ stats.GalleryViews, stats.PhotoViews, stats.BytesSent / 1024, last_client);
+ });
+ }
+
+ void HandleLimitToggled (object sender, EventArgs e)
+ {
+ options.LimitMaxPhotos = limit_checkbox.Active;
+ limit_spin.Sensitive = limit_checkbox.Active;
+ HandleLimitValueChanged (sender, e);
+ }
+
+ void HandleLimitValueChanged (object sender, EventArgs e)
+ {
+ options.MaxPhotos = limit_spin.ValueAsInt;
+ }
+
+ void HandleRadioChanged (object o, EventArgs e)
+ {
+ tag_button.Sensitive = tagged_radio.Active;
+ if (tagged_radio.Active)
+ options.QueryType = QueryType.ByTag;
+ else if (current_view_radio.Active)
+ options.QueryType = QueryType.CurrentView;
+ else
+ options.QueryType = QueryType.Selected;
+ }
+
+ void UpdateQueryRadios ()
+ {
+ switch (options.QueryType)
+ {
+ case QueryType.ByTag:
+ tagged_radio.Active = true;
+ break;
+ case QueryType.CurrentView:
+ current_view_radio.Active = true;
+ break;
+ case QueryType.Selected:
+ default:
+ selected_radio.Active = true;
+ break;
+ }
+ HandleRadioChanged (null, null);
+ }
+
+ void HandleActivated (object o, EventArgs e)
+ {
+ if (activate_button.Active)
+ server.Start ();
+ else
+ server.Stop ();
+
+ UpdateGalleryURL ();
+ }
+
+ void UpdateGalleryURL ()
+ {
+ url_button.Sensitive = server.Active;
+ copy_button.Sensitive = server.Active;
+ if (server.Active) {
+ url_button.Uri = "http://" + server.HostPort;
+ url_button.Label = url_button.Uri;
+ } else {
+ url_button.Label = Catalog.GetString ("Gallery is inactive");
+ }
+ }
+
+ void ShowTagMenuFor (Widget widget, TagMenu.TagSelectedHandler handler)
+ {
+ TagMenu tag_menu = new TagMenu (null, App.Instance.Database.Tags);
+ tag_menu.TagSelected += handler;
+ tag_menu.Populate ();
+ int x, y;
+ GetPosition (out x, out y);
+ x += widget.Allocation.X; y += widget.Allocation.Y;
+ tag_menu.Popup (null, null, delegate (Menu menu, out int x_, out int y_, out bool push_in) {x_ = x; y_ = y; push_in = true;}, 0, 0);
+ }
+
+ void HandleQueryTagClicked (object sender, EventArgs e)
+ {
+ ShowTagMenuFor (tag_button, HandleQueryTagSelected);
+ }
+
+ void HandleQueryTagSelected (Tag tag)
+ {
+ options.QueryTag = tag;
+ tag_button.Label = tag.Name;
+ tag_button.Image = tag.Icon != null ? new Gtk.Image (PixbufUtils.ScaleDown (tag.Icon, 16, 16)) : null;
+ }
+
+ void HandleAllowTaggingToggled (object sender, EventArgs e)
+ {
+ tag_edit_button.Sensitive = allow_tagging_checkbox.Active;
+ options.TaggingAllowed = allow_tagging_checkbox.Active;
+ }
+
+ void HandleTagForEditClicked (object sender, EventArgs e)
+ {
+ ShowTagMenuFor (tag_edit_button, HandleEditableTagSelected);
+ }
+
+ void HandleEditableTagSelected (Tag tag)
+ {
+ options.EditableTag = tag;
+ tag_edit_button.Label = tag.Name;
+ tag_edit_button.Image = tag.Icon != null ? new Gtk.Image (PixbufUtils.ScaleDown (tag.Icon, 16, 16)) : null;
+ }
+ }
+}
diff --git a/extensions/Tools/LiveWebGallery/Makefile.am b/extensions/Tools/LiveWebGallery/Makefile.am
new file mode 100644
index 0000000..74eeea2
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/Makefile.am
@@ -0,0 +1,33 @@
+addin = LiveWebGallery
+
+addin_manifest = $(addin).addin.xml
+
+addin_sources = \
+ LiveWebGallery.cs \
+ LiveWebGalleryDialog.cs \
+ SimpleWebServer.cs \
+ GalleryRequestHandler.cs \
+ PhotoRequestHandler.cs \
+ ResourceRequestHandler.cs
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0 \
+ gnome-sharp-2.0
+
+addin_resources = \
+ $(addin_manifest) \
+ ui/$(addin).ui \
+ ui/empty.png \
+ ui/f-spot.css \
+ ui/f-spot.js \
+ ui/gallery.html
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extradist =
+
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/LiveWebGallery/Makefile.in b/extensions/Tools/LiveWebGallery/Makefile.in
new file mode 100644
index 0000000..16a2de3
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/Makefile.in
@@ -0,0 +1,587 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
+subdir = extensions/Tools/LiveWebGallery
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+addin = LiveWebGallery
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ LiveWebGallery.cs \
+ LiveWebGalleryDialog.cs \
+ SimpleWebServer.cs \
+ GalleryRequestHandler.cs \
+ PhotoRequestHandler.cs \
+ ResourceRequestHandler.cs
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_resources = \
+ $(addin_manifest) \
+ ui/$(addin).ui \
+ ui/empty.png \
+ ui/f-spot.css \
+ ui/f-spot.js \
+ ui/gallery.html
+
+addin_extradist =
+ASSEMBLY = $(addin).dll
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+EXTRA_DIST = \
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/LiveWebGallery/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign extensions/Tools/LiveWebGallery/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-addinDATA: $(addin_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
+ done
+
+uninstall-addinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(addindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-addinDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-addinDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-addinDATA uninstall-am
+
+
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extensions/Tools/LiveWebGallery/PhotoRequestHandler.cs b/extensions/Tools/LiveWebGallery/PhotoRequestHandler.cs
new file mode 100644
index 0000000..0885a60
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/PhotoRequestHandler.cs
@@ -0,0 +1,93 @@
+/*
+ * LiveWebGalleryExtension.PhotoRequestHandler.cs
+ *
+ * Author(s):
+ * Anton Keks <anton at azib.net>
+ *
+ * This is free software. See COPYING for details
+ */
+
+using System;
+using System.IO;
+using System.Text;
+
+using FSpot;
+using FSpot.Filters;
+using FSpot.Utils;
+
+namespace LiveWebGalleryExtension
+{
+ public class PhotoRequestHandler : RequestHandler
+ {
+ private LiveWebGalleryStats stats;
+
+ public PhotoRequestHandler (LiveWebGalleryStats stats)
+ {
+ this.stats = stats;
+ }
+
+ public override void Handle (string requested, Stream stream)
+ {
+ uint photo_id = uint.Parse (requested);
+ Photo photo = App.Instance.Database.Photos.Get (photo_id);
+
+ SendImage (photo, stream);
+ }
+
+ protected virtual void SendImage (Photo photo, Stream stream)
+ {
+ string path = photo.DefaultVersionUri.LocalPath;
+ FileInfo file_info = new FileInfo(path);
+ if (!file_info.Exists) {
+ SendError (stream, "404 The file is not on the disk");
+ return;
+ }
+
+ FilterSet filters = new FilterSet ();
+ filters.Add (new JpegFilter ());
+ filters.Add (new ResizeFilter (1600));
+ filters.Add (new OrientationFilter ());
+
+ using (FilterRequest request = new FilterRequest (photo.DefaultVersionUri)) {
+ filters.Convert (request);
+ file_info = new FileInfo (request.Current.LocalPath);
+ SendFile (file_info, photo, stream);
+ }
+
+ if (stats != null)
+ stats.PhotoViews++;
+ }
+
+ protected void SendFile (FileInfo file, Photo photo, Stream dest)
+ {
+ stats.BytesSent += (int)file.Length;
+ Log.Debug ("Sending {0}, {1} kb", file.FullName, file.Length / 1024);
+ SendHeadersAndStartContent(dest, "Content-Type: " + MimeTypeForExt (file.Extension),
+ "Content-Length: " + file.Length,
+ "Last-Modified: " + photo.Time.ToString ("r"));
+ using (Stream src = file.OpenRead ()) {
+ byte[] buf = new byte[10240];
+ int read;
+ while((read = src.Read(buf, 0, buf.Length)) != 0) {
+ dest.Write (buf, 0, read);
+ }
+ }
+ }
+ }
+
+ public class ThumbnailRequestHandler : PhotoRequestHandler
+ {
+ public ThumbnailRequestHandler (LiveWebGalleryStats stats)
+ : base (stats) {}
+
+ protected override void SendImage (Photo photo, Stream dest)
+ {
+ Gdk.Pixbuf thumb = FSpot.Platform.ThumbnailFactory.LoadThumbnail (photo.DefaultVersionUri);
+ byte[] buf = thumb.SaveToBuffer ("png");
+ SendHeadersAndStartContent(dest, "Content-Type: " + MimeTypeForExt (".png"),
+ "Content-Length: " + buf.Length,
+ "Last-Modified: " + photo.Time.ToString ("r"));
+ dest.Write (buf, 0, buf.Length);
+ }
+ }
+}
diff --git a/extensions/Tools/LiveWebGallery/ResourceRequestHandler.cs b/extensions/Tools/LiveWebGallery/ResourceRequestHandler.cs
new file mode 100644
index 0000000..22ce27f
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/ResourceRequestHandler.cs
@@ -0,0 +1,36 @@
+/*
+ * LiveWebGalleryExtension.ResourceRequestHandler.cs
+ *
+ * Author(s):
+ * Anton Keks <anton at azib.net>
+ *
+ * This is free software. See COPYING for details
+ */
+
+using System;
+using System.IO;
+using System.Text;
+using System.Reflection;
+
+using FSpot;
+
+namespace LiveWebGalleryExtension
+{
+ public class ResourceRequestHandler : RequestHandler
+ {
+ public override void Handle (string requested, Stream stream)
+ {
+ string resource = requested;
+ using (Stream source = Assembly.GetCallingAssembly ().GetManifestResourceStream (resource)) {
+ string ext = Path.GetExtension (resource);
+ SendHeadersAndStartContent(stream, "Content-Type: " + MimeTypeForExt (ext),
+ "Last-Modified: Fri, 21 Oct 2005 04:58:08 GMT"); // for caching
+ byte[] buf = new byte[10240];
+ int read;
+ while((read = source.Read(buf, 0, buf.Length)) != 0) {
+ stream.Write (buf, 0, read);
+ }
+ }
+ }
+ }
+}
diff --git a/extensions/Tools/LiveWebGallery/SimpleWebServer.cs b/extensions/Tools/LiveWebGallery/SimpleWebServer.cs
new file mode 100644
index 0000000..9a07637
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/SimpleWebServer.cs
@@ -0,0 +1,220 @@
+/*
+ * LiveWebGalleryExtension.SimpleWebServer.cs
+ *
+ * Author(s):
+ * Anton Keks <anton at azib.net>
+ *
+ * This is free software. See COPYING for details
+ */
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+
+using FSpot;
+using FSpot.Extensions;
+using FSpot.Utils;
+
+namespace LiveWebGalleryExtension
+{
+ public class SimpleWebServer : IService
+ {
+ private Thread server_thread;
+ private TcpListener listener;
+ private Dictionary<string, RequestHandler> handlers = new Dictionary<string, RequestHandler> ();
+
+ private IWebStats stats;
+ public IWebStats Stats {
+ set { stats = value; }
+ }
+
+ public bool Active {
+ get { return server_thread != null && server_thread.IsAlive; }
+ }
+
+ public string HostPort {
+ get {
+ string host = Dns.GetHostName ();
+ // TODO: add support for .local hostnames
+ foreach (IPAddress addr in Dns.GetHostAddresses(host)) {
+ if (!IPAddress.IsLoopback (addr)) {
+ host = addr.ToString ();
+ }
+ }
+ return host + ":" + (listener.LocalEndpoint as IPEndPoint).Port;
+ }
+ }
+
+ public void RegisterHandler (string request_prefix, RequestHandler handler) {
+ handlers.Add (request_prefix, handler);
+ }
+
+ public bool Start () {
+ try {
+ listener = new TcpListener (IPAddress.Any, 8080);
+ listener.Start ();
+ }
+ catch (SocketException) {
+ // address already in use? choose a random port then
+ listener = new TcpListener (IPAddress.Any, 0);
+ listener.Start ();
+ }
+ server_thread = new Thread (new ThreadStart(ServerLoop));
+ server_thread.Start ();
+ return true;
+ }
+
+ public bool Stop () {
+ server_thread.Abort ();
+ server_thread.Join ();
+ listener.Stop ();
+ return true;
+ }
+
+ public void ServerLoop ()
+ {
+ Log.Information ("Listening on " + listener.LocalEndpoint);
+
+ while (true) {
+ TcpClient client = listener.AcceptTcpClient ();
+ if (client.Connected) {
+ if (stats != null)
+ stats.IncomingRequest ((client.Client.RemoteEndPoint as IPEndPoint).Address);
+
+ RequestProcessor parser = new RequestProcessor (client, handlers);
+ new Thread (new ThreadStart (parser.Process)).Start ();
+ }
+ }
+ }
+
+ class RequestProcessor
+ {
+ private TcpClient client;
+ private Dictionary<string, RequestHandler> handlers;
+
+ public RequestProcessor (TcpClient client, Dictionary<string, RequestHandler> handlers) {
+ this.client = client;
+ this.handlers = handlers;
+ }
+
+ public void Process () {
+ using (client) {
+ NetworkStream stream = client.GetStream ();
+ TextReader reader = new StreamReader (stream, Encoding.UTF8);
+
+ string line = reader.ReadLine ();
+ if (line == null)
+ return;
+
+ Log.Debug ("Incoming request from " + (client.Client.RemoteEndPoint as IPEndPoint).Address + ": " + line);
+
+ string request_method = null, request_string = null;
+ int space_pos = line.IndexOf (' ');
+ if (space_pos > 0) {
+ request_method = line.Substring (0, space_pos);
+ request_string = line.Substring (space_pos + 1, line.LastIndexOf (' ') - space_pos - 1);
+ }
+ while (!string.IsNullOrEmpty(line = reader.ReadLine ())) {
+ // process other request headers here if needed
+ }
+
+ using (stream) {
+ if (!"GET".Equals (request_method)) {
+ RequestHandler.SendError (stream, "400 Bad Request");
+ return;
+ }
+
+ if (request_string.StartsWith ("/"))
+ request_string = request_string.Substring (1);
+
+ string request_prefix = request_string;
+ int slash_pos = request_string.IndexOf ("/");
+ if (slash_pos >= 0)
+ request_prefix = request_string.Substring (0, slash_pos);
+
+ if (!handlers.ContainsKey (request_prefix)) {
+ RequestHandler.SendError (stream, "404 No handler for \"" + request_string + "\"");
+ return;
+ }
+
+ try {
+ handlers[request_prefix].Handle (request_string.Substring (slash_pos+1), stream);
+ }
+ catch (Exception e) {
+ Log.Exception (e);
+ try {
+ RequestHandler.SendError (stream, "500 " + e.Message);
+ }
+ catch (IOException) {
+ // ignore already closed connections
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ public abstract class RequestHandler
+ {
+ public abstract void Handle (string requested, Stream stream);
+
+ public static void SendLine (Stream stream, string header) {
+ byte[] buf = Encoding.UTF8.GetBytes (header + "\r\n");
+ stream.Write (buf, 0, buf.Length);
+ }
+
+ public static void SendStatus (Stream stream, string status) {
+ SendLine (stream, "HTTP/1.0 " + status + "\r\nServer: F-Spot");
+ }
+
+ public static void SendError (Stream stream, string error) {
+ SendStatus (stream, error);
+ StartContent (stream);
+ SendLine (stream, error);
+ }
+
+ public static void StartContent (Stream stream) {
+ // sends the last empty newline after headers
+ SendLine (stream, "");
+ }
+
+ public static void SendHeadersAndStartContent (Stream stream, params string[] headers) {
+ SendStatus (stream, "200 OK");
+ foreach (string header in headers) {
+ SendLine (stream, header);
+ }
+ StartContent (stream);
+ }
+
+ public string MimeTypeForExt (string ext)
+ {
+ switch (ext.ToLower ()) {
+ case ".jpg":
+ case ".jpeg":
+ return "image/jpeg";
+ case ".png":
+ return "image/png";
+ case ".gif":
+ return "image/gif";
+ case ".js":
+ return "text/javascript";
+ case ".css":
+ return "text/css";
+ default:
+ throw new Exception ("Unknown file type: " + ext);
+ }
+ }
+
+ }
+
+ public interface IWebStats
+ {
+ void IncomingRequest (IPAddress addr);
+ }
+}
diff --git a/extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui b/extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui
new file mode 100644
index 0000000..0bc986c
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui
@@ -0,0 +1,361 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="live_web_gallery_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">F-Spot Live Web Gallery</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="border_width">2</property>
+ <property name="n_rows">9</property>
+ <property name="n_columns">4</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="selected_radio">
+ <property name="label" translatable="yes">Selected Photos</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">current_view_radio</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="tagged_radio">
+ <property name="label" translatable="yes">Photos with a Tag</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">current_view_radio</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="current_view_radio">
+ <property name="label" translatable="yes">Current View</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Share:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><small><i>When the gallery is active, above is the URL you need to open
+on another computer to access the shared photos.</i></small></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ <property name="y_padding">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Gallery URL:</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="url_button">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="activate_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="is_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Activates and deactivates the web gallery</property>
+ <property name="image">activate_image</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="limit_spin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">4</property>
+ <property name="adjustment">limit_spin_adjustment</property>
+ <property name="climb_rate">25</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="allow_tagging_checkbox">
+ <property name="label" translatable="yes">Allow viewers to add tags</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Options:</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="limit_checkbox">
+ <property name="label" translatable="yes">Limit number of shared photos to</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">1</property>
+ <property name="label" translatable="yes"><small><i>The gallery stays active until you either deactivate it or close
+F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="tag_button">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="stats_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="selectable">True</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Views:</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="copy_button">
+ <property name="width_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Copy URL to clipboard</property>
+ <property name="image">copy_image</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="tag_edit_button">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="close_button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-3">close_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkImage" id="activate_image">
+ <property name="visible">True</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <object class="GtkAdjustment" id="limit_spin_adjustment">
+ <property name="upper">99999</property>
+ <property name="step_increment">5</property>
+ <property name="page_increment">50</property>
+ <property name="page_size">50</property>
+ </object>
+ <object class="GtkImage" id="copy_image">
+ <property name="visible">True</property>
+ <property name="stock">gtk-copy</property>
+ </object>
+</interface>
diff --git a/extensions/Tools/LiveWebGallery/ui/empty.png b/extensions/Tools/LiveWebGallery/ui/empty.png
new file mode 100644
index 0000000..49b383b
Binary files /dev/null and b/extensions/Tools/LiveWebGallery/ui/empty.png differ
diff --git a/extensions/Tools/LiveWebGallery/ui/f-spot.css b/extensions/Tools/LiveWebGallery/ui/f-spot.css
new file mode 100644
index 0000000..91136cf
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/ui/f-spot.css
@@ -0,0 +1,130 @@
+/*
+ * F-Spot Web Sharing Gallery Stylesheet
+ * Author: Anton Keks <anton at azib.net>
+ */
+
+body {
+ font-family: luxi sans, trebuchet ms, sans-serif;
+ color: #888;
+ background-color: #3c3c3c;
+ margin: 0;
+}
+
+.header {
+ position: fixed;
+ top: 0;
+ width: 100%;
+ padding: 10px;
+ font-size: 14px;
+ color: black;
+ background-color: #BBBBBB;
+ text-align: center;
+ opacity: 0.8;
+ filter: alpha(opacity=80);
+ margin-left: -12px;
+}
+
+div.thumbs {
+ margin: 50px 12px 12px 12px;
+ clear: both;
+ padding: 6px;
+ text-align: center;
+}
+
+div.thumbs img.horizontal {
+ width: 256px;
+}
+
+div.thumbs img.vertical {
+ height: 256px;
+}
+
+div.thumbs a {
+ margin: 2px;
+ padding: 8px;
+ display: block;
+ float: left;
+ width: 260px;
+ height: 260px;
+ line-height: 260px;
+ background-color: #333333;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+
+div.thumbs a:hover {
+ background-color: #444444;
+}
+
+div.thumbs img, div.photo img {
+ vertical-align: middle;
+ padding: 1px;
+ border: 1px solid #AAAAAA;
+}
+
+#navi_photo {
+ position: absolute;
+ left: 10px;
+}
+
+#navi_thumbs {
+ position: absolute;
+ right: 20px;
+}
+
+.navi a {
+ float: left;
+ border: 1px solid #444444;
+ display: block;
+ height: 1.4em;
+ margin-left: 10px;
+ text-align: center;
+ padding-top: 1px;
+ padding-left: 12px;
+ padding-right: 12px;
+ color: #000000;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 4px;
+}
+
+.navi a:hover {
+ text-decoration: none;
+ background-color: #FEFEFE;
+ color: #000000;
+}
+
+#title, #offline {
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
+ margin-left: 3px;
+ font-size: large;
+ letter-spacing: .3em;
+}
+
+#offline {
+ color: red;
+}
+
+a {
+ text-decoration: none;
+ color: #000000;
+}
+
+div.photo {
+ text-align: center;
+ vertical-align: middle;
+ margin-top: 60px;
+ margin-bottom: 60px;
+}
+
+div.photo a {
+ color: #AAAAAA;
+ display: inline;
+ float: none;
+}
+
+div.photo a:hover {
+ text-decoration: underline;
+ text-color: #FEFEFE;
+}
diff --git a/extensions/Tools/LiveWebGallery/ui/f-spot.js b/extensions/Tools/LiveWebGallery/ui/f-spot.js
new file mode 100644
index 0000000..363d001
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/ui/f-spot.js
@@ -0,0 +1,230 @@
+/*
+ * F-Spot Web Sharing Gallery Scripts
+ * Author: Anton Keks <anton at azib.net>
+ */
+
+var photos;
+var missing_thumbs;
+var thumb_size = screen.width <= 1280 ? 160 : screen.width <= 1600 ? 192 : 224;
+var current_photo_id;
+var editable_tag;
+
+function $(id) {
+ return document.getElementById(id);
+}
+
+function generateThumbs() {
+ missing_thumbs = {};
+ var html = '';
+ var prev_id = null;
+ for (var id in photos) {
+ if (prev_id) photos[prev_id].next_id = id;
+ photos[id].prev_id = prev_id;
+ prev_id = id;
+ missing_thumbs[id] = true;
+ html += '<a href="javascript:showPhoto(' + id + ')"><img id="thumb_' + id + '" alt="' + photos[id].name + '" src="ui/empty.png" class="horizontal" onload="changeClass(this)"/></a>';
+ }
+ document.getElementById('thumbs').innerHTML = html;
+}
+
+function loadThumb(img) {
+ img.src = img.id.replace(/thumb_/, '/thumb/');
+}
+
+function changeClass(img) {
+ if (img.height > img.width)
+ img.className = 'vertical';
+}
+
+function loadVisibleThumbs() {
+ var visibleTop, visibleBottom;
+ if (window.innerHeight) {
+ visibleTop = window.pageYOffset;
+ visibleBottom = visibleTop + window.innerHeight;
+ } else if (document.documentElement) {
+ visibleTop = document.documentElement.scrollTop;
+ visibleBottom = visibleTop + document.documentElement.clientHeight;
+ }
+ visibleTop -= 128; visibleBottom += 128;
+
+ for (var id in missing_thumbs) {
+ var img = $('thumb_' + id);
+ if (img.offsetTop >= visibleTop && img.offsetTop <= visibleBottom) {
+ loadThumb(img);
+ delete missing_thumbs[id];
+ }
+ }
+}
+
+function largerThumbs() {
+ switch (thumb_size) {
+ case 128: thumb_size = 160; break;
+ case 160: thumb_size = 192; break;
+ case 192: thumb_size = 224; break;
+ default: thumb_size = 256;
+ }
+ resizeThumbs();
+}
+
+function smallerThumbs() {
+ switch (thumb_size) {
+ case 256: thumb_size = 224; break;
+ case 224: thumb_size = 192; break;
+ case 192: thumb_size = 160; break;
+ default: thumb_size = 128;
+ }
+ resizeThumbs();
+}
+
+function resizeThumbs() {
+ var cssRules = document.styleSheets[0].cssRules;
+ if (!cssRules)
+ cssRules = document.styleSheets[0].rules;
+ // div.thumbs img.horizontal
+ cssRules[3].style.width = thumb_size + 'px';
+ // div.thumbs img.vertical
+ cssRules[4].style.height = thumb_size + 'px';
+ // div.thumbs a
+ cssRules[5].style.width = cssRules[5].style.height = cssRules[5].style.lineHeight = (thumb_size + 5) + 'px';
+ loadVisibleThumbs();
+}
+
+function scalePhoto(event) {
+ var vHeight, vWidth;
+ if (window.innerHeight) {
+ vHeight = window.innerHeight;
+ vWidth = window.innerWidth;
+ }
+ else if (document.documentElement) {
+ vHeight = document.documentElement.clientHeight;
+ vWidth = document.documentElement.clientWidth;
+ }
+ vHeight -= 100;
+ vWidth -= 50;
+
+ var img = $('photo_img');
+ if (img.width > vWidth || img.height > vHeight || (event && event.type == 'resize')) {
+ if (vWidth / vHeight > img.width / img.height)
+ img.height = vHeight;
+ else
+ img.width = vWidth;
+ }
+
+ img.style.display = 'inline';
+}
+
+function showThumbs() {
+ $('photo').style.display = 'none';
+ $('thumbs').style.display = 'block';
+ $('navi_photo').style.display = 'none';
+ $('navi_thumbs').style.display = 'block';
+ $('photo_img').src = 'ui/empty.png';
+ window.onresize = window.onscroll = loadVisibleThumbs;
+ window.onkeydown = null;
+ loadVisibleThumbs();
+ if (current_photo_id)
+ window.scroll(0, $('thumb_' + current_photo_id).offsetTop - 150);
+}
+
+function showPhoto(id) {
+ current_photo_id = id;
+ var photo = photos[id];
+ $('thumbs').style.display = 'none';
+ $('navi_photo').style.display = 'inline';
+ $('navi_thumbs').style.display = 'none';
+
+ $('description').innerHTML = photo.description;
+ showPhotoTags(photo);
+
+ var img = $('photo_img');
+ img.style.display = 'none';
+ img.removeAttribute("width");
+ img.removeAttribute("height");
+ img.src = '/photo/' + id;
+ img.title = photo.name + ' (' + photo.version + ')';
+
+ $('photo').style.display = 'block';
+ window.onresize = scalePhoto;
+ window.onscroll = null;
+ window.onkeydown = handleKeys;
+
+ if (photo.next_id) {
+ var preload = new Image();
+ preload.src = '/photo/' + photo.next_id;
+ }
+}
+
+function nextPhoto() {
+ var next_id = photos[current_photo_id].next_id;
+ if (next_id)
+ showPhoto(next_id);
+}
+
+function prevPhoto() {
+ var prev_id = photos[current_photo_id].prev_id;
+ if (prev_id)
+ showPhoto(prev_id);
+}
+
+function handleKeys(e) {
+ switch (e.keyCode) {
+ case 27 /* esc */:
+ showThumbs();
+ return true;
+ case 37 /* left */:
+ prevPhoto();
+ return true;
+ case 39 /* right */:
+ nextPhoto();
+ return true;
+ }
+}
+
+function showPhotoTags(photo) {
+ $('tags').innerHTML = photo.tags;
+ if (editable_tag) {
+ $('edit_tag').innerHTML = "<b>" + (hasTag(editable_tag) ? "-" : "+") + "</b> " + editable_tag;
+ }
+}
+
+function hasTag(tag_name) {
+ var tags = photos[current_photo_id].tags;
+ var pos = tags.indexOf(editable_tag);
+ var end = pos + editable_tag.length;
+ return pos >= 0 && (pos == 0 || tags.charAt(pos-1) == ' ') && (end == tags.length || tags.charAt(end) == ',');
+}
+
+function addRemoveTag() {
+ if (!editable_tag)
+ return;
+
+ var http = new XMLHttpRequest();
+ http.open('GET', '/tag/' + (hasTag(editable_tag) ? "remove" : "add") + "/" + current_photo_id + "/" + editable_tag);
+ http.onreadystatechange = function() {
+ if (this.readyState == 4 && this.status == 200) {
+ photos[current_photo_id].tags = this.responseText.replace(/[\r\n]/g, "");
+ showPhotoTags(photos[current_photo_id]);
+ }
+ else if (this.readyState == 4 && this.status != 200) {
+ alert("Failed to update tags, Gallery is inactive?");
+ }
+ };
+ http.send("");
+}
+
+function galleryPing() {
+ var http = new XMLHttpRequest();
+ http.open('GET', '/ping');
+ http.onreadystatechange = function() {
+ if (this.readyState == 4 && this.status == 200) {
+ setTimeout(galleryPing, 5000);
+ }
+ else if (this.readyState == 4 && this.status != 200) {
+ $('title').style.display = 'none';
+ $('offline').style.display = 'block';
+ }
+ };
+ http.send("");
+}
+
+setTimeout(galleryPing, 10000);
diff --git a/extensions/Tools/LiveWebGallery/ui/gallery.html b/extensions/Tools/LiveWebGallery/ui/gallery.html
new file mode 100644
index 0000000..620e480
--- /dev/null
+++ b/extensions/Tools/LiveWebGallery/ui/gallery.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>TITLE</title>
+ <link media="screen" href="/ui/f-spot.css" rel="stylesheet" type="text/css"/>
+ <script src="/ui/f-spot.js" type="text/javascript"></script>
+</head>
+<body onload="generateThumbs(); resizeThumbs(); showThumbs();">
+ <div class="header">
+ <div id="navi_photo" class="navi" style="display: none">
+ <a href="javascript:showThumbs()">SHOW_ALL</a>
+ <a href="javascript:prevPhoto()">◄</a>
+ <a href="javascript:nextPhoto()">►</a>
+ </div>
+ <div id="navi_thumbs" class="navi" style="display: none">
+ <a href="javascript:smallerThumbs()">-</a>
+ <a href="javascript:largerThumbs()">+</a>
+ </div>
+ <div id="title"><a href="http://f-spot.org">F-Spot</a> - QUERY_TYPE - NUM_PHOTOS</div>
+ <div id="offline" style="display:none">OFFLINE_MESSAGE</div>
+ </div>
+ <div id="thumbs" class="thumbs">
+ </div>
+ <div id="photo" class="photo" style="display: none">
+ <img id="photo_img" style="display: none" onload="scalePhoto(event)" src="ui/empty.png"/>
+ <div id="description"></div>
+ <div>
+ <div id="tags"></div>
+ <a id="edit_tag" href="javascript:addRemoveTag()"></a>
+ </div>
+ </div>
+ <script type="text/javascript">
+ editable_tag = "EDITABLE_TAG_NAME";
+ photos = {
+ BEGIN_PHOTO
+ PHOTO_ID: {name: "PHOTO_NAME", version: "VERSION_NAME", description: "PHOTO_DESCRIPTION", tags: "PHOTO_TAGS"},
+ END_PHOTO
+ 'eof': null
+ };
+ delete photos['eof'];
+ </script>
+</body>
+</html>
diff --git a/extensions/Tools/Makefile.am b/extensions/Tools/Makefile.am
index 2b291ae..0becd70 100644
--- a/extensions/Tools/Makefile.am
+++ b/extensions/Tools/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = \
ChangePhotoPath \
DevelopInUFraw \
HashJob \
+ LiveWebGallery \
MergeDb \
RawPlusJpeg \
+ RetroactiveRoll \
ScreensaverConfig
diff --git a/extensions/Tools/Makefile.in b/extensions/Tools/Makefile.in
index a9f84f9..ddd9b19 100644
--- a/extensions/Tools/Makefile.in
+++ b/extensions/Tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,11 +36,14 @@ host_triplet = @host@
subdir = extensions/Tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -88,16 +91,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -114,8 +118,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -128,9 +131,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -179,16 +187,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -199,6 +209,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -209,21 +220,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -251,6 +266,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -275,6 +292,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -285,8 +303,10 @@ SUBDIRS = \
ChangePhotoPath \
DevelopInUFraw \
HashJob \
+ LiveWebGallery \
MergeDb \
RawPlusJpeg \
+ RetroactiveRoll \
ScreensaverConfig
all: all-recursive
@@ -301,9 +321,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Tools/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Tools/Makefile
+ $(AUTOMAKE) --foreign extensions/Tools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -336,7 +356,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -361,7 +381,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/extensions/Tools/MergeDb/Makefile.am b/extensions/Tools/MergeDb/Makefile.am
index ae17a84..a59b482 100644
--- a/extensions/Tools/MergeDb/Makefile.am
+++ b/extensions/Tools/MergeDb/Makefile.am
@@ -1,55 +1,24 @@
-include $(top_srcdir)/Makefile.include
+addin = MergeDb
-PLUGIN_NAME = MergeDb
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ $(addin).cs \
+ MergeDbDialog.cs \
+ PickFolderDialog.cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ $(addin_manifest) \
+ $(addin).glade
-PLUGIN_SOURCES = \
- $(srcdir)/MergeDb.cs \
- $(srcdir)/MergeDbDialog.cs \
- $(srcdir)/PickFolderDialog.cs
+addin_references = \
+ Mono.Posix
-REFS = \
- -r:Mono.Posix \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
+addin_packages = \
+ gtk-sharp-2.0 \
+ glade-sharp-2.0
-PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
+addin_extradist =
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).glade
+include $(top_srcdir)/Makefile.addins
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST) $(PLUGIN_NAME).glade
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- $(PLUGIN_NAME).glade
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
diff --git a/extensions/Tools/MergeDb/Makefile.in b/extensions/Tools/MergeDb/Makefile.in
index 7c8ece2..22022cb 100644
--- a/extensions/Tools/MergeDb/Makefile.in
+++ b/extensions/Tools/MergeDb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Tools/MergeDb
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,35 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = MergeDb
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs \
+ MergeDbDialog.cs \
+ PickFolderDialog.cs
+
+addin_resources = \
+ $(addin_manifest) \
+ $(addin).glade
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0 \
+ glade-sharp-2.0
+
+addin_extradist =
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,68 +315,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = MergeDb
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/MergeDb.cs \
- $(srcdir)/MergeDbDialog.cs \
- $(srcdir)/PickFolderDialog.cs
-
-REFS = \
- -r:Mono.Posix \
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
-r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
$(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
-
-PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).glade
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
+addin_SOURCES = \
+ $(build_sources)
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- $(PLUGIN_NAME).glade
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -351,9 +372,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Tools/MergeDb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/MergeDb/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Tools/MergeDb/Makefile
+ $(AUTOMAKE) --foreign extensions/Tools/MergeDb/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -378,26 +399,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -439,7 +460,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -488,7 +509,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -532,30 +553,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST) $(PLUGIN_NAME).glade
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Tools/MergeDb/MergeDb.addin.xml b/extensions/Tools/MergeDb/MergeDb.addin.xml
index 23d4c18..3cd7fd0 100644
--- a/extensions/Tools/MergeDb/MergeDb.addin.xml
+++ b/extensions/Tools/MergeDb/MergeDb.addin.xml
@@ -1,14 +1,14 @@
<Addin namespace="FSpot"
id="MergeDb"
name="MergeDb"
- version="0.6"
+ version="0.7"
description="Merge another db back to the main one"
author="Stephane Delcroix"
url="http://f-spot.org/Extensions"
category="Tools"
defaultEnabled="false">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
<Command id = "MergeDb" _label = "Merge Db" command_type = "MergeDbExtension.MergeDb" />
diff --git a/extensions/Tools/MergeDb/MergeDb.cs b/extensions/Tools/MergeDb/MergeDb.cs
index 3f43cbb..043885e 100644
--- a/extensions/Tools/MergeDb/MergeDb.cs
+++ b/extensions/Tools/MergeDb/MergeDb.cs
@@ -37,7 +37,7 @@ namespace MergeDbExtension
{
from_db = new Db ();
from_db.ExceptionThrown += HandleDbException;
- to_db = Core.Database;
+ to_db = App.Instance.Database;
//ShowDialog ();
mdd = new MergeDbDialog (this);
diff --git a/extensions/Tools/MergeDb/MergeDbDialog.cs b/extensions/Tools/MergeDb/MergeDbDialog.cs
index d59e810..7efbf2d 100644
--- a/extensions/Tools/MergeDb/MergeDbDialog.cs
+++ b/extensions/Tools/MergeDb/MergeDbDialog.cs
@@ -62,6 +62,7 @@ namespace MergeDbExtension
rolls = value;
foreach (Roll r in rolls) {
uint numphotos = parent.FromDb.Rolls.PhotosInRoll (r);
+ // Roll time is in UTC always
DateTime date = r.Time.ToLocalTime ();
rolls_combo.AppendText (String.Format ("{0} ({1})", date.ToString("%dd %MMM, %HH:%mm"), numphotos));
rolls_combo.Active = 0;
diff --git a/extensions/Tools/RawPlusJpeg/Makefile.am b/extensions/Tools/RawPlusJpeg/Makefile.am
index a9a6607..876e527 100644
--- a/extensions/Tools/RawPlusJpeg/Makefile.am
+++ b/extensions/Tools/RawPlusJpeg/Makefile.am
@@ -1,52 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = RawPlusJpeg
-PLUGIN_NAME = RawPlusJpeg
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ $(addin).cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ $(addin_manifest)
-PLUGIN_SOURCES = \
- $(srcdir)/RawPlusJpeg.cs
+addin_references = \
+ Mono.Posix
-REFS = \
- -r:Mono.Posix \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
+addin_packages = \
+ gtk-sharp-2.0 \
+ glade-sharp-2.0
-PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
+addin_extradist =
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/RawPlusJpeg/Makefile.in b/extensions/Tools/RawPlusJpeg/Makefile.in
index 6eb786e..9399f91 100644
--- a/extensions/Tools/RawPlusJpeg/Makefile.in
+++ b/extensions/Tools/RawPlusJpeg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Tools/RawPlusJpeg
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,32 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = RawPlusJpeg
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0 \
+ glade-sharp-2.0
+
+addin_extradist =
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,65 +312,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = RawPlusJpeg
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/RawPlusJpeg.cs
-
-REFS = \
- -r:Mono.Posix \
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
-r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
-
-PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -348,9 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Tools/RawPlusJpeg/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/RawPlusJpeg/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Tools/RawPlusJpeg/Makefile
+ $(AUTOMAKE) --foreign extensions/Tools/RawPlusJpeg/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -375,26 +396,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -436,7 +457,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -485,7 +506,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -529,30 +550,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Tools/RawPlusJpeg/RawPlusJpeg.addin.xml b/extensions/Tools/RawPlusJpeg/RawPlusJpeg.addin.xml
index 55563c5..cba8b57 100644
--- a/extensions/Tools/RawPlusJpeg/RawPlusJpeg.addin.xml
+++ b/extensions/Tools/RawPlusJpeg/RawPlusJpeg.addin.xml
@@ -1,14 +1,14 @@
<Addin namespace="FSpot"
id="RawPlusJpeg"
name="RawPlusJpeg"
- version="0.6"
+ version="0.7"
description="Merge RAW+Jpeg as multiple versions of the same photo"
author="Stephane Delcroix"
url="http://f-spot.org/Extensions"
category="Tools"
defaultEnabled="false">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
<Command id = "MergeRawJpeg" _label = "Merge Raw" command_type = "RawPlusJpegExtension.RawPlusJpeg" />
diff --git a/extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs b/extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs
index ec04628..e348a49 100644
--- a/extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs
+++ b/extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs
@@ -33,7 +33,7 @@ namespace RawPlusJpegExtension
"Do it now"))
return;
- Photo [] photos = Core.Database.Photos.Query ((Tag [])null, null, null, null);
+ Photo [] photos = App.Instance.Database.Photos.Query ((Tag [])null, null, null, null);
Array.Sort (photos, new Photo.CompareDirectory ());
Photo raw = null;
@@ -115,8 +115,8 @@ namespace RawPlusJpegExtension
}
}
raw.Changes.DataChanged = true;
- Core.Database.Photos.Commit (raw);
- Core.Database.Photos.Remove (jpeg);
+ App.Instance.Database.Photos.Commit (raw);
+ App.Instance.Database.Photos.Remove (jpeg);
}
}
}
diff --git a/extensions/Tools/RetroactiveRoll/Makefile.am b/extensions/Tools/RetroactiveRoll/Makefile.am
new file mode 100644
index 0000000..0ddb099
--- /dev/null
+++ b/extensions/Tools/RetroactiveRoll/Makefile.am
@@ -0,0 +1,20 @@
+addin = RetroactiveRoll
+
+addin_manifest = $(addin).addin.xml
+
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix \
+ Mono.Data.SqliteClient
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extradist =
+
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/RetroactiveRoll/Makefile.in b/extensions/Tools/RetroactiveRoll/Makefile.in
new file mode 100644
index 0000000..5a66b7a
--- /dev/null
+++ b/extensions/Tools/RetroactiveRoll/Makefile.in
@@ -0,0 +1,578 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
+subdir = extensions/Tools/RetroactiveRoll
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+addin = RetroactiveRoll
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix \
+ Mono.Data.SqliteClient
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extradist =
+ASSEMBLY = $(addin).dll
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+EXTRA_DIST = \
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/RetroactiveRoll/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign extensions/Tools/RetroactiveRoll/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-addinDATA: $(addin_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
+ done
+
+uninstall-addinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(addindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-addinDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-addinDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-addinDATA uninstall-am
+
+
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extensions/Tools/RetroactiveRoll/RetroactiveRoll.addin.xml b/extensions/Tools/RetroactiveRoll/RetroactiveRoll.addin.xml
new file mode 100644
index 0000000..d8e1b77
--- /dev/null
+++ b/extensions/Tools/RetroactiveRoll/RetroactiveRoll.addin.xml
@@ -0,0 +1,15 @@
+<Addin namespace="FSpot"
+ id="RetroactiveRoll"
+ name="RetroactiveRoll"
+ version="0.7"
+ description="Retroactively assign old photos to import rolls"
+ author="Andy Wingo"
+ url="http://f-spot.org/Extensions"
+ category="Tools">
+ <Dependencies>
+ <Addin id="Core" version="0.7"/>
+ </Dependencies>
+ <Extension path = "/FSpot/Menus/PhotoPopup">
+ <Command id = "RetroactiveRoll" _label = "Reassign to new import roll" command_type = "RetroactiveRoll.RetroactiveRoll"/>
+ </Extension>
+</Addin>
diff --git a/extensions/Tools/RetroactiveRoll/RetroactiveRoll.cs b/extensions/Tools/RetroactiveRoll/RetroactiveRoll.cs
new file mode 100644
index 0000000..019713a
--- /dev/null
+++ b/extensions/Tools/RetroactiveRoll/RetroactiveRoll.cs
@@ -0,0 +1,49 @@
+/*
+ * RetroactiveRoll.cs
+ *
+ * Author(s)
+ * Andy Wingo <wingo at pobox.com>
+ *
+ * This is free software. See COPYING for details
+ */
+
+
+using FSpot;
+using FSpot.Extensions;
+using Mono.Unix;
+using System;
+using Mono.Data.SqliteClient;
+using Banshee.Database;
+
+namespace RetroactiveRoll
+{
+ public class RetroactiveRoll: ICommand
+ {
+ public void Run (object o, EventArgs e)
+ {
+ Photo[] photos = MainWindow.Toplevel.SelectedPhotos ();
+
+ if (photos.Length == 0) {
+ Console.WriteLine ("no photos selected, returning");
+ return;
+ }
+
+ DateTime import_time = photos[0].Time;
+ foreach (Photo p in photos)
+ if (p.Time > import_time)
+ import_time = p.Time;
+
+ RollStore rolls = App.Instance.Database.Rolls;
+ Roll roll = rolls.Create(import_time);
+ foreach (Photo p in photos) {
+ DbCommand cmd = new DbCommand ("UPDATE photos SET roll_id = :roll_id " +
+ "WHERE id = :id ",
+ "roll_id", roll.Id,
+ "id", p.Id);
+ App.Instance.Database.Database.ExecuteNonQuery (cmd);
+ p.RollId = roll.Id;
+ }
+ Console.WriteLine ("RetroactiveRoll done: " + photos.Length + " photos in roll " + roll.Id);
+ }
+ }
+}
diff --git a/extensions/Tools/ScreensaverConfig/Makefile.am b/extensions/Tools/ScreensaverConfig/Makefile.am
index f0044cd..e0016c8 100644
--- a/extensions/Tools/ScreensaverConfig/Makefile.am
+++ b/extensions/Tools/ScreensaverConfig/Makefile.am
@@ -1,54 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = ScreensaverConfig
-PLUGIN_NAME = ScreensaverConfig
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ $(addin).cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ ScreensaverConfigDialog.ui \
+ $(addin_manifest)
-PLUGIN_SOURCES = \
- $(srcdir)/ScreensaverConfig.cs
+addin_references = \
+ Mono.Posix
-REFS = \
- -r:Mono.Posix \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Widgets.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
+addin_packages = \
+ gtk-sharp-2.0
-PKGS = \
- -pkg:gtk-sharp-2.0
+addin_extradist =
-RESOURCES = \
- -resource:$(srcdir)/ScreensaverConfigDialog.ui \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(srcdir)/ScreensaverConfigDialog.ui \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/ScreensaverConfig/Makefile.in b/extensions/Tools/ScreensaverConfig/Makefile.in
index 0181aa1..ed38f88 100644
--- a/extensions/Tools/ScreensaverConfig/Makefile.in
+++ b/extensions/Tools/ScreensaverConfig/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Tools/ScreensaverConfig
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,32 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = ScreensaverConfig
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ ScreensaverConfigDialog.ui \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Posix
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extradist =
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,67 +312,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = ScreensaverConfig
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/ScreensaverConfig.cs
-
-REFS = \
- -r:Mono.Posix \
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
-r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
-r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Widgets.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
-r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GIOSHARP) \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
$(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
- $(LINK_DBUS) \
- $(LINK_GPHOTO2)
-
-PKGS = \
- -pkg:gtk-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/ScreensaverConfigDialog.ui \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
+addin_SOURCES = \
+ $(build_sources)
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(srcdir)/ScreensaverConfigDialog.ui \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -350,9 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Tools/ScreensaverConfig/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Tools/ScreensaverConfig/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Tools/ScreensaverConfig/Makefile
+ $(AUTOMAKE) --foreign extensions/Tools/ScreensaverConfig/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -377,26 +396,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -438,7 +457,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -487,7 +506,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -531,30 +550,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml b/extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml
index ab78012..4f77fb7 100644
--- a/extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml
+++ b/extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml
@@ -1,14 +1,14 @@
<Addin namespace="FSpot"
id="ScreensaverConfig"
name="Screensaver Configuration"
- version="0.6"
+ version="0.7.0.0"
description="Screensaver options"
author="Stephane Delcroix"
url="http://f-spot.org/Extensions"
category="Tools"
defaultEnabled="true">
<Dependencies>
- <Addin id="Core" version="0.6"/>
+ <Addin id="Core" version="0.7.0.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
<Command id = "ScreensaverConfig" _label = "Configure Screensaver" command_type = "ScreensaverConfig.ScreensaverConfig" />
diff --git a/extensions/Tools/ScreensaverConfig/ScreensaverConfig.cs b/extensions/Tools/ScreensaverConfig/ScreensaverConfig.cs
index 969fbfa..8824ddf 100644
--- a/extensions/Tools/ScreensaverConfig/ScreensaverConfig.cs
+++ b/extensions/Tools/ScreensaverConfig/ScreensaverConfig.cs
@@ -27,9 +27,8 @@ namespace ScreensaverConfig
const string SaverMode = "single";
const string GNOME_SCREENSAVER_THEME = "/apps/gnome-screensaver/themes";
const string GNOME_SCREENSAVER_MODE = "/apps/gnome-screensaver/mode";
- const string SCREENSAVER = "screensaver/";
- const string SCREENSAVER_TAG = Preferences.APP_FSPOT + SCREENSAVER + "tag_id";
- const string SCREENSAVER_DELAY = Preferences.APP_FSPOT + SCREENSAVER + "delay";
+ const string SCREENSAVER_TAG = Preferences.SCREENSAVER_TAG;
+ const string SCREENSAVER_DELAY = Preferences.SCREENSAVER_DELAY;
const double default_delay = 2.0;
public void Run (object o, EventArgs e)
diff --git a/extensions/Transitions/CoverTransition/CoverTransition.addin.xml b/extensions/Transitions/CoverTransition/CoverTransition.addin.xml
index 18594e7..330d4c4 100644
--- a/extensions/Transitions/CoverTransition/CoverTransition.addin.xml
+++ b/extensions/Transitions/CoverTransition/CoverTransition.addin.xml
@@ -1,13 +1,13 @@
<Addin namespace="FSpot"
id="CoverTransition"
- version="0.6.0.1"
+ version="0.7.0.0"
name="Cover Transition"
description="A Slideshow transition that covers images"
author="Stephane Delcroix"
url="http://f-spot.org/Extensions"
category="Transitions">
<Dependencies>
- <Addin id="Core" version="0.6.0.1"/>
+ <Addin id="Core" version="0.7.0.0"/>
</Dependencies>
<Extension path = "/FSpot/SlideShow">
<Transition transition_type="CoverTransition.CoverTransition"/>
diff --git a/extensions/Transitions/CoverTransition/Makefile.am b/extensions/Transitions/CoverTransition/Makefile.am
index 300526e..db79db3 100644
--- a/extensions/Transitions/CoverTransition/Makefile.am
+++ b/extensions/Transitions/CoverTransition/Makefile.am
@@ -1,52 +1,19 @@
-include $(top_srcdir)/Makefile.include
+addin = CoverTransition
-PLUGIN_NAME = CoverTransition
+addin_manifest = $(addin).addin.xml
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources = \
+ $(addin).cs
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources = \
+ $(addin_manifest)
-PLUGIN_SOURCES = \
- $(srcdir)/CoverTransition.cs
+addin_references = \
+ Mono.Cairo
+addin_packages = \
+ gtk-sharp-2.0
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Widgets.dll\
- -r:Mono.Cairo \
- -pkg:gtk-sharp-2.0 \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_BEAGLE)
+addin_extradist =
-PKGS =
-
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Transitions/CoverTransition/Makefile.in b/extensions/Transitions/CoverTransition/Makefile.in
index 913872f..72abf3e 100644
--- a/extensions/Transitions/CoverTransition/Makefile.in
+++ b/extensions/Transitions/CoverTransition/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
+ $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include
subdir = extensions/Transitions/CoverTransition
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,20 +72,21 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-DATA = $(plugin_DATA)
+am__installdirs = "$(DESTDIR)$(addindir)"
+DATA = $(addin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,31 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+addin = CoverTransition
+addin_manifest = $(addin).addin.xml
+addin_sources = \
+ $(addin).cs
+
+addin_resources = \
+ $(addin_manifest)
+
+addin_references = \
+ Mono.Cairo
+
+addin_packages = \
+ gtk-sharp-2.0
+
+addin_extradist =
+ASSEMBLY = $(addin).dll
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,63 +311,55 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-PLUGIN_NAME = CoverTransition
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
-PLUGIN_SOURCES = \
- $(srcdir)/CoverTransition.cs
-
-REFS = \
- -r:$(top_builddir)/src/f-spot.exe \
- -r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Widgets.dll\
- -r:Mono.Cairo \
- -pkg:gtk-sharp-2.0 \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GPHOTO2) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- $(LINK_BEAGLE)
-
-PKGS =
-RESOURCES = \
- -resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-plugindir = $(pkglibdir)/extensions
-plugin_DATA = \
- $(PLUGIN_ASSEMBLY)
-
+dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
+build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
+build_sources = $(addprefix $(srcdir)/, $(addin_sources))
+build_packages = \
+ $(addprefix -pkg:, $(addin_packages)) \
+ -pkg:mono-addins
+
+build_references = \
+ $(addprefix -r:, $(addin_references)) \
+ -r:$(top_builddir)/src/f-spot.exe \
+ -r:$(top_builddir)/src/Cms.dll \
+ -r:$(top_builddir)/src/FSpot.Core.dll \
+ -r:$(top_builddir)/src/FSpot.Platform.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Widgets.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ $(LINK_GTKSHARPBEANS)
+
+addin_SOURCES = \
+ $(build_sources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST)
-
-CLEANFILES = \
- $(PLUGIN_ASSEMBLY) \
- $(PLUGIN_ASSEMBLY).mdb \
- *.mpack
+ $(build_sources) \
+ $(dep_resources) \
+ $(addin_extradist)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.addins $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -346,9 +368,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Transitions/CoverTransition/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Transitions/CoverTransition/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Transitions/CoverTransition/Makefile
+ $(AUTOMAKE) --foreign extensions/Transitions/CoverTransition/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -373,26 +395,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pluginDATA: $(plugin_DATA)
+install-addinDATA: $(addin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ test -z "$(addindir)" || $(MKDIR_P) "$(DESTDIR)$(addindir)"
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(addindir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(addindir)" || exit $$?; \
done
-uninstall-pluginDATA:
+uninstall-addinDATA:
@$(NORMAL_UNINSTALL)
- @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ @list='$(addin_DATA)'; test -n "$(addindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(addindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(addindir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -434,7 +456,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
+ for dir in "$(DESTDIR)$(addindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -483,7 +505,7 @@ info: info-am
info-am:
-install-data-am: install-pluginDATA
+install-data-am: install-addinDATA
install-dvi: install-dvi-am
@@ -527,30 +549,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pluginDATA
+uninstall-am: uninstall-addinDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pluginDATA install-ps install-ps-am \
+ dvi-am html html-am info info-am install install-addinDATA \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pluginDATA
-
+ uninstall uninstall-addinDATA uninstall-am
-all: $(PLUGIN_ASSEMBLY)
-mpack: $(PLUGIN_ASSEMBLY)
- mautil p $(PLUGIN_ASSEMBLY)
+mpack: $(ASSEMBLY)
+ mautil p $(ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
+ $(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/extensions/Transitions/Makefile.in b/extensions/Transitions/Makefile.in
index e423900..2a650cb 100644
--- a/extensions/Transitions/Makefile.in
+++ b/extensions/Transitions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,11 +36,14 @@ host_triplet = @host@
subdir = extensions/Transitions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -88,16 +91,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -114,8 +118,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -128,9 +131,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -179,16 +187,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -199,6 +209,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -209,21 +220,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -251,6 +266,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -275,6 +292,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -296,9 +314,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Transitions/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Transitions/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu extensions/Transitions/Makefile
+ $(AUTOMAKE) --foreign extensions/Transitions/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -331,7 +349,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -356,7 +374,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/f-spot-import.desktop b/f-spot-import.desktop
index ecc3605..d81f444 100644
--- a/f-spot-import.desktop
+++ b/f-spot-import.desktop
@@ -4,6 +4,7 @@ Name=F-Spot
Name[ar]=إف-سبوت
Name[be at latin]=F-Spot
Name[bg]=F-Spot
+Name[bn_IN]=F-Spot
Name[ca]=F-Spot
Name[cs]=F-Spot
Name[da]=F-Spot
@@ -13,6 +14,7 @@ Name[el]=F-Spot
Name[en_CA]=F-Spot
Name[en_GB]=F-Spot
Name[es]=F-Spot
+Name[et]=F-Spot
Name[eu]=F-Spot
Name[fa]=اِف- اِسپات
Name[fi]=F-Spot
@@ -31,11 +33,13 @@ Name[lv]=F-Spot
Name[mk]=F-Spot
Name[mr]=F-Spot
Name[nb]=F-Spot
+Name[nds]=F-Spot
Name[or]=F-Spot
Name[pa]=F-ਸਪੋਟ
Name[pl]=F-Spot
Name[pt]=F-Spot
Name[pt_BR]=F-Spot
+Name[ro]=F-Spot
Name[ru]=F-Spot
Name[sk]=F-Spot
Name[sl]=F-Spot
@@ -54,12 +58,14 @@ GenericName=Photo Manager
GenericName[ar]=مدير الصور
GenericName[as]=ফটো মেনেজাৰ
GenericName[be at latin]=Kiraŭnik zdymkaŭ
+GenericName[bg]=Управление на снимки
+GenericName[bn_IN]=ফটো পরিচালন ব্যবস্থা
GenericName[ca]=Gestor fotogràfic
GenericName[cs]=Správce fotografií
GenericName[da]=Fotohåndtering
GenericName[de]=Fotoverwaltung
GenericName[dz]=དཔར་འཛིན་སྐྱོང་པ་
-GenericName[el]=Διαχειριστής εικόνων
+GenericName[el]=Διαχείριση φωτογραφιών
GenericName[en_CA]=Photo Manager
GenericName[en_GB]=Photo Manager
GenericName[es]=Gestor de fotografías
@@ -89,6 +95,7 @@ GenericName[pa]=ਫੋਟੋ ਮੈਨੇਜਰ
GenericName[pl]=Menedżer zdjęć
GenericName[pt]=Gestor de Fotografias
GenericName[pt_BR]=Gerenciador de fotos
+GenericName[ro]=Manager Foto
GenericName[ru]=Управление фотографиями
GenericName[sk]=Správca fotiek
GenericName[sl]=Upravljalnik fotografij
@@ -107,12 +114,14 @@ X-GNOME-FullName=F-Spot Photo Manager
X-GNOME-FullName[ar]=مدير الصور إف-سبوت
X-GNOME-FullName[as]=F-Spot ফটো মেনেজাৰ
X-GNOME-FullName[be at latin]=Kiraŭnik zdymkaŭ F-Spot
+X-GNOME-FullName[bg]=Управление на снимки (F-Spot)
+X-GNOME-FullName[bn_IN]=F-Spot ফটো পরিচালন ব্যবস্থা
X-GNOME-FullName[ca]=Gestor fotogràfic F-Spot
X-GNOME-FullName[cs]=Správce fotografií F-Spot
X-GNOME-FullName[da]=F-Spot fotohåndtering
X-GNOME-FullName[de]=F-Spot Fotoverwaltung
X-GNOME-FullName[dz]=ཨེཕ་-ཨིསི་པོཊི་ དཔར་འཛིན་སྐྱོང་པ་
-X-GNOME-FullName[el]=Διαχειριστής εικόνων f-spot
+X-GNOME-FullName[el]=Διαχείριση φωτογραφιών
X-GNOME-FullName[en_CA]=F-Spot Photo Manager
X-GNOME-FullName[en_GB]=F-Spot Photo Manager
X-GNOME-FullName[es]=Gestor de fotos F-Spot
@@ -126,7 +135,7 @@ X-GNOME-FullName[gu]=F-Spot ફોટો વ્યવસ્થાપક
X-GNOME-FullName[he]=מנהל התמונות F-Spot
X-GNOME-FullName[hi]=एफ़ स्पॉट फोटो प्रबंधक
X-GNOME-FullName[hu]=F-Spot fotókezelő
-X-GNOME-FullName[it]=F-Spot - Gestore di fotografie
+X-GNOME-FullName[it]=Gestore di fotografie F-spot
X-GNOME-FullName[ja]=F-Spot 写真マネージャ
X-GNOME-FullName[ka]=F-სპოტ ფოტო მენეჯერი
X-GNOME-FullName[kn]=F-Spot ಫೋಟೋ ವ್ಯವಸ್ಥಾಪಕ
@@ -142,6 +151,7 @@ X-GNOME-FullName[pa]=F-ਸਪੋਟ ਫੋਟੋ ਮੈਨੇਜਰ
X-GNOME-FullName[pl]=Menedżer zdjęć F-Spot
X-GNOME-FullName[pt]=Gestor de Fotografias do F-Spot
X-GNOME-FullName[pt_BR]=Gerenciador de fotos F-Spot
+X-GNOME-FullName[ro]=Manager Foto F-Spot
X-GNOME-FullName[ru]=Управление фотографиями в F-Spot
X-GNOME-FullName[sk]=Správca fotiek F-Spot
X-GNOME-FullName[sl]=F-spot upravljalnik fotografij
@@ -159,6 +169,8 @@ X-GNOME-FullName[zh_TW]=F-Spot 相片管理員
Comment=Import into F-Spot
Comment[ar]=استيراد إلى إف-سبوت
Comment[as]=F-Spot লৈ আমদানি কৰক
+Comment[bg]=Внасяне в F-Spot
+Comment[bn_IN]=F-Spot-এ ইম্পোর্ট করুন
Comment[ca]=Importa a l'F-Spot
Comment[cs]=Importovat do F-Spot
Comment[da]=Importér til F-Spot
@@ -178,14 +190,17 @@ Comment[hu]=Importálás az F-Spotba
Comment[it]=Importa in F-Spot
Comment[ja]=F-Spot にインポート
Comment[kn]=F-Spot ಗೆ ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ
+Comment[ko]=F-스팟으로 가져오기
Comment[lt]=Importuoti į F-Spot
Comment[mk]=Увези во F-Spot
Comment[mr]=F-Spot अंतर्गत आयात करा
Comment[nb]=Importer til F-Spot
Comment[or]=F-Spot ଭିତରେ ଆମଦାନୀ କରନ୍ତୁ
+Comment[pa]=F-ਸਪੋਟ ਵਿੱਚ ਇੰਪੋਰਟ ਕਰੋ
Comment[pl]=Importowanie do programu F-Spot
Comment[pt]=Importar para o F-Spot
Comment[pt_BR]=Importar para o F-Spot
+Comment[ro]=Importă în F-Spot
Comment[ru]=Импортировать в F-Spot
Comment[sk]=Importovať do F-Spot
Comment[sl]=Uvoz v F-Spot
@@ -208,5 +223,5 @@ Type=Application
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=f-spot
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=0.6.1.5
+X-GNOME-Bugzilla-Version=0.6.2
X-GNOME-DocPath=f-spot/f-spot.xml
diff --git a/f-spot-import.desktop.in b/f-spot-import.desktop.in
index 1ec6785..fc7bf18 100644
--- a/f-spot-import.desktop.in
+++ b/f-spot-import.desktop.in
@@ -14,5 +14,5 @@ Type=Application
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=f-spot
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=0.6.1.5
+X-GNOME-Bugzilla-Version=0.6.2
X-GNOME-DocPath=f-spot/f-spot.xml
diff --git a/f-spot-view.desktop b/f-spot-view.desktop
index 624d9aa..c55957e 100644
--- a/f-spot-view.desktop
+++ b/f-spot-view.desktop
@@ -4,6 +4,7 @@ Name=F-Spot
Name[ar]=إف-سبوت
Name[be at latin]=F-Spot
Name[bg]=F-Spot
+Name[bn_IN]=F-Spot
Name[ca]=F-Spot
Name[cs]=F-Spot
Name[da]=F-Spot
@@ -13,6 +14,7 @@ Name[el]=F-Spot
Name[en_CA]=F-Spot
Name[en_GB]=F-Spot
Name[es]=F-Spot
+Name[et]=F-Spot
Name[eu]=F-Spot
Name[fa]=اِف- اِسپات
Name[fi]=F-Spot
@@ -31,11 +33,13 @@ Name[lv]=F-Spot
Name[mk]=F-Spot
Name[mr]=F-Spot
Name[nb]=F-Spot
+Name[nds]=F-Spot
Name[or]=F-Spot
Name[pa]=F-ਸਪੋਟ
Name[pl]=F-Spot
Name[pt]=F-Spot
Name[pt_BR]=F-Spot
+Name[ro]=F-Spot
Name[ru]=F-Spot
Name[sk]=F-Spot
Name[sl]=F-Spot
@@ -54,12 +58,14 @@ GenericName=Photo Viewer
GenericName[ar]=عارض الصور
GenericName[as]=ফ'টো ভিৱাৰ
GenericName[be at latin]=Prahladalnik zdymkaŭ
+GenericName[bg]=Преглед на снимки
+GenericName[bn_IN]=ফটো প্রদর্শন ব্যবস্থা
GenericName[ca]=Visualitzador fotogràfic
GenericName[cs]=Prohlížeč fotografií
GenericName[da]=Fotofremviser
GenericName[de]=Fotobetrachter
GenericName[dz]=དཔར་མཐོང་བྱེད་
-GenericName[el]=Προβολή εικόνων f-spot
+GenericName[el]=Προβολή φωτογραφιών
GenericName[en_CA]=Photo Viewer
GenericName[en_GB]=Photo Viewer
GenericName[es]=Visor de fotos
@@ -89,9 +95,10 @@ GenericName[pa]=ਤਸਵੀਰ ਦਰਸ਼ਕ
GenericName[pl]=Przeglądarka zdjęć
GenericName[pt]=Visualizador de Fotografias
GenericName[pt_BR]=Visualizador de fotos
+GenericName[ro]=Vizualizator de fotografii
GenericName[ru]=Просмотр снимков
GenericName[sk]=Prehliadač fotiek
-GenericName[sl]=Ogledovalec fotografij
+GenericName[sl]=Pregledovalnik fotografij
GenericName[sr]=Прегледник фотографија
GenericName[sr at latin]=Preglednik fotografija
GenericName[sv]=Fotovisare
@@ -106,13 +113,14 @@ X-GNOME-FullName=F-Spot Photo Viewer
X-GNOME-FullName[ar]=عارض صور إف-سبوت
X-GNOME-FullName[as]=F-Spot ফ'টো প্ৰদৰ্শক
X-GNOME-FullName[be at latin]=Prahladalnik zdymkaŭ F-Spot
-X-GNOME-FullName[bg]=Преглед на снимки F-Spot
+X-GNOME-FullName[bg]=Преглед на снимки с F-Spot
+X-GNOME-FullName[bn_IN]=F-Spot ফটো প্রদর্শন ব্যবস্থা
X-GNOME-FullName[ca]=Visualitzador fotogràfic F-Spot
X-GNOME-FullName[cs]=Prohlížeč fotografií F-Spot
X-GNOME-FullName[da]=F-Spot fotofremviser
X-GNOME-FullName[de]=F-Spot Fotobetrachter
X-GNOME-FullName[dz]=ཨེཕ་-ཨིསི་པོཊི་ དཔར་མཐོང་བྱེད་
-X-GNOME-FullName[el]=Προβολέας εικόνων F-Spot
+X-GNOME-FullName[el]=F-Spot προβολή φωτογραφιών
X-GNOME-FullName[en_CA]=F-Spot Photo Viewer
X-GNOME-FullName[en_GB]=F-Spot Photo Viewer
X-GNOME-FullName[es]=Visor de fotos F-Spot
@@ -126,7 +134,7 @@ X-GNOME-FullName[gu]=F-Spot ફોટો દર્શક
X-GNOME-FullName[he]=מציג התמונות F-Spot
X-GNOME-FullName[hi]=एफ़ स्पॉट फोटो प्रदर्शक
X-GNOME-FullName[hu]=F-Spot fotómegjelenítő
-X-GNOME-FullName[it]=F-Spot - Visualizzatore di fotografie
+X-GNOME-FullName[it]=Visualizzatore di fotografie F-Spot
X-GNOME-FullName[ja]=F-Spot 写真ビューア
X-GNOME-FullName[ka]=F-სპოტ ფოტო დამთვალიერებელი
X-GNOME-FullName[kn]=F-Spot ಫೋಟೋ ವೀಕ್ಷಕ
@@ -142,9 +150,10 @@ X-GNOME-FullName[pa]=F-ਸਪੋਟ ਫੋਟੋ ਦਰਸ਼ਕ
X-GNOME-FullName[pl]=Przeglądarka zdjęć F-Spot
X-GNOME-FullName[pt]=Visualizador de Fotografias do F-Spot
X-GNOME-FullName[pt_BR]=Visualizador de fotos F-Spot
+X-GNOME-FullName[ro]=Vizualizatorul de fotografii F-Spot
X-GNOME-FullName[ru]=Просмотр снимков в F-Spot
X-GNOME-FullName[sk]=Prehliadač fotiek F-Spot
-X-GNOME-FullName[sl]=F-_Spot ogledovalec fotografij
+X-GNOME-FullName[sl]=F-_Spot preledovalnik fotografij
X-GNOME-FullName[sr]=Ф-број прегледач фотографија
X-GNOME-FullName[sr at latin]=F-broj pregledač fotografija
X-GNOME-FullName[sv]=Fotovisaren F-Spot
@@ -165,5 +174,5 @@ Type=Application
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=f-spot
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=0.6.1.5
+X-GNOME-Bugzilla-Version=0.6.2
MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/svg+xml;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/x-dcraw;image/x-ciff;image/x-mrw;image/x-x3f;image/x-orf;image/x-nef;image/x-cr2;image/x-raf;
diff --git a/f-spot-view.desktop.in b/f-spot-view.desktop.in
index 021ece2..3d2165c 100644
--- a/f-spot-view.desktop.in
+++ b/f-spot-view.desktop.in
@@ -13,5 +13,5 @@ Type=Application
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=f-spot
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=0.6.1.5
+X-GNOME-Bugzilla-Version=0.6.2
MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/svg+xml;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/x-dcraw;image/x-ciff;image/x-mrw;image/x-x3f;image/x-orf;image/x-nef;image/x-cr2;image/x-raf;
diff --git a/f-spot.desktop b/f-spot.desktop
index 5487c62..9ab6639 100644
--- a/f-spot.desktop
+++ b/f-spot.desktop
@@ -4,6 +4,7 @@ Name=F-Spot
Name[ar]=إف-سبوت
Name[be at latin]=F-Spot
Name[bg]=F-Spot
+Name[bn_IN]=F-Spot
Name[ca]=F-Spot
Name[cs]=F-Spot
Name[da]=F-Spot
@@ -13,6 +14,7 @@ Name[el]=F-Spot
Name[en_CA]=F-Spot
Name[en_GB]=F-Spot
Name[es]=F-Spot
+Name[et]=F-Spot
Name[eu]=F-Spot
Name[fa]=اِف- اِسپات
Name[fi]=F-Spot
@@ -31,11 +33,13 @@ Name[lv]=F-Spot
Name[mk]=F-Spot
Name[mr]=F-Spot
Name[nb]=F-Spot
+Name[nds]=F-Spot
Name[or]=F-Spot
Name[pa]=F-ਸਪੋਟ
Name[pl]=F-Spot
Name[pt]=F-Spot
Name[pt_BR]=F-Spot
+Name[ro]=F-Spot
Name[ru]=F-Spot
Name[sk]=F-Spot
Name[sl]=F-Spot
@@ -54,12 +58,14 @@ GenericName=Photo Manager
GenericName[ar]=مدير الصور
GenericName[as]=ফটো মেনেজাৰ
GenericName[be at latin]=Kiraŭnik zdymkaŭ
+GenericName[bg]=Управление на снимки
+GenericName[bn_IN]=ফটো পরিচালন ব্যবস্থা
GenericName[ca]=Gestor fotogràfic
GenericName[cs]=Správce fotografií
GenericName[da]=Fotohåndtering
GenericName[de]=Fotoverwaltung
GenericName[dz]=དཔར་འཛིན་སྐྱོང་པ་
-GenericName[el]=Διαχειριστής εικόνων
+GenericName[el]=Διαχείριση φωτογραφιών
GenericName[en_CA]=Photo Manager
GenericName[en_GB]=Photo Manager
GenericName[es]=Gestor de fotografías
@@ -89,6 +95,7 @@ GenericName[pa]=ਫੋਟੋ ਮੈਨੇਜਰ
GenericName[pl]=Menedżer zdjęć
GenericName[pt]=Gestor de Fotografias
GenericName[pt_BR]=Gerenciador de fotos
+GenericName[ro]=Manager Foto
GenericName[ru]=Управление фотографиями
GenericName[sk]=Správca fotiek
GenericName[sl]=Upravljalnik fotografij
@@ -107,12 +114,14 @@ X-GNOME-FullName=F-Spot Photo Manager
X-GNOME-FullName[ar]=مدير الصور إف-سبوت
X-GNOME-FullName[as]=F-Spot ফটো মেনেজাৰ
X-GNOME-FullName[be at latin]=Kiraŭnik zdymkaŭ F-Spot
+X-GNOME-FullName[bg]=Управление на снимки (F-Spot)
+X-GNOME-FullName[bn_IN]=F-Spot ফটো পরিচালন ব্যবস্থা
X-GNOME-FullName[ca]=Gestor fotogràfic F-Spot
X-GNOME-FullName[cs]=Správce fotografií F-Spot
X-GNOME-FullName[da]=F-Spot fotohåndtering
X-GNOME-FullName[de]=F-Spot Fotoverwaltung
X-GNOME-FullName[dz]=ཨེཕ་-ཨིསི་པོཊི་ དཔར་འཛིན་སྐྱོང་པ་
-X-GNOME-FullName[el]=Διαχειριστής εικόνων f-spot
+X-GNOME-FullName[el]=Διαχείριση φωτογραφιών
X-GNOME-FullName[en_CA]=F-Spot Photo Manager
X-GNOME-FullName[en_GB]=F-Spot Photo Manager
X-GNOME-FullName[es]=Gestor de fotos F-Spot
@@ -126,7 +135,7 @@ X-GNOME-FullName[gu]=F-Spot ફોટો વ્યવસ્થાપક
X-GNOME-FullName[he]=מנהל התמונות F-Spot
X-GNOME-FullName[hi]=एफ़ स्पॉट फोटो प्रबंधक
X-GNOME-FullName[hu]=F-Spot fotókezelő
-X-GNOME-FullName[it]=F-Spot - Gestore di fotografie
+X-GNOME-FullName[it]=Gestore di fotografie F-spot
X-GNOME-FullName[ja]=F-Spot 写真マネージャ
X-GNOME-FullName[ka]=F-სპოტ ფოტო მენეჯერი
X-GNOME-FullName[kn]=F-Spot ಫೋಟೋ ವ್ಯವಸ್ಥಾಪಕ
@@ -142,6 +151,7 @@ X-GNOME-FullName[pa]=F-ਸਪੋਟ ਫੋਟੋ ਮੈਨੇਜਰ
X-GNOME-FullName[pl]=Menedżer zdjęć F-Spot
X-GNOME-FullName[pt]=Gestor de Fotografias do F-Spot
X-GNOME-FullName[pt_BR]=Gerenciador de fotos F-Spot
+X-GNOME-FullName[ro]=Manager Foto F-Spot
X-GNOME-FullName[ru]=Управление фотографиями в F-Spot
X-GNOME-FullName[sk]=Správca fotiek F-Spot
X-GNOME-FullName[sl]=F-spot upravljalnik fotografij
@@ -160,12 +170,14 @@ Comment=Organize, enjoy, and share your photos
Comment[ar]=نظم, تمتع, وقم بمشاركة الصور
Comment[as]=আপোনাৰ ফটোবোৰ সজাওক, ভাগ বতৰা কৰক আৰু উপভোগ কৰক
Comment[be at latin]=Kiruj svaimi zdymkami i dzialisia imi
-Comment[ca]=Organitzeu, gaudiu i compartiu fotografies
+Comment[bg]=Организирайте, наслаждавайте се и споделете снимките си
+Comment[bn_IN]=আপনার ফটোর সংকলন সুবিন্যস্ত, উপভোগ ও বিনিময় করুন
+Comment[ca]=Organitzeu, visualitzeu i compartiu fotografies
Comment[cs]=Organizuje, prohlíží a sdílí vaše fotografie
Comment[da]=Organisér, nyd og del dine fotos
Comment[de]=Fotos anschauen, sortieren und weitergeben
Comment[dz]=ཁྱོད་ཀྱི་དཔར་ཚུ་ འགོ་འདྲེན་འཐབ་ སྤྲོ་བ་སྟོན་ དེ་ལས་ རུབ་སྤྱོད་འབད་
-Comment[el]=Οργανώστε απολαύστε και μοιραστείτε τις φωτογραφίες σας
+Comment[el]=Οργανώστε, απολαύστε και μοιραστείτε τις φωτογραφίες σας με το F-Spot
Comment[en_CA]=Organize, enjoy, and share your photos
Comment[en_GB]=Organise, enjoy, and share your photos
Comment[es]=Organice, diviértase y comparta sus fotografías
@@ -192,9 +204,10 @@ Comment[nb]=Organiser, verdsett og del bildene dine
Comment[nl]=Beheer, deel en geniet van uw foto's
Comment[or]=ଆପଣଙ୍କ ଫୋଟୋଗୁଡ଼ିକୁ ସୁସଂଗଠନ କରନ୍ତୁ, ଉପଭୋଗ କରନ୍ତୁ, ଏବଂ ସହଭାଗ କରନ୍ତୁ
Comment[pa]=ਆਪਣੀਆਂ ਫੋਟੋ ਵੇਖੋ, ਸਾਂਝੀਆਂ ਕਰੋ
-Comment[pl]=Organizowanie i dzielenie się swoimi zdjęciami
+Comment[pl]=Organizowanie i dzielenie się zdjęciami
Comment[pt]=Organize, divirta-se e partilhe as suas fotos
Comment[pt_BR]=Organize, compartilhe e divirta-se com suas fotos
+Comment[ro]=Organizați, priviți și partajați fotografii
Comment[ru]=Организация, просмотр и передача фотографий
Comment[sk]=Organizovať, mať potešenie a zdielať vaše fotky
Comment[sl]=Urejajte, uživajte in delite vaše fotografije.
@@ -206,6 +219,8 @@ Comment[te]=నిర్వహించు, ఆనందించు, మరి
Comment[uk]=Організація, перегляд та передача фотографій
Comment[vi]=Tổ chức, thích thú và chia ra các ảnh chụp của bạn
Comment[zh_CN]=组织、欣赏及共享您的照片
+Comment[zh_HK]=組織、享受、並分享你的相片
+Comment[zh_TW]=組織、享受、並分享您的相片
Exec=f-spot
Icon=f-spot
StartupNotify=true
@@ -215,5 +230,5 @@ Categories=Graphics;Photography;GNOME;GTK;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=f-spot
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=0.6.1.5
+X-GNOME-Bugzilla-Version=0.6.2
X-GNOME-DocPath=f-spot/f-spot.xml
diff --git a/f-spot.desktop.in b/f-spot.desktop.in
index c30cf66..99916b1 100644
--- a/f-spot.desktop.in
+++ b/f-spot.desktop.in
@@ -13,5 +13,5 @@ Categories=Graphics;Photography;GNOME;GTK;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=f-spot
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=0.6.1.5
+X-GNOME-Bugzilla-Version=0.6.2
X-GNOME-DocPath=f-spot/f-spot.xml
diff --git a/f-spot.pc.in b/f-spot.pc.in
index 27ee812..75c0539 100644
--- a/f-spot.pc.in
+++ b/f-spot.pc.in
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
Name: F-Spot
diff --git a/f-spot.schemas.in b/f-spot.schemas.in
new file mode 100644
index 0000000..d5f91de
--- /dev/null
+++ b/f-spot.schemas.in
@@ -0,0 +1,335 @@
+<gconfschemafile>
+ <schemalist>
+
+ <!-- F-Spot User Interface Preferences -->
+
+ <!-- Gtk Theme Override -->
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/gtkrc</key>
+ <applyto>/desktop/gnome/f-spot/ui/gtkrc</applyto>
+ <type>string</type>
+ <default></default>
+ <locale name="C">
+ <short>Path to custom gtkrc for theming F-Spot.</short>
+ <long>Path to custom gtkrc for theming F-Spot.</long>
+ </locale>
+ </schema>
+
+ <!-- Main Window -->
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/maximized</key>
+ <applyto>/desktop/gnome/f-spot/ui/maximized</applyto>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Maximize the main window.</short>
+ <long>Maximize the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/main_window_width</key>
+ <applyto>/desktop/gnome/f-spot/ui/main_window_width</applyto>
+ <type>int</type>
+ <default>640</default>
+ <locale name="C">
+ <short>Width of the main window.</short>
+ <long>The width dimension to use for the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/main_window_height</key>
+ <applyto>/desktop/gnome/f-spot/ui/main_window_height</applyto>
+ <type>int</type>
+ <default>480</default>
+ <locale name="C">
+ <short>Height of the main window.</short>
+ <long>The height dimension to use for the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/main_window_x</key>
+ <applyto>/desktop/gnome/f-spot/ui/main_window_x</applyto>
+ <type>int</type>
+ <default></default>
+ <locale name="C">
+ <short>X position of the main window.</short>
+ <long>The X position to use for the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/main_window_y</key>
+ <applyto>/desktop/gnome/f-spot/ui/main_window_y</applyto>
+ <type>int</type>
+ <default></default>
+ <locale name="C">
+ <short>Y position of the main window.</short>
+ <long>The Y position to use for the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/show_dates</key>
+ <applyto>/desktop/gnome/f-spot/ui/show_dates</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show dates in the thumbnail view.</short>
+ <long>Show dates in the thumbnail view.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/show_tags</key>
+ <applyto>/desktop/gnome/f-spot/ui/show_tags</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show tags in the thumbnail view.</short>
+ <long>Show tags in the thumbnail view.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/tag_icon_size</key>
+ <applyto>/desktop/gnome/f-spot/ui/tag_icon_size</applyto>
+ <type>int</type>
+ <default>24</default>
+ <locale name="C">
+ <short>Size of the tag icons shown in the sidebar.</short>
+ <long>Size of the tag icons shown in the sidebar.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/show_ratings</key>
+ <applyto>/desktop/gnome/f-spot/ui/show_ratings</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show ratings in the thumbnail view.</short>
+ <long>Show ratings in the thumbnail view.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/show_filmstrip</key>
+ <applyto>/desktop/gnome/f-spot/ui/show_filmstrip</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show the filmstrip in the main window.</short>
+ <long>Show the filmstrip in the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/filmstrip_orientation</key>
+ <applyto>/desktop/gnome/f-spot/ui/filmstrip_orientation</applyto>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short>The orientation of the filmstrip.</short>
+ <long>The orientation of the filmstrip, if shown.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/show_timeline</key>
+ <applyto>/desktop/gnome/f-spot/ui/show_timeline</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show the timeline in the main window.</short>
+ <long>Show the timeline in the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/show_toolbar</key>
+ <applyto>/desktop/gnome/f-spot/ui/show_toolbar</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show the toolbar in the main window.</short>
+ <long>Show the toolbar in the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/show_sidebar</key>
+ <applyto>/desktop/gnome/f-spot/ui/show_sidebar</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show the sidebar in the main window.</short>
+ <long>Show the sidebar in the main window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/sidebar_size</key>
+ <applyto>/desktop/gnome/f-spot/ui/sidebar_size</applyto>
+ <type>int</type>
+ <default>130</default>
+ <locale name="C">
+ <short>The size of the sidebar in the main window.</short>
+ <long>The size (width) of the sidebar in the main window.</long>
+ </locale>
+ </schema>
+
+ <!-- Import Window -->
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/import_window_width</key>
+ <applyto>/desktop/gnome/f-spot/ui/import_window_width</applyto>
+ <type>int</type>
+ <default>640</default>
+ <locale name="C">
+ <short>Width of the import dialog.</short>
+ <long>The width dimension to use for the import dialog.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/import_window_height</key>
+ <applyto>/desktop/gnome/f-spot/ui/import_window_height</applyto>
+ <type>int</type>
+ <default>480</default>
+ <locale name="C">
+ <short>Height of the import dialog.</short>
+ <long>The height dimension to use for the import dialog.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/import_window_pane_position</key>
+ <applyto>/desktop/gnome/f-spot/ui/import_window_pane_position</applyto>
+ <type>int</type>
+ <default>400</default>
+ <locale name="C">
+ <short>Width of the preview image pane in the import dialog.</short>
+ <long>Width of the preview image pane in the import dialog.</long>
+ </locale>
+ </schema>
+
+ <!-- Photo Viewer Window -->
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/viewer_maximized</key>
+ <applyto>/desktop/gnome/f-spot/ui/viewer_maximized</applyto>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Maximize the photo viewer window.</short>
+ <long>Maximize the photo viewer window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/viewer_width</key>
+ <applyto>/desktop/gnome/f-spot/ui/viewer_width</applyto>
+ <type>int</type>
+ <default>640</default>
+ <locale name="C">
+ <short>Width of the photo viewer window.</short>
+ <long>The width dimension to use for the photo viewer window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/viewer_height</key>
+ <applyto>/desktop/gnome/f-spot/ui/viewer_height</applyto>
+ <type>int</type>
+ <default>480</default>
+ <locale name="C">
+ <short>Height of the photo viewer window.</short>
+ <long>The height dimension to use for the photo viewer window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/viewer_x</key>
+ <applyto>/desktop/gnome/f-spot/ui/viewer_x</applyto>
+ <type>int</type>
+ <default></default>
+ <locale name="C">
+ <short>X position of the photo viewer window.</short>
+ <long>The X position to use for the photo viewer window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/viewer_y</key>
+ <applyto>/desktop/gnome/f-spot/ui/viewer_y</applyto>
+ <type>int</type>
+ <default></default>
+ <locale name="C">
+ <short>Y position of the photo viewer window.</short>
+ <long>The Y position to use for the photo viewer window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/viewer_show_toolbar</key>
+ <applyto>/desktop/gnome/f-spot/ui/viewer_show_toolbar</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show the toolbar in the photo viewer window.</short>
+ <long>Show the toolbar in the photo viewer window.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/ui/viewer_show_filenames</key>
+ <applyto>/desktop/gnome/f-spot/ui/viewer_show_filenames</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show the filename in the viewer window.</short>
+ <long>Use the current photo's filename as the viewer window's title.</long>
+ </locale>
+ </schema>
+
+ <!-- Photo Viewer Preferences -->
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/viewer/interpolation</key>
+ <applyto>/desktop/gnome/f-spot/viewer/interpolation</applyto>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Interpolate image on zoom.</short>
+ <long>Enable this to allow interpolation on zoomed images.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/viewer/transparency</key>
+ <applyto>/desktop/gnome/f-spot/viewer/transparency</applyto>
+ <type>string</type>
+ <default>NONE</default>
+ <locale name="C">
+ <short>Display of transparent parts.</short>
+ <long>You can choose how to display transparent parts in
+ images. This option has no effect on photos but setting this value
+ to CHECK_PATTERN or CUSTOM_COLOR could be useful when viewing icons
+ or other artwork with transparent parts.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/f-spot/viewer/trans_color</key>
+ <applyto>/desktop/gnome/f-spot/viewer/trans_color</applyto>
+ <type>string</type>
+ <default>#000000</default>
+ <locale name="C">
+ <short>The color to use for transparent parts.</short>
+ <long>If the 'transparency' option is set, the color specified in
+ this option will be used as the transparent color when viewing images.</long>
+ </locale>
+ </schema>
+
+ </schemalist>
+</gconfschemafile>
diff --git a/f-spot.spec b/f-spot.spec
index 7a794a8..8535971 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,6 +1,6 @@
Summary: F-Spot
Name: f-spot
-Version: 0.6.1.5
+Version: 0.6.2
Release: 1
License: GPL
Group: Applications/Imaging
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index b7ea210..97fd549 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -92,6 +92,14 @@ all: $(DOC_H_FILE)
## The name of the document being built
DOC_MODULE ?=
+## @ DOC_ID
+## The unique identifier for a Mallard document
+DOC_ID ?=
+
+## @ DOC_PAGES
+## Page files in a Mallard document
+DOC_PAGES ?=
+
## @ DOC_ENTITIES
## Files included with a SYSTEM entity
DOC_ENTITIES ?=
@@ -123,9 +131,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
## Variables for Bootstrapping
_xml2po ?= `which xml2po`
+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
@@ -205,6 +215,10 @@ omf: $(_DOC_OMF_ALL)
## The top-level documentation file in the C locale
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
+## @ _DOC_C_PAGES
+## Page files in a Mallard document in the C locale
+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
+
## @ _DOC_C_ENTITIES
## Files included with a SYSTEM entity in the C locale
_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
@@ -217,13 +231,14 @@ _DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
## All documentation files in the C locale
_DOC_C_DOCS = \
$(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
- $(_DOC_C_MODULE)
+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
## @ _DOC_C_DOCS_NOENT
## All documentation files in the C locale,
## except files included with a SYSTEM entity
_DOC_C_DOCS_NOENT = \
- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
+ $(_DOC_C_PAGES)
## @ _DOC_C_FIGURES
## All figures and other external data in the C locale
@@ -245,17 +260,30 @@ _DOC_C_HTML = $(foreach f, \
## @ _DOC_POFILES
## The .po files used for translating the document
-_DOC_POFILES = $(if $(DOC_MODULE), \
+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
.PHONY: po
po: $(_DOC_POFILES)
+## @ _DOC_MOFILES
+## The .mo files used for translating the document
+_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
+
+.PHONY: mo
+mo: $(_DOC_MOFILES)
+
## @ _DOC_LC_MODULES
## The top-level documentation files in all other locales
_DOC_LC_MODULES = $(if $(DOC_MODULE), \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
+## @ _DOC_LC_PAGES
+## Page files in a Mallard document in all other locales
+_DOC_LC_PAGES = \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
+ $(lc)/$(notdir $(page)) ))
+
## @ _DOC_LC_XINCLUDES
## Files included with XInclude in all other locales
_DOC_LC_INCLUDES = \
@@ -272,7 +300,7 @@ _DOC_LC_HTML = \
## @ _DOC_LC_DOCS
## All documentation files in all other locales
_DOC_LC_DOCS = \
- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
## @ _DOC_LC_FIGURES
@@ -299,27 +327,35 @@ $(_DOC_POFILES):
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
(cd $(dir $@) && \
- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
else \
echo "(cd $(dir $@) && \
- $(_xml2po) -e -u $(notdir $@) $$docs)"; \
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
(cd $(dir $@) && \
- $(_xml2po) -e -u $(notdir $@) $$docs); \
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
fi
+$(_DOC_MOFILES): %.mo: %.po
+ @if ! test -d $(dir $@); then \
+ echo "mkdir $(dir $@)"; \
+ mkdir "$(dir $@)"; \
+ fi
+ msgfmt -o $@ $<
+
# FIXME: fix the dependancy
# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
+$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
if ! test -d $(dir $@); then mkdir $(dir $@); fi
if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
+ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
(cd $(dir $@) && \
- $(_xml2po) -e -p \
- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
"$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
@@ -329,7 +365,7 @@ _DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
.PHONY: pot
pot: $(_DOC_POT)
$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
- $(_xml2po) -e -o $@ $^
+ $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
################################################################################
@@ -347,6 +383,7 @@ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
################################################################################
+## All
all: \
$(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
@@ -354,25 +391,30 @@ all: \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
+################################################################################
+## Clean
+
.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
clean-doc-lc:
rm -f $(_DOC_LC_DOCS)
+ rm -f $(_DOC_MOFILES)
@list='$(_DOC_POFILES)'; for po in $$list; do \
if ! test "$$po" -ef "$(srcdir)/$$po"; then \
echo "rm -f $$po"; \
rm -f "$$po"; \
fi; \
done
+# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
rm -f "$$lc/.xml2po.mo"; \
fi; \
done
-clean-doc-dir:
+clean-doc-dir: clean-doc-lc
@for lc in C $(_DOC_REAL_LINGUAS); do \
for dir in `find $$lc -depth -type d`; do \
if ! test $$dir -ef $(srcdir)/$$dir; then \
@@ -385,7 +427,7 @@ clean-doc-dir:
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
clean-local: \
$(_clean_omf) $(_clean_dsk) \
@@ -401,10 +443,14 @@ maintainer-clean-local: \
$(_clean_lc) $(_clean_dir)
-.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: \
- $(if $(DOC_MODULE),dist-doc-docs) \
- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
+
+################################################################################
+## Dist
+
+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
+doc-dist-hook: \
+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
$(if $(_DOC_OMF_IN),dist-doc-omf)
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
@@ -451,9 +497,14 @@ dist-doc-dsk:
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
+
+################################################################################
+## Check
+
.PHONY: check-doc-docs check-doc-omf
check: \
$(if $(DOC_MODULE),check-doc-docs) \
+ $(if $(DOC_ID),check-doc-pages) \
$(if $(_DOC_OMF_IN),check-doc-omf)
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
@@ -469,6 +520,21 @@ check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
done
+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
+ for lc in C $(_DOC_REAL_LINGUAS); do \
+ if test -f "$$lc"; \
+ then d=; \
+ xmlpath="$$lc"; \
+ else \
+ d="$(srcdir)/"; \
+ xmlpath="$$lc:$(srcdir)/$$lc"; \
+ fi; \
+ for page in $(DOC_PAGES); do \
+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
+ xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
+ done; \
+ done
+
check-doc-omf: $(_DOC_OMF_ALL)
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
@@ -476,9 +542,16 @@ check-doc-omf: $(_DOC_OMF_ALL)
done
+
+################################################################################
+## Install
+
.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
+
+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
+
install-data-local: \
- $(if $(DOC_MODULE),install-doc-docs) \
+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
$(if $(_DOC_HTML_ALL),install-doc-html) \
$(if $(_DOC_C_FIGURES),install-doc-figs) \
$(if $(_DOC_OMF_IN),install-doc-omf)
@@ -486,19 +559,19 @@ install-data-local: \
install-doc-docs:
@for lc in C $(_DOC_REAL_LINGUAS); do \
- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
if ! test -d "$$docdir"; then \
echo "$(mkinstalldirs) $$docdir"; \
$(mkinstalldirs) "$$docdir"; \
fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
done
install-doc-figs:
@@ -513,7 +586,7 @@ install-doc-figs:
figsymlink=true; \
fi; \
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
if ! test -d "$$figdir"; then \
echo "$(mkinstalldirs) $$figdir"; \
$(mkinstalldirs) "$$figdir"; \
@@ -533,23 +606,27 @@ install-doc-html:
echo install-html
install-doc-omf:
- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
done
@if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
fi;
install-doc-dsk:
echo install-dsk
+
+################################################################################
+## Uninstall
+
.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
uninstall-local: \
- $(if $(DOC_MODULE),uninstall-doc-docs) \
+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
@@ -557,22 +634,22 @@ uninstall-local: \
uninstall-doc-docs:
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
done
uninstall-doc-figs:
@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
done;
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
fi; \
- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
done
diff --git a/icons/Makefile.in b/icons/Makefile.in
index f2d162b..51d9605 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,11 +36,14 @@ host_triplet = @host@
subdir = icons
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -48,16 +51,17 @@ SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -74,8 +78,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -88,9 +91,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -139,16 +147,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -159,6 +169,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -169,21 +180,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -211,6 +226,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -235,6 +252,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -364,9 +382,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icons/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu icons/Makefile
+ $(AUTOMAKE) --foreign icons/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/GKeyFile/Makefile.am b/lib/GKeyFile/Makefile.am
index fc90e14..958b432 100644
--- a/lib/GKeyFile/Makefile.am
+++ b/lib/GKeyFile/Makefile.am
@@ -22,14 +22,14 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll
all: $(ASSEMBLY)
gkeyfile-api.raw: gkeyfile-sharp-sources.xml
- gapi2-parser gkeyfile-sharp-sources.xml
+ $(GAPI2PARSER) gkeyfile-sharp-sources.xml
gkeyfile-api.xml: gkeyfile-api.raw GKeyFile.metadata
cp gkeyfile-api.raw gkeyfile-api.xml
- gapi2-fixup --api=gkeyfile-api.xml --metadata=GKeyFile.metadata
+ $(GAPI2FIXUP) --api=gkeyfile-api.xml --metadata=GKeyFile.metadata
.generated_timestamp: gkeyfile-api.xml $(CUSTOMS)
- gapi2-codegen --outdir=generated --customdir=$(srcdir) --generate gkeyfile-api.xml
+ $(GAPI2CODEGEN) --outdir=generated --customdir=$(srcdir) --generate gkeyfile-api.xml
touch $@
$(ASSEMBLY): .generated_timestamp $(ASSEMBLY_SOURCES) $(ASSEMBLY_CUSTOMS)
$(CSC_LIB) -unsafe -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(srcdir)/generated/*.cs
diff --git a/lib/GKeyFile/Makefile.in b/lib/GKeyFile/Makefile.in
index ba9b38f..87136c7 100644
--- a/lib/GKeyFile/Makefile.in
+++ b/lib/GKeyFile/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/GKeyFile
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -342,9 +352,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/GKeyFile/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/GKeyFile/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/GKeyFile/Makefile
+ $(AUTOMAKE) --foreign lib/GKeyFile/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -543,14 +553,14 @@ uninstall-am: uninstall-assemblyDATA
all: $(ASSEMBLY)
gkeyfile-api.raw: gkeyfile-sharp-sources.xml
- gapi2-parser gkeyfile-sharp-sources.xml
+ $(GAPI2PARSER) gkeyfile-sharp-sources.xml
gkeyfile-api.xml: gkeyfile-api.raw GKeyFile.metadata
cp gkeyfile-api.raw gkeyfile-api.xml
- gapi2-fixup --api=gkeyfile-api.xml --metadata=GKeyFile.metadata
+ $(GAPI2FIXUP) --api=gkeyfile-api.xml --metadata=GKeyFile.metadata
.generated_timestamp: gkeyfile-api.xml $(CUSTOMS)
- gapi2-codegen --outdir=generated --customdir=$(srcdir) --generate gkeyfile-api.xml
+ $(GAPI2CODEGEN) --outdir=generated --customdir=$(srcdir) --generate gkeyfile-api.xml
touch $@
$(ASSEMBLY): .generated_timestamp $(ASSEMBLY_SOURCES) $(ASSEMBLY_CUSTOMS)
$(CSC_LIB) -unsafe -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(srcdir)/generated/*.cs
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f2adf82..a4c9d3e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,27 +4,20 @@
UNCONDITIONAL_SUBDIRS = \
GKeyFile \
gio-sharp \
- glitz-sharp \
gnome-keyring-sharp \
gtk-sharp-beans \
libjpegtran \
libfspot \
libgphoto2-sharp \
- mono-addins \
- semweb
+ semweb \
+ unique-sharp
-# Depending on whether the packaged ndesk-dbus is used, we might not want to
-# build it, but we will always want to ship it. Also, dpap-sharp isn't built,
-# but it is shipped.
+# dpap-sharp isn't built, but it is shipped.
SUBDIRS = \
- $(DIR_DBUS) \
- $(DIR_DBUS_GLIB) \
$(UNCONDITIONAL_SUBDIRS)
DIST_SUBDIRS = \
- dbus-sharp \
- dbus-sharp-glib \
dpap-sharp \
$(UNCONDITIONAL_SUBDIRS)
diff --git a/lib/Makefile.in b/lib/Makefile.in
index c822c1c..97dd102 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39,11 +39,14 @@ host_triplet = @host@
subdir = lib
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -90,16 +93,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -116,8 +120,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -130,9 +133,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -181,16 +189,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -201,6 +211,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -211,21 +222,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -253,6 +268,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -277,6 +294,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -286,27 +304,20 @@ top_srcdir = @top_srcdir@
UNCONDITIONAL_SUBDIRS = \
GKeyFile \
gio-sharp \
- glitz-sharp \
gnome-keyring-sharp \
gtk-sharp-beans \
libjpegtran \
libfspot \
libgphoto2-sharp \
- mono-addins \
- semweb
+ semweb \
+ unique-sharp
-# Depending on whether the packaged ndesk-dbus is used, we might not want to
-# build it, but we will always want to ship it. Also, dpap-sharp isn't built,
-# but it is shipped.
+# dpap-sharp isn't built, but it is shipped.
SUBDIRS = \
- $(DIR_DBUS) \
- $(DIR_DBUS_GLIB) \
$(UNCONDITIONAL_SUBDIRS)
DIST_SUBDIRS = \
- dbus-sharp \
- dbus-sharp-glib \
dpap-sharp \
$(UNCONDITIONAL_SUBDIRS)
@@ -322,9 +333,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/Makefile
+ $(AUTOMAKE) --foreign lib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -357,7 +368,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -382,7 +393,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/lib/dbus-sharp-glib/AssemblyInfo.cs b/lib/dbus-sharp-glib/AssemblyInfo.cs
deleted file mode 100644
index 6f92ef0..0000000
--- a/lib/dbus-sharp-glib/AssemblyInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2007 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyVersion("0.3.0")]
-[assembly: AssemblyTitle ("NDesk.DBus.GLib")]
-[assembly: AssemblyDescription ("GLib integration for NDesk.DBus, the D-Bus IPC library")]
-[assembly: AssemblyCopyright ("Copyright (C) Alp Toker")]
-[assembly: AssemblyCompany ("NDesk")]
diff --git a/lib/dbus-sharp-glib/COPYING b/lib/dbus-sharp-glib/COPYING
deleted file mode 100644
index baed05f..0000000
--- a/lib/dbus-sharp-glib/COPYING
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright 2006 Alp Toker <alp at atoker.com>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/dbus-sharp-glib/GLib.IO.cs b/lib/dbus-sharp-glib/GLib.IO.cs
deleted file mode 100644
index a48f250..0000000
--- a/lib/dbus-sharp-glib/GLib.IO.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections;
-using System.Runtime.InteropServices;
-
-namespace NDesk.GLib
-{
- /*
- Specifies the type of function which is called when a data element is destroyed. It is passed the pointer to the data element and should free any memory and resources allocated for it.
-
- @data: the data element.
- */
- delegate void DestroyNotify (IntPtr data);
-
- /*
- Specifies the type of function passed to g_io_add_watch() or g_io_add_watch_full(), which is called when the requested condition on a GIOChannel is satisfied.
-
- @source: the GIOChannel event source.
- @condition: the condition which has been satisfied.
- @data: user data set in g_io_add_watch() or g_io_add_watch_full().
-
- Returns: the function should return FALSE if the event source should be removed.
- */
- delegate bool IOFunc (IOChannel source, IOCondition condition, IntPtr data);
-
- //this is actually somewhat like Stream, but we don't use it that way
- [StructLayout (LayoutKind.Sequential)]
- struct IOChannel
- {
- const string GLIB = "libglib-2.0-0.dll";
-
- public IntPtr Handle;
-
- [DllImport(GLIB)]
- static extern IntPtr g_io_channel_unix_new (int fd);
-
- public IOChannel (int fd)
- {
- Handle = g_io_channel_unix_new (fd);
- }
-
- [DllImport(GLIB)]
- //static extern int g_io_channel_unix_get_fd (IntPtr channel);
- static extern int g_io_channel_unix_get_fd (IOChannel channel);
-
- public int UnixFd
- {
- get {
- //return g_io_channel_unix_get_fd (Handle);
- return g_io_channel_unix_get_fd (this);
- }
- }
-
- [DllImport(GLIB)]
- public static extern IntPtr g_io_channel_win32_new_fd (int fd);
-
- [DllImport(GLIB)]
- public static extern IntPtr g_io_channel_win32_new_socket (int socket);
-
- [DllImport(GLIB)]
- public static extern IntPtr g_io_channel_win32_new_messages (uint hwnd);
-
-
- [DllImport(GLIB)]
- public static extern uint g_io_channel_get_buffer_size (IOChannel channel);
-
- [DllImport(GLIB)]
- public static extern void g_io_channel_set_buffer_size (IOChannel channel, uint size);
-
- public uint BufferSize
- {
- get {
- return g_io_channel_get_buffer_size (this);
- } set {
- g_io_channel_set_buffer_size (this, value);
- }
- }
-
- [DllImport(GLIB)]
- public static extern IOCondition g_io_channel_get_buffer_condition (IOChannel channel);
-
- public IOCondition BufferCondition
- {
- get {
- return g_io_channel_get_buffer_condition (this);
- }
- }
-
- [DllImport(GLIB)]
- public static extern IOFlags g_io_channel_get_flags (IOChannel channel);
-
- [DllImport(GLIB)]
- static extern short g_io_channel_set_flags (IOChannel channel, IOFlags flags, IntPtr error);
-
- public IOFlags Flags
- {
- get {
- return g_io_channel_get_flags (this);
- } set {
- //TODO: fix return and error
- g_io_channel_set_flags (this, value, IntPtr.Zero);
- }
- }
- }
-
- class IO
- {
- const string GLIB = "libglib-2.0-0.dll";
-
- //TODO: better memory management
- public static ArrayList objs = new ArrayList ();
-
- /*
- Adds the GIOChannel into the main event loop with the default priority.
-
- @channel: a GIOChannel.
- @condition: the condition to watch for.
- @func: the function to call when the condition is satisfied.
- @user_data: user data to pass to func.
-
- Returns: the event source id.
- */
- [DllImport(GLIB)]
- protected static extern uint g_io_add_watch (IOChannel channel, IOCondition condition, IOFunc func, IntPtr user_data);
-
- public static uint AddWatch (IOChannel channel, IOCondition condition, IOFunc func)
- {
- objs.Add (func);
-
- return g_io_add_watch (channel, condition, func, IntPtr.Zero);
- }
-
- /*
- Adds the GIOChannel into the main event loop with the given priority.
-
- @channel: a GIOChannel.
- @priority: the priority of the GIOChannel source.
- @condition: the condition to watch for.
- @func: the function to call when the condition is satisfied.
- @user_data: user data to pass to func.
- @notify: the function to call when the source is removed.
-
- Returns: the event source id.
- */
- [DllImport(GLIB)]
- protected static extern uint g_io_add_watch_full (IOChannel channel, int priority, IOCondition condition, IOFunc func, IntPtr user_data, DestroyNotify notify);
-
- public static uint AddWatch (IOChannel channel, int priority, IOCondition condition, IOFunc func, DestroyNotify notify)
- {
- objs.Add (func);
- objs.Add (notify);
-
- return g_io_add_watch_full (channel, priority, condition, func, IntPtr.Zero, notify);
- }
-
- [DllImport(GLIB)]
- protected static extern IntPtr g_main_context_default ();
-
- public static IntPtr MainContextDefault ()
- {
- return g_main_context_default ();
- }
-
- [DllImport(GLIB)]
- protected static extern void g_main_context_wakeup (IntPtr context);
-
- public static void MainContextWakeup (IntPtr context)
- {
- g_main_context_wakeup (context);
- }
- }
-
- //From Mono.Unix and poll(2)
- [Flags]
- enum PollEvents : short {
- POLLIN = 0x0001, // There is data to read
- POLLPRI = 0x0002, // There is urgent data to read
- POLLOUT = 0x0004, // Writing now will not block
- POLLERR = 0x0008, // Error condition
- POLLHUP = 0x0010, // Hung up
- POLLNVAL = 0x0020, // Invalid request; fd not open
- // XPG4.2 definitions (via _XOPEN_SOURCE)
- POLLRDNORM = 0x0040, // Normal data may be read
- POLLRDBAND = 0x0080, // Priority data may be read
- POLLWRNORM = 0x0100, // Writing now will not block
- POLLWRBAND = 0x0200, // Priority data may be written
- }
-
- //A bitwise combination representing a condition to watch for on an event source.
- [Flags]
- enum IOCondition : short
- {
- //There is data to read.
- In = PollEvents.POLLIN,
- //Data can be written (without blocking).
- Out = PollEvents.POLLOUT,
- //There is urgent data to read.
- Pri = PollEvents.POLLPRI,
- //Error condition.
- Err = PollEvents.POLLERR,
- //Hung up (the connection has been broken, usually for pipes and sockets).
- Hup = PollEvents.POLLHUP,
- //Invalid request. The file descriptor is not open.
- Nval = PollEvents.POLLNVAL,
- }
-
- [Flags]
- enum IOFlags : short
- {
- Append = 1 << 0,
- Nonblock = 1 << 1,
- //Read only flag
- IsReadable = 1 << 2,
- //Read only flag
- isWriteable = 1 << 3,
- //Read only flag
- IsSeekable = 1 << 4,
- //?
- Mask = (1 << 5) - 1,
- GetMask = Mask,
- SetMask = Append | Nonblock,
- }
-}
diff --git a/lib/dbus-sharp-glib/GLib.cs b/lib/dbus-sharp-glib/GLib.cs
deleted file mode 100644
index fe2a059..0000000
--- a/lib/dbus-sharp-glib/GLib.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-//using GLib;
-//using Gtk;
-using NDesk.DBus;
-using NDesk.GLib;
-using org.freedesktop.DBus;
-
-namespace NDesk.DBus
-{
- //FIXME: this API needs review and de-unixification. It is horrid, but gets the job done.
- public static class BusG
- {
- static bool initialized = false;
- public static void Init ()
- {
- if (initialized)
- return;
-
- Init (Bus.System);
- Init (Bus.Session);
- //TODO: consider starter bus?
-
- initialized = true;
- }
-
- public static void Init (Connection conn)
- {
- IOFunc dispatchHandler = delegate (IOChannel source, IOCondition condition, IntPtr data) {
- if ((condition & IOCondition.Hup) == IOCondition.Hup) {
- if (Protocol.Verbose)
- Console.Error.WriteLine ("Warning: Connection was probably hung up (" + condition + ")");
-
- //TODO: handle disconnection properly, consider memory management
- return false;
- }
-
- //this may not provide expected behaviour all the time, but works for now
- conn.Iterate ();
- return true;
- };
-
- Init (conn, dispatchHandler);
- }
-
- static void Init (Connection conn, IOFunc dispatchHandler)
- {
- IOChannel channel = new IOChannel ((int)conn.Transport.SocketHandle);
- IO.AddWatch (channel, IOCondition.In | IOCondition.Hup, dispatchHandler);
- }
- }
-}
diff --git a/lib/dbus-sharp-glib/Makefile.am b/lib/dbus-sharp-glib/Makefile.am
deleted file mode 100644
index 57a9f4a..0000000
--- a/lib/dbus-sharp-glib/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-include $(top_srcdir)/Makefile.include
-
-ASSEMBLY_NAME = NDesk.DBus.GLib
-
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/GLib.IO.cs \
- $(srcdir)/GLib.cs
-
-REFS = -r:../$(DIR_DBUS)/NDesk.DBus.dll
-
-PKGS =
-
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY) \
- $(ASSEMBLY).config
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- $(ASSEMBLY).config \
- README \
- COPYING
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
diff --git a/lib/dbus-sharp-glib/Makefile.in b/lib/dbus-sharp-glib/Makefile.in
deleted file mode 100644
index 1cfe693..0000000
--- a/lib/dbus-sharp-glib/Makefile.in
+++ /dev/null
@@ -1,541 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include COPYING
-subdir = lib/dbus-sharp-glib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(assemblydir)"
-DATA = $(assembly_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
-DIR_DOCS = $(top_builddir)/docs
-DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
-DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
-DIR_SEMWEB = $(top_builddir)/lib/semweb
-DIR_SRC = $(top_builddir)/src
-DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
-LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
-LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-CSC_FLAGS = -debug
-CSC = $(MCS) $(CSC_FLAGS) -target:exe
-CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
-MONO_DEBUGFLAGS = --debug
-RUNTIME = mono $(MONO_DEBUGFLAGS)
-ASSEMBLY_NAME = NDesk.DBus.GLib
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/GLib.IO.cs \
- $(srcdir)/GLib.cs
-
-REFS = -r:../$(DIR_DBUS)/NDesk.DBus.dll
-PKGS =
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY) \
- $(ASSEMBLY).config
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- $(ASSEMBLY).config \
- README \
- COPYING
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dbus-sharp-glib/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dbus-sharp-glib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(assemblydir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(assemblydir)" || exit $$?; \
- done
-
-uninstall-assemblyDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(assemblydir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(assemblydir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-assemblyDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-assemblyDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-assemblyDATA install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll.config b/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll.config
deleted file mode 100644
index 03cb09f..0000000
--- a/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration>
- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
- <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0.so.0"/>
-</configuration>
diff --git a/lib/dbus-sharp-glib/README b/lib/dbus-sharp-glib/README
deleted file mode 100644
index edd56f1..0000000
--- a/lib/dbus-sharp-glib/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This code provides GLib integration for Managed DBus
-
-See http://www.ndesk.org/DBusSharp
-
-It is currently at concept stage.
-
---
-Alp Toker <alp at atoker.com>
diff --git a/lib/dbus-sharp/Address.cs b/lib/dbus-sharp/Address.cs
deleted file mode 100644
index 892d1e3..0000000
--- a/lib/dbus-sharp/Address.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Text;
-using System.Collections.Generic;
-
-namespace NDesk.DBus
-{
- public class BadAddressException : Exception
- {
- public BadAddressException (string reason) : base (reason) {}
- }
-
- class AddressEntry
- {
- public string Method;
- public IDictionary<string,string> Properties = new Dictionary<string,string> ();
-
- public override string ToString ()
- {
- StringBuilder sb = new StringBuilder ();
- sb.Append (Method);
- sb.Append (':');
-
- bool first = true;
- foreach (KeyValuePair<string,string> prop in Properties) {
- if (first)
- first = false;
- else
- sb.Append (',');
-
- sb.Append (prop.Key);
- sb.Append ('=');
- sb.Append (Escape (prop.Value));
- }
-
- return sb.ToString ();
- }
-
- static string Escape (string str)
- {
- if (str == null)
- return String.Empty;
-
- StringBuilder sb = new StringBuilder ();
- int len = str.Length;
-
- for (int i = 0 ; i != len ; i++) {
- char c = str[i];
-
- //everything other than the optionally escaped chars _must_ be escaped
- if (Char.IsLetterOrDigit (c) || c == '-' || c == '_' || c == '/' || c == '\\' || c == '.')
- sb.Append (c);
- else
- sb.Append (Uri.HexEscape (c));
- }
-
- return sb.ToString ();
- }
-
- static string Unescape (string str)
- {
- if (str == null)
- return String.Empty;
-
- StringBuilder sb = new StringBuilder ();
- int len = str.Length;
- int i = 0;
- while (i != len) {
- if (Uri.IsHexEncoding (str, i))
- sb.Append (Uri.HexUnescape (str, ref i));
- else
- sb.Append (str[i++]);
- }
-
- return sb.ToString ();
- }
-
-
- public static AddressEntry Parse (string s)
- {
- AddressEntry entry = new AddressEntry ();
-
- string[] parts = s.Split (':');
-
- if (parts.Length < 2)
- throw new BadAddressException ("No colon found");
- if (parts.Length > 2)
- throw new BadAddressException ("Too many colons found");
-
- entry.Method = parts[0];
-
- foreach (string propStr in parts[1].Split (',')) {
- parts = propStr.Split ('=');
-
- if (parts.Length < 2)
- throw new BadAddressException ("No equals sign found");
- if (parts.Length > 2)
- throw new BadAddressException ("Too many equals signs found");
-
- entry.Properties[parts[0]] = Unescape (parts[1]);
- }
-
- return entry;
- }
- }
-
- static class Address
- {
- //(unix:(path|abstract)=.*,guid=.*|tcp:host=.*(,port=.*)?);? ...
- public static AddressEntry[] Parse (string addresses)
- {
- if (addresses == null)
- throw new ArgumentNullException (addresses);
-
- List<AddressEntry> entries = new List<AddressEntry> ();
-
- foreach (string entryStr in addresses.Split (';'))
- entries.Add (AddressEntry.Parse (entryStr));
-
- return entries.ToArray ();
- }
-
- const string SYSTEM_BUS_ADDRESS = "unix:path=/var/run/dbus/system_bus_socket";
- public static string System
- {
- get {
- string addr = Environment.GetEnvironmentVariable ("DBUS_SYSTEM_BUS_ADDRESS");
-
- if (String.IsNullOrEmpty (addr))
- addr = SYSTEM_BUS_ADDRESS;
-
- return addr;
- }
- }
-
- public static string Session
- {
- get {
- return Environment.GetEnvironmentVariable ("DBUS_SESSION_BUS_ADDRESS");
- }
- }
-
- public static string Starter
- {
- get {
- return Environment.GetEnvironmentVariable ("DBUS_STARTER_ADDRESS");
- }
- }
-
- public static string StarterBusType
- {
- get {
- return Environment.GetEnvironmentVariable ("DBUS_STARTER_BUS_TYPE");
- }
- }
- }
-}
diff --git a/lib/dbus-sharp/AssemblyInfo.cs b/lib/dbus-sharp/AssemblyInfo.cs
deleted file mode 100644
index 905b36c..0000000
--- a/lib/dbus-sharp/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyTitle ("NDesk.DBus")]
-[assembly: AssemblyDescription ("D-Bus IPC protocol library and CLR binding")]
-[assembly: AssemblyCopyright ("Copyright (C) Alp Toker")]
-[assembly: AssemblyCompany ("NDesk")]
-
-#if STRONG_NAME
-[assembly: InternalsVisibleTo ("dbus-monitor, PublicKey=0024000004800000440000000602000000240000525341318001000011000000ffbfaa640454654de78297fde2d22dd4bc4b0476fa892c3f8575ad4f048ce0721ce4109f542936083bc4dd83be5f7f97")]
-[assembly: InternalsVisibleTo ("NDesk.DBus.GLib, PublicKey=0024000004800000440000000602000000240000525341318001000011000000ffbfaa640454654de78297fde2d22dd4bc4b0476fa892c3f8575ad4f048ce0721ce4109f542936083bc4dd83be5f7f97")]
-#else
-[assembly: InternalsVisibleTo ("dbus-monitor")]
-[assembly: InternalsVisibleTo ("NDesk.DBus.GLib")]
-[assembly: InternalsVisibleTo ("NDesk.DBus.Proxies")]
-#endif
diff --git a/lib/dbus-sharp/Authentication.cs b/lib/dbus-sharp/Authentication.cs
deleted file mode 100644
index 404ef82..0000000
--- a/lib/dbus-sharp/Authentication.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Globalization;
-
-namespace NDesk.DBus.Authentication
-{
- enum ClientState
- {
- WaitingForData,
- WaitingForOK,
- WaitingForReject,
- }
-
- enum ServerState
- {
- WaitingForAuth,
- WaitingForData,
- WaitingForBegin,
- }
-
- class SaslClient
- {
- protected Connection conn;
-
- protected SaslClient ()
- {
- }
-
- public SaslClient (Connection conn)
- {
- this.conn = conn;
- }
-
- public void Run ()
- {
- StreamReader sr = new StreamReader (conn.Transport.Stream, Encoding.ASCII);
- StreamWriter sw = new StreamWriter (conn.Transport.Stream, Encoding.ASCII);
-
- sw.NewLine = "\r\n";
-
- string str = conn.Transport.AuthString ();
- byte[] bs = Encoding.ASCII.GetBytes (str);
-
- string authStr = ToHex (bs);
-
- sw.WriteLine ("AUTH EXTERNAL {0}", authStr);
- sw.Flush ();
-
- string ok_rep = sr.ReadLine ();
-
- string[] parts;
- parts = ok_rep.Split (' ');
-
- if (parts.Length < 1 || parts[0] != "OK")
- throw new Exception ("Authentication error: AUTH EXTERNAL was not OK: \"" + ok_rep + "\"");
-
- /*
- string guid = parts[1];
- byte[] guidData = FromHex (guid);
- uint unixTime = BitConverter.ToUInt32 (guidData, 0);
- Console.Error.WriteLine ("guid: " + guid + ", " + "unixTime: " + unixTime + " (" + UnixToDateTime (unixTime) + ")");
- */
-
- sw.WriteLine ("BEGIN");
- sw.Flush ();
- }
-
- //From Mono.Unix.Native.NativeConvert
- //should these methods use long or (u)int?
- public static DateTime UnixToDateTime (long time)
- {
- DateTime LocalUnixEpoch = new DateTime (1970, 1, 1);
- TimeSpan LocalUtcOffset = TimeZone.CurrentTimeZone.GetUtcOffset (DateTime.UtcNow);
- return LocalUnixEpoch.AddSeconds ((double) time + LocalUtcOffset.TotalSeconds);
- }
-
- public static long DateTimeToUnix (DateTime time)
- {
- DateTime LocalUnixEpoch = new DateTime (1970, 1, 1);
- TimeSpan LocalUtcOffset = TimeZone.CurrentTimeZone.GetUtcOffset (DateTime.UtcNow);
- TimeSpan unixTime = time.Subtract (LocalUnixEpoch) - LocalUtcOffset;
-
- return (long) unixTime.TotalSeconds;
- }
-
- //From Mono.Security.Cryptography
- //Modified to output lowercase hex
- static public string ToHex (byte[] input)
- {
- if (input == null)
- return null;
-
- StringBuilder sb = new StringBuilder (input.Length * 2);
- foreach (byte b in input) {
- sb.Append (b.ToString ("x2", CultureInfo.InvariantCulture));
- }
- return sb.ToString ();
- }
-
- //From Mono.Security.Cryptography
- static private byte FromHexChar (char c)
- {
- if ((c >= 'a') && (c <= 'f'))
- return (byte) (c - 'a' + 10);
- if ((c >= 'A') && (c <= 'F'))
- return (byte) (c - 'A' + 10);
- if ((c >= '0') && (c <= '9'))
- return (byte) (c - '0');
- throw new ArgumentException ("Invalid hex char");
- }
-
- //From Mono.Security.Cryptography
- static public byte[] FromHex (string hex)
- {
- if (hex == null)
- return null;
- if ((hex.Length & 0x1) == 0x1)
- throw new ArgumentException ("Length must be a multiple of 2");
-
- byte[] result = new byte [hex.Length >> 1];
- int n = 0;
- int i = 0;
- while (n < result.Length) {
- result [n] = (byte) (FromHexChar (hex [i++]) << 4);
- result [n++] += FromHexChar (hex [i++]);
- }
- return result;
- }
- }
-}
diff --git a/lib/dbus-sharp/Bus.cs b/lib/dbus-sharp/Bus.cs
deleted file mode 100644
index ed77022..0000000
--- a/lib/dbus-sharp/Bus.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections.Generic;
-using org.freedesktop.DBus;
-
-namespace NDesk.DBus
-{
- public sealed class Bus : Connection
- {
- static Bus systemBus = null;
- public static Bus System
- {
- get {
- if (systemBus == null) {
- try {
- if (Address.StarterBusType == "system")
- systemBus = Starter;
- else
- systemBus = Bus.Open (Address.System);
- } catch (Exception e) {
- throw new Exception ("Unable to open the system message bus.", e);
- }
- }
-
- return systemBus;
- }
- }
-
- static Bus sessionBus = null;
- public static Bus Session
- {
- get {
- if (sessionBus == null) {
- try {
- if (Address.StarterBusType == "session")
- sessionBus = Starter;
- else
- sessionBus = Bus.Open (Address.Session);
- } catch (Exception e) {
- throw new Exception ("Unable to open the session message bus.", e);
- }
- }
-
- return sessionBus;
- }
- }
-
- //TODO: parsing of starter bus type, or maybe do this another way
- static Bus starterBus = null;
- public static Bus Starter
- {
- get {
- if (starterBus == null) {
- try {
- starterBus = Bus.Open (Address.Starter);
- } catch (Exception e) {
- throw new Exception ("Unable to open the starter message bus.", e);
- }
- }
-
- return starterBus;
- }
- }
-
- //public static readonly Bus Session = null;
-
- //TODO: use the guid, not the whole address string
- //TODO: consider what happens when a connection has been closed
- static Dictionary<string,Bus> buses = new Dictionary<string,Bus> ();
-
- //public static Connection Open (string address)
- public static new Bus Open (string address)
- {
- if (address == null)
- throw new ArgumentNullException ("address");
-
- if (buses.ContainsKey (address))
- return buses[address];
-
- Bus bus = new Bus (address);
- buses[address] = bus;
-
- return bus;
- }
-
- IBus bus;
-
- static readonly string DBusName = "org.freedesktop.DBus";
- static readonly ObjectPath DBusPath = new ObjectPath ("/org/freedesktop/DBus");
-
- public Bus (string address) : base (address)
- {
- bus = GetObject<IBus> (DBusName, DBusPath);
-
- /*
- bus.NameAcquired += delegate (string acquired_name) {
- Console.WriteLine ("NameAcquired: " + acquired_name);
- };
- */
- Register ();
- }
-
- //should this be public?
- //as long as Bus subclasses Connection, having a Register with a completely different meaning is bad
- void Register ()
- {
- if (unique_name != null)
- throw new Exception ("Bus already has a unique name");
-
- unique_name = bus.Hello ();
- }
-
- public ulong GetUnixUser (string name)
- {
- return bus.GetConnectionUnixUser (name);
- }
-
- public RequestNameReply RequestName (string name)
- {
- return RequestName (name, NameFlag.None);
- }
-
- public RequestNameReply RequestName (string name, NameFlag flags)
- {
- return bus.RequestName (name, flags);
- }
-
- public ReleaseNameReply ReleaseName (string name)
- {
- return bus.ReleaseName (name);
- }
-
- public bool NameHasOwner (string name)
- {
- return bus.NameHasOwner (name);
- }
-
- public StartReply StartServiceByName (string name)
- {
- return StartServiceByName (name, 0);
- }
-
- public StartReply StartServiceByName (string name, uint flags)
- {
- return bus.StartServiceByName (name, flags);
- }
-
- internal protected override void AddMatch (string rule)
- {
- bus.AddMatch (rule);
- }
-
- internal protected override void RemoveMatch (string rule)
- {
- bus.RemoveMatch (rule);
- }
-
- string unique_name = null;
- public string UniqueName
- {
- get {
- return unique_name;
- } set {
- if (unique_name != null)
- throw new Exception ("Unique name can only be set once");
- unique_name = value;
- }
- }
- }
-}
diff --git a/lib/dbus-sharp/BusObject.cs b/lib/dbus-sharp/BusObject.cs
deleted file mode 100644
index 4e589a6..0000000
--- a/lib/dbus-sharp/BusObject.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Collections.Generic;
-
-namespace NDesk.DBus
-{
- class BusObject
- {
- protected Connection conn;
- string bus_name;
- ObjectPath object_path;
-
- //protected BusObject ()
- public BusObject ()
- {
- }
-
- public BusObject (Connection conn, string bus_name, ObjectPath object_path)
- {
- this.conn = conn;
- this.bus_name = bus_name;
- this.object_path = object_path;
- }
-
- public Connection Connection
- {
- get {
- return conn;
- }
- }
-
- public string BusName
- {
- get {
- return bus_name;
- }
- }
-
- public ObjectPath Path
- {
- get {
- return object_path;
- }
- }
-
- public void ToggleSignal (string iface, string member, Delegate dlg, bool adding)
- {
- MatchRule rule = new MatchRule ();
- rule.MessageType = MessageType.Signal;
- rule.Interface = iface;
- rule.Member = member;
- rule.Path = object_path;
-
- if (adding) {
- if (conn.Handlers.ContainsKey (rule))
- conn.Handlers[rule] = Delegate.Combine (conn.Handlers[rule], dlg);
- else {
- conn.Handlers[rule] = dlg;
- conn.AddMatch (rule.ToString ());
- }
- } else {
- conn.Handlers[rule] = Delegate.Remove (conn.Handlers[rule], dlg);
- if (conn.Handlers[rule] == null) {
- conn.RemoveMatch (rule.ToString ());
- conn.Handlers.Remove (rule);
- }
- }
- }
-
- public void SendSignal (string iface, string member, string inSigStr, MessageWriter writer, Type retType, out Exception exception)
- {
- exception = null;
-
- //TODO: don't ignore retVal, exception etc.
-
- Signature outSig = String.IsNullOrEmpty (inSigStr) ? Signature.Empty : new Signature (inSigStr);
-
- Signal signal = new Signal (object_path, iface, member);
- signal.message.Signature = outSig;
-
- Message signalMsg = signal.message;
- signalMsg.Body = writer.ToArray ();
-
- conn.Send (signalMsg);
- }
-
- public object SendMethodCall (string iface, string member, string inSigStr, MessageWriter writer, Type retType, out Exception exception)
- {
- exception = null;
-
- //TODO: don't ignore retVal, exception etc.
-
- Signature inSig = String.IsNullOrEmpty (inSigStr) ? Signature.Empty : new Signature (inSigStr);
-
- MethodCall method_call = new MethodCall (object_path, iface, member, bus_name, inSig);
-
- Message callMsg = method_call.message;
- callMsg.Body = writer.ToArray ();
-
- //Invoke Code::
-
- //TODO: complete out parameter support
- /*
- Type[] outParmTypes = Mapper.GetTypes (ArgDirection.Out, mi.GetParameters ());
- Signature outParmSig = Signature.GetSig (outParmTypes);
-
- if (outParmSig != Signature.Empty)
- throw new Exception ("Out parameters not yet supported: out_signature='" + outParmSig.Value + "'");
- */
-
- Type[] outTypes = new Type[1];
- outTypes[0] = retType;
-
- //we default to always requiring replies for now, even though unnecessary
- //this is to make sure errors are handled synchronously
- //TODO: don't hard code this
- bool needsReply = true;
-
- //if (mi.ReturnType == typeof (void))
- // needsReply = false;
-
- callMsg.ReplyExpected = needsReply;
- callMsg.Signature = inSig;
-
- if (!needsReply) {
- conn.Send (callMsg);
- return null;
- }
-
-#if PROTO_REPLY_SIGNATURE
- if (needsReply) {
- Signature outSig = Signature.GetSig (outTypes);
- callMsg.Header.Fields[FieldCode.ReplySignature] = outSig;
- }
-#endif
-
- Message retMsg = conn.SendWithReplyAndBlock (callMsg);
-
- object retVal = null;
-
- //handle the reply message
- switch (retMsg.Header.MessageType) {
- case MessageType.MethodReturn:
- object[] retVals = MessageHelper.GetDynamicValues (retMsg, outTypes);
- if (retVals.Length != 0)
- retVal = retVals[retVals.Length - 1];
- break;
- case MessageType.Error:
- //TODO: typed exceptions
- Error error = new Error (retMsg);
- string errMsg = String.Empty;
- if (retMsg.Signature.Value.StartsWith ("s")) {
- MessageReader reader = new MessageReader (retMsg);
- errMsg = reader.ReadString ();
- }
- exception = new Exception (error.ErrorName + ": " + errMsg);
- break;
- default:
- throw new Exception ("Got unexpected message of type " + retMsg.Header.MessageType + " while waiting for a MethodReturn or Error");
- }
-
- return retVal;
- }
-
- public void Invoke (MethodBase methodBase, string methodName, object[] inArgs, out object[] outArgs, out object retVal, out Exception exception)
- {
- outArgs = new object[0];
- retVal = null;
- exception = null;
-
- MethodInfo mi = methodBase as MethodInfo;
-
- if (mi != null && mi.IsSpecialName && (methodName.StartsWith ("add_") || methodName.StartsWith ("remove_"))) {
- string[] parts = methodName.Split (new char[]{'_'}, 2);
- string ename = parts[1];
- Delegate dlg = (Delegate)inArgs[0];
-
- ToggleSignal (Mapper.GetInterfaceName (mi), ename, dlg, parts[0] == "add");
-
- return;
- }
-
- Type[] inTypes = Mapper.GetTypes (ArgDirection.In, mi.GetParameters ());
- Signature inSig = Signature.GetSig (inTypes);
-
- MethodCall method_call;
- Message callMsg;
-
- //build the outbound method call message
- {
- //this bit is error-prone (no null checking) and will need rewriting when DProxy is replaced
- string iface = null;
- if (mi != null)
- iface = Mapper.GetInterfaceName (mi);
-
- //map property accessors
- //TODO: this needs to be done properly, not with simple String.Replace
- //note that IsSpecialName is also for event accessors, but we already handled those and returned
- if (mi != null && mi.IsSpecialName) {
- methodName = methodName.Replace ("get_", "Get");
- methodName = methodName.Replace ("set_", "Set");
- }
-
- method_call = new MethodCall (object_path, iface, methodName, bus_name, inSig);
-
- callMsg = method_call.message;
-
- if (inArgs != null && inArgs.Length != 0) {
- MessageWriter writer = new MessageWriter (Connection.NativeEndianness);
- writer.connection = conn;
-
- for (int i = 0 ; i != inTypes.Length ; i++)
- writer.Write (inTypes[i], inArgs[i]);
-
- callMsg.Body = writer.ToArray ();
- }
- }
-
- //TODO: complete out parameter support
- /*
- Type[] outParmTypes = Mapper.GetTypes (ArgDirection.Out, mi.GetParameters ());
- Signature outParmSig = Signature.GetSig (outParmTypes);
-
- if (outParmSig != Signature.Empty)
- throw new Exception ("Out parameters not yet supported: out_signature='" + outParmSig.Value + "'");
- */
-
- Type[] outTypes = new Type[1];
- outTypes[0] = mi.ReturnType;
-
- //we default to always requiring replies for now, even though unnecessary
- //this is to make sure errors are handled synchronously
- //TODO: don't hard code this
- bool needsReply = true;
-
- //if (mi.ReturnType == typeof (void))
- // needsReply = false;
-
- callMsg.ReplyExpected = needsReply;
- callMsg.Signature = inSig;
-
- if (!needsReply) {
- conn.Send (callMsg);
- return;
- }
-
-#if PROTO_REPLY_SIGNATURE
- if (needsReply) {
- Signature outSig = Signature.GetSig (outTypes);
- callMsg.Header.Fields[FieldCode.ReplySignature] = outSig;
- }
-#endif
-
- Message retMsg = conn.SendWithReplyAndBlock (callMsg);
-
- //handle the reply message
- switch (retMsg.Header.MessageType) {
- case MessageType.MethodReturn:
- object[] retVals = MessageHelper.GetDynamicValues (retMsg, outTypes);
- if (retVals.Length != 0)
- retVal = retVals[retVals.Length - 1];
- break;
- case MessageType.Error:
- //TODO: typed exceptions
- Error error = new Error (retMsg);
- string errMsg = String.Empty;
- if (retMsg.Signature.Value.StartsWith ("s")) {
- MessageReader reader = new MessageReader (retMsg);
- errMsg = reader.ReadString ();
- }
- exception = new Exception (error.ErrorName + ": " + errMsg);
- break;
- default:
- throw new Exception ("Got unexpected message of type " + retMsg.Header.MessageType + " while waiting for a MethodReturn or Error");
- }
-
- return;
- }
-
- public static object GetObject (Connection conn, string bus_name, ObjectPath object_path, Type declType)
- {
- Type proxyType = TypeImplementer.GetImplementation (declType);
-
- BusObject inst = (BusObject)Activator.CreateInstance (proxyType);
- inst.conn = conn;
- inst.bus_name = bus_name;
- inst.object_path = object_path;
-
- return inst;
- }
-
- public Delegate GetHookupDelegate (EventInfo ei)
- {
- DynamicMethod hookupMethod = TypeImplementer.GetHookupMethod (ei);
- Delegate d = hookupMethod.CreateDelegate (ei.EventHandlerType, this);
- return d;
- }
- }
-}
diff --git a/lib/dbus-sharp/COPYING b/lib/dbus-sharp/COPYING
deleted file mode 100644
index baed05f..0000000
--- a/lib/dbus-sharp/COPYING
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright 2006 Alp Toker <alp at atoker.com>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/dbus-sharp/Connection.cs b/lib/dbus-sharp/Connection.cs
deleted file mode 100644
index 52d9cf8..0000000
--- a/lib/dbus-sharp/Connection.cs
+++ /dev/null
@@ -1,538 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Reflection;
-
-namespace NDesk.DBus
-{
- using Authentication;
- using Transports;
-
- public partial class Connection
- {
- //TODO: reconsider this field
- Stream ns = null;
-
- Transport transport;
- internal Transport Transport {
- get {
- return transport;
- } set {
- transport = value;
- }
- }
-
- protected Connection () {}
-
- internal Connection (Transport transport)
- {
- this.transport = transport;
- transport.Connection = this;
-
- //TODO: clean this bit up
- ns = transport.Stream;
- }
-
- //should this be public?
- internal Connection (string address)
- {
- OpenPrivate (address);
- Authenticate ();
- }
-
- /*
- bool isConnected = false;
- public bool IsConnected
- {
- get {
- return isConnected;
- }
- }
- */
-
- //should we do connection sharing here?
- public static Connection Open (string address)
- {
- Connection conn = new Connection ();
- conn.OpenPrivate (address);
- conn.Authenticate ();
-
- return conn;
- }
-
- internal void OpenPrivate (string address)
- {
- if (address == null)
- throw new ArgumentNullException ("address");
-
- AddressEntry[] entries = Address.Parse (address);
- if (entries.Length == 0)
- throw new Exception ("No addresses were found");
-
- //TODO: try alternative addresses if needed
- AddressEntry entry = entries[0];
-
- transport = Transport.Create (entry);
-
- //TODO: clean this bit up
- ns = transport.Stream;
- }
-
- void Authenticate ()
- {
- if (transport != null)
- transport.WriteCred ();
-
- SaslClient auth = new SaslClient (this);
- auth.Run ();
- isAuthenticated = true;
- }
-
- bool isAuthenticated = false;
- internal bool IsAuthenticated
- {
- get {
- return isAuthenticated;
- }
- }
-
- //Interlocked.Increment() handles the overflow condition for uint correctly, so it's ok to store the value as an int but cast it to uint
- int serial = 0;
- uint GenerateSerial ()
- {
- //return ++serial;
- return (uint)Interlocked.Increment (ref serial);
- }
-
- internal Message SendWithReplyAndBlock (Message msg)
- {
- PendingCall pending = SendWithReply (msg);
- return pending.Reply;
- }
-
- internal PendingCall SendWithReply (Message msg)
- {
- msg.ReplyExpected = true;
- msg.Header.Serial = GenerateSerial ();
-
- //TODO: throttle the maximum number of concurrent PendingCalls
- PendingCall pending = new PendingCall (this);
- pendingCalls[msg.Header.Serial] = pending;
-
- WriteMessage (msg);
-
- return pending;
- }
-
- internal uint Send (Message msg)
- {
- msg.Header.Serial = GenerateSerial ();
-
- WriteMessage (msg);
-
- //Outbound.Enqueue (msg);
- //temporary
- //Flush ();
-
- return msg.Header.Serial;
- }
-
- object writeLock = new object ();
- internal void WriteMessage (Message msg)
- {
- byte[] HeaderData = msg.GetHeaderData ();
-
- long msgLength = HeaderData.Length + (msg.Body != null ? msg.Body.Length : 0);
- if (msgLength > Protocol.MaxMessageLength)
- throw new Exception ("Message length " + msgLength + " exceeds maximum allowed " + Protocol.MaxMessageLength + " bytes");
-
- lock (writeLock) {
- ns.Write (HeaderData, 0, HeaderData.Length);
- if (msg.Body != null && msg.Body.Length != 0)
- ns.Write (msg.Body, 0, msg.Body.Length);
- }
- }
-
- Queue<Message> Inbound = new Queue<Message> ();
- /*
- Queue<Message> Outbound = new Queue<Message> ();
-
- public void Flush ()
- {
- //should just iterate the enumerator here
- while (Outbound.Count != 0) {
- Message msg = Outbound.Dequeue ();
- WriteMessage (msg);
- }
- }
-
- public bool ReadWrite (int timeout_milliseconds)
- {
- //TODO
-
- return true;
- }
-
- public bool ReadWrite ()
- {
- return ReadWrite (-1);
- }
-
- public bool Dispatch ()
- {
- //TODO
- Message msg = Inbound.Dequeue ();
- //HandleMessage (msg);
-
- return true;
- }
-
- public bool ReadWriteDispatch (int timeout_milliseconds)
- {
- //TODO
- return Dispatch ();
- }
-
- public bool ReadWriteDispatch ()
- {
- return ReadWriteDispatch (-1);
- }
- */
-
- internal Message ReadMessage ()
- {
- byte[] header;
- byte[] body = null;
-
- int read;
-
- //16 bytes is the size of the fixed part of the header
- byte[] hbuf = new byte[16];
- read = ns.Read (hbuf, 0, 16);
-
- if (read == 0)
- return null;
-
- if (read != 16)
- throw new Exception ("Header read length mismatch: " + read + " of expected " + "16");
-
- EndianFlag endianness = (EndianFlag)hbuf[0];
- MessageReader reader = new MessageReader (endianness, hbuf);
-
- //discard the endian byte as we've already read it
- reader.ReadByte ();
-
- //discard message type and flags, which we don't care about here
- reader.ReadByte ();
- reader.ReadByte ();
-
- byte version = reader.ReadByte ();
-
- if (version < Protocol.MinVersion || version > Protocol.MaxVersion)
- throw new NotSupportedException ("Protocol version '" + version.ToString () + "' is not supported");
-
- if (Protocol.Verbose)
- if (version != Protocol.Version)
- Console.Error.WriteLine ("Warning: Protocol version '" + version.ToString () + "' is not explicitly supported but may be compatible");
-
- uint bodyLength = reader.ReadUInt32 ();
- //discard serial
- reader.ReadUInt32 ();
- uint headerLength = reader.ReadUInt32 ();
-
- //this check may become relevant if a future version of the protocol allows larger messages
- /*
- if (bodyLength > Int32.MaxValue || headerLength > Int32.MaxValue)
- throw new NotImplementedException ("Long messages are not yet supported");
- */
-
- int bodyLen = (int)bodyLength;
- int toRead = (int)headerLength;
-
- //we fixup to include the padding following the header
- toRead = Protocol.Padded (toRead, 8);
-
- long msgLength = toRead + bodyLen;
- if (msgLength > Protocol.MaxMessageLength)
- throw new Exception ("Message length " + msgLength + " exceeds maximum allowed " + Protocol.MaxMessageLength + " bytes");
-
- header = new byte[16 + toRead];
- Array.Copy (hbuf, header, 16);
-
- read = ns.Read (header, 16, toRead);
-
- if (read != toRead)
- throw new Exception ("Message header length mismatch: " + read + " of expected " + toRead);
-
- //read the body
- if (bodyLen != 0) {
- body = new byte[bodyLen];
- read = ns.Read (body, 0, bodyLen);
-
- if (read != bodyLen)
- throw new Exception ("Message body length mismatch: " + read + " of expected " + bodyLen);
- }
-
- Message msg = new Message ();
- msg.Connection = this;
- msg.Body = body;
- msg.SetHeaderData (header);
-
- return msg;
- }
-
- //temporary hack
- internal void DispatchSignals ()
- {
- lock (Inbound) {
- while (Inbound.Count != 0) {
- Message msg = Inbound.Dequeue ();
- HandleSignal (msg);
- }
- }
- }
-
- internal Thread mainThread = Thread.CurrentThread;
-
- //temporary hack
- public void Iterate ()
- {
- mainThread = Thread.CurrentThread;
-
- //Message msg = Inbound.Dequeue ();
- Message msg = ReadMessage ();
- HandleMessage (msg);
- DispatchSignals ();
- }
-
- internal void HandleMessage (Message msg)
- {
- //TODO: support disconnection situations properly and move this check elsewhere
- if (msg == null)
- throw new ArgumentNullException ("msg", "Cannot handle a null message; maybe the bus was disconnected");
-
- {
- object field_value;
- if (msg.Header.Fields.TryGetValue (FieldCode.ReplySerial, out field_value)) {
- uint reply_serial = (uint)field_value;
- PendingCall pending;
-
- if (pendingCalls.TryGetValue (reply_serial, out pending)) {
- if (pendingCalls.Remove (reply_serial))
- pending.Reply = msg;
-
- return;
- }
-
- //we discard reply messages with no corresponding PendingCall
- if (Protocol.Verbose)
- Console.Error.WriteLine ("Unexpected reply message received: MessageType='" + msg.Header.MessageType + "', ReplySerial=" + reply_serial);
-
- return;
- }
- }
-
- switch (msg.Header.MessageType) {
- case MessageType.MethodCall:
- MethodCall method_call = new MethodCall (msg);
- HandleMethodCall (method_call);
- break;
- case MessageType.Signal:
- //HandleSignal (msg);
- lock (Inbound)
- Inbound.Enqueue (msg);
- break;
- case MessageType.Error:
- //TODO: better exception handling
- Error error = new Error (msg);
- string errMsg = String.Empty;
- if (msg.Signature.Value.StartsWith ("s")) {
- MessageReader reader = new MessageReader (msg);
- errMsg = reader.ReadString ();
- }
- //throw new Exception ("Remote Error: Signature='" + msg.Signature.Value + "' " + error.ErrorName + ": " + errMsg);
- //if (Protocol.Verbose)
- Console.Error.WriteLine ("Remote Error: Signature='" + msg.Signature.Value + "' " + error.ErrorName + ": " + errMsg);
- break;
- case MessageType.Invalid:
- default:
- throw new Exception ("Invalid message received: MessageType='" + msg.Header.MessageType + "'");
- }
- }
-
- Dictionary<uint,PendingCall> pendingCalls = new Dictionary<uint,PendingCall> ();
-
- //this might need reworking with MulticastDelegate
- internal void HandleSignal (Message msg)
- {
- Signal signal = new Signal (msg);
-
- //TODO: this is a hack, not necessary when MatchRule is complete
- MatchRule rule = new MatchRule ();
- rule.MessageType = MessageType.Signal;
- rule.Interface = signal.Interface;
- rule.Member = signal.Member;
- rule.Path = signal.Path;
-
- Delegate dlg;
- if (Handlers.TryGetValue (rule, out dlg)) {
- //dlg.DynamicInvoke (GetDynamicValues (msg));
-
- MethodInfo mi = dlg.Method;
- //signals have no return value
- dlg.DynamicInvoke (MessageHelper.GetDynamicValues (msg, mi.GetParameters ()));
-
- } else {
- //TODO: how should we handle this condition? sending an Error may not be appropriate in this case
- if (Protocol.Verbose)
- Console.Error.WriteLine ("Warning: No signal handler for " + signal.Member);
- }
- }
-
- internal Dictionary<MatchRule,Delegate> Handlers = new Dictionary<MatchRule,Delegate> ();
-
- //very messy
- internal void MaybeSendUnknownMethodError (MethodCall method_call)
- {
- Message msg = MessageHelper.CreateUnknownMethodError (method_call);
- if (msg != null)
- Send (msg);
- }
-
- //not particularly efficient and needs to be generalized
- internal void HandleMethodCall (MethodCall method_call)
- {
- //TODO: Ping and Introspect need to be abstracted and moved somewhere more appropriate once message filter infrastructure is complete
-
- //FIXME: these special cases are slightly broken for the case where the member but not the interface is specified in the message
- if (method_call.Interface == "org.freedesktop.DBus.Peer" && method_call.Member == "Ping") {
- object[] pingRet = new object[0];
- Message reply = MessageHelper.ConstructReplyFor (method_call, pingRet);
- Send (reply);
- return;
- }
-
- if (method_call.Interface == "org.freedesktop.DBus.Introspectable" && method_call.Member == "Introspect") {
- Introspector intro = new Introspector ();
- intro.root_path = method_call.Path;
- intro.WriteStart ();
-
- //FIXME: do this properly
- //this is messy and inefficient
- List<string> linkNodes = new List<string> ();
- int depth = method_call.Path.Decomposed.Length;
- foreach (ObjectPath pth in RegisteredObjects.Keys) {
- if (pth.Value == (method_call.Path.Value)) {
- ExportObject exo = (ExportObject)RegisteredObjects[pth];
- intro.WriteType (exo.obj.GetType ());
- } else {
- for (ObjectPath cur = pth ; cur != null ; cur = cur.Parent) {
- if (cur.Value == method_call.Path.Value) {
- string linkNode = pth.Decomposed[depth];
- if (!linkNodes.Contains (linkNode)) {
- intro.WriteNode (linkNode);
- linkNodes.Add (linkNode);
- }
- }
- }
- }
- }
-
- intro.WriteEnd ();
-
- object[] introRet = new object[1];
- introRet[0] = intro.xml;
- Message reply = MessageHelper.ConstructReplyFor (method_call, introRet);
- Send (reply);
- return;
- }
-
- BusObject bo;
- if (RegisteredObjects.TryGetValue (method_call.Path, out bo)) {
- ExportObject eo = (ExportObject)bo;
- eo.HandleMethodCall (method_call);
- } else {
- MaybeSendUnknownMethodError (method_call);
- }
- }
-
- Dictionary<ObjectPath,BusObject> RegisteredObjects = new Dictionary<ObjectPath,BusObject> ();
-
- //FIXME: this shouldn't be part of the core API
- //that also applies to much of the other object mapping code
-
- public object GetObject (Type type, string bus_name, ObjectPath path)
- {
- //if (type == null)
- // return GetObject (bus_name, path);
-
- //if the requested type is an interface, we can implement it efficiently
- //otherwise we fall back to using a transparent proxy
- if (type.IsInterface) {
- return BusObject.GetObject (this, bus_name, path, type);
- } else {
- if (Protocol.Verbose)
- Console.Error.WriteLine ("Warning: Note that MarshalByRefObject use is not recommended; for best performance, define interfaces");
-
- BusObject busObject = new BusObject (this, bus_name, path);
- DProxy prox = new DProxy (busObject, type);
- return prox.GetTransparentProxy ();
- }
- }
-
- public T GetObject<T> (string bus_name, ObjectPath path)
- {
- return (T)GetObject (typeof (T), bus_name, path);
- }
-
- public void Register (string bus_name, ObjectPath path, object obj)
- {
- ExportObject eo = new ExportObject (this, bus_name, path, obj);
- eo.Registered = true;
-
- //TODO: implement some kind of tree data structure or internal object hierarchy. right now we are ignoring the name and putting all object paths in one namespace, which is bad
- RegisteredObjects[path] = eo;
- }
-
- public object Unregister (string bus_name, ObjectPath path)
- {
- //TODO: make use of bus_name
-
- BusObject bo;
-
- if (!RegisteredObjects.TryGetValue (path, out bo))
- throw new Exception ("Cannot unregister " + path + " as it isn't registered");
-
- RegisteredObjects.Remove (path);
-
- ExportObject eo = (ExportObject)bo;
- eo.Registered = false;
-
- return eo.obj;
- }
-
- //these look out of place, but are useful
- internal protected virtual void AddMatch (string rule)
- {
- }
-
- internal protected virtual void RemoveMatch (string rule)
- {
- }
-
- static Connection ()
- {
- if (BitConverter.IsLittleEndian)
- NativeEndianness = EndianFlag.Little;
- else
- NativeEndianness = EndianFlag.Big;
- }
-
- internal static readonly EndianFlag NativeEndianness;
- }
-}
diff --git a/lib/dbus-sharp/DBus.cs b/lib/dbus-sharp/DBus.cs
deleted file mode 100644
index 48b48ab..0000000
--- a/lib/dbus-sharp/DBus.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using NDesk.DBus;
-
-namespace org.freedesktop.DBus
-{
- [Flags]
- public enum NameFlag : uint
- {
- None = 0,
- AllowReplacement = 0x1,
- ReplaceExisting = 0x2,
- DoNotQueue = 0x4,
- }
-
- public enum RequestNameReply : uint
- {
- PrimaryOwner = 1,
- InQueue,
- Exists,
- AlreadyOwner,
- }
-
- public enum ReleaseNameReply : uint
- {
- Released = 1,
- NonExistent,
- NotOwner,
- }
-
- public enum StartReply : uint
- {
- //The service was successfully started.
- Success = 1,
- //A connection already owns the given name.
- AlreadyRunning,
- }
-
- public delegate void NameOwnerChangedHandler (string name, string old_owner, string new_owner);
- public delegate void NameAcquiredHandler (string name);
- public delegate void NameLostHandler (string name);
-
- [Interface ("org.freedesktop.DBus.Peer")]
- public interface Peer
- {
- void Ping ();
- [return: Argument ("machine_uuid")]
- string GetMachineId ();
- }
-
- [Interface ("org.freedesktop.DBus.Introspectable")]
- public interface Introspectable
- {
- [return: Argument ("data")]
- string Introspect ();
- }
-
- [Interface ("org.freedesktop.DBus.Properties")]
- public interface Properties
- {
- [return: Argument ("value")]
- object Get (string @interface, string propname);
- void Set (string @interface, string propname, object value);
- }
-
- [Interface ("org.freedesktop.DBus")]
- public interface IBus : Introspectable
- {
- RequestNameReply RequestName (string name, NameFlag flags);
- ReleaseNameReply ReleaseName (string name);
- string Hello ();
- string[] ListNames ();
- string[] ListActivatableNames ();
- bool NameHasOwner (string name);
- event NameOwnerChangedHandler NameOwnerChanged;
- event NameLostHandler NameLost;
- event NameAcquiredHandler NameAcquired;
- StartReply StartServiceByName (string name, uint flags);
- string GetNameOwner (string name);
- uint GetConnectionUnixUser (string connection_name);
- void AddMatch (string rule);
- void RemoveMatch (string rule);
-
- //undocumented in spec
- string[] ListQueuedOwners (string name);
- uint GetConnectionUnixProcessID (string connection_name);
- byte[] GetConnectionSELinuxSecurityContext (string connection_name);
- void ReloadConfig ();
- }
-}
diff --git a/lib/dbus-sharp/DProxy.cs b/lib/dbus-sharp/DProxy.cs
deleted file mode 100644
index 1a8594f..0000000
--- a/lib/dbus-sharp/DProxy.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Reflection;
-using System.Runtime.Remoting.Proxies;
-using System.Runtime.Remoting.Messaging;
-
-namespace NDesk.DBus
-{
- //marked internal because this is really an implementation detail and needs to be replaced
- internal class DProxy : RealProxy
- {
- protected BusObject busObject;
-
- public DProxy (BusObject busObject, Type type) : base(type)
- {
- this.busObject = busObject;
- }
-
- static MethodInfo mi_GetHashCode = typeof (object).GetMethod ("GetHashCode");
- static MethodInfo mi_Equals = typeof (object).GetMethod ("Equals", BindingFlags.Instance);
- static MethodInfo mi_ToString = typeof (object).GetMethod ("ToString");
- static MethodInfo mi_GetLifetimeService = typeof (MarshalByRefObject).GetMethod ("GetLifetimeService");
-
- object GetDefaultReturn (MethodBase mi, object[] inArgs)
- {
- if (mi == mi_GetHashCode)
- return busObject.Path.Value.GetHashCode ();
- if (mi == mi_Equals)
- return busObject.Path.Value == ((BusObject)((MarshalByRefObject)inArgs[0]).GetLifetimeService ()).Path.Value;
- if (mi == mi_ToString)
- return busObject.Path.Value;
- if (mi == mi_GetLifetimeService)
- return busObject;
-
- return null;
- }
-
- public override IMessage Invoke (IMessage message)
- {
- IMethodCallMessage callMessage = (IMethodCallMessage) message;
-
- object defaultRetVal = GetDefaultReturn (callMessage.MethodBase, callMessage.InArgs);
- if (defaultRetVal != null) {
- MethodReturnMessageWrapper defaultReturnMessage = new MethodReturnMessageWrapper ((IMethodReturnMessage) message);
- defaultReturnMessage.ReturnValue = defaultRetVal;
-
- return defaultReturnMessage;
- }
-
- object[] outArgs;
- object retVal;
- Exception exception;
- busObject.Invoke (callMessage.MethodBase, callMessage.MethodName, callMessage.InArgs, out outArgs, out retVal, out exception);
-
- MethodReturnMessageWrapper returnMessage = new MethodReturnMessageWrapper ((IMethodReturnMessage) message);
- returnMessage.Exception = exception;
- returnMessage.ReturnValue = retVal;
-
- return returnMessage;
- }
-
- /*
- public override ObjRef CreateObjRef (Type ServerType)
- {
- throw new System.NotImplementedException ();
- }
- */
-
- ~DProxy ()
- {
- //FIXME: remove handlers/match rules here
- if (Protocol.Verbose)
- Console.Error.WriteLine ("Warning: Finalization of " + busObject.Path + " not yet supported");
- }
- }
-}
diff --git a/lib/dbus-sharp/ExportObject.cs b/lib/dbus-sharp/ExportObject.cs
deleted file mode 100644
index 39e9da5..0000000
--- a/lib/dbus-sharp/ExportObject.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Reflection;
-using System.Reflection.Emit;
-
-using org.freedesktop.DBus;
-
-namespace NDesk.DBus
-{
- internal class ExportObject : BusObject //, Peer
- {
- public readonly object obj;
-
- public ExportObject (Connection conn, string bus_name, ObjectPath object_path, object obj) : base (conn, bus_name, object_path)
- {
- this.obj = obj;
- }
-
- //maybe add checks to make sure this is not called more than once
- //it's a bit silly as a property
- public bool Registered
- {
- set {
- Type type = obj.GetType ();
-
- foreach (MemberInfo mi in Mapper.GetPublicMembers (type)) {
- EventInfo ei = mi as EventInfo;
-
- if (ei == null)
- continue;
-
- Delegate dlg = GetHookupDelegate (ei);
-
- if (value)
- ei.AddEventHandler (obj, dlg);
- else
- ei.RemoveEventHandler (obj, dlg);
- }
- }
- }
-
- public void HandleMethodCall (MethodCall method_call)
- {
- Type type = obj.GetType ();
- //object retObj = type.InvokeMember (msg.Member, BindingFlags.InvokeMethod, null, obj, MessageHelper.GetDynamicValues (msg));
-
- //TODO: there is no member name mapping for properties etc. yet
- MethodInfo mi = Mapper.GetMethod (type, method_call);
-
- if (mi == null) {
- conn.MaybeSendUnknownMethodError (method_call);
- return;
- }
-
- object retObj = null;
- try {
- object[] inArgs = MessageHelper.GetDynamicValues (method_call.message, mi.GetParameters ());
- retObj = mi.Invoke (obj, inArgs);
- } catch (TargetInvocationException e) {
- if (!method_call.message.ReplyExpected)
- return;
-
- Exception ie = e.InnerException;
- //TODO: complete exception sending support
-
- Error error = new Error (Mapper.GetInterfaceName (ie.GetType ()), method_call.message.Header.Serial);
- error.message.Signature = new Signature (DType.String);
-
- MessageWriter writer = new MessageWriter (Connection.NativeEndianness);
- writer.connection = conn;
- writer.Write (ie.Message);
- error.message.Body = writer.ToArray ();
-
- //TODO: we should be more strict here, but this fallback was added as a quick fix for p2p
- if (method_call.Sender != null)
- error.message.Header.Fields[FieldCode.Destination] = method_call.Sender;
-
- conn.Send (error.message);
- return;
- }
-
- if (method_call.message.ReplyExpected) {
- /*
- object[] retObjs;
-
- if (retObj == null) {
- retObjs = new object[0];
- } else {
- retObjs = new object[1];
- retObjs[0] = retObj;
- }
-
- Message reply = ConstructReplyFor (method_call, retObjs);
- */
- Message reply = MessageHelper.ConstructReplyFor (method_call, mi.ReturnType, retObj);
- conn.Send (reply);
- }
- }
-
- /*
- public void Ping ()
- {
- }
-
- public string GetMachineId ()
- {
- //TODO: implement this
- return String.Empty;
- }
- */
- }
-}
diff --git a/lib/dbus-sharp/Introspection.cs b/lib/dbus-sharp/Introspection.cs
deleted file mode 100644
index 840de43..0000000
--- a/lib/dbus-sharp/Introspection.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml;
-using System.Text;
-using System.Reflection;
-
-namespace NDesk.DBus
-{
- //TODO: complete this class
- class Introspector
- {
- const string NAMESPACE = "http://www.freedesktop.org/standards/dbus";
- const string PUBLIC_IDENTIFIER = "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN";
- const string SYSTEM_IDENTIFIER = "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";
-
- public StringBuilder sb;
- public string xml;
- public ObjectPath root_path = ObjectPath.Root;
-
- protected XmlWriter writer;
-
- public Introspector ()
- {
- XmlWriterSettings settings = new XmlWriterSettings ();
- settings.Indent = true;
- settings.IndentChars = (" ");
- settings.OmitXmlDeclaration = true;
-
- sb = new StringBuilder ();
-
- writer = XmlWriter.Create (sb, settings);
- }
-
- public void WriteStart ()
- {
- writer.WriteDocType ("node", PUBLIC_IDENTIFIER, SYSTEM_IDENTIFIER, null);
-
- AssemblyName aname = Assembly.GetExecutingAssembly().GetName ();
- writer.WriteComment (" " + aname.Name + " " + aname.Version.ToString (3) + " ");
- writer.WriteComment (" hax ");
-
- //the root node element
- writer.WriteStartElement ("node");
- }
-
- public void WriteNode (string name)
- {
- writer.WriteStartElement ("node");
- writer.WriteAttributeString ("name", name);
- writer.WriteEndElement ();
- }
-
- public void WriteEnd ()
- {
- /*
- WriteEnum (typeof (org.freedesktop.DBus.NameFlag));
- WriteEnum (typeof (org.freedesktop.DBus.NameReply));
- WriteEnum (typeof (org.freedesktop.DBus.ReleaseNameReply));
- WriteEnum (typeof (org.freedesktop.DBus.StartReply));
- WriteInterface (typeof (org.freedesktop.DBus.IBus));
- */
-
- writer.WriteEndElement ();
-
- writer.Flush ();
- xml = sb.ToString ();
- }
-
- //public void WriteNode ()
- public void WriteType (Type target_type)
- {
- //writer.WriteStartElement ("node");
-
- //TODO: non-well-known introspection has paths as well, which we don't do yet. read the spec again
- //hackishly just remove the root '/' to make the path relative for now
- //writer.WriteAttributeString ("name", target_path.Value.Substring (1));
- //writer.WriteAttributeString ("name", "test");
-
- //reflect our own interface manually
- WriteInterface (typeof (org.freedesktop.DBus.Introspectable));
-
- //reflect the target interface
- if (target_type != null) {
- WriteInterface (target_type);
-
- foreach (Type ifType in target_type.GetInterfaces ())
- WriteInterface (ifType);
- }
-
- //TODO: review recursion of interfaces and inheritance hierarchy
-
- //writer.WriteEndElement ();
- }
-
- public void WriteArg (ParameterInfo pi)
- {
- WriteArg (pi.ParameterType, Mapper.GetArgumentName (pi), pi.IsOut, false);
- }
-
- public void WriteArgReverse (ParameterInfo pi)
- {
- WriteArg (pi.ParameterType, Mapper.GetArgumentName (pi), pi.IsOut, true);
- }
-
- //TODO: clean up and get rid of reverse (or argIsOut) parm
- public void WriteArg (Type argType, string argName, bool argIsOut, bool reverse)
- {
- argType = argIsOut ? argType.GetElementType () : argType;
- if (argType == typeof (void))
- return;
-
- writer.WriteStartElement ("arg");
-
- if (!String.IsNullOrEmpty (argName))
- writer.WriteAttributeString ("name", argName);
-
- //we can't rely on the default direction (qt-dbus requires a direction at time of writing), so we use a boolean to reverse the parameter direction and make it explicit
-
- if (argIsOut)
- writer.WriteAttributeString ("direction", !reverse ? "out" : "in");
- else
- writer.WriteAttributeString ("direction", !reverse ? "in" : "out");
-
- Signature sig = Signature.GetSig (argType);
-
- //TODO: avoid writing null (DType.Invalid) to the XML stream
- writer.WriteAttributeString ("type", sig.Value);
-
- //annotations aren't valid in an arg element, so this is disabled
- //if (argType.IsEnum)
- // WriteAnnotation ("org.ndesk.DBus.Enum", Mapper.GetInterfaceName (argType));
-
- writer.WriteEndElement ();
- }
-
- public void WriteMethod (MethodInfo mi)
- {
- writer.WriteStartElement ("method");
- writer.WriteAttributeString ("name", mi.Name);
-
- foreach (ParameterInfo pi in mi.GetParameters ())
- WriteArg (pi);
-
- //Mono <= 1.1.13 doesn't support MethodInfo.ReturnParameter, so avoid it
- //WriteArgReverse (mi.ReturnParameter);
- WriteArg (mi.ReturnType, Mapper.GetArgumentName (mi.ReturnTypeCustomAttributes, "ret"), false, true);
-
- WriteAnnotations (mi);
-
- writer.WriteEndElement ();
- }
-
- public void WriteProperty (PropertyInfo pri)
- {
- //expose properties as dbus properties
- writer.WriteStartElement ("property");
- writer.WriteAttributeString ("name", pri.Name);
- writer.WriteAttributeString ("type", Signature.GetSig (pri.PropertyType).Value);
- string access = (pri.CanRead ? "read" : String.Empty) + (pri.CanWrite ? "write" : String.Empty);
- writer.WriteAttributeString ("access", access);
- WriteAnnotations (pri);
- writer.WriteEndElement ();
-
- //expose properties as methods also
- //it may not be worth doing this in the long run
- /*
- if (pri.CanRead) {
- writer.WriteStartElement ("method");
- writer.WriteAttributeString ("name", "Get" + pri.Name);
- WriteArgReverse (pri.GetGetMethod ().ReturnParameter);
- writer.WriteEndElement ();
- }
-
- if (pri.CanWrite) {
- writer.WriteStartElement ("method");
- writer.WriteAttributeString ("name", "Set" + pri.Name);
- foreach (ParameterInfo pi in pri.GetSetMethod ().GetParameters ())
- WriteArg (pi);
- writer.WriteEndElement ();
- }
- */
- }
-
- public void WriteSignal (EventInfo ei)
- {
- writer.WriteStartElement ("signal");
- writer.WriteAttributeString ("name", ei.Name);
-
- foreach (ParameterInfo pi in ei.EventHandlerType.GetMethod ("Invoke").GetParameters ())
- WriteArgReverse (pi);
-
- WriteAnnotations (ei);
-
- //no need to consider the delegate return value as dbus doesn't support it
- writer.WriteEndElement ();
- }
-
- const BindingFlags relevantBindingFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly;
-
- public void WriteInterface (Type type)
- {
- if (type == null)
- return;
-
- //TODO: this is unreliable, fix it
- if (!Mapper.IsPublic (type))
- return;
-
- writer.WriteStartElement ("interface");
-
- writer.WriteAttributeString ("name", Mapper.GetInterfaceName (type));
-
- /*
- foreach (MemberInfo mbi in type.GetMembers (relevantBindingFlags)) {
- switch (mbi.MemberType) {
- case MemberTypes.Method:
- if (!((MethodInfo)mbi).IsSpecialName)
- WriteMethod ((MethodInfo)mbi);
- break;
- case MemberTypes.Event:
- WriteSignal ((EventInfo)mbi);
- break;
- case MemberTypes.Property:
- WriteProperty ((PropertyInfo)mbi);
- break;
- default:
- Console.Error.WriteLine ("Warning: Unhandled MemberType '{0}' encountered while introspecting {1}", mbi.MemberType, type.FullName);
- break;
- }
- }
- */
-
- foreach (MethodInfo mi in type.GetMethods (relevantBindingFlags))
- if (!mi.IsSpecialName)
- WriteMethod (mi);
-
- foreach (EventInfo ei in type.GetEvents (relevantBindingFlags))
- WriteSignal (ei);
-
- foreach (PropertyInfo pri in type.GetProperties (relevantBindingFlags))
- WriteProperty (pri);
-
- //TODO: indexers
-
- //TODO: attributes as annotations?
-
- writer.WriteEndElement ();
-
- //this recursion seems somewhat inelegant
- WriteInterface (type.BaseType);
- }
-
- public void WriteAnnotations (ICustomAttributeProvider attrProvider)
- {
- if (Mapper.IsDeprecated (attrProvider))
- WriteAnnotation ("org.freedesktop.DBus.Deprecated", "true");
- }
-
- public void WriteAnnotation (string name, string value)
- {
- writer.WriteStartElement ("annotation");
-
- writer.WriteAttributeString ("name", name);
- writer.WriteAttributeString ("value", value);
-
- writer.WriteEndElement ();
- }
-
- //this is not in the spec, and is not finalized
- public void WriteEnum (Type type)
- {
- writer.WriteStartElement ("enum");
- writer.WriteAttributeString ("name", Mapper.GetInterfaceName (type));
- writer.WriteAttributeString ("type", Signature.GetSig (type.GetElementType ()).Value);
- writer.WriteAttributeString ("flags", (type.IsDefined (typeof (FlagsAttribute), false)) ? "true" : "false");
-
- string[] names = Enum.GetNames (type);
-
- int i = 0;
- foreach (Enum val in Enum.GetValues (type)) {
- writer.WriteStartElement ("element");
- writer.WriteAttributeString ("name", names[i++]);
- writer.WriteAttributeString ("value", val.ToString ("d"));
- writer.WriteEndElement ();
- }
-
- writer.WriteEndElement ();
- }
- }
-}
diff --git a/lib/dbus-sharp/Makefile.am b/lib/dbus-sharp/Makefile.am
deleted file mode 100644
index 4f45337..0000000
--- a/lib/dbus-sharp/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-include $(top_srcdir)/Makefile.include
-
-ASSEMBLY_NAME = NDesk.DBus
-
-ASSEMBLY_SOURCES = \
- $(srcdir)/Address.cs \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Authentication.cs \
- $(srcdir)/Bus.cs \
- $(srcdir)/BusObject.cs \
- $(srcdir)/Connection.cs \
- $(srcdir)/DBus.cs \
- $(srcdir)/DProxy.cs \
- $(srcdir)/ExportObject.cs \
- $(srcdir)/Introspection.cs \
- $(srcdir)/Mapper.cs \
- $(srcdir)/MatchRule.cs \
- $(srcdir)/Message.cs \
- $(srcdir)/MessageFilter.cs \
- $(srcdir)/MessageReader.cs \
- $(srcdir)/MessageWriter.cs \
- $(srcdir)/PendingCall.cs \
- $(srcdir)/Protocol.cs \
- $(srcdir)/Signature.cs \
- $(srcdir)/SocketTransport.cs \
- $(srcdir)/Transport.cs \
- $(srcdir)/TypeImplementer.cs \
- $(srcdir)/UnixNativeTransport.cs\
- $(srcdir)/UnixTransport.cs \
- $(srcdir)/Wrapper.cs
-
-REFS = -r:Mono.Posix
-
-PKGS =
-
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-
-EXTRAFLAGS = -unsafe
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-assemblydir = $(pkglibdir)
-assembly_DATA = $(ASSEMBLY)
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- README \
- COPYING
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
diff --git a/lib/dbus-sharp/Makefile.in b/lib/dbus-sharp/Makefile.in
deleted file mode 100644
index c19a7ca..0000000
--- a/lib/dbus-sharp/Makefile.in
+++ /dev/null
@@ -1,560 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include COPYING
-subdir = lib/dbus-sharp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(assemblydir)"
-DATA = $(assembly_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
-DIR_DOCS = $(top_builddir)/docs
-DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
-DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
-DIR_SEMWEB = $(top_builddir)/lib/semweb
-DIR_SRC = $(top_builddir)/src
-DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
-LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
-LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-CSC_FLAGS = -debug
-CSC = $(MCS) $(CSC_FLAGS) -target:exe
-CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
-MONO_DEBUGFLAGS = --debug
-RUNTIME = mono $(MONO_DEBUGFLAGS)
-ASSEMBLY_NAME = NDesk.DBus
-ASSEMBLY_SOURCES = \
- $(srcdir)/Address.cs \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Authentication.cs \
- $(srcdir)/Bus.cs \
- $(srcdir)/BusObject.cs \
- $(srcdir)/Connection.cs \
- $(srcdir)/DBus.cs \
- $(srcdir)/DProxy.cs \
- $(srcdir)/ExportObject.cs \
- $(srcdir)/Introspection.cs \
- $(srcdir)/Mapper.cs \
- $(srcdir)/MatchRule.cs \
- $(srcdir)/Message.cs \
- $(srcdir)/MessageFilter.cs \
- $(srcdir)/MessageReader.cs \
- $(srcdir)/MessageWriter.cs \
- $(srcdir)/PendingCall.cs \
- $(srcdir)/Protocol.cs \
- $(srcdir)/Signature.cs \
- $(srcdir)/SocketTransport.cs \
- $(srcdir)/Transport.cs \
- $(srcdir)/TypeImplementer.cs \
- $(srcdir)/UnixNativeTransport.cs\
- $(srcdir)/UnixTransport.cs \
- $(srcdir)/Wrapper.cs
-
-REFS = -r:Mono.Posix
-PKGS =
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-EXTRAFLAGS = -unsafe
-assemblydir = $(pkglibdir)
-assembly_DATA = $(ASSEMBLY)
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- README \
- COPYING
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dbus-sharp/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dbus-sharp/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(assemblydir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(assemblydir)" || exit $$?; \
- done
-
-uninstall-assemblyDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(assemblydir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(assemblydir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-assemblyDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-assemblyDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-assemblyDATA install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/dbus-sharp/Mapper.cs b/lib/dbus-sharp/Mapper.cs
deleted file mode 100644
index 150135d..0000000
--- a/lib/dbus-sharp/Mapper.cs
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace NDesk.DBus
-{
- static class Mapper
- {
- //TODO: move these Get*Name helpers somewhere more appropriate
- public static string GetArgumentName (ParameterInfo pi)
- {
- string argName = pi.Name;
-
- if (pi.IsRetval && String.IsNullOrEmpty (argName))
- argName = "ret";
-
- return GetArgumentName ((ICustomAttributeProvider)pi, argName);
- }
-
- public static string GetArgumentName (ICustomAttributeProvider attrProvider, string defaultName)
- {
- string argName = defaultName;
-
- //TODO: no need for foreach
- foreach (ArgumentAttribute aa in attrProvider.GetCustomAttributes (typeof (ArgumentAttribute), true))
- argName = aa.Name;
-
- return argName;
- }
-
- //TODO: these two methods are quite messy and need review
- public static IEnumerable<MemberInfo> GetPublicMembers (Type type)
- {
- //note that Type.GetInterfaces() returns all interfaces with flattened hierarchy
- foreach (Type ifType in type.GetInterfaces ())
- foreach (MemberInfo mi in GetDeclaredPublicMembers (ifType))
- yield return mi;
-
- if (IsPublic (type))
- foreach (MemberInfo mi in GetDeclaredPublicMembers (type))
- yield return mi;
- }
-
- static IEnumerable<MemberInfo> GetDeclaredPublicMembers (Type type)
- {
- if (IsPublic (type))
- foreach (MemberInfo mi in type.GetMembers (BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
- yield return mi;
- }
-
- //this method walks the interface tree in an undefined manner and returns the first match, or if no matches are found, null
- //the logic needs review and cleanup
- //TODO: unify member name mapping as is already done with interfaces and args
- public static MethodInfo GetMethod (Type type, MethodCall method_call)
- {
- foreach (MemberInfo member in Mapper.GetPublicMembers (type)) {
- //this could be made more efficient by using the given interface name earlier and avoiding walking through all public interfaces
- if (method_call.Interface != null)
- if (GetInterfaceName (member) != method_call.Interface)
- continue;
-
- MethodInfo meth = null;
- Type[] inTypes = null;
-
- if (member is PropertyInfo) {
- PropertyInfo prop = member as PropertyInfo;
-
- MethodInfo getter = prop.GetGetMethod (false);
- MethodInfo setter = prop.GetSetMethod (false);
-
- if (getter != null && "Get" + prop.Name == method_call.Member) {
- meth = getter;
- inTypes = Type.EmptyTypes;
- } else if (setter != null && "Set" + prop.Name == method_call.Member) {
- meth = setter;
- inTypes = new Type[] {prop.PropertyType};
- }
- } else {
- meth = member as MethodInfo;
-
- if (meth == null)
- continue;
-
- if (meth.Name != method_call.Member)
- continue;
-
- inTypes = Mapper.GetTypes (ArgDirection.In, meth.GetParameters ());
- }
-
- if (meth == null || inTypes == null)
- continue;
-
- Signature inSig = Signature.GetSig (inTypes);
-
- if (inSig != method_call.Signature)
- continue;
-
- return meth;
- }
-
- return null;
- }
-
- public static bool IsPublic (MemberInfo mi)
- {
- return IsPublic (mi.DeclaringType);
- }
-
- public static bool IsPublic (Type type)
- {
- //we need to have a proper look at what's really public at some point
- //this will do for now
-
- if (type.IsDefined (typeof (InterfaceAttribute), false))
- return true;
-
- if (type.IsSubclassOf (typeof (MarshalByRefObject)))
- return true;
-
- return false;
- }
-
- public static string GetInterfaceName (MemberInfo mi)
- {
- return GetInterfaceName (mi.DeclaringType);
- }
-
- public static string GetInterfaceName (Type type)
- {
- string interfaceName = type.FullName;
-
- //TODO: better fallbacks and namespace mangling when no InterfaceAttribute is available
-
- //TODO: no need for foreach
- foreach (InterfaceAttribute ia in type.GetCustomAttributes (typeof (InterfaceAttribute), true))
- interfaceName = ia.Name;
-
- return interfaceName;
- }
-
- public static Type[] GetTypes (ArgDirection dir, ParameterInfo[] parms)
- {
- List<Type> types = new List<Type> ();
-
- //TODO: consider InOut/Ref
-
- for (int i = 0 ; i != parms.Length ; i++) {
- switch (dir) {
- case ArgDirection.In:
- //docs say IsIn isn't reliable, and this is indeed true
- //if (parms[i].IsIn)
- if (!parms[i].IsOut)
- types.Add (parms[i].ParameterType);
- break;
- case ArgDirection.Out:
- if (parms[i].IsOut) {
- //TODO: note that IsOut is optional to the compiler, we may want to use IsByRef instead
- //eg: if (parms[i].ParameterType.IsByRef)
- types.Add (parms[i].ParameterType.GetElementType ());
- }
- break;
- }
- }
-
- return types.ToArray ();
- }
-
- public static bool IsDeprecated (ICustomAttributeProvider attrProvider)
- {
- return attrProvider.IsDefined (typeof (ObsoleteAttribute), true);
- }
-
- static bool AreEqual (Type[] a, Type[] b)
- {
- if (a.Length != b.Length)
- return false;
-
- for (int i = 0 ; i != a.Length ; i++)
- if (a[i] != b[i])
- return false;
-
- return true;
- }
-
- //workaround for Mono bug #81035 (memory leak)
- static List<Type> genTypes = new List<Type> ();
- internal static Type GetGenericType (Type defType, Type[] parms)
- {
- foreach (Type genType in genTypes) {
- if (genType.GetGenericTypeDefinition () != defType)
- continue;
-
- Type[] genParms = genType.GetGenericArguments ();
-
- if (!AreEqual (genParms, parms))
- continue;
-
- return genType;
- }
-
- Type type = defType.MakeGenericType (parms);
- genTypes.Add (type);
- return type;
- }
- }
-
- //TODO: this class is messy, move the methods somewhere more appropriate
- static class MessageHelper
- {
- public static Message CreateUnknownMethodError (MethodCall method_call)
- {
- if (!method_call.message.ReplyExpected)
- return null;
-
- string errMsg = String.Format ("Method \"{0}\" with signature \"{1}\" on interface \"{2}\" doesn't exist", method_call.Member, method_call.Signature.Value, method_call.Interface);
-
- Error error = new Error ("org.freedesktop.DBus.Error.UnknownMethod", method_call.message.Header.Serial);
- error.message.Signature = new Signature (DType.String);
-
- MessageWriter writer = new MessageWriter (Connection.NativeEndianness);
- writer.Write (errMsg);
- error.message.Body = writer.ToArray ();
-
- //TODO: we should be more strict here, but this fallback was added as a quick fix for p2p
- if (method_call.Sender != null)
- error.message.Header.Fields[FieldCode.Destination] = method_call.Sender;
-
- return error.message;
- }
-
- //GetDynamicValues() should probably use yield eventually
-
- public static object[] GetDynamicValues (Message msg, ParameterInfo[] parms)
- {
- //TODO: consider out parameters
-
- Type[] types = new Type[parms.Length];
- for (int i = 0 ; i != parms.Length ; i++)
- types[i] = parms[i].ParameterType;
-
- return MessageHelper.GetDynamicValues (msg, types);
- }
-
- public static object[] GetDynamicValues (Message msg, Type[] types)
- {
- //TODO: this validation check should provide better information, eg. message dump or a stack trace, or at least the interface/member
- if (Protocol.Verbose) {
- Signature expected = Signature.GetSig (types);
- Signature actual = msg.Signature;
- if (actual != expected)
- Console.Error.WriteLine ("Warning: The signature of the message does not match that of the handler: " + "Expected '" + expected + "', got '" + actual + "'");
- }
-
- object[] vals = new object[types.Length];
-
- if (msg.Body != null) {
- MessageReader reader = new MessageReader (msg);
-
- for (int i = 0 ; i != types.Length ; i++)
- vals[i] = reader.ReadValue (types[i]);
- }
-
- return vals;
- }
-
- //should generalize this method
- //it is duplicated in DProxy
- public static Message ConstructReplyFor (MethodCall method_call, object[] vals)
- {
- MethodReturn method_return = new MethodReturn (method_call.message.Header.Serial);
- Message replyMsg = method_return.message;
-
- Signature inSig = Signature.GetSig (vals);
-
- if (vals != null && vals.Length != 0) {
- MessageWriter writer = new MessageWriter (Connection.NativeEndianness);
-
- foreach (object arg in vals)
- writer.Write (arg.GetType (), arg);
-
- replyMsg.Body = writer.ToArray ();
- }
-
- //TODO: we should be more strict here, but this fallback was added as a quick fix for p2p
- if (method_call.Sender != null)
- replyMsg.Header.Fields[FieldCode.Destination] = method_call.Sender;
-
- replyMsg.Signature = inSig;
-
- //replyMsg.WriteHeader ();
-
- return replyMsg;
- }
-
- //TODO: merge this with the above method
- public static Message ConstructReplyFor (MethodCall method_call, Type retType, object retVal)
- {
- MethodReturn method_return = new MethodReturn (method_call.message.Header.Serial);
- Message replyMsg = method_return.message;
-
- Signature inSig = Signature.GetSig (retType);
-
- if (inSig != Signature.Empty) {
- MessageWriter writer = new MessageWriter (Connection.NativeEndianness);
- writer.Write (retType, retVal);
- replyMsg.Body = writer.ToArray ();
- }
-
- //TODO: we should be more strict here, but this fallback was added as a quick fix for p2p
- if (method_call.Sender != null)
- replyMsg.Header.Fields[FieldCode.Destination] = method_call.Sender;
-
- replyMsg.Signature = inSig;
-
- //replyMsg.WriteHeader ();
-
- return replyMsg;
- }
- }
-
- [AttributeUsage (AttributeTargets.Interface | AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
- public class InterfaceAttribute : Attribute
- {
- public string Name;
-
- public InterfaceAttribute (string name)
- {
- this.Name = name;
- }
- }
-
- [AttributeUsage (AttributeTargets.Parameter | AttributeTargets.ReturnValue, AllowMultiple=false, Inherited=true)]
- public class ArgumentAttribute : Attribute
- {
- public string Name;
-
- public ArgumentAttribute (string name)
- {
- this.Name = name;
- }
- }
-}
diff --git a/lib/dbus-sharp/MatchRule.cs b/lib/dbus-sharp/MatchRule.cs
deleted file mode 100644
index cf54828..0000000
--- a/lib/dbus-sharp/MatchRule.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2007 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Text;
-using System.Collections.Generic;
-
-namespace NDesk.DBus
-{
- //delegate void MessageHandler (Message msg);
-
- class MatchRule
- {
- public MessageType? MessageType;
- public string Interface;
- public string Member;
- public ObjectPath Path;
- public string Sender;
- public string Destination;
- public readonly SortedDictionary<int,string> Args = new SortedDictionary<int,string> ();
-
- public MatchRule ()
- {
- }
-
- void Append (StringBuilder sb, string key, string value)
- {
- if (sb.Length != 0)
- sb.Append (",");
-
- sb.Append (key + "='");
- sb.Append (value);
- sb.Append ("'");
- }
-
- void AppendArg (StringBuilder sb, int index, string value)
- {
- Append (sb, "arg" + index, value);
- }
-
- public override bool Equals (object o)
- {
- MatchRule r = o as MatchRule;
-
- if (r == null)
- return false;
-
- if (r.MessageType != MessageType)
- return false;
-
- if (r.Interface != Interface)
- return false;
-
- if (r.Member != Member)
- return false;
-
- //TODO: see why path comparison doesn't work
- if (r.Path.Value != Path.Value)
- //if (r.Path != Path)
- return false;
-
- if (r.Sender != Sender)
- return false;
-
- if (r.Destination != Destination)
- return false;
-
- //FIXME: do args
-
- return true;
- }
-
- public override int GetHashCode ()
- {
- //FIXME: not at all optimal
- return ToString ().GetHashCode ();
- }
-
- public override string ToString ()
- {
- StringBuilder sb = new StringBuilder ();
-
- if (MessageType != null)
- Append (sb, "type", MessageFilter.MessageTypeToString ((MessageType)MessageType));
-
- if (Interface != null)
- Append (sb, "interface", Interface);
-
- if (Member != null)
- Append (sb, "member", Member);
-
- if (Path != null)
- //Append (sb, "path", Path.ToString ());
- Append (sb, "path", Path.Value);
-
- if (Sender != null)
- Append (sb, "sender", Sender);
-
- if (Destination != null)
- Append (sb, "destination", Destination);
-
- if (Args != null) {
- foreach (KeyValuePair<int,string> pair in Args)
- AppendArg (sb, pair.Key, pair.Value);
- }
-
- return sb.ToString ();
- }
-
- //this is useful as a Predicate<Message> delegate
- public bool Matches (Message msg)
- {
- if (MessageType != null)
- if (msg.Header.MessageType != MessageType)
- return false;
-
- object value;
-
- if (Interface != null)
- if (msg.Header.Fields.TryGetValue (FieldCode.Interface, out value))
- if ((string)value != Interface)
- return false;
-
- if (Member != null)
- if (msg.Header.Fields.TryGetValue (FieldCode.Member, out value))
- if ((string)value != Member)
- return false;
-
- if (Path != null)
- if (msg.Header.Fields.TryGetValue (FieldCode.Path, out value))
- //if ((ObjectPath)value != Path)
- if (((ObjectPath)value).Value != Path.Value)
- return false;
-
- if (Sender != null)
- if (msg.Header.Fields.TryGetValue (FieldCode.Sender, out value))
- if ((string)value != Sender)
- return false;
-
- if (Destination != null)
- if (msg.Header.Fields.TryGetValue (FieldCode.Destination, out value))
- if ((string)value != Destination)
- return false;
-
- //FIXME: do args
-
- return true;
- }
-
- //this could be made more efficient
- public static MatchRule Parse (string text)
- {
- MatchRule r = new MatchRule ();
-
- foreach (string propStr in text.Split (',')) {
- string[] parts = propStr.Split ('=');
-
- if (parts.Length < 2)
- throw new Exception ("No equals sign found");
- if (parts.Length > 2)
- throw new Exception ("Too many equals signs found");
-
- string key = parts[0].Trim ();
- string value = parts[1].Trim ();
-
- if (!value.StartsWith ("'") || !value.EndsWith ("'"))
- throw new Exception ("Too many equals signs found");
-
- value = value.Substring (1, value.Length - 2);
-
- if (key.StartsWith ("arg")) {
- int argnum = Int32.Parse (key.Remove (0, "arg".Length));
-
- if (argnum < 0 || argnum > 63)
- throw new Exception ("arg match must be between 0 and 63 inclusive");
-
- if (r.Args.ContainsKey (argnum))
- return null;
-
- r.Args[argnum] = value;
-
- continue;
- }
-
- //TODO: more consistent error handling
- switch (key) {
- case "type":
- if (r.MessageType != null)
- return null;
- r.MessageType = MessageFilter.StringToMessageType (value);
- break;
- case "interface":
- if (r.Interface != null)
- return null;
- r.Interface = value;
- break;
- case "member":
- if (r.Member != null)
- return null;
- r.Member = value;
- break;
- case "path":
- if (r.Path != null)
- return null;
- r.Path = new ObjectPath (value);
- break;
- case "sender":
- if (r.Sender != null)
- return null;
- r.Sender = value;
- break;
- case "destination":
- if (r.Destination != null)
- return null;
- r.Destination = value;
- break;
- default:
- if (Protocol.Verbose)
- Console.Error.WriteLine ("Warning: Unrecognized match rule key: " + key);
- break;
- }
- }
-
- return r;
- }
- }
-}
diff --git a/lib/dbus-sharp/Message.cs b/lib/dbus-sharp/Message.cs
deleted file mode 100644
index 01303da..0000000
--- a/lib/dbus-sharp/Message.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace NDesk.DBus
-{
- class Message
- {
- public Message ()
- {
- Header.Endianness = Connection.NativeEndianness;
- Header.MessageType = MessageType.MethodCall;
- Header.Flags = HeaderFlag.NoReplyExpected; //TODO: is this the right place to do this?
- Header.MajorVersion = Protocol.Version;
- Header.Fields = new Dictionary<FieldCode,object> ();
- }
-
- public Header Header;
-
- public Connection Connection;
-
- public Signature Signature
- {
- get {
- object o;
- if (Header.Fields.TryGetValue (FieldCode.Signature, out o))
- return (Signature)o;
- else
- return Signature.Empty;
- } set {
- if (value == Signature.Empty)
- Header.Fields.Remove (FieldCode.Signature);
- else
- Header.Fields[FieldCode.Signature] = value;
- }
- }
-
- public bool ReplyExpected
- {
- get {
- return (Header.Flags & HeaderFlag.NoReplyExpected) == HeaderFlag.None;
- } set {
- if (value)
- Header.Flags &= ~HeaderFlag.NoReplyExpected; //flag off
- else
- Header.Flags |= HeaderFlag.NoReplyExpected; //flag on
- }
- }
-
- //public HeaderField[] HeaderFields;
- //public Dictionary<FieldCode,object>;
-
- public byte[] Body;
-
- //TODO: make use of Locked
- /*
- protected bool locked = false;
- public bool Locked
- {
- get {
- return locked;
- }
- }
- */
-
- public void SetHeaderData (byte[] data)
- {
- EndianFlag endianness = (EndianFlag)data[0];
- MessageReader reader = new MessageReader (endianness, data);
-
- Header = (Header)reader.ReadStruct (typeof (Header));
- }
-
- public byte[] GetHeaderData ()
- {
- if (Body != null)
- Header.Length = (uint)Body.Length;
-
- MessageWriter writer = new MessageWriter (Header.Endianness);
- writer.WriteValueType (Header, typeof (Header));
- writer.CloseWrite ();
-
- return writer.ToArray ();
- }
- }
-}
diff --git a/lib/dbus-sharp/MessageFilter.cs b/lib/dbus-sharp/MessageFilter.cs
deleted file mode 100644
index b0849c2..0000000
--- a/lib/dbus-sharp/MessageFilter.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-
-namespace NDesk.DBus
-{
- class MessageFilter
- {
- //this should probably be made to use HeaderField or similar
- //this class is not generalized yet
-
- public static string MessageTypeToString (MessageType mtype)
- {
- switch (mtype)
- {
- case MessageType.MethodCall:
- return "method_call";
- case MessageType.MethodReturn:
- return "method_return";
- case MessageType.Error:
- return "error";
- case MessageType.Signal:
- return "signal";
- case MessageType.Invalid:
- return "invalid";
- default:
- throw new Exception ("Bad MessageType: " + mtype);
- }
- }
-
- public static MessageType StringToMessageType (string text)
- {
- switch (text)
- {
- case "method_call":
- return MessageType.MethodCall;
- case "method_return":
- return MessageType.MethodReturn;
- case "error":
- return MessageType.Error;
- case "signal":
- return MessageType.Signal;
- case "invalid":
- return MessageType.Invalid;
- default:
- throw new Exception ("Bad MessageType: " + text);
- }
- }
-
- //TODO: remove this -- left here for the benefit of the monitor tool for now
- public static string CreateMatchRule (MessageType mtype)
- {
- return "type='" + MessageTypeToString (mtype) + "'";
- }
- }
-}
diff --git a/lib/dbus-sharp/MessageReader.cs b/lib/dbus-sharp/MessageReader.cs
deleted file mode 100644
index 5a1f662..0000000
--- a/lib/dbus-sharp/MessageReader.cs
+++ /dev/null
@@ -1,436 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Text;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-
-namespace NDesk.DBus
-{
- class MessageReader
- {
- protected EndianFlag endianness;
- protected byte[] data;
- //TODO: this should be uint or long to handle long messages
- protected int pos = 0;
- protected Message message;
-
- public MessageReader (EndianFlag endianness, byte[] data)
- {
- if (data == null)
- throw new ArgumentNullException ("data");
-
- this.endianness = endianness;
- this.data = data;
- }
-
- public MessageReader (Message message) : this (message.Header.Endianness, message.Body)
- {
- if (message == null)
- throw new ArgumentNullException ("message");
-
- this.message = message;
- }
-
- public object ReadValue (Type type)
- {
- if (type == typeof (void))
- return null;
-
- if (type.IsArray) {
- return ReadArray (type.GetElementType ());
- } else if (type == typeof (ObjectPath)) {
- return ReadObjectPath ();
- } else if (type == typeof (Signature)) {
- return ReadSignature ();
- } else if (type == typeof (object)) {
- return ReadVariant ();
- } else if (type == typeof (string)) {
- return ReadString ();
- } else if (type.IsGenericType && type.GetGenericTypeDefinition () == typeof (IDictionary<,>)) {
- Type[] genArgs = type.GetGenericArguments ();
- //Type dictType = typeof (Dictionary<,>).MakeGenericType (genArgs);
- //workaround for Mono bug #81035 (memory leak)
- Type dictType = Mapper.GetGenericType (typeof (Dictionary<,>), genArgs);
- System.Collections.IDictionary idict = (System.Collections.IDictionary)Activator.CreateInstance(dictType, new object[0]);
- GetValueToDict (genArgs[0], genArgs[1], idict);
- return idict;
- } else if (Mapper.IsPublic (type)) {
- return GetObject (type);
- } else if (!type.IsPrimitive && !type.IsEnum) {
- return ReadStruct (type);
- } else {
- object val;
- DType dtype = Signature.TypeToDType (type);
- val = ReadValue (dtype);
-
- if (type.IsEnum)
- val = Enum.ToObject (type, val);
-
- return val;
- }
- }
-
- //helper method, should not be used generally
- public object ReadValue (DType dtype)
- {
- switch (dtype)
- {
- case DType.Byte:
- return ReadByte ();
-
- case DType.Boolean:
- return ReadBoolean ();
-
- case DType.Int16:
- return ReadInt16 ();
-
- case DType.UInt16:
- return ReadUInt16 ();
-
- case DType.Int32:
- return ReadInt32 ();
-
- case DType.UInt32:
- return ReadUInt32 ();
-
- case DType.Int64:
- return ReadInt64 ();
-
- case DType.UInt64:
- return ReadUInt64 ();
-
-#if !DISABLE_SINGLE
- case DType.Single:
- return ReadSingle ();
-#endif
-
- case DType.Double:
- return ReadDouble ();
-
- case DType.String:
- return ReadString ();
-
- case DType.ObjectPath:
- return ReadObjectPath ();
-
- case DType.Signature:
- return ReadSignature ();
-
- case DType.Variant:
- return ReadVariant ();
-
- default:
- throw new Exception ("Unhandled D-Bus type: " + dtype);
- }
- }
-
- public object GetObject (Type type)
- {
- ObjectPath path = ReadObjectPath ();
-
- return message.Connection.GetObject (type, (string)message.Header.Fields[FieldCode.Sender], path);
- }
-
- public byte ReadByte ()
- {
- return data[pos++];
- }
-
- public bool ReadBoolean ()
- {
- uint intval = ReadUInt32 ();
-
- switch (intval) {
- case 0:
- return false;
- case 1:
- return true;
- default:
- throw new Exception ("Read value " + intval + " at position " + pos + " while expecting boolean (0/1)");
- }
- }
-
- unsafe protected void MarshalUShort (byte *dst)
- {
- ReadPad (2);
-
- if (endianness == Connection.NativeEndianness) {
- dst[0] = data[pos + 0];
- dst[1] = data[pos + 1];
- } else {
- dst[0] = data[pos + 1];
- dst[1] = data[pos + 0];
- }
-
- pos += 2;
- }
-
- unsafe public short ReadInt16 ()
- {
- short val;
-
- MarshalUShort ((byte*)&val);
-
- return val;
- }
-
- unsafe public ushort ReadUInt16 ()
- {
- ushort val;
-
- MarshalUShort ((byte*)&val);
-
- return val;
- }
-
- unsafe protected void MarshalUInt (byte *dst)
- {
- ReadPad (4);
-
- if (endianness == Connection.NativeEndianness) {
- dst[0] = data[pos + 0];
- dst[1] = data[pos + 1];
- dst[2] = data[pos + 2];
- dst[3] = data[pos + 3];
- } else {
- dst[0] = data[pos + 3];
- dst[1] = data[pos + 2];
- dst[2] = data[pos + 1];
- dst[3] = data[pos + 0];
- }
-
- pos += 4;
- }
-
- unsafe public int ReadInt32 ()
- {
- int val;
-
- MarshalUInt ((byte*)&val);
-
- return val;
- }
-
- unsafe public uint ReadUInt32 ()
- {
- uint val;
-
- MarshalUInt ((byte*)&val);
-
- return val;
- }
-
- unsafe protected void MarshalULong (byte *dst)
- {
- ReadPad (8);
-
- if (endianness == Connection.NativeEndianness) {
- for (int i = 0; i < 8; ++i)
- dst[i] = data[pos + i];
- } else {
- for (int i = 0; i < 8; ++i)
- dst[i] = data[pos + (7 - i)];
- }
-
- pos += 8;
- }
-
- unsafe public long ReadInt64 ()
- {
- long val;
-
- MarshalULong ((byte*)&val);
-
- return val;
- }
-
- unsafe public ulong ReadUInt64 ()
- {
- ulong val;
-
- MarshalULong ((byte*)&val);
-
- return val;
- }
-
-#if !DISABLE_SINGLE
- unsafe public float ReadSingle ()
- {
- float val;
-
- MarshalUInt ((byte*)&val);
-
- return val;
- }
-#endif
-
- unsafe public double ReadDouble ()
- {
- double val;
-
- MarshalULong ((byte*)&val);
-
- return val;
- }
-
- public string ReadString ()
- {
- uint ln = ReadUInt32 ();
-
- string val = Encoding.UTF8.GetString (data, pos, (int)ln);
- pos += (int)ln;
- ReadNull ();
-
- return val;
- }
-
- public ObjectPath ReadObjectPath ()
- {
- //exactly the same as string
- return new ObjectPath (ReadString ());
- }
-
- public Signature ReadSignature ()
- {
- byte ln = ReadByte ();
-
- if (ln > Protocol.MaxSignatureLength)
- throw new Exception ("Signature length " + ln + " exceeds maximum allowed " + Protocol.MaxSignatureLength + " bytes");
-
- byte[] sigData = new byte[ln];
- Array.Copy (data, pos, sigData, 0, (int)ln);
- pos += (int)ln;
- ReadNull ();
-
- return new Signature (sigData);
- }
-
- public object ReadVariant ()
- {
- return ReadVariant (ReadSignature ());
- }
-
- object ReadVariant (Signature sig)
- {
- return ReadValue (sig.ToType ());
- }
-
- //not pretty or efficient but works
- public void GetValueToDict (Type keyType, Type valType, System.Collections.IDictionary val)
- {
- uint ln = ReadUInt32 ();
-
- if (ln > Protocol.MaxArrayLength)
- throw new Exception ("Dict length " + ln + " exceeds maximum allowed " + Protocol.MaxArrayLength + " bytes");
-
- //advance to the alignment of the element
- //ReadPad (Protocol.GetAlignment (Signature.TypeToDType (type)));
- ReadPad (8);
-
- int endPos = pos + (int)ln;
-
- //while (stream.Position != endPos)
- while (pos < endPos)
- {
- ReadPad (8);
-
- val.Add (ReadValue (keyType), ReadValue (valType));
- }
-
- if (pos != endPos)
- throw new Exception ("Read pos " + pos + " != ep " + endPos);
- }
-
- //this could be made generic to avoid boxing
- public Array ReadArray (Type elemType)
- {
- uint ln = ReadUInt32 ();
-
- if (ln > Protocol.MaxArrayLength)
- throw new Exception ("Array length " + ln + " exceeds maximum allowed " + Protocol.MaxArrayLength + " bytes");
-
- //TODO: more fast paths for primitive arrays
- if (elemType == typeof (byte)) {
- byte[] valb = new byte[ln];
- Array.Copy (data, pos, valb, 0, (int)ln);
- pos += (int)ln;
- return valb;
- }
-
- //advance to the alignment of the element
- ReadPad (Protocol.GetAlignment (Signature.TypeToDType (elemType)));
-
- int endPos = pos + (int)ln;
-
- //List<T> vals = new List<T> ();
- System.Collections.ArrayList vals = new System.Collections.ArrayList ();
-
- //while (stream.Position != endPos)
- while (pos < endPos)
- vals.Add (ReadValue (elemType));
-
- if (pos != endPos)
- throw new Exception ("Read pos " + pos + " != ep " + endPos);
-
- return vals.ToArray (elemType);
- }
-
- //struct
- //probably the wrong place for this
- //there might be more elegant solutions
- public object ReadStruct (Type type)
- {
- ReadPad (8);
-
- object val = Activator.CreateInstance (type);
-
- /*
- if (type.IsGenericType && type.GetGenericTypeDefinition () == typeof (KeyValuePair<,>)) {
- object elem;
-
- System.Reflection.PropertyInfo key_prop = type.GetProperty ("Key");
- GetValue (key_prop.PropertyType, out elem);
- key_prop.SetValue (val, elem, null);
-
- System.Reflection.PropertyInfo val_prop = type.GetProperty ("Value");
- GetValue (val_prop.PropertyType, out elem);
- val_prop.SetValue (val, elem, null);
-
- return;
- }
- */
-
- FieldInfo[] fis = type.GetFields (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-
- foreach (System.Reflection.FieldInfo fi in fis)
- fi.SetValue (val, ReadValue (fi.FieldType));
-
- return val;
- }
-
- public void ReadNull ()
- {
- if (data[pos] != 0)
- throw new Exception ("Read non-zero byte at position " + pos + " while expecting null terminator");
- pos++;
- }
-
- /*
- public void ReadPad (int alignment)
- {
- pos = Protocol.Padded (pos, alignment);
- }
- */
-
- public void ReadPad (int alignment)
- {
- for (int endPos = Protocol.Padded (pos, alignment) ; pos != endPos ; pos++)
- if (data[pos] != 0)
- throw new Exception ("Read non-zero byte at position " + pos + " while expecting padding");
- }
- }
-}
diff --git a/lib/dbus-sharp/MessageWriter.cs b/lib/dbus-sharp/MessageWriter.cs
deleted file mode 100644
index 3b61f86..0000000
--- a/lib/dbus-sharp/MessageWriter.cs
+++ /dev/null
@@ -1,455 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Text;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-
-namespace NDesk.DBus
-{
- class MessageWriter
- {
- protected EndianFlag endianness;
- protected MemoryStream stream;
-
- public Connection connection;
-
- //a default constructor is a bad idea for now as we want to make sure the header and content-type match
- public MessageWriter () : this (Connection.NativeEndianness) {}
-
- public MessageWriter (EndianFlag endianness)
- {
- this.endianness = endianness;
- stream = new MemoryStream ();
- }
-
- public byte[] ToArray ()
- {
- //TODO: mark the writer locked or something here
- return stream.ToArray ();
- }
-
- public void CloseWrite ()
- {
- int needed = Protocol.PadNeeded ((int)stream.Position, 8);
- for (int i = 0 ; i != needed ; i++)
- stream.WriteByte (0);
- }
-
- public void Write (byte val)
- {
- stream.WriteByte (val);
- }
-
- public void Write (bool val)
- {
- Write ((uint) (val ? 1 : 0));
- }
-
- unsafe protected void MarshalUShort (byte *data)
- {
- WritePad (2);
- byte[] dst = new byte[2];
-
- if (endianness == Connection.NativeEndianness) {
- dst[0] = data[0];
- dst[1] = data[1];
- } else {
- dst[0] = data[1];
- dst[1] = data[0];
- }
-
- stream.Write (dst, 0, 2);
- }
-
- unsafe public void Write (short val)
- {
- MarshalUShort ((byte*)&val);
- }
-
- unsafe public void Write (ushort val)
- {
- MarshalUShort ((byte*)&val);
- }
-
- unsafe protected void MarshalUInt (byte *data)
- {
- WritePad (4);
- byte[] dst = new byte[4];
-
- if (endianness == Connection.NativeEndianness) {
- dst[0] = data[0];
- dst[1] = data[1];
- dst[2] = data[2];
- dst[3] = data[3];
- } else {
- dst[0] = data[3];
- dst[1] = data[2];
- dst[2] = data[1];
- dst[3] = data[0];
- }
-
- stream.Write (dst, 0, 4);
- }
-
- unsafe public void Write (int val)
- {
- MarshalUInt ((byte*)&val);
- }
-
- unsafe public void Write (uint val)
- {
- MarshalUInt ((byte*)&val);
- }
-
- unsafe protected void MarshalULong (byte *data)
- {
- WritePad (8);
- byte[] dst = new byte[8];
-
- if (endianness == Connection.NativeEndianness) {
- for (int i = 0; i < 8; ++i)
- dst[i] = data[i];
- } else {
- for (int i = 0; i < 8; ++i)
- dst[i] = data[7 - i];
- }
-
- stream.Write (dst, 0, 8);
- }
-
- unsafe public void Write (long val)
- {
- MarshalULong ((byte*)&val);
- }
-
- unsafe public void Write (ulong val)
- {
- MarshalULong ((byte*)&val);
- }
-
-#if !DISABLE_SINGLE
- unsafe public void Write (float val)
- {
- MarshalUInt ((byte*)&val);
- }
-#endif
-
- unsafe public void Write (double val)
- {
- MarshalULong ((byte*)&val);
- }
-
- public void Write (string val)
- {
- byte[] utf8_data = Encoding.UTF8.GetBytes (val);
- Write ((uint)utf8_data.Length);
- stream.Write (utf8_data, 0, utf8_data.Length);
- WriteNull ();
- }
-
- public void Write (ObjectPath val)
- {
- Write (val.Value);
- }
-
- public void Write (Signature val)
- {
- byte[] ascii_data = val.GetBuffer ();
-
- if (ascii_data.Length > Protocol.MaxSignatureLength)
- throw new Exception ("Signature length " + ascii_data.Length + " exceeds maximum allowed " + Protocol.MaxSignatureLength + " bytes");
-
- Write ((byte)ascii_data.Length);
- stream.Write (ascii_data, 0, ascii_data.Length);
- WriteNull ();
- }
-
- public void WriteComplex (object val, Type type)
- {
- if (type == typeof (void))
- return;
-
- if (type.IsArray) {
- WriteArray (val, type.GetElementType ());
- } else if (type.IsGenericType && (type.GetGenericTypeDefinition () == typeof (IDictionary<,>) || type.GetGenericTypeDefinition () == typeof (Dictionary<,>))) {
- Type[] genArgs = type.GetGenericArguments ();
- System.Collections.IDictionary idict = (System.Collections.IDictionary)val;
- WriteFromDict (genArgs[0], genArgs[1], idict);
- } else if (Mapper.IsPublic (type)) {
- WriteObject (type, val);
- } else if (!type.IsPrimitive && !type.IsEnum) {
- WriteValueType (val, type);
- /*
- } else if (type.IsGenericType && type.GetGenericTypeDefinition () == typeof (Nullable<>)) {
- //is it possible to support nullable types?
- Type[] genArgs = type.GetGenericArguments ();
- WriteVariant (genArgs[0], val);
- */
- } else {
- throw new Exception ("Can't write");
- }
- }
-
- public void Write (Type type, object val)
- {
- if (type == typeof (void))
- return;
-
- if (type.IsArray) {
- WriteArray (val, type.GetElementType ());
- } else if (type == typeof (ObjectPath)) {
- Write ((ObjectPath)val);
- } else if (type == typeof (Signature)) {
- Write ((Signature)val);
- } else if (type == typeof (object)) {
- Write (val);
- } else if (type == typeof (string)) {
- Write ((string)val);
- } else if (type.IsGenericType && (type.GetGenericTypeDefinition () == typeof (IDictionary<,>) || type.GetGenericTypeDefinition () == typeof (Dictionary<,>))) {
- Type[] genArgs = type.GetGenericArguments ();
- System.Collections.IDictionary idict = (System.Collections.IDictionary)val;
- WriteFromDict (genArgs[0], genArgs[1], idict);
- } else if (Mapper.IsPublic (type)) {
- WriteObject (type, val);
- } else if (!type.IsPrimitive && !type.IsEnum) {
- WriteValueType (val, type);
- } else {
- Write (Signature.TypeToDType (type), val);
- }
- }
-
- //helper method, should not be used as it boxes needlessly
- public void Write (DType dtype, object val)
- {
- switch (dtype)
- {
- case DType.Byte:
- {
- Write ((byte)val);
- }
- break;
- case DType.Boolean:
- {
- Write ((bool)val);
- }
- break;
- case DType.Int16:
- {
- Write ((short)val);
- }
- break;
- case DType.UInt16:
- {
- Write ((ushort)val);
- }
- break;
- case DType.Int32:
- {
- Write ((int)val);
- }
- break;
- case DType.UInt32:
- {
- Write ((uint)val);
- }
- break;
- case DType.Int64:
- {
- Write ((long)val);
- }
- break;
- case DType.UInt64:
- {
- Write ((ulong)val);
- }
- break;
-#if !DISABLE_SINGLE
- case DType.Single:
- {
- Write ((float)val);
- }
- break;
-#endif
- case DType.Double:
- {
- Write ((double)val);
- }
- break;
- case DType.String:
- {
- Write ((string)val);
- }
- break;
- case DType.ObjectPath:
- {
- Write ((ObjectPath)val);
- }
- break;
- case DType.Signature:
- {
- Write ((Signature)val);
- }
- break;
- case DType.Variant:
- {
- Write ((object)val);
- }
- break;
- default:
- throw new Exception ("Unhandled D-Bus type: " + dtype);
- }
- }
-
- public void WriteObject (Type type, object val)
- {
- ObjectPath path;
-
- BusObject bobj = val as BusObject;
-
- if (bobj == null && val is MarshalByRefObject) {
- bobj = ((MarshalByRefObject)val).GetLifetimeService () as BusObject;
- }
-
- if (bobj == null)
- throw new Exception ("No object reference to write");
-
- path = bobj.Path;
-
- Write (path);
- }
-
- //variant
- public void Write (object val)
- {
- //TODO: maybe support sending null variants
-
- if (val == null)
- throw new NotSupportedException ("Cannot send null variant");
-
- Type type = val.GetType ();
-
- WriteVariant (type, val);
- }
-
- public void WriteVariant (Type type, object val)
- {
- Signature sig = Signature.GetSig (type);
-
- Write (sig);
- Write (type, val);
- }
-
- //this requires a seekable stream for now
- public void WriteArray (object obj, Type elemType)
- {
- Array val = (Array)obj;
-
- //TODO: more fast paths for primitive arrays
- if (elemType == typeof (byte)) {
- if (val.Length > Protocol.MaxArrayLength)
- throw new Exception ("Array length " + val.Length + " exceeds maximum allowed " + Protocol.MaxArrayLength + " bytes");
-
- Write ((uint)val.Length);
- stream.Write ((byte[])val, 0, val.Length);
- return;
- }
-
- long origPos = stream.Position;
- Write ((uint)0);
-
- //advance to the alignment of the element
- WritePad (Protocol.GetAlignment (Signature.TypeToDType (elemType)));
-
- long startPos = stream.Position;
-
- foreach (object elem in val)
- Write (elemType, elem);
-
- long endPos = stream.Position;
- uint ln = (uint)(endPos - startPos);
- stream.Position = origPos;
-
- if (ln > Protocol.MaxArrayLength)
- throw new Exception ("Array length " + ln + " exceeds maximum allowed " + Protocol.MaxArrayLength + " bytes");
-
- Write (ln);
- stream.Position = endPos;
- }
-
- public void WriteFromDict (Type keyType, Type valType, System.Collections.IDictionary val)
- {
- long origPos = stream.Position;
- Write ((uint)0);
-
- //advance to the alignment of the element
- //WritePad (Protocol.GetAlignment (Signature.TypeToDType (type)));
- WritePad (8);
-
- long startPos = stream.Position;
-
- foreach (System.Collections.DictionaryEntry entry in val)
- {
- WritePad (8);
-
- Write (keyType, entry.Key);
- Write (valType, entry.Value);
- }
-
- long endPos = stream.Position;
- uint ln = (uint)(endPos - startPos);
- stream.Position = origPos;
-
- if (ln > Protocol.MaxArrayLength)
- throw new Exception ("Dict length " + ln + " exceeds maximum allowed " + Protocol.MaxArrayLength + " bytes");
-
- Write (ln);
- stream.Position = endPos;
- }
-
- public void WriteValueType (object val, Type type)
- {
- MethodInfo mi = TypeImplementer.GetWriteMethod (type);
- mi.Invoke (null, new object[] {this, val});
- //mi.Invoke (this, new object[] {val});
- }
-
- /*
- public void WriteValueTypeOld (object val, Type type)
- {
- WritePad (8);
-
- if (type.IsGenericType && type.GetGenericTypeDefinition () == typeof (KeyValuePair<,>)) {
- System.Reflection.PropertyInfo key_prop = type.GetProperty ("Key");
- Write (key_prop.PropertyType, key_prop.GetValue (val, null));
-
- System.Reflection.PropertyInfo val_prop = type.GetProperty ("Value");
- Write (val_prop.PropertyType, val_prop.GetValue (val, null));
-
- return;
- }
-
- FieldInfo[] fis = type.GetFields (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-
- foreach (System.Reflection.FieldInfo fi in fis) {
- object elem;
- elem = fi.GetValue (val);
- Write (fi.FieldType, elem);
- }
- }
- */
-
- public void WriteNull ()
- {
- stream.WriteByte (0);
- }
-
- public void WritePad (int alignment)
- {
- stream.Position = Protocol.Padded ((int)stream.Position, alignment);
- }
- }
-}
diff --git a/lib/dbus-sharp/PendingCall.cs b/lib/dbus-sharp/PendingCall.cs
deleted file mode 100644
index a9950df..0000000
--- a/lib/dbus-sharp/PendingCall.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2007 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Threading;
-
-namespace NDesk.DBus
-{
- class PendingCall
- {
- Connection conn;
- Message reply = null;
- object lockObj = new object ();
-
- public PendingCall (Connection conn)
- {
- this.conn = conn;
- }
-
- int waiters = 0;
-
- public Message Reply
- {
- get {
- if (Thread.CurrentThread == conn.mainThread) {
- /*
- while (reply == null)
- conn.Iterate ();
- */
-
- while (reply == null)
- conn.HandleMessage (conn.ReadMessage ());
-
- conn.DispatchSignals ();
- } else {
- lock (lockObj) {
- Interlocked.Increment (ref waiters);
-
- while (reply == null)
- Monitor.Wait (lockObj);
-
- Interlocked.Decrement (ref waiters);
- }
- }
-
- return reply;
- } set {
- lock (lockObj) {
- reply = value;
-
- if (waiters > 0)
- Monitor.PulseAll (lockObj);
-
- if (Completed != null)
- Completed (reply);
- }
- }
- }
-
- public event Action<Message> Completed;
- }
-}
diff --git a/lib/dbus-sharp/Protocol.cs b/lib/dbus-sharp/Protocol.cs
deleted file mode 100644
index 71a0b4a..0000000
--- a/lib/dbus-sharp/Protocol.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections.Generic;
-
-namespace NDesk.DBus
-{
- //yyyyuua{yv}
- struct Header
- {
- public EndianFlag Endianness;
- public MessageType MessageType;
- public HeaderFlag Flags;
- public byte MajorVersion;
- public uint Length;
- public uint Serial;
- //public HeaderField[] Fields;
- public IDictionary<FieldCode,object> Fields;
-
- /*
- public static DType TypeForField (FieldCode f)
- {
- switch (f) {
- case FieldCode.Invalid:
- return DType.Invalid;
- case FieldCode.Path:
- return DType.ObjectPath;
- case FieldCode.Interface:
- return DType.String;
- case FieldCode.Member:
- return DType.String;
- case FieldCode.ErrorName:
- return DType.String;
- case FieldCode.ReplySerial:
- return DType.UInt32;
- case FieldCode.Destination:
- return DType.String;
- case FieldCode.Sender:
- return DType.String;
- case FieldCode.Signature:
- return DType.Signature;
-#if PROTO_REPLY_SIGNATURE
- case FieldCode.ReplySignature: //note: not supported in dbus
- return DType.Signature;
-#endif
- default:
- return DType.Invalid;
- }
- }
- */
- }
-
- /*
- public struct HeaderField
- {
- //public HeaderField (FieldCode code, object value)
- //{
- // this.Code = code;
- // this.Value = value;
- //}
-
- public static HeaderField Create (FieldCode code, object value)
- {
- HeaderField hf;
-
- hf.Code = code;
- hf.Value = value;
-
- return hf;
- }
-
- public FieldCode Code;
- public object Value;
- }
- */
-
- enum MessageType : byte
- {
- //This is an invalid type.
- Invalid,
- //Method call.
- MethodCall,
- //Method reply with returned data.
- MethodReturn,
- //Error reply. If the first argument exists and is a string, it is an error message.
- Error,
- //Signal emission.
- Signal,
- }
-
- enum FieldCode : byte
- {
- Invalid,
- Path,
- Interface,
- Member,
- ErrorName,
- ReplySerial,
- Destination,
- Sender,
- Signature,
-#if PROTO_REPLY_SIGNATURE
- ReplySignature, //note: not supported in dbus
-#endif
- }
-
- enum EndianFlag : byte
- {
- Little = (byte)'l',
- Big = (byte)'B',
- }
-
- [Flags]
- enum HeaderFlag : byte
- {
- None = 0,
- NoReplyExpected = 0x1,
- NoAutoStart = 0x2,
- }
-
- public sealed class ObjectPath //: IComparable, IComparable<ObjectPath>, IEquatable<ObjectPath>
- {
- public static readonly ObjectPath Root = new ObjectPath ("/");
-
- internal readonly string Value;
-
- public ObjectPath (string value)
- {
- if (value == null)
- throw new ArgumentNullException ("value");
-
- this.Value = value;
- }
-
- public override bool Equals (object o)
- {
- ObjectPath b = o as ObjectPath;
-
- if (b == null)
- return false;
-
- return Value.Equals (b.Value);
- }
-
- public override int GetHashCode ()
- {
- return Value.GetHashCode ();
- }
-
- public override string ToString ()
- {
- return Value;
- }
-
- //this may or may not prove useful
- internal string[] Decomposed
- {
- get {
- return Value.Split (new char[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
- /*
- } set {
- Value = String.Join ("/", value);
- */
- }
- }
-
- internal ObjectPath Parent
- {
- get {
- if (Value == Root.Value)
- return null;
-
- string par = Value.Substring (0, Value.LastIndexOf ('/'));
- if (par == String.Empty)
- par = "/";
-
- return new ObjectPath (par);
- }
- }
-
- /*
- public int CompareTo (object value)
- {
- return 1;
- }
-
- public int CompareTo (ObjectPath value)
- {
- return 1;
- }
-
- public bool Equals (ObjectPath value)
- {
- return false;
- }
- */
- }
-
- static class Protocol
- {
- //protocol versions that we support
- public const byte MinVersion = 0;
- public const byte Version = 1;
- public const byte MaxVersion = Version;
-
- public const uint MaxMessageLength = 134217728; //2 to the 27th power
- public const uint MaxArrayLength = 67108864; //2 to the 26th power
- public const uint MaxSignatureLength = 255;
- public const uint MaxArrayDepth = 32;
- public const uint MaxStructDepth = 32;
-
- //this is not strictly related to Protocol since names are passed around as strings
- internal const uint MaxNameLength = 255;
-
- public static int PadNeeded (int pos, int alignment)
- {
- int pad = pos % alignment;
- pad = pad == 0 ? 0 : alignment - pad;
-
- return pad;
- }
-
- public static int Padded (int pos, int alignment)
- {
- int pad = pos % alignment;
- if (pad != 0)
- pos += alignment - pad;
-
- return pos;
- }
-
- public static int GetAlignment (DType dtype)
- {
- switch (dtype) {
- case DType.Byte:
- return 1;
- case DType.Boolean:
- return 4;
- case DType.Int16:
- case DType.UInt16:
- return 2;
- case DType.Int32:
- case DType.UInt32:
- return 4;
- case DType.Int64:
- case DType.UInt64:
- return 8;
-#if !DISABLE_SINGLE
- case DType.Single: //Not yet supported!
- return 4;
-#endif
- case DType.Double:
- return 8;
- case DType.String:
- return 4;
- case DType.ObjectPath:
- return 4;
- case DType.Signature:
- return 1;
- case DType.Array:
- return 4;
- case DType.Struct:
- return 8;
- case DType.Variant:
- return 1;
- case DType.DictEntry:
- return 8;
- case DType.Invalid:
- default:
- throw new Exception ("Cannot determine alignment of " + dtype);
- }
- }
-
- //this class may not be the best place for Verbose
- public readonly static bool Verbose;
-
- static Protocol ()
- {
- Verbose = !String.IsNullOrEmpty (Environment.GetEnvironmentVariable ("DBUS_VERBOSE"));
- }
- }
-
-#if UNDOCUMENTED_IN_SPEC
-/*
-"org.freedesktop.DBus.Error.Failed"
-"org.freedesktop.DBus.Error.NoMemory"
-"org.freedesktop.DBus.Error.ServiceUnknown"
-"org.freedesktop.DBus.Error.NameHasNoOwner"
-"org.freedesktop.DBus.Error.NoReply"
-"org.freedesktop.DBus.Error.IOError"
-"org.freedesktop.DBus.Error.BadAddress"
-"org.freedesktop.DBus.Error.NotSupported"
-"org.freedesktop.DBus.Error.LimitsExceeded"
-"org.freedesktop.DBus.Error.AccessDenied"
-"org.freedesktop.DBus.Error.AuthFailed"
-"org.freedesktop.DBus.Error.NoServer"
-"org.freedesktop.DBus.Error.Timeout"
-"org.freedesktop.DBus.Error.NoNetwork"
-"org.freedesktop.DBus.Error.AddressInUse"
-"org.freedesktop.DBus.Error.Disconnected"
-"org.freedesktop.DBus.Error.InvalidArgs"
-"org.freedesktop.DBus.Error.FileNotFound"
-"org.freedesktop.DBus.Error.UnknownMethod"
-"org.freedesktop.DBus.Error.TimedOut"
-"org.freedesktop.DBus.Error.MatchRuleNotFound"
-"org.freedesktop.DBus.Error.MatchRuleInvalid"
-"org.freedesktop.DBus.Error.Spawn.ExecFailed"
-"org.freedesktop.DBus.Error.Spawn.ForkFailed"
-"org.freedesktop.DBus.Error.Spawn.ChildExited"
-"org.freedesktop.DBus.Error.Spawn.ChildSignaled"
-"org.freedesktop.DBus.Error.Spawn.Failed"
-"org.freedesktop.DBus.Error.UnixProcessIdUnknown"
-"org.freedesktop.DBus.Error.InvalidSignature"
-"org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown"
-*/
-#endif
-}
diff --git a/lib/dbus-sharp/README b/lib/dbus-sharp/README
deleted file mode 100644
index 3ef7e59..0000000
--- a/lib/dbus-sharp/README
+++ /dev/null
@@ -1,33 +0,0 @@
-D-Bus for .NET
-==============
-
-This is a C# implementation of D-Bus. It's often referred to as "managed
-D-Bus" to avoid confusion with existing bindings (which wrap libdbus).
-
-See http://www.ndesk.org/DBusSharp
-
-D-Bus is an inter-process communication framework that lets applications
-interface with the system event bus as well as allowing them to talk to
-one another in a peer-to-peer configuration.
-
-See http://www.freedesktop.org/wiki/Software/dbus for general
-information on the D-Bus IPC mechanism.
-
-This software is currently at an early stage of development and not
-recommended for use in stable applications.
-
-However it is hoped that it will soon provide a tested, high-performance
-bridge to and from all systems that are exposed via D-Bus, regardless of
-programming language, UI toolkit or license.
-
-The code was written and is maintained by Alp Toker <alp at atoker.com>
-
-It is a clean-room implementation based on the D-Bus Specification
-Version 0.11 and study of the wire protocol of existing tools.
-
-It aims for compatibility with Mono and Microsoft .NET frameworks
-supporting the 2.0 profile. Backward compatibility with 1.0 will not be
-a consideration.
-
---
-Alp Toker <alp at atoker.com>
diff --git a/lib/dbus-sharp/Signature.cs b/lib/dbus-sharp/Signature.cs
deleted file mode 100644
index a808a31..0000000
--- a/lib/dbus-sharp/Signature.cs
+++ /dev/null
@@ -1,568 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Text;
-
-using System.Collections.Generic;
-//TODO: Reflection should be done at a higher level than this class
-using System.Reflection;
-
-namespace NDesk.DBus
-{
- //maybe this should be nullable?
- struct Signature
- {
- //TODO: this class needs some work
- //Data should probably include the null terminator
-
- public static readonly Signature Empty = new Signature (String.Empty);
-
- public static bool operator == (Signature a, Signature b)
- {
- /*
- //TODO: remove this hack to handle bad case when Data is null
- if (a.data == null || b.data == null)
- throw new Exception ("Encountered Signature with null buffer");
- */
-
- /*
- if (a.data == null && b.data == null)
- return true;
-
- if (a.data == null || b.data == null)
- return false;
- */
-
- if (a.data.Length != b.data.Length)
- return false;
-
- for (int i = 0 ; i != a.data.Length ; i++)
- if (a.data[i] != b.data[i])
- return false;
-
- return true;
- }
-
- public static bool operator != (Signature a, Signature b)
- {
- return !(a == b);
- }
-
- public override bool Equals (object o)
- {
- if (o == null)
- return false;
-
- if (!(o is Signature))
- return false;
-
- return this == (Signature)o;
- }
-
- public override int GetHashCode ()
- {
- return data.GetHashCode ();
- }
-
- public static Signature operator + (Signature s1, Signature s2)
- {
- return Concat (s1, s2);
- }
-
- //these need to be optimized
- public static Signature Concat (Signature s1, Signature s2)
- {
- return new Signature (s1.Value + s2.Value);
- }
-
- public static Signature Copy (Signature sig)
- {
- return new Signature (sig.data);
- }
-
- public Signature (string value)
- {
- this.data = Encoding.ASCII.GetBytes (value);
- }
-
- public Signature (byte[] value)
- {
- this.data = (byte[])value.Clone ();
- }
-
- //this will become obsolete soon
- internal Signature (DType value)
- {
- this.data = new byte[] {(byte)value};
- }
-
- internal Signature (DType[] value)
- {
- this.data = new byte[value.Length];
-
- /*
- MemoryStream ms = new MemoryStream (this.data);
-
- foreach (DType t in value)
- ms.WriteByte ((byte)t);
- */
-
- for (int i = 0 ; i != value.Length ; i++)
- this.data[i] = (byte)value[i];
- }
-
- byte[] data;
-
- //TODO: this should be private, but MessageWriter and Monitor still use it
- //[Obsolete]
- public byte[] GetBuffer ()
- {
- return data;
- }
-
- internal DType this[int index]
- {
- get {
- return (DType)data[index];
- }
- }
-
- public int Length
- {
- get {
- return data.Length;
- }
- }
-
- //[Obsolete]
- public string Value
- {
- get {
- /*
- //FIXME: hack to handle bad case when Data is null
- if (data == null)
- return String.Empty;
- */
-
- return Encoding.ASCII.GetString (data);
- }
- }
-
- public override string ToString ()
- {
- return Value;
-
- /*
- StringBuilder sb = new StringBuilder ();
-
- foreach (DType t in data) {
- //we shouldn't rely on object mapping here, but it's an easy way to get string representations for now
- Type type = DTypeToType (t);
- if (type != null) {
- sb.Append (type.Name);
- } else {
- char c = (char)t;
- if (!Char.IsControl (c))
- sb.Append (c);
- else
- sb.Append (@"\" + (int)c);
- }
- sb.Append (" ");
- }
-
- return sb.ToString ();
- */
- }
-
- public Signature MakeArraySignature ()
- {
- return new Signature (DType.Array) + this;
- }
-
- public static Signature MakeStruct (params Signature[] elems)
- {
- Signature sig = Signature.Empty;
-
- sig += new Signature (DType.StructBegin);
-
- foreach (Signature elem in elems)
- sig += elem;
-
- sig += new Signature (DType.StructEnd);
-
- return sig;
- }
-
- public static Signature MakeDictEntry (Signature keyType, Signature valueType)
- {
- Signature sig = Signature.Empty;
-
- sig += new Signature (DType.DictEntryBegin);
-
- sig += keyType;
- sig += valueType;
-
- sig += new Signature (DType.DictEntryEnd);
-
- return sig;
- }
-
- public static Signature MakeDict (Signature keyType, Signature valueType)
- {
- return MakeDictEntry (keyType, valueType).MakeArraySignature ();
- }
-
- /*
- //TODO: complete this
- public bool IsPrimitive
- {
- get {
- if (this == Signature.Empty)
- return true;
-
- return false;
- }
- }
- */
-
- public bool IsDict
- {
- get {
- if (Length < 3)
- return false;
-
- if (!IsArray)
- return false;
-
- if (this[2] != DType.DictEntryBegin)
- return false;
-
- return true;
- }
- }
-
- public bool IsArray
- {
- get {
- if (Length < 2)
- return false;
-
- if (this[0] != DType.Array)
- return false;
-
- return true;
- }
- }
-
- public Signature GetElementSignature ()
- {
- if (!IsArray)
- throw new Exception ("Cannot get the element signature of a non-array (signature was '" + this + "')");
-
- //TODO: improve this
- if (Length != 2)
- throw new NotSupportedException ("Parsing signatures with more than one primitive value is not supported (signature was '" + this + "')");
-
- return new Signature (this[1]);
- }
-
- public Type[] ToTypes ()
- {
- List<Type> types = new List<Type> ();
- for (int i = 0 ; i != data.Length ; types.Add (ToType (ref i)));
- return types.ToArray ();
- }
-
- public Type ToType ()
- {
- int pos = 0;
- Type ret = ToType (ref pos);
- if (pos != data.Length)
- throw new Exception ("Signature '" + Value + "' is not a single complete type");
- return ret;
- }
-
- internal static DType TypeCodeToDType (TypeCode typeCode)
- {
- switch (typeCode)
- {
- case TypeCode.Empty:
- return DType.Invalid;
- case TypeCode.Object:
- return DType.Invalid;
- case TypeCode.DBNull:
- return DType.Invalid;
- case TypeCode.Boolean:
- return DType.Boolean;
- case TypeCode.Char:
- return DType.UInt16;
- case TypeCode.SByte:
- return DType.Byte;
- case TypeCode.Byte:
- return DType.Byte;
- case TypeCode.Int16:
- return DType.Int16;
- case TypeCode.UInt16:
- return DType.UInt16;
- case TypeCode.Int32:
- return DType.Int32;
- case TypeCode.UInt32:
- return DType.UInt32;
- case TypeCode.Int64:
- return DType.Int64;
- case TypeCode.UInt64:
- return DType.UInt64;
- case TypeCode.Single:
- return DType.Single;
- case TypeCode.Double:
- return DType.Double;
- case TypeCode.Decimal:
- return DType.Invalid;
- case TypeCode.DateTime:
- return DType.Invalid;
- case TypeCode.String:
- return DType.String;
- default:
- return DType.Invalid;
- }
- }
-
- //FIXME: this method is bad, get rid of it
- internal static DType TypeToDType (Type type)
- {
- if (type == typeof (void))
- return DType.Invalid;
-
- if (type == typeof (string))
- return DType.String;
-
- if (type == typeof (ObjectPath))
- return DType.ObjectPath;
-
- if (type == typeof (Signature))
- return DType.Signature;
-
- if (type == typeof (object))
- return DType.Variant;
-
- if (type.IsPrimitive)
- return TypeCodeToDType (Type.GetTypeCode (type));
-
- if (type.IsEnum)
- return TypeToDType (Enum.GetUnderlyingType (type));
-
- //needs work
- if (type.IsArray)
- return DType.Array;
-
- //if (type.UnderlyingSystemType != null)
- // return TypeToDType (type.UnderlyingSystemType);
- if (Mapper.IsPublic (type))
- return DType.ObjectPath;
-
- if (!type.IsPrimitive && !type.IsEnum)
- return DType.Struct;
-
- //TODO: maybe throw an exception here
- return DType.Invalid;
- }
-
- /*
- public static DType TypeToDType (Type type)
- {
- if (type == null)
- return DType.Invalid;
- else if (type == typeof (byte))
- return DType.Byte;
- else if (type == typeof (bool))
- return DType.Boolean;
- else if (type == typeof (short))
- return DType.Int16;
- else if (type == typeof (ushort))
- return DType.UInt16;
- else if (type == typeof (int))
- return DType.Int32;
- else if (type == typeof (uint))
- return DType.UInt32;
- else if (type == typeof (long))
- return DType.Int64;
- else if (type == typeof (ulong))
- return DType.UInt64;
- else if (type == typeof (float)) //not supported by libdbus at time of writing
- return DType.Single;
- else if (type == typeof (double))
- return DType.Double;
- else if (type == typeof (string))
- return DType.String;
- else if (type == typeof (ObjectPath))
- return DType.ObjectPath;
- else if (type == typeof (Signature))
- return DType.Signature;
- else
- return DType.Invalid;
- }
- */
-
- public Type ToType (ref int pos)
- {
- DType dtype = (DType)data[pos++];
-
- switch (dtype) {
- case DType.Invalid:
- return typeof (void);
- case DType.Byte:
- return typeof (byte);
- case DType.Boolean:
- return typeof (bool);
- case DType.Int16:
- return typeof (short);
- case DType.UInt16:
- return typeof (ushort);
- case DType.Int32:
- return typeof (int);
- case DType.UInt32:
- return typeof (uint);
- case DType.Int64:
- return typeof (long);
- case DType.UInt64:
- return typeof (ulong);
- case DType.Single: ////not supported by libdbus at time of writing
- return typeof (float);
- case DType.Double:
- return typeof (double);
- case DType.String:
- return typeof (string);
- case DType.ObjectPath:
- return typeof (ObjectPath);
- case DType.Signature:
- return typeof (Signature);
- case DType.Array:
- //peek to see if this is in fact a dictionary
- if ((DType)data[pos] == DType.DictEntryBegin) {
- //skip over the {
- pos++;
- Type keyType = ToType (ref pos);
- Type valueType = ToType (ref pos);
- //skip over the }
- pos++;
- //return typeof (IDictionary<,>).MakeGenericType (new Type[] {keyType, valueType});
- //workaround for Mono bug #81035 (memory leak)
- return Mapper.GetGenericType (typeof (IDictionary<,>), new Type[] {keyType, valueType});
- } else {
- return ToType (ref pos).MakeArrayType ();
- }
- case DType.Struct:
- return typeof (ValueType);
- case DType.DictEntry:
- return typeof (System.Collections.Generic.KeyValuePair<,>);
- case DType.Variant:
- return typeof (object);
- default:
- throw new NotSupportedException ("Parsing or converting this signature is not yet supported (signature was '" + this + "'), at DType." + dtype);
- }
- }
-
- public static Signature GetSig (object[] objs)
- {
- return GetSig (Type.GetTypeArray (objs));
- }
-
- public static Signature GetSig (Type[] types)
- {
- if (types == null)
- throw new ArgumentNullException ("types");
-
- Signature sig = Signature.Empty;
-
- foreach (Type type in types)
- sig += GetSig (type);
-
- return sig;
- }
-
- public static Signature GetSig (Type type)
- {
- if (type == null)
- throw new ArgumentNullException ("type");
-
- //this is inelegant, but works for now
- if (type == typeof (Signature))
- return new Signature (DType.Signature);
-
- if (type == typeof (ObjectPath))
- return new Signature (DType.ObjectPath);
-
- if (type == typeof (void))
- return Signature.Empty;
-
- if (type == typeof (string))
- return new Signature (DType.String);
-
- if (type == typeof (object))
- return new Signature (DType.Variant);
-
- if (type.IsArray)
- return GetSig (type.GetElementType ()).MakeArraySignature ();
-
- if (type.IsGenericType && (type.GetGenericTypeDefinition () == typeof (IDictionary<,>) || type.GetGenericTypeDefinition () == typeof (Dictionary<,>))) {
-
- Type[] genArgs = type.GetGenericArguments ();
- return Signature.MakeDict (GetSig (genArgs[0]), GetSig (genArgs[1]));
- }
-
- if (Mapper.IsPublic (type)) {
- return new Signature (DType.ObjectPath);
- }
-
- if (!type.IsPrimitive && !type.IsEnum) {
- Signature sig = Signature.Empty;
-
- foreach (FieldInfo fi in type.GetFields (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
- sig += GetSig (fi.FieldType);
-
- return Signature.MakeStruct (sig);
- }
-
- DType dtype = Signature.TypeToDType (type);
- return new Signature (dtype);
- }
- }
-
- enum ArgDirection
- {
- In,
- Out,
- }
-
- enum DType : byte
- {
- Invalid = (byte)'\0',
-
- Byte = (byte)'y',
- Boolean = (byte)'b',
- Int16 = (byte)'n',
- UInt16 = (byte)'q',
- Int32 = (byte)'i',
- UInt32 = (byte)'u',
- Int64 = (byte)'x',
- UInt64 = (byte)'t',
- Single = (byte)'f', //This is not yet supported!
- Double = (byte)'d',
- String = (byte)'s',
- ObjectPath = (byte)'o',
- Signature = (byte)'g',
-
- Array = (byte)'a',
- //TODO: remove Struct and DictEntry -- they are not relevant to wire protocol
- Struct = (byte)'r',
- DictEntry = (byte)'e',
- Variant = (byte)'v',
-
- StructBegin = (byte)'(',
- StructEnd = (byte)')',
- DictEntryBegin = (byte)'{',
- DictEntryEnd = (byte)'}',
- }
-}
diff --git a/lib/dbus-sharp/SocketTransport.cs b/lib/dbus-sharp/SocketTransport.cs
deleted file mode 100644
index 5389d2f..0000000
--- a/lib/dbus-sharp/SocketTransport.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-
-namespace NDesk.DBus.Transports
-{
- class SocketTransport : Transport
- {
- protected Socket socket;
-
- public override void Open (AddressEntry entry)
- {
- string host, portStr;
- int port;
-
- if (!entry.Properties.TryGetValue ("host", out host))
- throw new Exception ("No host specified");
-
- if (!entry.Properties.TryGetValue ("port", out portStr))
- throw new Exception ("No port specified");
-
- if (!Int32.TryParse (portStr, out port))
- throw new Exception ("Invalid port: \"" + port + "\"");
-
- Open (host, port);
- }
-
- public void Open (string host, int port)
- {
- //TODO: use Socket directly
- TcpClient client = new TcpClient (host, port);
- Stream = client.GetStream ();
- }
-
- public void Open (Socket socket)
- {
- this.socket = socket;
-
- socket.Blocking = true;
- SocketHandle = (long)socket.Handle;
- //Stream = new UnixStream ((int)socket.Handle);
- Stream = new NetworkStream (socket);
- }
-
- public override void WriteCred ()
- {
- Stream.WriteByte (0);
- }
-
- public override string AuthString ()
- {
- return String.Empty;
- }
- }
-}
diff --git a/lib/dbus-sharp/Transport.cs b/lib/dbus-sharp/Transport.cs
deleted file mode 100644
index b794dc2..0000000
--- a/lib/dbus-sharp/Transport.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.IO;
-
-namespace NDesk.DBus.Transports
-{
- abstract class Transport
- {
- public static Transport Create (AddressEntry entry)
- {
- switch (entry.Method) {
- case "tcp":
- {
- Transport transport = new SocketTransport ();
- transport.Open (entry);
- return transport;
- }
-#if !PORTABLE
- case "unix":
- {
- //Transport transport = new UnixMonoTransport ();
- Transport transport = new UnixNativeTransport ();
- transport.Open (entry);
- return transport;
- }
-#endif
- default:
- throw new NotSupportedException ("Transport method \"" + entry.Method + "\" not supported");
- }
- }
-
- protected Connection connection;
-
- public Connection Connection
- {
- get {
- return connection;
- } set {
- connection = value;
- }
- }
-
- //TODO: design this properly
-
- //this is just a temporary solution
- public Stream Stream;
- public long SocketHandle;
- public abstract void Open (AddressEntry entry);
- public abstract string AuthString ();
- public abstract void WriteCred ();
- }
-}
diff --git a/lib/dbus-sharp/TypeImplementer.cs b/lib/dbus-sharp/TypeImplementer.cs
deleted file mode 100644
index 37aa8bf..0000000
--- a/lib/dbus-sharp/TypeImplementer.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-// Copyright 2007 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Collections.Generic;
-
-namespace NDesk.DBus
-{
- static class TypeImplementer
- {
- static AssemblyBuilder asmB;
- static ModuleBuilder modB;
-
- static void InitHack ()
- {
- if (asmB != null)
- return;
-
- asmB = AppDomain.CurrentDomain.DefineDynamicAssembly (new AssemblyName ("NDesk.DBus.Proxies"), AssemblyBuilderAccess.Run);
- modB = asmB.DefineDynamicModule ("ProxyModule");
- }
-
- static Dictionary<Type,Type> map = new Dictionary<Type,Type> ();
-
- public static Type GetImplementation (Type declType)
- {
- Type retT;
-
- if (map.TryGetValue (declType, out retT))
- return retT;
-
- InitHack ();
-
- TypeBuilder typeB = modB.DefineType (declType.Name + "Proxy", TypeAttributes.Class | TypeAttributes.Public, typeof (BusObject));
-
- Implement (typeB, declType);
-
- foreach (Type iface in declType.GetInterfaces ())
- Implement (typeB, iface);
-
- retT = typeB.CreateType ();
- map[declType] = retT;
-
- return retT;
- }
-
- public static void Implement (TypeBuilder typeB, Type iface)
- {
- typeB.AddInterfaceImplementation (iface);
-
- foreach (MethodInfo declMethod in iface.GetMethods ()) {
-
- MethodBuilder method_builder = typeB.DefineMethod (declMethod.Name, MethodAttributes.Public | MethodAttributes.Virtual, declMethod.ReturnType, Mapper.GetTypes (ArgDirection.In, declMethod.GetParameters ()));
- ILGenerator ilg = method_builder.GetILGenerator ();
-
- //Mapper.GetTypes (ArgDirection.In, declMethod.GetParameters ())
-
- ParameterInfo[] delegateParms = declMethod.GetParameters ();
- Type[] hookupParms = new Type[delegateParms.Length+1];
- hookupParms[0] = typeof (BusObject);
- for (int i = 0; i < delegateParms.Length ; i++)
- hookupParms[i+1] = delegateParms[i].ParameterType;
-
- GenHookupMethod (ilg, declMethod, sendMethodCallMethod, Mapper.GetInterfaceName (iface), declMethod.Name, hookupParms);
-
- typeB.DefineMethodOverride (method_builder, declMethod);
- }
- }
-
- static MethodInfo sendMethodCallMethod = typeof (BusObject).GetMethod ("SendMethodCall");
- static MethodInfo sendSignalMethod = typeof (BusObject).GetMethod ("SendSignal");
- static MethodInfo toggleSignalMethod = typeof (BusObject).GetMethod ("ToggleSignal");
-
- static Dictionary<EventInfo,DynamicMethod> hookup_methods = new Dictionary<EventInfo,DynamicMethod> ();
- public static DynamicMethod GetHookupMethod (EventInfo ei)
- {
- DynamicMethod hookupMethod;
- if (hookup_methods.TryGetValue (ei, out hookupMethod))
- return hookupMethod;
-
- if (ei.EventHandlerType.IsAssignableFrom (typeof (System.EventHandler)))
- Console.Error.WriteLine ("Warning: Cannot yet fully expose EventHandler and its subclasses: " + ei.EventHandlerType);
-
- MethodInfo declMethod = ei.EventHandlerType.GetMethod ("Invoke");
-
- hookupMethod = GetHookupMethod (declMethod, sendSignalMethod, Mapper.GetInterfaceName (ei), ei.Name);
-
- hookup_methods[ei] = hookupMethod;
-
- return hookupMethod;
- }
-
- public static DynamicMethod GetHookupMethod (MethodInfo declMethod, MethodInfo invokeMethod, string @interface, string member)
- {
- ParameterInfo[] delegateParms = declMethod.GetParameters ();
- Type[] hookupParms = new Type[delegateParms.Length+1];
- hookupParms[0] = typeof (BusObject);
- for (int i = 0; i < delegateParms.Length ; i++)
- hookupParms[i+1] = delegateParms[i].ParameterType;
-
- DynamicMethod hookupMethod = new DynamicMethod ("Handle" + member, declMethod.ReturnType, hookupParms, typeof (MessageWriter));
-
- ILGenerator ilg = hookupMethod.GetILGenerator ();
-
- GenHookupMethod (ilg, declMethod, invokeMethod, @interface, member, hookupParms);
-
- return hookupMethod;
- }
-
- //static MethodInfo getMethodFromHandleMethod = typeof (MethodBase).GetMethod ("GetMethodFromHandle", new Type[] {typeof (RuntimeMethodHandle)});
- static MethodInfo getTypeFromHandleMethod = typeof (Type).GetMethod ("GetTypeFromHandle", new Type[] {typeof (RuntimeTypeHandle)});
- static ConstructorInfo argumentNullExceptionConstructor = typeof (ArgumentNullException).GetConstructor (new Type[] {typeof (string)});
- static ConstructorInfo messageWriterConstructor = typeof (MessageWriter).GetConstructor (Type.EmptyTypes);
- static MethodInfo messageWriterWriteMethod = typeof (MessageWriter).GetMethod ("WriteComplex", new Type[] {typeof (object), typeof (Type)});
- static MethodInfo messageWriterWritePad = typeof (MessageWriter).GetMethod ("WritePad", new Type[] {typeof (int)});
-
- static Dictionary<Type,MethodInfo> writeMethods = new Dictionary<Type,MethodInfo> ();
-
- public static MethodInfo GetWriteMethod (Type t)
- {
- MethodInfo meth;
-
- if (writeMethods.TryGetValue (t, out meth))
- return meth;
-
- /*
- Type tUnder = t;
- if (t.IsEnum)
- tUnder = Enum.GetUnderlyingType (t);
-
- meth = typeof (MessageWriter).GetMethod ("Write", BindingFlags.ExactBinding | BindingFlags.Instance | BindingFlags.Public, null, new Type[] {tUnder}, null);
- if (meth != null) {
- writeMethods[t] = meth;
- return meth;
- }
- */
-
- DynamicMethod method_builder = new DynamicMethod ("Write" + t.Name, typeof (void), new Type[] {typeof (MessageWriter), t}, typeof (MessageWriter));
- ILGenerator ilg = method_builder.GetILGenerator ();
-
- ilg.Emit (OpCodes.Ldarg_0);
- ilg.Emit (OpCodes.Ldarg_1);
-
- GenMarshalWrite (ilg, t);
-
- ilg.Emit (OpCodes.Ret);
-
- meth = method_builder;
-
- writeMethods[t] = meth;
- return meth;
- }
-
- //takes the Writer instance and the value of Type t off the stack, writes it
- public static void GenWriter (ILGenerator ilg, Type t)
- {
- Type tUnder = t;
- //bool imprecise = false;
-
- if (t.IsEnum) {
- tUnder = Enum.GetUnderlyingType (t);
- //imprecise = true;
- }
-
- //MethodInfo exactWriteMethod = typeof (MessageWriter).GetMethod ("Write", new Type[] {tUnder});
- MethodInfo exactWriteMethod = typeof (MessageWriter).GetMethod ("Write", BindingFlags.ExactBinding | BindingFlags.Instance | BindingFlags.Public, null, new Type[] {tUnder}, null);
- //ExactBinding InvokeMethod
-
- if (exactWriteMethod != null) {
- //if (imprecise)
- // ilg.Emit (OpCodes.Castclass, tUnder);
-
- ilg.Emit (exactWriteMethod.IsFinal ? OpCodes.Call : OpCodes.Callvirt, exactWriteMethod);
- } else {
- //..boxed if necessary
- if (t.IsValueType)
- ilg.Emit (OpCodes.Box, t);
-
- //the Type parameter
- ilg.Emit (OpCodes.Ldtoken, t);
- ilg.Emit (OpCodes.Call, getTypeFromHandleMethod);
-
- ilg.Emit (messageWriterWriteMethod.IsFinal ? OpCodes.Call : OpCodes.Callvirt, messageWriterWriteMethod);
- }
- }
-
- //takes a writer and a reference to an object off the stack
- public static void GenMarshalWrite (ILGenerator ilg, Type type)
- {
- LocalBuilder val = ilg.DeclareLocal (type);
- ilg.Emit (OpCodes.Stloc, val);
-
- LocalBuilder writer = ilg.DeclareLocal (typeof (MessageWriter));
- ilg.Emit (OpCodes.Stloc, writer);
-
- FieldInfo[] fis = type.GetFields (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-
- //align to 8 for structs
- ilg.Emit (OpCodes.Ldloc, writer);
- ilg.Emit (OpCodes.Ldc_I4, 8);
- ilg.Emit (messageWriterWritePad.IsFinal ? OpCodes.Call : OpCodes.Callvirt, messageWriterWritePad);
-
- foreach (FieldInfo fi in fis) {
- Type t = fi.FieldType;
-
- //the Writer to write to
- ilg.Emit (OpCodes.Ldloc, writer);
-
- //the object parameter
- ilg.Emit (OpCodes.Ldloc, val);
- ilg.Emit (OpCodes.Ldfld, fi);
-
- GenWriter (ilg, t);
- }
- }
-
- public static void GenHookupMethod (ILGenerator ilg, MethodInfo declMethod, MethodInfo invokeMethod, string @interface, string member, Type[] hookupParms)
- {
- Type retType = declMethod.ReturnType;
-
- //the BusObject instance
- ilg.Emit (OpCodes.Ldarg_0);
-
- //MethodInfo
- /*
- ilg.Emit (OpCodes.Ldtoken, declMethod);
- ilg.Emit (OpCodes.Call, getMethodFromHandleMethod);
- */
-
- //interface
- ilg.Emit (OpCodes.Ldstr, @interface);
-
- //special case event add/remove methods
- if (declMethod.IsSpecialName && (declMethod.Name.StartsWith ("add_") || declMethod.Name.StartsWith ("remove_"))) {
- string[] parts = declMethod.Name.Split (new char[]{'_'}, 2);
- string ename = parts[1];
- //Delegate dlg = (Delegate)inArgs[0];
- bool adding = parts[0] == "add";
-
- ilg.Emit (OpCodes.Ldstr, ename);
-
- ilg.Emit (OpCodes.Ldarg_1);
-
- ilg.Emit (OpCodes.Ldc_I4, adding ? 1 : 0);
-
- ilg.Emit (OpCodes.Tailcall);
- ilg.Emit (toggleSignalMethod.IsFinal ? OpCodes.Call : OpCodes.Callvirt, toggleSignalMethod);
- ilg.Emit (OpCodes.Ret);
- return;
- }
-
- //property accessor mapping
- if (declMethod.IsSpecialName) {
- if (member.StartsWith ("get_"))
- member = "Get" + member.Substring (4);
- else if (member.StartsWith ("set_"))
- member = "Set" + member.Substring (4);
- }
-
- //member
- ilg.Emit (OpCodes.Ldstr, member);
-
- //signature
- Signature inSig = Signature.Empty;
- if (!declMethod.IsSpecialName)
- for (int i = 1 ; i < hookupParms.Length ; i++)
- {
- inSig += Signature.GetSig (hookupParms[i]);
- }
-
- ilg.Emit (OpCodes.Ldstr, inSig.Value);
-
- LocalBuilder writer = ilg.DeclareLocal (typeof (MessageWriter));
- ilg.Emit (OpCodes.Newobj, messageWriterConstructor);
- ilg.Emit (OpCodes.Stloc, writer);
-
- //offset by one because arg0 is the instance of the delegate
- for (int i = 1 ; i < hookupParms.Length ; i++)
- {
- Type t = hookupParms[i];
-
- //null checking of parameters (but not their recursive contents)
- if (!t.IsValueType) {
- Label notNull = ilg.DefineLabel ();
-
- //if the value is null...
- ilg.Emit (OpCodes.Ldarg, i);
- ilg.Emit (OpCodes.Brtrue_S, notNull);
-
- //...throw Exception
- //TODO: use proper parameter names
- string paramName = "arg" + (i-1);
- ilg.Emit (OpCodes.Ldstr, paramName);
- ilg.Emit (OpCodes.Newobj, argumentNullExceptionConstructor);
- ilg.Emit (OpCodes.Throw);
-
- //was not null, so all is well
- ilg.MarkLabel (notNull);
- }
-
- ilg.Emit (OpCodes.Ldloc, writer);
-
- //the parameter
- ilg.Emit (OpCodes.Ldarg, i);
-
- GenWriter (ilg, t);
- }
-
- ilg.Emit (OpCodes.Ldloc, writer);
-
- //the expected return Type
- ilg.Emit (OpCodes.Ldtoken, retType);
- ilg.Emit (OpCodes.Call, getTypeFromHandleMethod);
-
- LocalBuilder exc = ilg.DeclareLocal (typeof (Exception));
- ilg.Emit (OpCodes.Ldloca_S, exc);
-
- //make the call
- ilg.Emit (invokeMethod.IsFinal ? OpCodes.Call : OpCodes.Callvirt, invokeMethod);
-
- //define a label we'll use to deal with a non-null Exception
- Label noErr = ilg.DefineLabel ();
-
- //if the out Exception is not null...
- ilg.Emit (OpCodes.Ldloc, exc);
- ilg.Emit (OpCodes.Brfalse_S, noErr);
-
- //...throw it.
- ilg.Emit (OpCodes.Ldloc, exc);
- ilg.Emit (OpCodes.Throw);
-
- //Exception was null, so all is well
- ilg.MarkLabel (noErr);
-
- if (retType == typeof (void)) {
- //we aren't expecting a return value, so throw away the (hopefully) null return
- if (invokeMethod.ReturnType != typeof (void))
- ilg.Emit (OpCodes.Pop);
- } else {
- if (retType.IsValueType)
- ilg.Emit (OpCodes.Unbox_Any, retType);
- else
- ilg.Emit (OpCodes.Castclass, retType);
- }
-
- ilg.Emit (OpCodes.Ret);
- }
- }
-}
diff --git a/lib/dbus-sharp/UnixNativeTransport.cs b/lib/dbus-sharp/UnixNativeTransport.cs
deleted file mode 100644
index e57fab2..0000000
--- a/lib/dbus-sharp/UnixNativeTransport.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-//We send BSD-style credentials on all platforms
-//Doesn't seem to break Linux (but is redundant there)
-//This may turn out to be a bad idea
-#define HAVE_CMSGCRED
-
-using System;
-using System.IO;
-using System.Text;
-
-using System.Runtime.InteropServices;
-
-using Mono.Unix;
-using Mono.Unix.Native;
-
-namespace NDesk.DBus.Transports
-{
- class UnixSocket
- {
- public const short AF_UNIX = 1;
- //TODO: SOCK_STREAM is 2 on Solaris
- public const short SOCK_STREAM = 1;
-
- //TODO: some of these are provided by libsocket instead of libc on Solaris
-
- [DllImport ("libc", SetLastError=true)]
- protected static extern int socket (int domain, int type, int protocol);
-
- [DllImport ("libc", SetLastError=true)]
- protected static extern int connect (int sockfd, byte[] serv_addr, uint addrlen);
-
- [DllImport ("libc", SetLastError=true)]
- protected static extern int bind (int sockfd, byte[] my_addr, uint addrlen);
-
- [DllImport ("libc", SetLastError=true)]
- protected static extern int listen (int sockfd, int backlog);
-
- //TODO: this prototype is probably wrong, fix it
- [DllImport ("libc", SetLastError=true)]
- protected static extern int accept (int sockfd, byte[] addr, ref uint addrlen);
-
- //TODO: confirm and make use of these functions
- [DllImport ("libc", SetLastError=true)]
- protected static extern int getsockopt (int s, int optname, IntPtr optval, ref uint optlen);
-
- [DllImport ("libc", SetLastError=true)]
- protected static extern int setsockopt (int s, int optname, IntPtr optval, uint optlen);
-
- [DllImport ("libc", SetLastError=true)]
- public static extern int recvmsg (int s, IntPtr msg, int flags);
-
- [DllImport ("libc", SetLastError=true)]
- public static extern int sendmsg (int s, IntPtr msg, int flags);
-
- public int Handle;
-
- public UnixSocket (int handle)
- {
- this.Handle = handle;
- }
-
- public UnixSocket ()
- {
- //TODO: don't hard-code PF_UNIX and SOCK_STREAM or SocketType.Stream
- //AddressFamily family, SocketType type, ProtocolType proto
-
- int r = socket (AF_UNIX, SOCK_STREAM, 0);
- //we should get the Exception from UnixMarshal and throw it here for a better stack trace, but the relevant API seems to be private
- UnixMarshal.ThrowExceptionForLastErrorIf (r);
- Handle = r;
- }
-
- protected bool connected = false;
-
- //TODO: consider memory management
- public void Connect (byte[] remote_end)
- {
- int r = connect (Handle, remote_end, (uint)remote_end.Length);
- //we should get the Exception from UnixMarshal and throw it here for a better stack trace, but the relevant API seems to be private
- UnixMarshal.ThrowExceptionForLastErrorIf (r);
- connected = true;
- }
-
- //assigns a name to the socket
- public void Bind (byte[] local_end)
- {
- int r = bind (Handle, local_end, (uint)local_end.Length);
- UnixMarshal.ThrowExceptionForLastErrorIf (r);
- }
-
- public void Listen (int backlog)
- {
- int r = listen (Handle, backlog);
- UnixMarshal.ThrowExceptionForLastErrorIf (r);
- }
-
- public UnixSocket Accept ()
- {
- byte[] addr = new byte[110];
- uint addrlen = (uint)addr.Length;
-
- int r = accept (Handle, addr, ref addrlen);
- UnixMarshal.ThrowExceptionForLastErrorIf (r);
- //TODO: use the returned addr
- //TODO: fix probable memory leak here
- //string str = Encoding.Default.GetString (addr, 0, (int)addrlen);
- return new UnixSocket (r);
- }
- }
-
- struct IOVector
- {
- public IntPtr Base;
- public int Length;
- }
-
- class UnixNativeTransport : UnixTransport
- {
- protected UnixSocket socket;
-
- public override void Open (string path, bool @abstract)
- {
- if (String.IsNullOrEmpty (path))
- throw new ArgumentException ("path");
-
- if (@abstract)
- socket = OpenAbstractUnix (path);
- else
- socket = OpenUnix (path);
-
- //socket.Blocking = true;
- SocketHandle = (long)socket.Handle;
- Stream = new UnixStream ((int)socket.Handle);
- }
-
- //send peer credentials null byte
- //different platforms do this in different ways
-#if HAVE_CMSGCRED
- unsafe void WriteBsdCred ()
- {
- //null credentials byte
- byte buf = 0;
-
- IOVector iov = new IOVector ();
- iov.Base = (IntPtr)(&buf);
- iov.Length = 1;
-
- msghdr msg = new msghdr ();
- msg.msg_iov = &iov;
- msg.msg_iovlen = 1;
-
- cmsg cm = new cmsg ();
- msg.msg_control = (IntPtr)(&cm);
- msg.msg_controllen = (uint)sizeof (cmsg);
- cm.hdr.cmsg_len = (uint)sizeof (cmsg);
- cm.hdr.cmsg_level = 0xffff; //SOL_SOCKET
- cm.hdr.cmsg_type = 0x03; //SCM_CREDS
-
- int written = UnixSocket.sendmsg (socket.Handle, (IntPtr)(&msg), 0);
- UnixMarshal.ThrowExceptionForLastErrorIf (written);
- if (written != 1)
- throw new Exception ("Failed to write credentials");
- }
-#endif
-
- public override void WriteCred ()
- {
-#if HAVE_CMSGCRED
- try {
- WriteBsdCred ();
- } catch {
- if (Protocol.Verbose)
- Console.Error.WriteLine ("Warning: WriteBsdCred() failed; falling back to ordinary WriteCred()");
- //null credentials byte
- byte buf = 0;
- Stream.WriteByte (buf);
- }
-#else
- //null credentials byte
- byte buf = 0;
- Stream.WriteByte (buf);
-#endif
- }
-
- protected UnixSocket OpenAbstractUnix (string path)
- {
- byte[] p = Encoding.Default.GetBytes (path);
-
- byte[] sa = new byte[2 + 1 + p.Length];
-
- //we use BitConverter to stay endian-safe
- byte[] afData = BitConverter.GetBytes (UnixSocket.AF_UNIX);
- sa[0] = afData[0];
- sa[1] = afData[1];
-
- sa[2] = 0; //null prefix for abstract domain socket addresses, see unix(7)
- for (int i = 0 ; i != p.Length ; i++)
- sa[3 + i] = p[i];
-
- UnixSocket client = new UnixSocket ();
- client.Connect (sa);
-
- return client;
- }
-
- public UnixSocket OpenUnix (string path)
- {
- byte[] p = Encoding.Default.GetBytes (path);
-
- byte[] sa = new byte[2 + p.Length + 1];
-
- //we use BitConverter to stay endian-safe
- byte[] afData = BitConverter.GetBytes (UnixSocket.AF_UNIX);
- sa[0] = afData[0];
- sa[1] = afData[1];
-
- for (int i = 0 ; i != p.Length ; i++)
- sa[2 + i] = p[i];
- sa[2 + p.Length] = 0; //null suffix for domain socket addresses, see unix(7)
-
- UnixSocket client = new UnixSocket ();
- client.Connect (sa);
-
- return client;
- }
- }
-
-#if HAVE_CMSGCRED
- /*
- public struct msg
- {
- public IntPtr msg_next;
- public long msg_type;
- public ushort msg_ts;
- short msg_spot;
- IntPtr label;
- }
- */
-
- unsafe struct msghdr
- {
- public IntPtr msg_name; //optional address
- public uint msg_namelen; //size of address
- public IOVector *msg_iov; //scatter/gather array
- public int msg_iovlen; //# elements in msg_iov
- public IntPtr msg_control; //ancillary data, see below
- public uint msg_controllen; //ancillary data buffer len
- public int msg_flags; //flags on received message
- }
-
- struct cmsghdr
- {
- public uint cmsg_len; //data byte count, including header
- public int cmsg_level; //originating protocol
- public int cmsg_type; //protocol-specific type
- }
-
- unsafe struct cmsgcred
- {
- public int cmcred_pid; //PID of sending process
- public uint cmcred_uid; //real UID of sending process
- public uint cmcred_euid; //effective UID of sending process
- public uint cmcred_gid; //real GID of sending process
- public short cmcred_ngroups; //number or groups
- public fixed uint cmcred_groups[16]; //groups, CMGROUP_MAX
- }
-
- struct cmsg
- {
- public cmsghdr hdr;
- public cmsgcred cred;
- }
-#endif
-}
diff --git a/lib/dbus-sharp/UnixTransport.cs b/lib/dbus-sharp/UnixTransport.cs
deleted file mode 100644
index 4ad4073..0000000
--- a/lib/dbus-sharp/UnixTransport.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.IO;
-using Mono.Unix;
-
-namespace NDesk.DBus.Transports
-{
- abstract class UnixTransport : Transport
- {
- public override void Open (AddressEntry entry)
- {
- string path;
- bool abstr;
-
- if (entry.Properties.TryGetValue ("path", out path))
- abstr = false;
- else if (entry.Properties.TryGetValue ("abstract", out path))
- abstr = true;
- else
- throw new Exception ("No path specified for UNIX transport");
-
- Open (path, abstr);
- }
-
- public override string AuthString ()
- {
- long uid = UnixUserInfo.GetRealUserId ();
-
- return uid.ToString ();
- }
-
- public abstract void Open (string path, bool @abstract);
- }
-}
diff --git a/lib/dbus-sharp/Wrapper.cs b/lib/dbus-sharp/Wrapper.cs
deleted file mode 100644
index 6ba9393..0000000
--- a/lib/dbus-sharp/Wrapper.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace NDesk.DBus
-{
- //TODO: complete and use these wrapper classes
- //not sure exactly what I'm thinking but there seems to be sense here
-
- //FIXME: signature sending/receiving is currently ambiguous in this code
- //FIXME: in fact, these classes are totally broken and end up doing no-op, do not use without understanding the problem
- class MethodCall
- {
- public Message message = new Message ();
-
- public MethodCall (ObjectPath path, string @interface, string member, string destination, Signature signature)
- {
- message.Header.MessageType = MessageType.MethodCall;
- message.ReplyExpected = true;
- message.Header.Fields[FieldCode.Path] = path;
- if (@interface != null)
- message.Header.Fields[FieldCode.Interface] = @interface;
- message.Header.Fields[FieldCode.Member] = member;
- message.Header.Fields[FieldCode.Destination] = destination;
- //TODO: consider setting Sender here for p2p situations
- //this will allow us to remove the p2p hacks in MethodCall and Message
-#if PROTO_REPLY_SIGNATURE
- //TODO
-#endif
- //message.Header.Fields[FieldCode.Signature] = signature;
- //use the wrapper in Message because it checks for emptiness
- message.Signature = signature;
- }
-
- public MethodCall (Message message)
- {
- this.message = message;
- Path = (ObjectPath)message.Header.Fields[FieldCode.Path];
- if (message.Header.Fields.ContainsKey (FieldCode.Interface))
- Interface = (string)message.Header.Fields[FieldCode.Interface];
- Member = (string)message.Header.Fields[FieldCode.Member];
- Destination = (string)message.Header.Fields[FieldCode.Destination];
- //TODO: filled by the bus so reliable, but not the case for p2p
- //so we make it optional here, but this needs some more thought
- if (message.Header.Fields.ContainsKey (FieldCode.Sender))
- Sender = (string)message.Header.Fields[FieldCode.Sender];
-#if PROTO_REPLY_SIGNATURE
- //TODO: note that an empty ReplySignature should really be treated differently to the field not existing!
- if (message.Header.Fields.ContainsKey (FieldCode.ReplySignature))
- ReplySignature = (Signature)message.Header.Fields[FieldCode.ReplySignature];
- else
- ReplySignature = Signature.Empty;
-#endif
- //Signature = (Signature)message.Header.Fields[FieldCode.Signature];
- //use the wrapper in Message because it checks for emptiness
- Signature = message.Signature;
- }
-
- public ObjectPath Path;
- public string Interface;
- public string Member;
- public string Destination;
- public string Sender;
-#if PROTO_REPLY_SIGNATURE
- public Signature ReplySignature;
-#endif
- public Signature Signature;
- }
-
- class MethodReturn
- {
- public Message message = new Message ();
-
- public MethodReturn (uint reply_serial)
- {
- message.Header.MessageType = MessageType.MethodReturn;
- message.Header.Flags = HeaderFlag.NoReplyExpected | HeaderFlag.NoAutoStart;
- message.Header.Fields[FieldCode.ReplySerial] = reply_serial;
- //signature optional?
- //message.Header.Fields[FieldCode.Signature] = signature;
- }
-
- public MethodReturn (Message message)
- {
- this.message = message;
- ReplySerial = (uint)message.Header.Fields[FieldCode.ReplySerial];
- }
-
- public uint ReplySerial;
- }
-
- class Error
- {
- public Message message = new Message ();
-
- public Error (string error_name, uint reply_serial)
- {
- message.Header.MessageType = MessageType.Error;
- message.Header.Flags = HeaderFlag.NoReplyExpected | HeaderFlag.NoAutoStart;
- message.Header.Fields[FieldCode.ErrorName] = error_name;
- message.Header.Fields[FieldCode.ReplySerial] = reply_serial;
- }
-
- public Error (Message message)
- {
- this.message = message;
- ErrorName = (string)message.Header.Fields[FieldCode.ErrorName];
- ReplySerial = (uint)message.Header.Fields[FieldCode.ReplySerial];
- //Signature = (Signature)message.Header.Fields[FieldCode.Signature];
- }
-
- public string ErrorName;
- public uint ReplySerial;
- //public Signature Signature;
- }
-
- class Signal
- {
- public Message message = new Message ();
-
- public Signal (ObjectPath path, string @interface, string member)
- {
- message.Header.MessageType = MessageType.Signal;
- message.Header.Flags = HeaderFlag.NoReplyExpected | HeaderFlag.NoAutoStart;
- message.Header.Fields[FieldCode.Path] = path;
- message.Header.Fields[FieldCode.Interface] = @interface;
- message.Header.Fields[FieldCode.Member] = member;
- }
-
- public Signal (Message message)
- {
- this.message = message;
- Path = (ObjectPath)message.Header.Fields[FieldCode.Path];
- Interface = (string)message.Header.Fields[FieldCode.Interface];
- Member = (string)message.Header.Fields[FieldCode.Member];
- if (message.Header.Fields.ContainsKey (FieldCode.Sender))
- Sender = (string)message.Header.Fields[FieldCode.Sender];
- }
-
- public ObjectPath Path;
- public string Interface;
- public string Member;
- public string Sender;
- }
-}
diff --git a/lib/dpap-sharp/DPAPBrowser/Makefile.am b/lib/dpap-sharp/DPAPBrowser/Makefile.am
index 1126e6f..3c6b424 100644
--- a/lib/dpap-sharp/DPAPBrowser/Makefile.am
+++ b/lib/dpap-sharp/DPAPBrowser/Makefile.am
@@ -8,7 +8,6 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
PLUGIN_SOURCES = \
$(srcdir)/DPAPBrowser.cs
-# $(srcdir)/BeagleNotifier.cs
REFS = \
@@ -17,7 +16,6 @@ REFS = \
-r:../../src/FSpot.Widgets.dll \
-r:../../src/FSpot.Utils.dll \
-r:../lib/dpap-sharp.dll
-# $(LINK_BEAGLE)
PKGS = \
-pkg:gtk-sharp-2.0
diff --git a/lib/dpap-sharp/DPAPBrowser/Makefile.in b/lib/dpap-sharp/DPAPBrowser/Makefile.in
index d3b415b..92543dd 100644
--- a/lib/dpap-sharp/DPAPBrowser/Makefile.in
+++ b/lib/dpap-sharp/DPAPBrowser/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/dpap-sharp/DPAPBrowser
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -303,7 +313,6 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
PLUGIN_SOURCES = \
$(srcdir)/DPAPBrowser.cs
-# $(srcdir)/BeagleNotifier.cs
REFS = \
-r:../../src/f-spot.exe \
-r:../../src/FSpot.Core.dll \
@@ -311,7 +320,6 @@ REFS = \
-r:../../src/FSpot.Utils.dll \
-r:../lib/dpap-sharp.dll
-# $(LINK_BEAGLE)
PKGS = \
-pkg:gtk-sharp-2.0
@@ -343,9 +351,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dpap-sharp/DPAPBrowser/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dpap-sharp/DPAPBrowser/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dpap-sharp/DPAPBrowser/Makefile
+ $(AUTOMAKE) --foreign lib/dpap-sharp/DPAPBrowser/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/dpap-sharp/DPAPService/DPAPService.cs b/lib/dpap-sharp/DPAPService/DPAPService.cs
index 56e5b5f..8d04893 100644
--- a/lib/dpap-sharp/DPAPService/DPAPService.cs
+++ b/lib/dpap-sharp/DPAPService/DPAPService.cs
@@ -42,14 +42,6 @@ namespace DPAP {
uint timer = Log.InformationTimerStart ("Starting DPAP");
StartServer ();
-
- /* try {
- Core.Database.Photos.ItemsChanged += HandleDbItemsChanged;
- } catch {
- Log.Warning ("unable to hook the BeagleNotifier. are you running --view mode?");
- }*/
- // Log.DebugTimerPrint (timer, "BeagleService startup took {0}");
-
return true;
}
private void StartServer ()
@@ -133,7 +125,6 @@ namespace DPAP {
//locator.Removed -= OnServiceRemoved;
sd = null;
}
- //Log.DebugTimerPrint (timer, "BeagleService shutdown took {0}");
return true;
}
@@ -169,20 +160,5 @@ namespace DPAP {
//client.Logout ();
// Console.WriteLine ("Press <enter> to exit...");
}
-
- /*private void HandleDbItemsChanged (object sender, DbItemEventArgs args)
- {
-#if ENABLE_BEAGLE
- Log.Debug ("Notifying beagle");
- foreach (DbItem item in args.Items) {
- if (item as Photo != null)
- try {
- BeagleNotifier.SendUpdate (item as Photo);
- } catch (Exception e) {
- Log.Debug ("BeagleNotifier.SendUpdate failed with {0}", e.Message);
- }
- }
-#endif
- }*/
}
}
diff --git a/lib/dpap-sharp/DPAPService/Makefile.am b/lib/dpap-sharp/DPAPService/Makefile.am
index 5792034..12a0cf9 100644
--- a/lib/dpap-sharp/DPAPService/Makefile.am
+++ b/lib/dpap-sharp/DPAPService/Makefile.am
@@ -8,7 +8,6 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
PLUGIN_SOURCES = \
$(srcdir)/DPAPService.cs
-# $(srcdir)/BeagleNotifier.cs
REFS = \
@@ -17,7 +16,6 @@ REFS = \
-r:../../src/FSpot.Widgets.dll \
-r:../../src/FSpot.Utils.dll \
-r:../lib/dpap-sharp.dll
-# $(LINK_BEAGLE)
PKGS = \
-pkg:gnome-sharp-2.0 \
diff --git a/lib/dpap-sharp/DPAPService/Makefile.in b/lib/dpap-sharp/DPAPService/Makefile.in
index f9dbcc3..6383251 100644
--- a/lib/dpap-sharp/DPAPService/Makefile.in
+++ b/lib/dpap-sharp/DPAPService/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/dpap-sharp/DPAPService
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -303,7 +313,6 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
PLUGIN_SOURCES = \
$(srcdir)/DPAPService.cs
-# $(srcdir)/BeagleNotifier.cs
REFS = \
-r:../../src/f-spot.exe \
-r:../../src/FSpot.Core.dll \
@@ -311,7 +320,6 @@ REFS = \
-r:../../src/FSpot.Utils.dll \
-r:../lib/dpap-sharp.dll
-# $(LINK_BEAGLE)
PKGS = \
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0
@@ -344,9 +352,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dpap-sharp/DPAPService/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dpap-sharp/DPAPService/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dpap-sharp/DPAPService/Makefile
+ $(AUTOMAKE) --foreign lib/dpap-sharp/DPAPService/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/dpap-sharp/Makefile.in b/lib/dpap-sharp/Makefile.in
index 88cf617..637debe 100644
--- a/lib/dpap-sharp/Makefile.in
+++ b/lib/dpap-sharp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,11 +36,14 @@ host_triplet = @host@
subdir = lib/dpap-sharp
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -88,16 +91,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -114,8 +118,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -128,9 +131,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -179,16 +187,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -199,6 +209,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -209,21 +220,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -251,6 +266,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -275,6 +292,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -300,9 +318,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dpap-sharp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dpap-sharp/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dpap-sharp/Makefile
+ $(AUTOMAKE) --foreign lib/dpap-sharp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -335,7 +353,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -360,7 +378,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/lib/dpap-sharp/dpap-client/Makefile.in b/lib/dpap-sharp/dpap-client/Makefile.in
index f54bd94..301b7d3 100644
--- a/lib/dpap-sharp/dpap-client/Makefile.in
+++ b/lib/dpap-sharp/dpap-client/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/dpap-sharp/dpap-client
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -327,9 +337,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dpap-sharp/dpap-client/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dpap-sharp/dpap-client/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dpap-sharp/dpap-client/Makefile
+ $(AUTOMAKE) --foreign lib/dpap-sharp/dpap-client/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/dpap-sharp/dpap-server/Makefile.in b/lib/dpap-sharp/dpap-server/Makefile.in
index a7af04f..e1c8b75 100644
--- a/lib/dpap-sharp/dpap-server/Makefile.in
+++ b/lib/dpap-sharp/dpap-server/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/dpap-sharp/dpap-server
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -332,9 +342,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dpap-sharp/dpap-server/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dpap-sharp/dpap-server/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dpap-sharp/dpap-server/Makefile
+ $(AUTOMAKE) --foreign lib/dpap-sharp/dpap-server/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/dpap-sharp/lib/Makefile.in b/lib/dpap-sharp/lib/Makefile.in
index d634189..5a23266 100644
--- a/lib/dpap-sharp/lib/Makefile.in
+++ b/lib/dpap-sharp/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/dpap-sharp/lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -349,9 +359,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dpap-sharp/lib/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dpap-sharp/lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dpap-sharp/lib/Makefile
+ $(AUTOMAKE) --foreign lib/dpap-sharp/lib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/gio-sharp/Makefile.in b/lib/gio-sharp/Makefile.in
index 1d843ed..cabc019 100644
--- a/lib/gio-sharp/Makefile.in
+++ b/lib/gio-sharp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,11 +36,14 @@ host_triplet = @host@
subdir = lib/gio-sharp
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -88,16 +91,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -114,8 +118,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -128,9 +131,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -179,16 +187,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -199,6 +209,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -209,21 +220,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -251,6 +266,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -275,6 +292,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -297,9 +315,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gio-sharp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/gio-sharp/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/gio-sharp/Makefile
+ $(AUTOMAKE) --foreign lib/gio-sharp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -332,7 +350,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -357,7 +375,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/lib/gio-sharp/generator/Makefile.in b/lib/gio-sharp/generator/Makefile.in
index 52909bb..cf1f916 100644
--- a/lib/gio-sharp/generator/Makefile.in
+++ b/lib/gio-sharp/generator/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,11 +37,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/gio-sharp/generator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -49,16 +52,17 @@ SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -75,8 +79,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -89,9 +92,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -140,16 +148,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -160,6 +170,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -170,21 +181,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -212,6 +227,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -236,18 +253,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -257,17 +271,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -344,9 +354,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gio-sharp/generator/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/gio-sharp/generator/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/gio-sharp/generator/Makefile
+ $(AUTOMAKE) --foreign lib/gio-sharp/generator/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/gio-sharp/gio/Gio.metadata b/lib/gio-sharp/gio/Gio.metadata
index b1c2bd5..81716fc 100644
--- a/lib/gio-sharp/gio/Gio.metadata
+++ b/lib/gio-sharp/gio/Gio.metadata
@@ -31,6 +31,8 @@
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_set_attribute_int32']" name="name">SetAttributeInt</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_get_attribute_uint32']" name="name">GetAttributeUInt</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_set_attribute_uint32']" name="name">SetAttributeUInt</attr>
+ <attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_set_modification_time']" name="hidden">1</attr>
+ <attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_get_modification_time']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read']/parameters/parameter[@name='buffer']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read_all']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
diff --git a/lib/gio-sharp/gio/Makefile.am b/lib/gio-sharp/gio/Makefile.am
index d4bfccf..32c0293 100644
--- a/lib/gio-sharp/gio/Makefile.am
+++ b/lib/gio-sharp/gio/Makefile.am
@@ -12,7 +12,7 @@ CUSTOMS = \
$(srcdir)/AppInfoAdapter.custom \
$(srcdir)/FileAdapter.custom \
$(srcdir)/File.custom \
- $(srcdir)/FileEnumerator.custom
+ $(srcdir)/FileEnumerator.custom
SNK = $(srcdir)/snk
@@ -25,12 +25,12 @@ gio-api.xml: $(srcdir)/gio-api.raw $(srcdir)/Gio.metadata
@echo -e "\n*** Massaging the raw api into $@"
cp $(srcdir)/gio-api.raw gio-api.xml
chmod +w gio-api.xml
- gapi2-fixup --api=gio-api.xml --metadata=$(srcdir)/Gio.metadata
+ $(GAPI2FIXUP) --api=gio-api.xml --metadata=$(srcdir)/Gio.metadata
$(top_builddir)/gio-sharp/generator/gapi_codegen.exe:
$(MAKE) -C $(top_builddir)/lib/gio-sharp/generator
-generated/File.cs: gio-api.xml $(CUSTOMS) $(top_builddir)/gio-sharp/generator/gapi_codegen.exe
+generated/File.cs: gio-api.xml $(CUSTOMS) $(builddir)/../generator/gapi_codegen.exe
@echo -e "\n*** Generating C# code"
$(MONO) $(top_builddir)/lib/gio-sharp/generator/gapi_codegen.exe $(GLIBSHARP_CFLAGS) --outdir=generated --customdir=$(srcdir) --generate gio-api.xml
diff --git a/lib/gio-sharp/gio/Makefile.in b/lib/gio-sharp/gio/Makefile.in
index f1bf9eb..d50f8b1 100644
--- a/lib/gio-sharp/gio/Makefile.in
+++ b/lib/gio-sharp/gio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/gio-sharp/gio
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -308,7 +318,7 @@ CUSTOMS = \
$(srcdir)/AppInfoAdapter.custom \
$(srcdir)/FileAdapter.custom \
$(srcdir)/File.custom \
- $(srcdir)/FileEnumerator.custom
+ $(srcdir)/FileEnumerator.custom
SNK = $(srcdir)/snk
ASSEMBLIES = \
@@ -348,9 +358,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gio-sharp/gio/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/gio-sharp/gio/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/gio-sharp/gio/Makefile
+ $(AUTOMAKE) --foreign lib/gio-sharp/gio/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -553,12 +563,12 @@ gio-api.xml: $(srcdir)/gio-api.raw $(srcdir)/Gio.metadata
@echo -e "\n*** Massaging the raw api into $@"
cp $(srcdir)/gio-api.raw gio-api.xml
chmod +w gio-api.xml
- gapi2-fixup --api=gio-api.xml --metadata=$(srcdir)/Gio.metadata
+ $(GAPI2FIXUP) --api=gio-api.xml --metadata=$(srcdir)/Gio.metadata
$(top_builddir)/gio-sharp/generator/gapi_codegen.exe:
$(MAKE) -C $(top_builddir)/lib/gio-sharp/generator
-generated/File.cs: gio-api.xml $(CUSTOMS) $(top_builddir)/gio-sharp/generator/gapi_codegen.exe
+generated/File.cs: gio-api.xml $(CUSTOMS) $(builddir)/../generator/gapi_codegen.exe
@echo -e "\n*** Generating C# code"
$(MONO) $(top_builddir)/lib/gio-sharp/generator/gapi_codegen.exe $(GLIBSHARP_CFLAGS) --outdir=generated --customdir=$(srcdir) --generate gio-api.xml
diff --git a/lib/glitz-sharp/COPYING b/lib/glitz-sharp/COPYING
deleted file mode 100644
index baed05f..0000000
--- a/lib/glitz-sharp/COPYING
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright 2006 Alp Toker <alp at atoker.com>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/glitz-sharp/Makefile.am b/lib/glitz-sharp/Makefile.am
deleted file mode 100644
index 6278755..0000000
--- a/lib/glitz-sharp/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = src
-
-EXTRA_DIST = COPYING
diff --git a/lib/glitz-sharp/Makefile.in b/lib/glitz-sharp/Makefile.in
deleted file mode 100644
index 95c2bc1..0000000
--- a/lib/glitz-sharp/Makefile.in
+++ /dev/null
@@ -1,635 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lib/glitz-sharp
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = src
-EXTRA_DIST = COPYING
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/glitz-sharp/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/glitz-sharp/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/glitz-sharp/src/Buffer.cs b/lib/glitz-sharp/src/Buffer.cs
deleted file mode 100644
index 9b86669..0000000
--- a/lib/glitz-sharp/src/Buffer.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-
-namespace NDesk.Glitz
-{
- public class Buffer : IDisposable
- {
- public IntPtr Handle;
-
- public Buffer (Drawable drawable, IntPtr data, uint size, BufferHint hint)
- {
- Handle = GlitzAPI.glitz_buffer_create (drawable.Handle, data, size, hint);
- GlitzAPI.glitz_buffer_reference (Handle);
- }
-
- public Buffer (Drawable drawable, IntPtr data)
- {
- Handle = GlitzAPI.glitz_buffer_create_for_data (data);
- GlitzAPI.glitz_buffer_reference (Handle);
- }
-
- public IntPtr Map (BufferAccess access)
- {
- return GlitzAPI.glitz_buffer_map (Handle, access);
- }
-
- public Status Unmap (BufferAccess access)
- {
- return GlitzAPI.glitz_buffer_unmap (Handle);
- }
-
- ~Buffer ()
- {
- Dispose (false);
- }
-
- void IDisposable.Dispose ()
- {
- Dispose (true);
- GC.SuppressFinalize (this);
- }
-
- protected virtual void Dispose (bool disposing)
- {
- if (Handle == IntPtr.Zero)
- return;
-
- Console.WriteLine ("glitz_buffer_destroy");
- GlitzAPI.glitz_buffer_destroy (Handle);
- Handle = IntPtr.Zero;
- }
-
- public void Destroy()
- {
- Dispose (true);
- }
-
- /*
- public void Destroy ()
- {
- GlitzAPI.glitz_buffer_destroy (Handle);
- }
- */
- }
-}
diff --git a/lib/glitz-sharp/src/Context.cs b/lib/glitz-sharp/src/Context.cs
deleted file mode 100644
index 91f8849..0000000
--- a/lib/glitz-sharp/src/Context.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-
-namespace NDesk.Glitz
-{
- public class Context : IDisposable
- {
- public IntPtr Handle;
-
- public Context (Drawable drawable, IntPtr format)
- {
- Handle = GlitzAPI.glitz_context_create (drawable.Handle, format);
- GlitzAPI.glitz_context_reference (Handle);
- }
-
- public IntPtr GetProcAddress (string name)
- {
- return GlitzAPI.glitz_context_get_proc_address (Handle, name);
- }
-
- public void MakeCurrent (Drawable drawable)
- {
- GlitzAPI.glitz_context_make_current (Handle, drawable.Handle);
- }
-
- public void BindTexture (TextureObject texture)
- {
- GlitzAPI.glitz_context_bind_texture (Handle, texture.Handle);
- }
-
- public void DrawBuffers (DrawableBuffer[] buffers)
- {
- GlitzAPI.glitz_context_draw_buffers (Handle, buffers, buffers.Length);
- }
-
- public void ReadBuffer (DrawableBuffer buffer)
- {
- GlitzAPI.glitz_context_read_buffer (Handle, buffer);
- }
-
- ~Context ()
- {
- Dispose (false);
- }
-
- void IDisposable.Dispose ()
- {
- Dispose (true);
- GC.SuppressFinalize (this);
- }
-
- protected virtual void Dispose (bool disposing)
- {
- if (Handle == IntPtr.Zero)
- return;
-
- Console.WriteLine ("glitz_context_destroy");
- GlitzAPI.glitz_context_destroy (Handle);
- Handle = IntPtr.Zero;
- }
-
- public void Destroy()
- {
- Dispose (true);
- }
-
- /*
- public void Destroy ()
- {
- GlitzAPI.glitz_context_destroy (Handle);
- }
- */
- }
-}
diff --git a/lib/glitz-sharp/src/Drawable.cs b/lib/glitz-sharp/src/Drawable.cs
deleted file mode 100644
index 11d4dbb..0000000
--- a/lib/glitz-sharp/src/Drawable.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-
-namespace NDesk.Glitz
-{
- public class Drawable : IDisposable
- {
- public IntPtr Handle;
-
- public Drawable (IntPtr handle)
- {
- this.Handle = handle;
- GlitzAPI.glitz_drawable_reference (Handle);
- }
-
- public Drawable (Drawable other, ref DrawableFormat format, uint width, uint height)
- {
- this.Handle = GlitzAPI.glitz_create_drawable (other.Handle, ref format, width, height);
- GlitzAPI.glitz_drawable_reference (Handle);
- }
-
- public static Drawable CreatePbuffer (Drawable other, ref DrawableFormat format, uint width, uint height)
- {
- IntPtr Handle = GlitzAPI.glitz_create_pbuffer_drawable (other.Handle, ref format, width, height);
- return new Drawable (Handle);
- }
-
- public void UpdateSize (uint width, uint height)
- {
- GlitzAPI.glitz_drawable_update_size (Handle, width, height);
- }
-
- public void SwapBufferRegion (int x_origin, int y_origin, Box[] box)
- {
- GlitzAPI.glitz_drawable_swap_buffer_region (Handle, x_origin, y_origin, box, box.Length);
- }
-
- public void SwapBuffers ()
- {
- GlitzAPI.glitz_drawable_swap_buffers (Handle);
- }
-
- public void Flush ()
- {
- GlitzAPI.glitz_drawable_flush (Handle);
- }
-
- public void Finish ()
- {
- GlitzAPI.glitz_drawable_flush (Handle);
- }
-
- public FeatureMask Features {
- get {
- return GlitzAPI.glitz_drawable_get_features (Handle);
- }
- }
-
- public IntPtr Format {
- get {
- return GlitzAPI.glitz_drawable_get_format (Handle);
- }
- }
-
- public uint Width {
- get {
- return GlitzAPI.glitz_drawable_get_width (Handle);
- }
- }
-
- public uint Height {
- get {
- return GlitzAPI.glitz_drawable_get_height (Handle);
- }
- }
-
- public IntPtr FindStandardFormat (FormatName format_name)
- {
- return GlitzAPI.glitz_find_standard_format (Handle, format_name);
- }
-
- ~Drawable ()
- {
- Dispose (false);
- }
-
- void IDisposable.Dispose ()
- {
- Dispose (true);
- GC.SuppressFinalize (this);
- }
-
- protected virtual void Dispose (bool disposing)
- {
- if (Handle == IntPtr.Zero)
- return;
-
- Console.WriteLine ("glitz_drawable_destroy");
- GlitzAPI.glitz_drawable_destroy (Handle);
- Handle = IntPtr.Zero;
- }
-
- public void Destroy()
- {
- Dispose (true);
- }
-
- /*
- public void Destroy ()
- {
- GlitzAPI.glitz_drawable_destroy (Handle);
- }
- */
- }
-}
diff --git a/lib/glitz-sharp/src/Glitz.cs b/lib/glitz-sharp/src/Glitz.cs
deleted file mode 100644
index 6b882cc..0000000
--- a/lib/glitz-sharp/src/Glitz.cs
+++ /dev/null
@@ -1,496 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-using System.Runtime.InteropServices;
-//using Cairo;
-//using Gtk;
-
-namespace NDesk.Glitz
-{
- public
- enum Status
- {
- Success,
- NoMemory,
- BadCoordinate,
- NotSupported,
- ContentDestroyed,
- }
-
- public
- enum FormatName
- {
- ARGB32,
- RGB24,
- A8,
- A1,
- }
-
- public
- enum DrawableBuffer
- {
- FrontColor,
- BackColor,
- }
-
- [Flags]
- public
- enum FormatMask
- {
- None = 0,
-
- ID = 1 << 0,
- RedSize = 1 << 1,
- GreenSize = 1 << 2,
- BlueSize = 1 << 3,
- AlphaSize = 1 << 4,
-
- Fourcc = 1 << 5,
-
- DepthSize = 1 << 6,
- StencilSize = 1 << 7,
- Doublebuffer = 1 << 8,
- Samples = 1 << 9,
- }
-
- public
- enum Fill
- {
- Transparent,
- Nearest,
- Repeat,
- Reflect,
- }
-
- public
- struct Rectangle
- {
- public short X, Y;
- public ushort Width, Height;
- }
-
- public
- struct Box
- {
- public short X1, Y1, X2, Y2;
- }
-
- public
- struct Point
- {
- public int X, Y;
- }
-
- public
- struct Line
- {
- public Point P1, P2;
- }
-
- public
- struct Trapezoid
- {
- public int Top, Bottom;
- public Line Left, Right;
- }
-
- public
- struct Span
- {
- public int Left, Right, Y;
- }
-
- public
- struct Trap
- {
- public Span Top, Bottom;
- }
-
- public unsafe
- struct Transform
- {
- //TODO: should be 3x3
- public fixed int Matrix[9];
- }
-
- public
- struct Color
- {
- public uint Fourcc;
- public ushort Red;
- public ushort Green;
- public ushort Blue;
- public ushort Alpha;
- }
-
- public
- enum FilterType
- {
- Mag,
- Min,
- }
-
- public
- enum Filter
- {
- Nearest,
- Bilinear,
- Convolution,
- Gaussian,
- LinearGradient,
- RadialGradient,
- }
-
- public
- enum Operator
- {
- Clear,
- Src,
- Dst,
- Over,
- OverReverse,
- In,
- InReverse,
- Out,
- OutReverse,
- Atop,
- AtopReverse,
- Xor,
- Add,
- }
-
- public
- struct ColorFormat
- {
- public uint Fourcc;
- public ushort RedSize;
- public ushort GreenSize;
- public ushort BlueSize;
- public ushort AlphaSize;
- }
-
- public
- struct DrawableFormat
- {
- public ulong ID;
- public ColorFormat Color;
- public ushort DepthSize;
- public ushort StencilSize;
- public ushort Samples;
- public bool Doublebuffer;
- }
-
- [Flags]
- public
- enum FeatureMask
- {
- None = 0,
-
- TextureRectangle = 1 << 0,
- TextureNonPowerOfTwo = 1 << 1,
- TextureMirroredRepeat = 1 << 2,
- TextureBorderClamp = 1 << 3,
- Multisample = 1 << 4,
- MultisampleFilterHint = 1 << 5,
- Multitexture = 1 << 6,
- TextureEnvCombine = 1 << 7,
- TextureEnvDot3 = 1 << 8,
- FragmentProgram = 1 << 9,
- VertexBufferObject = 1 << 10,
- PixelBufferObject = 1 << 11,
- PerComponentRendering = 1 << 12,
- BlendColor = 1 << 13,
- PackedPixels = 1 << 14,
- MultiDrawArrays = 1 << 15,
- FramebufferObject = 1 << 16,
- CopySubBuffer = 1 << 17,
- }
-
- public
- enum BufferHint
- {
- StreamDraw,
- StreamRead,
- StreamCopy,
- StaticDraw,
- StaticRead,
- StaticCopy,
- DynamicDraw,
- DynamicRead,
- DynamicCopy,
- }
-
- public
- enum BufferAccess
- {
- ReadOnly,
- WriteOnly,
- ReadWrite,
- }
-
- public class GlitzAPI
- {
- [DllImport("glitz-glx")]
- public
- static extern IntPtr glitz_glx_create_drawable_for_window (IntPtr display, int screen, IntPtr glitz_drawable_format, uint window, uint width, uint height);
-
- //this one needs work
- [DllImport("glitz-glx")]
- public
- //static extern IntPtr glitz_glx_find_window_format (IntPtr display, int screen, FormatMask mask, IntPtr glitz_drawable_format, int count);
- static extern IntPtr glitz_glx_find_window_format (IntPtr display, int screen, FormatMask mask, ref DrawableFormat templ, int count);
-
- [DllImport("glitz-glx")]
- public
- static extern IntPtr glitz_glx_find_drawable_format_for_visual (IntPtr display, int screen, uint visualid);
-
- [DllImport("glitz-glx")]
- public
- static extern IntPtr glitz_glx_get_visual_info_from_format (IntPtr display, int screen, IntPtr format);
-
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_create_drawable (IntPtr other_drawable, ref DrawableFormat format, uint width, uint height);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_create_pbuffer_drawable (IntPtr other_drawable, ref DrawableFormat format, uint width, uint height);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_find_standard_format (IntPtr drawable, FormatName format_name);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_surface_create (IntPtr drawable, IntPtr format, uint width, uint height, ulong mask, IntPtr attributes);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_destroy (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_reference (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_attach (IntPtr surface, IntPtr drawable, DrawableBuffer buffer);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_detach (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_flush (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_surface_get_drawable (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_surface_get_attached_drawable (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_set_transform (IntPtr surface, IntPtr transform);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_set_fill (IntPtr surface, Fill fill);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_set_component_alpha (IntPtr surface, bool component_alpha);
-
- //TODO: review this
- [DllImport("glitz")]
- public
- static extern void glitz_surface_set_filter (IntPtr surface, Filter filter, int[] @params, int n_params);
-
- [DllImport("glitz")]
- public
- static extern void glitz_surface_set_dither (IntPtr surface, bool dither);
-
- [DllImport("glitz")]
- public
- static extern uint glitz_surface_get_width (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern uint glitz_surface_get_height (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern Status glitz_surface_get_status (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_surface_get_format (IntPtr surface);
-
- //TODO: complete point_fixed_t
- [DllImport("glitz")]
- public
- static extern void glitz_surface_translate_point (IntPtr surface, ref Point src, ref Point dst);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_surface_set_clip_region (IntPtr surface, int x_origin, int y_origin, Box[] box, int n_box);
-
- [DllImport("glitz")]
- public
- static extern bool glitz_surface_valid_target (IntPtr surface);
-
- //TextureObject
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_texture_object_create (IntPtr surface);
-
- [DllImport("glitz")]
- public
- static extern void glitz_texture_object_destroy (IntPtr texture);
-
- [DllImport("glitz")]
- public
- static extern void glitz_texture_object_reference (IntPtr texture);
-
- [DllImport("glitz")]
- public
- static extern void glitz_texture_object_set_filter (IntPtr texture, FilterType type, Filter filter);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_texture_object_get_target (IntPtr texture);
-
- //Drawable
-
- [DllImport("glitz")]
- public
- static extern void glitz_drawable_destroy (IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern void glitz_drawable_reference (IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern void glitz_drawable_update_size (IntPtr drawable, uint width, uint height);
-
- [DllImport("glitz")]
- public
- static extern uint glitz_drawable_get_width (IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern uint glitz_drawable_get_height (IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern void glitz_drawable_swap_buffer_region (IntPtr drawable, int x_origin, int y_origin, Box[] box, int n_box);
-
- [DllImport("glitz")]
- public
- static extern void glitz_drawable_swap_buffers (IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern void glitz_drawable_flush (IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern void glitz_drawable_finish (IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern FeatureMask glitz_drawable_get_features (IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_drawable_get_format (IntPtr drawable);
-
- //Context
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_context_create (IntPtr drawable, IntPtr drawable_format);
-
- [DllImport("glitz")]
- public
- static extern void glitz_context_destroy (IntPtr context);
-
- [DllImport("glitz")]
- public
- static extern void glitz_context_reference (IntPtr context);
-
- [DllImport("glitz")]
- public
- static extern void glitz_context_copy (IntPtr context, IntPtr dst_context, ulong mask);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_context_get_proc_address (IntPtr context, string name);
-
- [DllImport("glitz")]
- public
- static extern void glitz_context_make_current (IntPtr context, IntPtr drawable);
-
- [DllImport("glitz")]
- public
- static extern void glitz_context_bind_texture (IntPtr context, IntPtr texture);
-
- [DllImport("glitz")]
- public
- static extern void glitz_context_draw_buffers (IntPtr context, DrawableBuffer[] buffers, int n);
-
- [DllImport("glitz")]
- public
- static extern void glitz_context_read_buffer (IntPtr context, DrawableBuffer buffer);
-
- //Buffer
-
- [DllImport("glitz")]
- public
- //static extern IntPtr glitz_buffer_create (IntPtr drawable, IntPtr data, uint size, BufferHint hint);
- static extern IntPtr glitz_buffer_create (IntPtr drawable, IntPtr data, uint size, BufferHint hint);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_buffer_create_for_data (IntPtr data);
-
- [DllImport("glitz")]
- public
- static extern void glitz_buffer_destroy (IntPtr buffer);
-
- [DllImport("glitz")]
- public
- static extern void glitz_buffer_reference (IntPtr buffer);
-
- [DllImport("glitz")]
- public
- static extern IntPtr glitz_buffer_map (IntPtr buffer, BufferAccess access);
-
- [DllImport("glitz")]
- public
- static extern Status glitz_buffer_unmap (IntPtr buffer);
-
- //Glitz
-
- [DllImport("glitz")]
- public
- static extern void glitz_composite (Operator op, IntPtr src, IntPtr mask, IntPtr dst, int x_src, int y_src, int x_mask, int y_mask, int x_dst, int y_dst, int width, int height);
-
- [DllImport("glitz")]
- public
- static extern void glitz_copy_area (IntPtr src, IntPtr dst, int x_src, int y_src, int width, int height, int x_dst, int y_dst);
-
-
- //[DllImport("cairo")]
- //static extern IntPtr cairo_glitz_surface_create (IntPtr surface);
- }
-}
-
diff --git a/lib/glitz-sharp/src/Makefile.am b/lib/glitz-sharp/src/Makefile.am
deleted file mode 100644
index 70d9afa..0000000
--- a/lib/glitz-sharp/src/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-include $(top_srcdir)/Makefile.include
-
-ASSEMBLY_NAME = NDesk.Glitz
-
-ASSEMBLY_SOURCES = \
- $(srcdir)/Buffer.cs \
- $(srcdir)/Context.cs \
- $(srcdir)/Glitz.cs \
- $(srcdir)/Drawable.cs \
- $(srcdir)/Surface.cs \
- $(srcdir)/TextureObject.cs
-
-REFS =
-
-PKGS =
-
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) -out:$@ -unsafe $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-assemblydir = $(pkglibdir)
-assembly_DATA = $(ASSEMBLY)
-
-EXTRA_DIST = $(ASSEMBLY_SOURCES)
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
diff --git a/lib/glitz-sharp/src/Makefile.in b/lib/glitz-sharp/src/Makefile.in
deleted file mode 100644
index af927c2..0000000
--- a/lib/glitz-sharp/src/Makefile.in
+++ /dev/null
@@ -1,536 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
-subdir = lib/glitz-sharp/src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(assemblydir)"
-DATA = $(assembly_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
-DIR_DOCS = $(top_builddir)/docs
-DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
-DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
-DIR_SEMWEB = $(top_builddir)/lib/semweb
-DIR_SRC = $(top_builddir)/src
-DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
-LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
-LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-CSC_FLAGS = -debug
-CSC = $(MCS) $(CSC_FLAGS) -target:exe
-CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
-MONO_DEBUGFLAGS = --debug
-RUNTIME = mono $(MONO_DEBUGFLAGS)
-ASSEMBLY_NAME = NDesk.Glitz
-ASSEMBLY_SOURCES = \
- $(srcdir)/Buffer.cs \
- $(srcdir)/Context.cs \
- $(srcdir)/Glitz.cs \
- $(srcdir)/Drawable.cs \
- $(srcdir)/Surface.cs \
- $(srcdir)/TextureObject.cs
-
-REFS =
-PKGS =
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-assemblydir = $(pkglibdir)
-assembly_DATA = $(ASSEMBLY)
-EXTRA_DIST = $(ASSEMBLY_SOURCES)
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/glitz-sharp/src/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/glitz-sharp/src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(assemblydir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(assemblydir)" || exit $$?; \
- done
-
-uninstall-assemblyDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(assemblydir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(assemblydir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-assemblyDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-assemblyDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-assemblyDATA install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) -out:$@ -unsafe $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/glitz-sharp/src/Surface.cs b/lib/glitz-sharp/src/Surface.cs
deleted file mode 100644
index 5542af0..0000000
--- a/lib/glitz-sharp/src/Surface.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-
-namespace NDesk.Glitz
-{
- public class Surface : IDisposable
- {
- public IntPtr Handle;
-
- public Surface (Drawable drawable, IntPtr format, uint width, uint height, ulong mask, IntPtr attributes)
- {
- Handle = GlitzAPI.glitz_surface_create (drawable.Handle, format, width, height, mask, attributes);
- GlitzAPI.glitz_surface_reference (Handle);
- }
-
- public void Attach (Drawable drawable, DrawableBuffer buffer)
- {
- GlitzAPI.glitz_surface_attach (Handle, drawable.Handle, buffer);
- }
-
- public void Detach ()
- {
- GlitzAPI.glitz_surface_detach (Handle);
- }
-
- public void Flush ()
- {
- GlitzAPI.glitz_surface_flush (Handle);
- }
-
- public IntPtr Drawable {
- get {
- return GlitzAPI.glitz_surface_get_drawable (Handle);
- }
- }
-
- public IntPtr AttachedDrawable {
- get {
- return GlitzAPI.glitz_surface_get_attached_drawable (Handle);
- }
- }
-
- //TODO: consider memory management
- /*
- public void SetTransform (ref Transform transform)
- {
- GlitzAPI.glitz_surface_set_transform (Handle, ref transform);
- }
- */
- public void SetFill (Fill fill)
- {
- GlitzAPI.glitz_surface_set_fill (Handle, fill);
- }
-
- public void SetComponentAlpha (bool component_alpha)
- {
- GlitzAPI.glitz_surface_set_component_alpha (Handle, component_alpha);
- }
-
- public void SetFilter (Filter filter, int[] @params)
- {
- GlitzAPI.glitz_surface_set_filter (Handle, filter, @params, @params.Length);
- }
-
- public void SetDither (bool dither)
- {
- GlitzAPI.glitz_surface_set_dither (Handle, dither);
- }
-
- public uint Width {
- get {
- return GlitzAPI.glitz_surface_get_width (Handle);
- }
- }
-
- public uint Height {
- get {
- return GlitzAPI.glitz_surface_get_height (Handle);
- }
- }
-
- public Status Status {
- get {
- return GlitzAPI.glitz_surface_get_status (Handle);
- }
- }
-
- public IntPtr Format {
- get {
- return GlitzAPI.glitz_surface_get_format (Handle);
- }
- }
-
- public void TranslatePoint (ref Point src, ref Point dst)
- {
- GlitzAPI.glitz_surface_translate_point (Handle, ref src, ref dst);
- }
-
- public void SetClipRegion (int x_origin, int y_origin, Box[] box)
- {
- GlitzAPI.glitz_surface_set_clip_region (Handle, x_origin, y_origin, box, box.Length);
- }
-
- public bool ValidTarget {
- get {
- return GlitzAPI.glitz_surface_valid_target (Handle);
- }
- }
-
- public static void Composite (Operator op, Surface src, Surface mask, Surface dst, int x_src, int y_src, int x_mask, int y_mask, int x_dst, int y_dst, int width, int height)
- {
- GlitzAPI.glitz_composite (op, src.Handle, mask.Handle, dst.Handle, x_src, y_src, x_mask, y_mask, x_dst, y_dst, width, height);
- }
-
- public static void CopyArea (int op, Surface src, Surface dst, int x_src, int y_src, int width, int height, int x_dst, int y_dst)
- {
- GlitzAPI.glitz_copy_area (src.Handle, dst.Handle, x_src, y_src, width, height, x_dst, y_dst);
- }
-
- ~Surface ()
- {
- Dispose (false);
- }
-
- void IDisposable.Dispose ()
- {
- Dispose (true);
- GC.SuppressFinalize (this);
- }
-
- protected virtual void Dispose (bool disposing)
- {
- if (Handle == IntPtr.Zero)
- return;
-
- Console.WriteLine ("glitz_surface_destroy");
- GlitzAPI.glitz_surface_destroy (Handle);
- Handle = IntPtr.Zero;
- }
-
- public void Destroy()
- {
- Dispose (true);
- }
-
- /*
- public void Destroy ()
- {
- GlitzAPI.glitz_surface_destroy (Handle);
- }
- */
- }
-}
diff --git a/lib/glitz-sharp/src/TextureObject.cs b/lib/glitz-sharp/src/TextureObject.cs
deleted file mode 100644
index 6c3d520..0000000
--- a/lib/glitz-sharp/src/TextureObject.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2006 Alp Toker <alp at atoker.com>
-// This software is made available under the MIT License
-// See COPYING for details
-
-using System;
-
-namespace NDesk.Glitz
-{
- public class TextureObject : IDisposable
- {
- public IntPtr Handle;
-
- public TextureObject (IntPtr handle)
- {
- this.Handle = handle;
- GlitzAPI.glitz_texture_object_reference (Handle);
- }
-
- public TextureObject (Surface surface)
- {
- Handle = GlitzAPI.glitz_texture_object_create (surface.Handle);
- GlitzAPI.glitz_texture_object_reference (Handle);
- }
-
- public void SetFilter (FilterType type, Filter filter)
- {
- GlitzAPI.glitz_texture_object_set_filter (Handle, type, filter);
- }
-
- public TextureObject Target
- {
- get {
- return new TextureObject (GlitzAPI.glitz_texture_object_get_target (Handle));
- }
- }
-
- ~TextureObject ()
- {
- Dispose (false);
- }
-
- void IDisposable.Dispose ()
- {
- Dispose (true);
- GC.SuppressFinalize (this);
- }
-
- protected virtual void Dispose (bool disposing)
- {
- if (Handle == IntPtr.Zero)
- return;
-
- Console.WriteLine ("glitz_texture_object_destroy");
- GlitzAPI.glitz_texture_object_destroy (Handle);
- Handle = IntPtr.Zero;
- }
-
- public void Destroy()
- {
- Dispose (true);
- }
-
- /*
- public void Destroy ()
- {
- GlitzAPI.glitz_texture_object_destroy (Handle);
- }
- */
- }
-}
diff --git a/lib/gnome-keyring-sharp/Makefile.am b/lib/gnome-keyring-sharp/Makefile.am
index 4469d5b..309fd2f 100644
--- a/lib/gnome-keyring-sharp/Makefile.am
+++ b/lib/gnome-keyring-sharp/Makefile.am
@@ -20,7 +20,7 @@ ASSEMBLY_SOURCES = \
$(srcdir)/ResultCode.cs \
$(srcdir)/Ring.cs
-REFS = -r:Mono.Posix $(LINK_DBUS)
+REFS = -r:Mono.Posix $(NDESK_DBUS_LIBS)
PKGS =
diff --git a/lib/gnome-keyring-sharp/Makefile.in b/lib/gnome-keyring-sharp/Makefile.in
index 9b916cb..8adec9c 100644
--- a/lib/gnome-keyring-sharp/Makefile.in
+++ b/lib/gnome-keyring-sharp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/gnome-keyring-sharp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -316,7 +326,7 @@ ASSEMBLY_SOURCES = \
$(srcdir)/ResultCode.cs \
$(srcdir)/Ring.cs
-REFS = -r:Mono.Posix $(LINK_DBUS)
+REFS = -r:Mono.Posix $(NDESK_DBUS_LIBS)
PKGS =
ASSEMBLY = $(ASSEMBLY_NAME).dll
assemblydir = $(pkglibdir)
@@ -338,9 +348,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gnome-keyring-sharp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/gnome-keyring-sharp/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/gnome-keyring-sharp/Makefile
+ $(AUTOMAKE) --foreign lib/gnome-keyring-sharp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/gtk-sharp-beans/Gtk.metadata b/lib/gtk-sharp-beans/Gtk.metadata
index 0bdc265..389de6b 100644
--- a/lib/gtk-sharp-beans/Gtk.metadata
+++ b/lib/gtk-sharp-beans/Gtk.metadata
@@ -1,6 +1,4 @@
<?xml version="1.0"?>
<metadata>
- <attr path="/api/namespace/object[@cname='GtkBuilder']" name="name">Builder</attr>
- <attr path="/api/namespace/enum[@cname='GtkBuilderError']" name="name">BuilderError</attr>
- <attr path="/api/namespace/callback[@cname='GtkBuilderConnectFunc']" name="name">BuilderConnectFunc</attr>
+ <attr path="/api/namespace/object[@cname='GtkMountOperation']/method[@name='IsShowing']" name="name">GetIsShowing</attr>
</metadata>
diff --git a/lib/gtk-sharp-beans/Gtk.metadata b/lib/gtk-sharp-beans/GtkBeans.metadata
similarity index 100%
copy from lib/gtk-sharp-beans/Gtk.metadata
copy to lib/gtk-sharp-beans/GtkBeans.metadata
diff --git a/lib/gtk-sharp-beans/ImageMenuItem.cs b/lib/gtk-sharp-beans/ImageMenuItem.cs
new file mode 100644
index 0000000..32092af
--- /dev/null
+++ b/lib/gtk-sharp-beans/ImageMenuItem.cs
@@ -0,0 +1,41 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2009 Novell, Inc. (http://www.novell.com)
+//
+// Authors:
+// Sandy Armstrong <sanfordarmstrong at gmail.com>
+//
+
+#if GTK_2_16
+using System;
+using System.Runtime.InteropServices;
+
+namespace GtkBeans {
+ public static class ImageMenuItemExtensions {
+ [DllImport("libgtk-win32-2.0-0.dll")]
+ static extern void gtk_image_menu_item_set_always_show_image(IntPtr raw, bool always_show);
+
+ public static void SetAlwaysShowImage (this Gtk.ImageMenuItem item, bool always_show)
+ {
+ gtk_image_menu_item_set_always_show_image (item.Handle, always_show);
+ }
+ }
+}
+#endif
diff --git a/lib/gtk-sharp-beans/Makefile.am b/lib/gtk-sharp-beans/Makefile.am
index 81cb889..122ecb3 100644
--- a/lib/gtk-sharp-beans/Makefile.am
+++ b/lib/gtk-sharp-beans/Makefile.am
@@ -5,11 +5,13 @@ SRCS = \
$(srcdir)/Drawable.cs \
$(srcdir)/Global.cs \
$(srcdir)/Image.cs \
+ $(srcdir)/ImageMenuItem.cs \
$(srcdir)/Widget.cs \
$(srcdir)/Format.cs \
$(srcdir)/Priority.cs \
$(srcdir)/Shell.cs \
$(srcdir)/Sources.cs \
+ $(srcdir)/Style.cs \
$(srcdir)/Timeout.cs \
$(srcdir)/PixbufFormat.cs \
$(srcdir)/PixbufLoader.cs \
@@ -28,26 +30,34 @@ SNK = snk
all: gtk-sharp-beans.dll
+gtkbeans-api.xml: $(srcdir)/gtkbeans-api.raw $(srcdir)/GtkBeans.metadata
+ @echo -e "\n*** Massaging the raw api into $@"
+ cp $(srcdir)/gtkbeans-api.raw gtkbeans-api.xml
+ chmod +w gtkbeans-api.xml
+ $(GAPI2FIXUP) --api=gtkbeans-api.xml --metadata=$(srcdir)/GtkBeans.metadata
+
gtk-api.xml: $(srcdir)/gtk-api.raw $(srcdir)/Gtk.metadata
@echo -e "\n*** Massaging the raw api into $@"
cp $(srcdir)/gtk-api.raw gtk-api.xml
chmod +w gtk-api.xml
- gapi2-fixup --api=gtk-api.xml --metadata=$(srcdir)/Gtk.metadata
+ $(GAPI2FIXUP) --api=gtk-api.xml --metadata=$(srcdir)/Gtk.metadata
-gtk_generated/Builder.cs: gtk-api.xml $(GTK_CUSTOMS)
+gtk_generated/Builder.cs: gtk-api.xml gtkbeans-api.xml $(GTK_CUSTOMS)
@echo -e "\n*** Generating C# code"
- gapi2-codegen $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir) --generate gtk-api.xml
+ $(GAPI2CODEGEN) $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir) --generate gtkbeans-api.xml
+ $(GAPI2CODEGEN) $(GLIBSHARP_CFLAGS) $(GTKSHARP_CFLAGS) -I:$(top_builddir)/lib/gio-sharp/gio/gio-api.xml --outdir=gtk_generated --customdir=$(srcdir) --generate gtk-api.xml
gtk-sharp-beans.snk: $(SNK)
cp $< $@
gtk-sharp-beans.dll: gtk_generated/Builder.cs $(SRCS) gtk-sharp-beans.snk
@echo -e "\n*** Building $@"
- $(CSC) -target:library -out:$@ -unsafe $(ASSEMBLIES) $(SRCS) gtk_generated/*.cs
+ $(CSC) -target:library -out:$@ $(CSC_DEFINES) -unsafe $(ASSEMBLIES) $(SRCS) gtk_generated/*.cs
CLEANFILES = \
gtk-sharp-beans.dll \
gtk-sharp-beans.dll.mdb \
+ gtkbeans-api.xml \
gtk-api.xml
DISTCLEANFILES = \
@@ -60,6 +70,8 @@ EXTRA_DIST = \
$(SNK) \
gtk-sharp-beans.dll.config \
Gtk.metadata \
+ GtkBeans.metadata \
+ gtkbeans-api.raw \
gtk-api.raw
assemblydir = $(pkglibdir)
@@ -75,11 +87,13 @@ fetch:
update:
cp fetch/*.cs \
fetch/gtk-api.raw \
+ fetch/gtkbeans-api.raw \
fetch/Gdk.Sources/*.cs \
fetch/GLib.Sources/*.cs \
fetch/Gtk.Customs/*.custom \
fetch/Gtk.Sources/*.cs \
fetch/Gtk.metadata \
+ fetch/GtkBeans.metadata \
.
.PHONY: fetch update
diff --git a/lib/gtk-sharp-beans/Makefile.in b/lib/gtk-sharp-beans/Makefile.in
index fc609da..779b965 100644
--- a/lib/gtk-sharp-beans/Makefile.in
+++ b/lib/gtk-sharp-beans/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/gtk-sharp-beans
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -302,11 +312,13 @@ SRCS = \
$(srcdir)/Drawable.cs \
$(srcdir)/Global.cs \
$(srcdir)/Image.cs \
+ $(srcdir)/ImageMenuItem.cs \
$(srcdir)/Widget.cs \
$(srcdir)/Format.cs \
$(srcdir)/Priority.cs \
$(srcdir)/Shell.cs \
$(srcdir)/Sources.cs \
+ $(srcdir)/Style.cs \
$(srcdir)/Timeout.cs \
$(srcdir)/PixbufFormat.cs \
$(srcdir)/PixbufLoader.cs \
@@ -324,6 +336,7 @@ SNK = snk
CLEANFILES = \
gtk-sharp-beans.dll \
gtk-sharp-beans.dll.mdb \
+ gtkbeans-api.xml \
gtk-api.xml
DISTCLEANFILES = \
@@ -336,6 +349,8 @@ EXTRA_DIST = \
$(SNK) \
gtk-sharp-beans.dll.config \
Gtk.metadata \
+ GtkBeans.metadata \
+ gtkbeans-api.raw \
gtk-api.raw
assemblydir = $(pkglibdir)
@@ -355,9 +370,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gtk-sharp-beans/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/gtk-sharp-beans/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/gtk-sharp-beans/Makefile
+ $(AUTOMAKE) --foreign lib/gtk-sharp-beans/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -556,22 +571,29 @@ uninstall-am: uninstall-assemblyDATA
all: gtk-sharp-beans.dll
+gtkbeans-api.xml: $(srcdir)/gtkbeans-api.raw $(srcdir)/GtkBeans.metadata
+ @echo -e "\n*** Massaging the raw api into $@"
+ cp $(srcdir)/gtkbeans-api.raw gtkbeans-api.xml
+ chmod +w gtkbeans-api.xml
+ $(GAPI2FIXUP) --api=gtkbeans-api.xml --metadata=$(srcdir)/GtkBeans.metadata
+
gtk-api.xml: $(srcdir)/gtk-api.raw $(srcdir)/Gtk.metadata
@echo -e "\n*** Massaging the raw api into $@"
cp $(srcdir)/gtk-api.raw gtk-api.xml
chmod +w gtk-api.xml
- gapi2-fixup --api=gtk-api.xml --metadata=$(srcdir)/Gtk.metadata
+ $(GAPI2FIXUP) --api=gtk-api.xml --metadata=$(srcdir)/Gtk.metadata
-gtk_generated/Builder.cs: gtk-api.xml $(GTK_CUSTOMS)
+gtk_generated/Builder.cs: gtk-api.xml gtkbeans-api.xml $(GTK_CUSTOMS)
@echo -e "\n*** Generating C# code"
- gapi2-codegen $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir) --generate gtk-api.xml
+ $(GAPI2CODEGEN) $(GLIBSHARP_CFLAGS) --outdir=gtk_generated --customdir=$(srcdir) --generate gtkbeans-api.xml
+ $(GAPI2CODEGEN) $(GLIBSHARP_CFLAGS) $(GTKSHARP_CFLAGS) -I:$(top_builddir)/lib/gio-sharp/gio/gio-api.xml --outdir=gtk_generated --customdir=$(srcdir) --generate gtk-api.xml
gtk-sharp-beans.snk: $(SNK)
cp $< $@
gtk-sharp-beans.dll: gtk_generated/Builder.cs $(SRCS) gtk-sharp-beans.snk
@echo -e "\n*** Building $@"
- $(CSC) -target:library -out:$@ -unsafe $(ASSEMBLIES) $(SRCS) gtk_generated/*.cs
+ $(CSC) -target:library -out:$@ $(CSC_DEFINES) -unsafe $(ASSEMBLIES) $(SRCS) gtk_generated/*.cs
fetch:
rm -rf fetch
@@ -580,11 +602,13 @@ fetch:
update:
cp fetch/*.cs \
fetch/gtk-api.raw \
+ fetch/gtkbeans-api.raw \
fetch/Gdk.Sources/*.cs \
fetch/GLib.Sources/*.cs \
fetch/Gtk.Customs/*.custom \
fetch/Gtk.Sources/*.cs \
fetch/Gtk.metadata \
+ fetch/GtkBeans.metadata \
.
.PHONY: fetch update
diff --git a/lib/gtk-sharp-beans/Style.cs b/lib/gtk-sharp-beans/Style.cs
new file mode 100644
index 0000000..7ba92ff
--- /dev/null
+++ b/lib/gtk-sharp-beans/Style.cs
@@ -0,0 +1,44 @@
+// Gtk.Style.cs
+//
+// Author(s):
+// Stephane Delcroix <stephane at delcroix.org>
+//
+// Copyright (c) 2009 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// 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
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using Gtk;
+
+namespace GtkBeans {
+ public class Style {
+ [DllImport("libgtk-win32-2.0-0.dll")]
+ static extern void gtk_paint_flat_box(IntPtr style, IntPtr window, int state_type, int shadow_type, IntPtr area, IntPtr widget, IntPtr detail, int x, int y, int width, int height);
+
+ public static void PaintFlatBox(Gtk.Style style, Gdk.Drawable window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget widget, string detail, int x, int y, int width, int height) {
+ IntPtr native_area = area == null ? IntPtr.Zero : GLib.Marshaller.StructureToPtrAlloc (area);
+ IntPtr native_detail = GLib.Marshaller.StringToPtrGStrdup (detail);
+ gtk_paint_flat_box(style == null ? IntPtr.Zero : style.Handle, window == null ? IntPtr.Zero : window.Handle, (int) state_type, (int) shadow_type, native_area, widget == null ? IntPtr.Zero : widget.Handle, native_detail, x, y, width, height);
+ if (area != null) {
+ area = Gdk.Rectangle.New (native_area);
+ Marshal.FreeHGlobal (native_area);
+ }
+ GLib.Marshaller.Free (native_detail);
+ }
+ }
+}
+
diff --git a/lib/gtk-sharp-beans/gtk-api.raw b/lib/gtk-sharp-beans/gtk-api.raw
index 498c8bd..847f673 100644
--- a/lib/gtk-sharp-beans/gtk-api.raw
+++ b/lib/gtk-sharp-beans/gtk-api.raw
@@ -6,131 +6,39 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
- <namespace name="GtkBeans" library="libgtk-win32-2.0-0.dll">
- <enum name="GtkBuilderError" cname="GtkBuilderError" type="enum">
- <member cname="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" name="InvalidTypeFunction" />
- <member cname="GTK_BUILDER_ERROR_UNHANDLED_TAG" name="UnhandledTag" />
- <member cname="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" name="MissingAttribute" />
- <member cname="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE" name="InvalidAttribute" />
- <member cname="GTK_BUILDER_ERROR_INVALID_TAG" name="InvalidTag" />
- <member cname="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" name="MissingPropertyValue" />
- <member cname="GTK_BUILDER_ERROR_INVALID_VALUE" name="InvalidValue" />
- <member cname="GTK_BUILDER_ERROR_VERSION_MISMATCH" name="VersionMismatch" />
- </enum>
- <callback name="GtkBuilderConnectFunc" cname="GtkBuilderConnectFunc">
- <return-type type="void" />
- <parameters>
- <parameter type="GtkBuilder*" name="builder" />
- <parameter type="GObject*" name="object" />
- <parameter type="const-gchar*" name="signal_name" />
- <parameter type="const-gchar*" name="handler_name" />
- <parameter type="GObject*" name="connect_object" />
- <parameter type="GConnectFlags" name="flags" />
- <parameter type="gpointer" name="user_data" />
- </parameters>
- </callback>
- <object name="GtkBuilder" cname="GtkBuilder" parent="GObject">
- <field name="GSEAL" cname="GSEAL (priv)" type="GtkBuilderPrivate*" />
- <property name="TranslationDomain" cname="translation-domain" type="gchar*" readable="true" writeable="true" />
- <virtual_method name="GetTypeFromName" cname="get_type_from_name">
+ <namespace name="Gtk" library="libgtk-win32-2.0-0.dll">
+ <object name="MountOperation" cname="GtkMountOperation" parent="GMountOperation">
+ <field name="Priv" cname="priv" type="GtkMountOperationPrivate*" />
+ <property name="Parent" cname="parent" type="GtkWindow" readable="true" writeable="true" />
+ <property name="IsShowing" cname="is-showing" type="gboolean" readable="true" />
+ <property name="Screen" cname="screen" type="GtkWindow" readable="true" writeable="true" />
+ <method name="GetParent" cname="gtk_mount_operation_get_parent">
+ <return-type type="GtkWindow*" />
+ </method>
+ <method name="GetScreen" cname="gtk_mount_operation_get_screen">
+ <return-type type="GdkScreen*" />
+ </method>
+ <method name="GetType" cname="gtk_mount_operation_get_type" shared="true">
<return-type type="GType" />
- <parameters>
- <parameter type="GtkBuilder*" name="builder" />
- <parameter type="const-char*" name="type_name" />
- </parameters>
- </virtual_method>
- <method name="AddFromFile" cname="gtk_builder_add_from_file">
- <return-type type="guint" />
- <parameters>
- <parameter type="const-gchar*" name="filename" />
- <parameter type="GError**" name="error" />
- </parameters>
</method>
- <method name="AddFromString" cname="gtk_builder_add_from_string">
- <return-type type="guint" />
- <parameters>
- <parameter type="const-gchar*" name="buffer" />
- <parameter type="gsize" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="AddObjectsFromFile" cname="gtk_builder_add_objects_from_file">
- <return-type type="guint" />
- <parameters>
- <parameter type="const-gchar*" name="filename" />
- <parameter type="gchar**" name="object_ids" />
- <parameter type="GError**" name="error" />
- </parameters>
+ <method name="IsShowing" cname="gtk_mount_operation_is_showing">
+ <return-type type="gboolean" />
</method>
- <method name="AddObjectsFromString" cname="gtk_builder_add_objects_from_string">
- <return-type type="guint" />
+ <constructor cname="gtk_mount_operation_new">
<parameters>
- <parameter type="const-gchar*" name="buffer" />
- <parameter type="gsize" name="length" />
- <parameter type="gchar**" name="object_ids" />
- <parameter type="GError**" name="error" />
+ <parameter type="GtkWindow*" name="parent" />
</parameters>
- </method>
- <method name="ConnectSignals" cname="gtk_builder_connect_signals">
+ </constructor>
+ <method name="SetParent" cname="gtk_mount_operation_set_parent">
<return-type type="void" />
<parameters>
- <parameter type="gpointer" name="user_data" />
+ <parameter type="GtkWindow*" name="parent" />
</parameters>
</method>
- <method name="ConnectSignalsFull" cname="gtk_builder_connect_signals_full">
+ <method name="SetScreen" cname="gtk_mount_operation_set_screen">
<return-type type="void" />
<parameters>
- <parameter type="GtkBuilderConnectFunc" name="func" />
- <parameter type="gpointer" name="user_data" />
- </parameters>
- </method>
- <method name="ErrorQuark" cname="gtk_builder_error_quark" shared="true">
- <return-type type="GQuark" />
- </method>
- <method name="GetObject" cname="gtk_builder_get_object">
- <return-type type="GObject*" />
- <parameters>
- <parameter type="const-gchar*" name="name" />
- </parameters>
- </method>
- <method name="GetObjects" cname="gtk_builder_get_objects">
- <return-type type="GSList*" />
- </method>
- <method name="GetTranslationDomain" cname="gtk_builder_get_translation_domain">
- <return-type type="const-gchar*" />
- </method>
- <method name="GetType" cname="gtk_builder_get_type" shared="true">
- <return-type type="GType" />
- </method>
- <method name="GetTypeFromName" cname="gtk_builder_get_type_from_name">
- <return-type type="GType" />
- <parameters>
- <parameter type="const-char*" name="type_name" />
- </parameters>
- </method>
- <constructor cname="gtk_builder_new" />
- <method name="SetTranslationDomain" cname="gtk_builder_set_translation_domain">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="domain" />
- </parameters>
- </method>
- <method name="ValueFromString" cname="gtk_builder_value_from_string">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="GParamSpec*" name="pspec" />
- <parameter type="const-gchar*" name="string" />
- <parameter type="GValue*" name="value" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="ValueFromStringType" cname="gtk_builder_value_from_string_type">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="GType" name="type" />
- <parameter type="const-gchar*" name="string" />
- <parameter type="GValue*" name="value" />
- <parameter type="GError**" name="error" />
+ <parameter type="GdkScreen*" name="screen" />
</parameters>
</method>
</object>
diff --git a/lib/gtk-sharp-beans/gtk-api.raw b/lib/gtk-sharp-beans/gtkbeans-api.raw
similarity index 100%
copy from lib/gtk-sharp-beans/gtk-api.raw
copy to lib/gtk-sharp-beans/gtkbeans-api.raw
diff --git a/lib/libfspot/Makefile.in b/lib/libfspot/Makefile.in
index aedd021..f215a9c 100644
--- a/lib/libfspot/Makefile.in
+++ b/lib/libfspot/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,11 +37,14 @@ host_triplet = @host@
subdir = lib/libfspot
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -95,16 +98,17 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -121,8 +125,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -135,9 +138,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -186,16 +194,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -206,6 +216,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -216,21 +227,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -258,6 +273,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -282,6 +299,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -346,9 +364,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/libfspot/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/libfspot/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/libfspot/Makefile
+ $(AUTOMAKE) --foreign lib/libfspot/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/libgphoto2-sharp/AUTHORS b/lib/libgphoto2-sharp/AUTHORS
index c6172ff..b362af0 100644
--- a/lib/libgphoto2-sharp/AUTHORS
+++ b/lib/libgphoto2-sharp/AUTHORS
@@ -1,2 +1,3 @@
+Stephane Delcroix <stephane at delcroix.org>
Ewen Cheslack-Postava <echeslack at gmail.com>
Larry Ewing <lewing at novell.com>
diff --git a/lib/libgphoto2-sharp/AssemblyInfo.cs b/lib/libgphoto2-sharp/AssemblyInfo.cs
index 9e8d878..88ec37f 100644
--- a/lib/libgphoto2-sharp/AssemblyInfo.cs
+++ b/lib/libgphoto2-sharp/AssemblyInfo.cs
@@ -4,8 +4,9 @@
* Author(s):
* Ewen Cheslack-Postava <echeslack at gmail.com>
* Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
*
- * This is free software. See COPYING for details.
+ * This is open source software. See COPYING for details.
*/
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -16,8 +17,8 @@ using System.Runtime.CompilerServices;
// change them to the information which is associated with the assembly
// you compile.
-[assembly: AssemblyTitle("libgphoto2-sharp")]
-[assembly: AssemblyDescription(".NET Bindings for libgphoto2 in C#")]
+[assembly: AssemblyTitle("GPhoto2#")]
+[assembly: AssemblyDescription(".NET Bindings for libgphoto2 (f-spot version)")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
@@ -32,7 +33,7 @@ using System.Runtime.CompilerServices;
// You can specify all values by your own or you can build default build and revision
// numbers with the '*' character (the default):
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("2.4.*")]
// The following attributes specify the key for the sign of your assembly. See the
// .NET Framework documentation for more information about signing.
diff --git a/lib/libgphoto2-sharp/Camera.cs b/lib/libgphoto2-sharp/Camera.cs
index 8cfb8ea..c448306 100644
--- a/lib/libgphoto2-sharp/Camera.cs
+++ b/lib/libgphoto2-sharp/Camera.cs
@@ -8,200 +8,80 @@
*
* Copyright (c) 2005-2009 Novell, Inc.
*
- * This is free software. See COPYING for details.
+ * This is open source software. See COPYING for details.
*/
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
- [StructLayout(LayoutKind.Sequential)]
- public unsafe struct CameraText
- {
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=(32*1024))] string text;
-
- public string Text {
- get {
- return text;
- }
- set {
- text = value;
- }
- }
- }
-
-#if false
- [StructLayout(LayoutKind.Sequential)]
- internal unsafe struct CameraFunctions
- {
- internal delegate ErrorCode _CameraExitFunc (_Camera *camera, HandleRef context);
-
- internal delegate ErrorCode _CameraGetConfigFunc (_Camera *camera, out IntPtr widget, HandleRef context);
-
- internal delegate ErrorCode _CameraSetConfigFunc (_Camera *camera, HandleRef widget, HandleRef context);
-
- internal delegate ErrorCode _CameraCaptureFunc (_Camera *camera, CameraCaptureType type, IntPtr path, HandleRef context);
-
- internal delegate ErrorCode _CameraCapturePreviewFunc (_Camera *camera, _CameraFile *file, HandleRef context);
-
- internal delegate ErrorCode _CameraSummaryFunc (_Camera *camera, IntPtr text, HandleRef context);
-
- internal delegate ErrorCode _CameraManualFunc (_Camera *camera, IntPtr text, HandleRef context);
-
- internal delegate ErrorCode _CameraAboutFunc (_Camera *camera, IntPtr text, HandleRef context);
-
- internal delegate ErrorCode _CameraPrePostFunc (_Camera *camera, HandleRef context);
-
- /* Those will be called before and after each operation */
- _CameraPrePostFunc pre_func;
- _CameraPrePostFunc post_func;
-
- _CameraExitFunc exit;
-
- /* Configuration */
- _CameraGetConfigFunc get_config;
- _CameraSetConfigFunc set_config;
-
- /* Capturing */
- _CameraCaptureFunc capture;
- _CameraCapturePreviewFunc capture_preview;
-
- /* Textual information */
- _CameraSummaryFunc summary;
- _CameraManualFunc manual;
- _CameraAboutFunc about;
-
- /* Reserved space to use in the future without changing the struct size */
- IntPtr reserved1;
- IntPtr reserved2;
- IntPtr reserved3;
- IntPtr reserved4;
- IntPtr reserved5;
- IntPtr reserved6;
- IntPtr reserved7;
- IntPtr reserved8;
- }
-#endif
-
- [StructLayout(LayoutKind.Sequential)]
- public unsafe struct CameraFilePath
- {
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=128)] public string name;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=1024)] public string folder;
- }
-
- public enum CameraCaptureType
- {
- Image,
- Movie,
- Sound
- }
-
- [StructLayout(LayoutKind.Sequential)]
- internal unsafe struct _Camera
- {
- public IntPtr port;
- public IntPtr fs;
- public IntPtr functions;
- //CameraPrivateLibrary *pl; /* Private data of camera libraries */
- //CameraPrivateCore *pc; /* Private data of the core of gphoto2 */
- public IntPtr p1;
- public IntPtr pc;
-
- public IntPtr GetFS ()
- {
- return fs;
- }
- }
-
- public class Camera : Object
+ public class Camera : GPObject
{
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_camera_new (out IntPtr handle);
+ [DllImport ("libgphoto2.so")]
+ internal static extern ErrorCode gp_camera_unref (HandleRef camera);
- public Camera()
+ public Camera () : base (gp_camera_unref)
{
IntPtr native;
-
Error.CheckError (gp_camera_new (out native));
-
this.handle = new HandleRef (this, native);
}
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_unref (HandleRef camera);
-
- protected override void Cleanup ()
- {
- gp_camera_unref(this.Handle);
- }
-
+#region Preparing initilization
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_camera_set_abilities (HandleRef camera, CameraAbilities abilities);
- public void SetAbilities (CameraAbilities abilities)
- {
- Error.CheckError (gp_camera_set_abilities(this.Handle, abilities));
- }
-
[DllImport ("libgphoto2.so")]
internal unsafe static extern ErrorCode gp_camera_get_abilities (HandleRef camera, out CameraAbilities abilities);
- public CameraAbilities GetAbilities ()
- {
- CameraAbilities abilities = new CameraAbilities ();
-
- Error.CheckError (gp_camera_get_abilities(this.Handle, out abilities));
-
- return abilities;
+ public CameraAbilities Abilities {
+ get {
+ CameraAbilities abilities;
+ Error.CheckError (gp_camera_get_abilities(this.Handle, out abilities));
+ return abilities;
+ }
+ set { Error.CheckError (gp_camera_set_abilities(this.Handle, value)); }
}
-
+
[DllImport ("libgphoto2.so")]
- internal unsafe static extern ErrorCode gp_camera_set_port_info (HandleRef camera, _PortInfo info);
+ internal unsafe static extern ErrorCode gp_camera_set_port_info (HandleRef camera, PortInfo info);
- public void SetPortInfo (PortInfo portinfo)
- {
- unsafe {
- Error.CheckError (gp_camera_set_port_info (this.Handle, portinfo.Handle));
- }
- }
-
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_get_port_info (HandleRef camera, out _PortInfo info);
+ internal static extern ErrorCode gp_camera_get_port_info (HandleRef camera, out PortInfo info);
- public PortInfo GetPortInfo ()
- {
- PortInfo portinfo = new PortInfo ();
- unsafe {
- Error.CheckError (gp_camera_get_port_info (this.Handle, out portinfo.Handle));
+ public PortInfo PortInfo {
+ get {
+ PortInfo portinfo;
+ Error.CheckError (gp_camera_get_port_info (this.Handle, out portinfo));
+ return portinfo;
}
- return portinfo;
+ set { Error.CheckError (gp_camera_set_port_info (this.Handle, value)); }
}
-
+#endregion
+#region Speed, do not use, camera driver pick the optimal one
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_camera_get_port_speed (HandleRef camera);
- public int GetPortSpeed ()
- {
- return (int) Error.CheckError (gp_camera_get_port_speed (this.Handle));
- }
-
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_camera_set_port_speed (HandleRef camera, int speed);
- public void SetPortSpeed (int speed)
- {
- Error.CheckError (gp_camera_set_port_speed (this.Handle, speed));
+ public int PortSpeed {
+ get { return Error.CheckError (gp_camera_get_port_speed (this.Handle)); }
+ set { Error.CheckError (gp_camera_set_port_speed (this.Handle, value)); }
}
-
+#endregion
+
+#region Initialization
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_camera_init (HandleRef camera, HandleRef context);
public void Init (Context context)
{
- Error.CheckError (gp_camera_init (this.Handle, context.Handle));
+ Error.CheckError (gp_camera_init (Handle, context.Handle));
}
[DllImport ("libgphoto2.so")]
@@ -209,16 +89,52 @@ namespace LibGPhoto2
public void Exit (Context context)
{
- Error.CheckError (gp_camera_init (this.Handle, context.Handle));
+ Error.CheckError (gp_camera_exit (Handle, context.Handle));
}
+#endregion
+
+#region Operations on camera
+ [DllImport ("libgphoto2.so")]
+ internal static extern ErrorCode gp_camera_get_summary (HandleRef camera, out CameraText summary, HandleRef context);
+
+ public CameraText GetSummary (Context context)
+ {
+ CameraText summary;
+ Error.CheckError (Camera.gp_camera_get_summary(this.Handle, out summary, context.Handle));
+
+ return summary;
+ }
+
+ [DllImport ("libgphoto2.so")]
+ internal static extern ErrorCode gp_camera_get_about (HandleRef camera, out CameraText about, HandleRef context);
+
+ public CameraText GetAbout (Context context)
+ {
+ CameraText about;
+ Error.CheckError (gp_camera_get_about(this.Handle, out about, context.Handle));
+
+ return about;
+ }
+
+ [DllImport ("libgphoto2.so")]
+ internal static extern ErrorCode gp_camera_get_manual (HandleRef camera, out CameraText manual, HandleRef context);
+ public CameraText GetManual (Context context)
+ {
+ CameraText manual;
+ unsafe
+ {
+ Error.CheckError (gp_camera_get_manual(this.Handle, out manual, context.Handle));
+ }
+ return manual;
+ }
+
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_camera_capture (HandleRef camera, CameraCaptureType type, out CameraFilePath path, HandleRef context);
public CameraFilePath Capture (CameraCaptureType type, Context context)
{
CameraFilePath path;
-
Error.CheckError (gp_camera_capture (this.Handle, type, out path, context.Handle));
return path;
@@ -227,57 +143,37 @@ namespace LibGPhoto2
[DllImport ("libgphoto2.so")]
internal unsafe static extern ErrorCode gp_camera_capture_preview (HandleRef camera, HandleRef file, HandleRef context);
- public CameraFile CapturePreview (Context context)
+ public void CapturePreview (CameraFile dest, Context context)
{
- CameraFile file = new CameraFile();
-
- Error.CheckError (gp_camera_capture_preview (this.Handle, file.Handle, context.Handle));
-
- return file;
+ Error.CheckError (gp_camera_capture_preview (this.Handle, dest.Handle, context.Handle));
}
-
-#if UNUSED
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_get_config (HandleRef camera, out IntPtr window, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_set_config (HandleRef camera, out IntPtr window, HandleRef context);
-#endif
+#endregion
+#region Operations on folders
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_folder_list_files (HandleRef camera, string folder, HandleRef list, HandleRef context);
+ internal static extern ErrorCode gp_camera_folder_list_files (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef list, HandleRef context);
public CameraList ListFiles (string folder, Context context)
{
CameraList file_list = new CameraList ();
-
Error.CheckError (gp_camera_folder_list_files(this.Handle, folder, file_list.Handle, context.Handle));
return file_list;
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_folder_list_folders (HandleRef camera, string folder, HandleRef list, HandleRef context);
+ internal static extern ErrorCode gp_camera_folder_list_folders (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef list, HandleRef context);
public CameraList ListFolders (string folder, Context context)
{
CameraList file_list = new CameraList();
-
Error.CheckError (gp_camera_folder_list_folders (this.Handle, folder, file_list.Handle, context.Handle));
return file_list;
}
[DllImport ("libgphoto2.so")]
- internal unsafe static extern ErrorCode gp_camera_folder_put_file (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef file, HandleRef context);
-
- public void PutFile (string folder, CameraFile file, Context context)
- {
- Error.CheckError (gp_camera_folder_put_file(this.Handle, folder, file.Handle, context.Handle));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_folder_delete_all (HandleRef camera, string folder, HandleRef context);
+ internal static extern ErrorCode gp_camera_folder_delete_all (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef context);
public void DeleteAll (string folder, Context context)
{
@@ -285,7 +181,7 @@ namespace LibGPhoto2
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_folder_make_dir (HandleRef camera, string folder, string name, HandleRef context);
+ internal static extern ErrorCode gp_camera_folder_make_dir (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string name, HandleRef context);
public void MakeDirectory (string folder, string name, Context context)
{
@@ -293,54 +189,47 @@ namespace LibGPhoto2
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_folder_remove_dir (HandleRef camera, string folder, string name, HandleRef context);
+ internal static extern ErrorCode gp_camera_folder_remove_dir (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string name, HandleRef context);
public void RemoveDirectory (string folder, string name, Context context)
{
Error.CheckError (gp_camera_folder_remove_dir(this.Handle, folder, name, context.Handle));
}
-
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_file_get (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string file, CameraFileType type, HandleRef camera_file, HandleRef context);
+ internal unsafe static extern ErrorCode gp_camera_folder_put_file (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef file, HandleRef context);
- public CameraFile GetFile (string folder, string name, CameraFileType type, Context context)
+ public void PutFile (string folder, CameraFile file, Context context)
{
- CameraFile file = new CameraFile();
-
- Error.CheckError (gp_camera_file_get(this.Handle, folder, name, type, file.Handle, context.Handle));
-
- return file;
+ Error.CheckError (gp_camera_folder_put_file(this.Handle, folder, file.Handle, context.Handle));
}
-
+#endregion
+
+#region Operations on files
+ [DllImport ("libgphoto2.so")]
+ internal static extern ErrorCode gp_camera_file_get (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string file, CameraFileType type, HandleRef camera_file, HandleRef context);
+
public void GetFile (string folder, string name, CameraFileType type, CameraFile camera_file, Context context)
{
- Error.CheckError (gp_camera_file_get(this.Handle, folder, name, type, camera_file.Handle, context.Handle));
-
+ Error.CheckError (gp_camera_file_get(this.Handle, folder, name, type, camera_file.Handle, context.Handle));
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_file_delete (HandleRef camera, string folder, string file, HandleRef context);
+ internal static extern ErrorCode gp_camera_file_delete (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string file, HandleRef context);
public void DeleteFile (string folder, string name, Context context)
{
- unsafe
- {
- Error.CheckError (gp_camera_file_delete(this.Handle, folder, name, context.Handle));
- }
+ Error.CheckError (gp_camera_file_delete(this.Handle, folder, name, context.Handle));
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_file_get_info (HandleRef camera, string folder, string file, out CameraFileInfo info, HandleRef context);
+ internal static extern ErrorCode gp_camera_file_get_info (HandleRef camera, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string file, out CameraFileInfo info, HandleRef context);
public CameraFileInfo GetFileInfo (string folder, string name, Context context)
{
CameraFileInfo fileinfo;
- unsafe
- {
- Error.CheckError (gp_camera_file_get_info(this.Handle, folder, name, out fileinfo, context.Handle));
- }
+ Error.CheckError (gp_camera_file_get_info(this.Handle, folder, name, out fileinfo, context.Handle));
return fileinfo;
}
@@ -350,57 +239,8 @@ namespace LibGPhoto2
public void SetFileInfo (string folder, string name, CameraFileInfo fileinfo, Context context)
{
- unsafe
- {
- Error.CheckError (gp_camera_file_set_info(this.Handle, folder, name, fileinfo, context.Handle));
- }
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_get_manual (HandleRef camera, out CameraText manual, HandleRef context);
-
- public CameraText GetManual (Context context)
- {
- CameraText manual;
- unsafe
- {
- Error.CheckError (gp_camera_get_manual(this.Handle, out manual, context.Handle));
- }
- return manual;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_get_summary (HandleRef camera, out CameraText summary, HandleRef context);
-
- public CameraText GetSummary (Context context)
- {
- CameraText summary;
-
- Error.CheckError (Camera.gp_camera_get_summary(this.Handle, out summary, context.Handle));
-
- return summary;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_camera_get_about (HandleRef camera, out CameraText about, HandleRef context);
-
- public CameraText GetAbout (Context context)
- {
- CameraText about;
-
- Error.CheckError (gp_camera_get_about(this.Handle, out about, context.Handle));
-
- return about;
- }
-
- public CameraFilesystem GetFS()
- {
- CameraFilesystem fs;
- unsafe {
- _Camera *obj = (_Camera *)this.Handle.Handle;
- fs = new CameraFilesystem((IntPtr)obj->GetFS ());
- }
- return fs;
+ Error.CheckError (gp_camera_file_set_info(this.Handle, folder, name, fileinfo, context.Handle));
}
+#endregion
}
}
diff --git a/lib/libgphoto2-sharp/CameraAbilities.cs b/lib/libgphoto2-sharp/CameraAbilities.cs
new file mode 100644
index 0000000..7039212
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraAbilities.cs
@@ -0,0 +1,114 @@
+/*
+ * CameraAbilities.cs
+ *
+ * Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ *
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace GPhoto2
+{
+ [StructLayout(LayoutKind.Sequential)]
+ public unsafe struct CameraAbilities
+ {
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=128)] string model;
+ CameraDriverStatus status;
+
+ PortType port;
+ [MarshalAs(UnmanagedType.ByValArray, SizeConst=64)] int[] speed;
+
+ CameraOperation operations;
+ CameraFileOperation file_operations;
+ CameraFolderOperation folder_operations;
+
+ int usb_vendor;
+ int usb_product;
+ int usb_class;
+ int usb_subclass;
+ int usb_protocol;
+
+#pragma warning disable 169
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=1024)] string library;
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=1024)] string id;
+#pragma warning restore 169
+
+ DeviceType device_type;
+
+#pragma warning disable 169
+ int reserved2;
+ int reserved3;
+ int reserved4;
+ int reserved5;
+ int reserved6;
+ int reserved7;
+ int reserved8;
+#pragma warning restore 169
+
+ public override string ToString ()
+ {
+ string ret = String.Format ("{0} ({1})", Model, PortType);
+ if (DriverStatus != CameraDriverStatus.Production)
+ ret += String.Format (" <{0}>", DriverStatus);
+ return ret;
+ }
+
+ public string Model {
+ get { return model; }
+ }
+
+ public CameraDriverStatus DriverStatus {
+ get { return status; }
+ }
+ public PortType PortType {
+ get { return port; }
+ }
+
+ public int[] Speeds {
+ get { return speed; }
+ }
+
+ public CameraOperation CameraOperation {
+ get { return operations; }
+ }
+
+ public CameraFileOperation CameraFileOperation {
+ get { return file_operations; }
+ }
+
+ public CameraFolderOperation CameraFolderOperation {
+ get { return folder_operations; }
+ }
+
+ public int UsbVendor {
+ get { return usb_vendor; }
+ }
+
+ public int UsbProduct {
+ get { return usb_product; }
+ }
+
+ public int UsbClass {
+ get { return usb_class; }
+ }
+
+ public int UsbSubclass {
+ get { return usb_subclass; }
+ }
+
+ public int UsbProtocol {
+ get { return usb_protocol; }
+ }
+
+ public DeviceType DeviceType {
+ get { return device_type;}
+ }
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraAbilitiesList.cs b/lib/libgphoto2-sharp/CameraAbilitiesList.cs
index 1f0c97d..8c1ceb1 100644
--- a/lib/libgphoto2-sharp/CameraAbilitiesList.cs
+++ b/lib/libgphoto2-sharp/CameraAbilitiesList.cs
@@ -2,173 +2,80 @@
* CameraAbilitiesList.cs
*
* Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
* Ewen Cheslack-Postava <echeslack at gmail.com>
* Larry Ewing <lewing at novell.com>
*
- * This is free software. See COPYING for details.
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
*/
+
using System;
using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Collections;
-namespace LibGPhoto2
+namespace GPhoto2
{
-
- public enum CameraDriverStatus
- {
- Production,
- Testing,
- Experimental
- }
-
- public enum CameraOperation
- {
- None = 0,
- CaptureImage = 1 << 0,
- CaptureVideo = 1 << 1,
- CaptureAudio = 1 << 2,
- CapturePreview = 1 << 3,
- Config = 1 << 4
- }
-
- public enum CameraFileOperation
- {
- None = 0,
- Delete = 1 << 1,
- Preview = 1 << 3,
- Raw = 1 << 4,
- Audio = 1 << 5,
- Exif = 1 << 6
- }
-
- public enum CameraFolderOperation
- {
- None = 0,
- DeleteAll = 1 << 0,
- PutFile = 1 << 1,
- MakeDirectory = 1 << 2,
- RemoveDirectory = 1 << 3
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public unsafe struct CameraAbilities
- {
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=128)] public string model;
- public CameraDriverStatus status;
-
- public PortType port;
- [MarshalAs(UnmanagedType.ByValArray, SizeConst=64)] public int[] speed;
-
- public CameraOperation operations;
- public CameraFileOperation file_operations;
- public CameraFolderOperation folder_operations;
-
- public int usb_vendor;
- public int usb_product;
- public int usb_class;
- public int usb_subclass;
- public int usb_protocol;
-
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=1024)] public string library;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=1024)] public string id;
-
- public int reserved1;
- public int reserved2;
- public int reserved3;
- public int reserved4;
- public int reserved5;
- public int reserved6;
- public int reserved7;
- public int reserved8;
- }
-
- public class CameraAbilitiesList : Object
+ public class CameraAbilitiesList : GPList<CameraAbilities>
{
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_abilities_list_new (out IntPtr native);
+ [DllImport ("libgphoto2.so")]
+ internal static extern ErrorCode gp_abilities_list_free (HandleRef list);
- public CameraAbilitiesList()
+ public CameraAbilitiesList () : base (gp_abilities_list_free)
{
IntPtr native;
-
Error.CheckError (gp_abilities_list_new (out native));
-
this.handle = new HandleRef (this, native);
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_abilities_list_free (HandleRef list);
-
- protected override void Cleanup ()
- {
- gp_abilities_list_free(this.handle);
- }
-
- [DllImport ("libgphoto2.so")]
internal unsafe static extern ErrorCode gp_abilities_list_load (HandleRef list, HandleRef context);
public void Load (Context context)
{
- unsafe {
- ErrorCode result = gp_abilities_list_load (this.Handle, context.Handle);
-
- if (Error.IsError (result))
- throw Error.ErrorException(result);
- }
+ Error.CheckError (gp_abilities_list_load (this.Handle, context.Handle));
}
[DllImport ("libgphoto2.so")]
internal unsafe static extern ErrorCode gp_abilities_list_detect (HandleRef list, HandleRef info_list, HandleRef l, HandleRef context);
- public void Detect (PortInfoList info_list, CameraList l, Context context)
+ public CameraList Detect (PortInfoList info_list, Context context)
{
- Error.CheckError (gp_abilities_list_detect (this.handle, info_list.Handle,
- l.Handle, context.Handle));
+ CameraList camera_list = new CameraList ();
+ Error.CheckError (gp_abilities_list_detect (Handle, info_list.Handle,
+ camera_list.Handle, context.Handle));
+ return camera_list;
}
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_abilities_list_count (HandleRef list);
- public int Count ()
- {
- ErrorCode result = gp_abilities_list_count (this.handle);
-
- if (Error.IsError (result))
- throw Error.ErrorException (result);
-
- return (int)result;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_abilities_list_lookup_model (HandleRef list, string model);
-
- public int LookupModel (string model)
- {
- ErrorCode result = gp_abilities_list_lookup_model(this.handle, model);
-
- if (Error.IsError (result))
- throw Error.ErrorException (result);
-
- return (int)result;
+ public override int Count {
+ get { return Error.CheckError (gp_abilities_list_count (this.handle)); }
}
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_abilities_list_get_abilities (HandleRef list, int index, out CameraAbilities abilities);
- public CameraAbilities GetAbilities (int index)
- {
- CameraAbilities abilities = new CameraAbilities ();
+ public override CameraAbilities this [int index] {
+ get {
+ CameraAbilities abilities;
+ Error.CheckError (gp_abilities_list_get_abilities(this.Handle, index, out abilities));
- Error.CheckError (gp_abilities_list_get_abilities(this.Handle, index, out abilities));
-
- return abilities;
+ return abilities;
+ }
}
-
+
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_abilities_list_append (HandleRef list, ref CameraAbilities abilities);
+ internal static extern ErrorCode gp_abilities_list_lookup_model (HandleRef list, [MarshalAs (UnmanagedType.LPTStr)]string model);
- public void Append (CameraAbilities abilities)
- {
- Error.CheckError (gp_abilities_list_append (this.Handle, ref abilities));
+ public CameraAbilities this [string model] {
+ get { return this [Error.CheckError (gp_abilities_list_lookup_model(this.handle, model))]; }
}
+
}
}
diff --git a/lib/libgphoto2-sharp/CameraCaptureType.cs b/lib/libgphoto2-sharp/CameraCaptureType.cs
new file mode 100644
index 0000000..c3fcdc1
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraCaptureType.cs
@@ -0,0 +1,19 @@
+/*
+ * CameraCaptureType.cs
+ *
+ * Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+namespace GPhoto2
+{
+ public enum CameraCaptureType {
+ Image,
+ Movie,
+ Sound,
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraDriverStatus.cs b/lib/libgphoto2-sharp/CameraDriverStatus.cs
new file mode 100644
index 0000000..6eb710e
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraDriverStatus.cs
@@ -0,0 +1,22 @@
+/*
+ * CameraDriverStatus.cs
+ *
+ * Author(s):
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+namespace GPhoto2
+{
+ public enum CameraDriverStatus {
+ Production,
+ Testing,
+ Experimental,
+ Deprecated,
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraEventType.cs b/lib/libgphoto2-sharp/CameraEventType.cs
new file mode 100644
index 0000000..03d155c
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraEventType.cs
@@ -0,0 +1,20 @@
+/*
+ * CameraEventType.cs
+ *
+ * Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+namespace GPhoto2
+{
+ public enum CameraEventType {
+ Unknown,
+ Timeout,
+ FileAdded,
+ FolderAdded,
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraFile.cs b/lib/libgphoto2-sharp/CameraFile.cs
index eb8ca5f..a43d0b9 100644
--- a/lib/libgphoto2-sharp/CameraFile.cs
+++ b/lib/libgphoto2-sharp/CameraFile.cs
@@ -8,12 +8,12 @@
*
* Copyright (c) 2005-2009 Novell, Inc.
*
- * This is free software. See COPYING for details.
+ * This is open source software. See COPYING for details.
*/
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
public enum CameraFileType
{
@@ -21,218 +21,71 @@ namespace LibGPhoto2
Normal,
Raw,
Audio,
- Exif
+ Exif,
+ Metadata,
}
public class MimeTypes
{
+ [MarshalAs(UnmanagedType.LPTStr)] public static string ASF = "audio/x-asf";
[MarshalAs(UnmanagedType.LPTStr)] public static string AVI = "video/x-msvideo";
[MarshalAs(UnmanagedType.LPTStr)] public static string BMP = "image/bmp";
[MarshalAs(UnmanagedType.LPTStr)] public static string CRW = "image/x-canon-raw";
+ [MarshalAs(UnmanagedType.LPTStr)] public static string CR2 = "image/x-canon-raw";
+ [MarshalAs(UnmanagedType.LPTStr)] public static string EXIF = "application/x-exif";
[MarshalAs(UnmanagedType.LPTStr)] public static string JPEG = "image/jpeg";
+ [MarshalAs(UnmanagedType.LPTStr)] public static string MP3 = "audio/mpeg";
+ [MarshalAs(UnmanagedType.LPTStr)] public static string MPEG = "video/mpeg";
+ [MarshalAs(UnmanagedType.LPTStr)] public static string OGG = "application/ogg";
[MarshalAs(UnmanagedType.LPTStr)] public static string PGM = "image/x-portable-graymap";
[MarshalAs(UnmanagedType.LPTStr)] public static string PNG = "image/png";
+ [MarshalAs(UnmanagedType.LPTStr)] public static string PNM = "image-x-portable-anymap";
[MarshalAs(UnmanagedType.LPTStr)] public static string PPM = "image-x-portable-pixmap";
[MarshalAs(UnmanagedType.LPTStr)] public static string QUICKTIME = "video/quicktime";
[MarshalAs(UnmanagedType.LPTStr)] public static string RAW = "image/x-raw";
[MarshalAs(UnmanagedType.LPTStr)] public static string TIFF = "image/tiff";
[MarshalAs(UnmanagedType.LPTStr)] public static string UNKNOWN = "application/octet-stream";
[MarshalAs(UnmanagedType.LPTStr)] public static string WAV = "audio/wav";
+ [MarshalAs(UnmanagedType.LPTStr)] public static string WMA = "audio/x-wma";
}
- public class CameraFile : Object
+ public class CameraFile : GPObject
{
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_file_new (out IntPtr file);
+ [DllImport ("libgphoto2.so")]
+ internal static extern ErrorCode gp_file_unref (HandleRef file);
- public CameraFile()
+ public CameraFile () : base (gp_file_unref)
{
IntPtr native;
-
Error.CheckError (gp_file_new (out native));
-
this.handle = new HandleRef (this, native);
}
-#if GPHOTO2_2_4
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_file_new_from_fd (out IntPtr file, int fd);
- public CameraFile(int fd)
+ public CameraFile (int fd) : base (gp_file_unref)
{
IntPtr native;
-
Error.CheckError (gp_file_new_from_fd (out native, fd));
-
this.handle = new HandleRef (this, native);
}
-#endif
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_unref (HandleRef file);
-
- protected override void Cleanup () {
- gp_file_unref (this.Handle);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_append (HandleRef file, byte[] data, ulong size);
-
- public void Append (byte[] data)
- {
- Error.CheckError (gp_file_append (this.Handle, data, (ulong)data.Length));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_open (HandleRef file, string filename);
-
- public void Open (string filename)
- {
- Error.CheckError (gp_file_open (this.Handle, filename));
- }
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_file_save (HandleRef file, string filename);
+ [Obsolete ("DO NOT USE")]
public void Save (string filename)
{
Error.CheckError (gp_file_save (this.Handle, filename));
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_clean (HandleRef file);
-
- public void Clean (string filename)
- {
- Error.CheckError (gp_file_clean (this.Handle));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_get_name (HandleRef file, out string name);
-
- public string GetName ()
- {
- string name;
-
- Error.CheckError (gp_file_get_name (this.Handle, out name));
-
- return name;
- }
-
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_set_name (HandleRef file, string name);
-
- public void SetName (string name)
- {
- Error.CheckError (gp_file_set_name (this.Handle, name));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_get_type (HandleRef file, out CameraFileType type);
-
- public CameraFileType GetFileType ()
- {
- CameraFileType type;
-
- Error.CheckError (gp_file_get_type (this.Handle, out type));
-
- return type;
- }
-
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_set_type (HandleRef file, CameraFileType type);
-
- public void SetFileType (CameraFileType type)
- {
- Error.CheckError (gp_file_set_type (this.Handle, type));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_get_mime_type (HandleRef file, out string mime_type);
-
- public string GetMimeType ()
- {
- string mime;
-
- Error.CheckError (gp_file_get_mime_type (this.Handle, out mime));
-
- return mime;
- }
-
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_set_mime_type (HandleRef file, string mime_type);
-
- public void SetMimeType (string mime_type)
- {
- Error.CheckError (gp_file_set_mime_type (this.Handle, mime_type));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_detect_mime_type (HandleRef file);
-
- public void DetectMimeType ()
- {
- Error.CheckError (gp_file_detect_mime_type (this.Handle));
- }
-
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_adjust_name_for_mime_type (HandleRef file);
-
- public void AdjustNameForMimeType ()
- {
- Error.CheckError (gp_file_adjust_name_for_mime_type (this.Handle));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_convert (HandleRef file, [MarshalAs(UnmanagedType.LPTStr)] string mime_type);
-
- public void Convert (string mime_type)
- {
- Error.CheckError (CameraFile.gp_file_convert (this.Handle, mime_type));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_copy (HandleRef destination, HandleRef source);
-
- public void Copy (CameraFile source)
- {
- Error.CheckError (gp_file_copy (this.Handle, source.Handle));
- }
-
- //[DllImport ("libgphoto2.so")]
- //internal static extern ErrorCode gp_file_set_color_table (HandleRef file, byte *red_table, int red_size, byte *green_table, int green_size, byte *blue_table, int blue_size);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_set_header (HandleRef file, [MarshalAs(UnmanagedType.LPTStr)] byte[] header);
-
- public void SetHeader (byte[] header)
- {
- Error.CheckError (gp_file_set_header(this.Handle, header));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_set_width_and_height (HandleRef file, int width, int height);
-
- public void SetWidthHeight (int width, int height)
- {
- Error.CheckError (gp_file_set_width_and_height(this.Handle, width, height));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_file_set_data_and_size (HandleRef file, byte[] data, ulong size);
-
- public void SetDataAndSize (byte[] data)
- {
- Error.CheckError (gp_file_set_data_and_size (this.Handle, data, (ulong)data.Length));
- }
-
- [DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_file_get_data_and_size (HandleRef file, out IntPtr data, out IntPtr size);
+ [Obsolete ("DO NOT USE")]
public byte[] GetDataAndSize ()
{
IntPtr size;
diff --git a/lib/libgphoto2-sharp/CameraFileOperation.cs b/lib/libgphoto2-sharp/CameraFileOperation.cs
new file mode 100644
index 0000000..296db30
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraFileOperation.cs
@@ -0,0 +1,27 @@
+/*
+ * CameraFileOperation.cs
+ *
+ * Author(s):
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+
+namespace GPhoto2
+{
+ [Flags]
+ public enum CameraFileOperation {
+ None = 0,
+ Delete = 1 << 1,
+ Preview = 1 << 3,
+ Raw = 1 << 4,
+ Audio = 1 << 5,
+ Exif = 1 << 6,
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraFilePath.cs b/lib/libgphoto2-sharp/CameraFilePath.cs
new file mode 100644
index 0000000..4ac2b2f
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraFilePath.cs
@@ -0,0 +1,35 @@
+/*
+ * xxx.cs
+ *
+ * Author(s):
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace GPhoto2
+{
+ [StructLayout(LayoutKind.Sequential)]
+ public unsafe struct CameraFilePath
+ {
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=128)] string name;
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=1024)] string folder;
+
+ public string Name {
+ get { return name; }
+ set { name = value; }
+ }
+
+ public string Folder {
+ get { return folder; }
+ set { folder = value; }
+ }
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraFilesystem.cs b/lib/libgphoto2-sharp/CameraFilesystem.cs
index 150ac3b..1d94675 100644
--- a/lib/libgphoto2-sharp/CameraFilesystem.cs
+++ b/lib/libgphoto2-sharp/CameraFilesystem.cs
@@ -10,7 +10,7 @@
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
public enum CameraFilePermissions
{
@@ -81,282 +81,4 @@ namespace LibGPhoto2
public CameraFileInfoFile file;
public CameraFileInfoAudio audio;
}
-
-#if false
- [StructLayout(LayoutKind.Sequential)]
- internal unsafe struct _CameraFilesystem
- {
-
- internal delegate ErrorCode _CameraFilesystemGetFileFunc (HandleRef fs, char *folder, char *filename, CameraFileType type, HandleRef file, void *data, HandleRef context);
-
- internal delegate ErrorCode _CameraFilesystemDeleteFileFunc (HandleRef fs, char *folder, char *filename, void *data, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_set_file_funcs (HandleRef fs, _CameraFilesystemGetFileFunc get_file_func, _CameraFilesystemDeleteFileFunc del_file_func, void *data);
-
- internal delegate ErrorCode _CameraFilesystemGetInfoFunc (HandleRef fs, char *folder, char *filename, CameraFileInfo *info, void *data, HandleRef context);
-
- internal delegate ErrorCode _CameraFilesystemSetInfoFunc (HandleRef fs, char *folder, char *filename, CameraFileInfo info, void *data, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_set_info_funcs (HandleRef fs, _CameraFilesystemGetInfoFunc get_info_func, _CameraFilesystemSetInfoFunc set_info_func, void *data);
-
- internal delegate ErrorCode _CameraFilesystemPutFileFunc (HandleRef fs, char *folder, HandleRef file, void *data, HandleRef context);
-
- internal delegate ErrorCode _CameraFilesystemDeleteAllFunc (HandleRef fs, char *folder, void *data, HandleRef context);
-
- internal delegate ErrorCode _CameraFilesystemDirFunc (HandleRef fs, char *folder, char *name, void *data, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_set_folder_funcs (HandleRef fs, _CameraFilesystemPutFileFunc put_file_func, _CameraFilesystemDeleteAllFunc delete_all_func, _CameraFilesystemDirFunc make_dir_func, _CameraFilesystemDirFunc remove_dir_func, void *data);
-
- internal delegate ErrorCode _CameraFilesystemListFunc (HandleRef fs, char *folder, HandleRef list, void *data, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_set_list_funcs (HandleRef fs, _CameraFilesystemListFunc file_list_func, _CameraFilesystemListFunc folder_list_func, void *data);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_append (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string filename, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_set_file_noop (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef file, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_dump (HandleRef fs);
- }
-#endif
-
- public class CameraFilesystem : Object
- {
- bool need_dispose;
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_new (out IntPtr fs);
-
- public CameraFilesystem()
- {
- IntPtr native;
-
- Error.CheckError (gp_filesystem_new(out native));
-
- this.handle = new HandleRef (this, native);
- need_dispose = true;
- }
-
- unsafe internal CameraFilesystem(IntPtr fs)
- {
- this.handle = new HandleRef (this, fs);
- need_dispose = false;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_free (HandleRef fs);
-
- protected override void Cleanup ()
- {
- if (need_dispose)
- Error.CheckError (gp_filesystem_free(this.Handle));
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_list_files (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef list, HandleRef context);
-
- public CameraList ListFiles (string folder, Context context)
- {
- ErrorCode result;
- CameraList list = new CameraList();
- unsafe
- {
- result = gp_filesystem_list_files (this.Handle, folder, list.Handle, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return list;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_list_folders (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef list, HandleRef context);
-
- public CameraList ListFolders (string folder, Context context)
- {
- ErrorCode result;
- CameraList list = new CameraList();
- unsafe
- {
- result = gp_filesystem_list_folders (this.Handle, folder, list.Handle, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return list;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_get_file (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string filename, CameraFileType type, HandleRef file, HandleRef context);
-
-
- public CameraFile GetFile (string folder, string filename, CameraFileType type, Context context)
- {
- ErrorCode result;
- CameraFile file = new CameraFile();
- unsafe
- {
- result = gp_filesystem_get_file (this.Handle, folder, filename, type, file.Handle, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return file;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_put_file (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef file, HandleRef context);
-
- public void PutFile (string folder, CameraFile file, Context context)
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_put_file (this.Handle, folder, file.Handle, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_delete_file (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string filename, HandleRef context);
-
- public void DeleteFile (string folder, string filename, Context context)
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_delete_file (this.Handle, folder, filename, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_delete_all (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef context);
-
- public void DeleteAll (string folder, Context context)
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_delete_all (this.Handle, folder, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_make_dir (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string name, HandleRef context);
-
- public void MakeDirectory (string folder, string name, Context context)
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_make_dir (this.Handle, folder, name, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_remove_dir (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string name, HandleRef context);
-
- public void RemoveDirectory (string folder, string name, Context context)
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_remove_dir (this.Handle, folder, name, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_get_info (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string filename, out CameraFileInfo info, HandleRef context);
-
- public CameraFileInfo GetInfo (string folder, string filename, Context context)
- {
- ErrorCode result;
- CameraFileInfo fileinfo = new CameraFileInfo();
- unsafe
- {
- result = gp_filesystem_get_info (this.Handle, folder, filename, out fileinfo, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return fileinfo;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_set_info (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string filename, CameraFileInfo info, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_set_info_noop (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, CameraFileInfo info, HandleRef context);
-
- public void SetInfo (string folder, string filename, CameraFileInfo fileinfo, Context context)
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_set_info (this.Handle, folder, filename, fileinfo, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_number (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, [MarshalAs(UnmanagedType.LPTStr)] string filename, HandleRef context);
-
- public int GetNumber (string folder, string filename, Context context)
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_number (this.Handle, folder, filename, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return (int)result;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_name (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, int filenumber, out string filename, HandleRef context);
-
- public string GetName (string folder, int number, Context context)
- {
- ErrorCode result;
- string name;
- unsafe
- {
- result = gp_filesystem_name (this.Handle, folder, number, out name, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return name;
- }
-
- //[DllImport ("libgphoto2.so")]
- //internal static extern ErrorCode gp_filesystem_get_folder (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string filename, IntPtr folder, HandleRef context);
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_count (HandleRef fs, [MarshalAs(UnmanagedType.LPTStr)] string folder, HandleRef context);
-
- public int Count (string folder, Context context)
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_count (this.Handle, folder, context.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return (int)result;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_filesystem_reset (HandleRef fs);
-
- public void Reset ()
- {
- ErrorCode result;
- unsafe
- {
- result = gp_filesystem_reset (this.Handle);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
- }
}
diff --git a/lib/libgphoto2-sharp/CameraFolderOperation.cs b/lib/libgphoto2-sharp/CameraFolderOperation.cs
new file mode 100644
index 0000000..c8144fc
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraFolderOperation.cs
@@ -0,0 +1,26 @@
+/*
+ * CameraFolderOperation.cs
+ *
+ * Author(s):
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+
+namespace GPhoto2
+{
+ [Flags]
+ public enum CameraFolderOperation {
+ None = 0,
+ DeleteAll = 1 << 0,
+ PutFile = 1 << 1,
+ MakeDirectory = 1 << 2,
+ RemoveDirectory = 1 << 3,
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraList.cs b/lib/libgphoto2-sharp/CameraList.cs
index 24e2a6c..8d1fa5b 100644
--- a/lib/libgphoto2-sharp/CameraList.cs
+++ b/lib/libgphoto2-sharp/CameraList.cs
@@ -2,22 +2,28 @@
* CameraList.cs
*
* Author(s):
+ * Stephane Delcroix <stephane at delcroix.org
* Ewen Cheslack-Postava <echeslack at gmail.com>
* Larry Ewing <lewing at novell.com>
*
- * This is free software. See COPYING for details.
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
*/
+
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
- public class CameraList : Object
+ public class CameraList : GPObject
{
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_list_new (out IntPtr list);
+ [DllImport ("libgphoto2.so")]
+ internal static extern ErrorCode gp_list_unref (HandleRef list);
- public CameraList ()
+ public CameraList () : base (gp_list_unref)
{
IntPtr native;
Error.CheckError (gp_list_new (out native));
@@ -26,86 +32,49 @@ namespace LibGPhoto2
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_list_unref (HandleRef list);
-
- protected override void Cleanup ()
- {
- gp_list_unref (handle);
- }
-
- [DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_list_count (HandleRef list);
- public int Count ()
- {
- ErrorCode result = gp_list_count (handle);
-
- if (Error.IsError (result))
- throw Error.ErrorException (result);
-
- return (int)result;
+ public int Count {
+ get { return Error.CheckError (gp_list_count (handle)); }
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_list_set_name (HandleRef list, int index, string name);
+ internal static extern ErrorCode gp_list_set_name (HandleRef list, int index, [MarshalAs(UnmanagedType.LPTStr)] string name);
public void SetName (int n, string name)
{
- ErrorCode result = gp_list_set_name(this.Handle, n, name);
-
- if (Error.IsError (result))
- throw Error.ErrorException (result);
+ Error.CheckError (gp_list_set_name(this.Handle, n, name));
}
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_list_set_value (HandleRef list, int index, string value);
- public void SetValue (int n, string value)
- {
- ErrorCode result = gp_list_set_value (this.Handle, n, value);
-
- if (Error.IsError (result))
- throw Error.ErrorException (result);
- }
-
[DllImport ("libgphoto2.so")]
internal static extern ErrorCode gp_list_get_name (HandleRef list, int index, out IntPtr name);
public string GetName (int index)
{
IntPtr name;
-
Error.CheckError (gp_list_get_name(this.Handle, index, out name));
return Marshal.PtrToStringAnsi (name);
}
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_list_get_value (HandleRef list, int index, out IntPtr value);
+ internal static extern ErrorCode gp_list_set_value (HandleRef list, int index, [MarshalAs (UnmanagedType.LPTStr)] string value);
- public string GetValue (int index)
+ public void SetValue (int n, string value)
{
- IntPtr value;
-
- Error.CheckError (gp_list_get_value(this.Handle, index, out value));
-
- return Marshal.PtrToStringAnsi (value);
+ Error.CheckError (gp_list_set_value (this.Handle, n, value));
}
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_list_append (HandleRef list, string name, string value);
-
- public void Append (string name, string value)
- {
- Error.CheckError (gp_list_append(this.Handle, name, value));
- }
[DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_list_populate (HandleRef list, string format, int count);
+ internal static extern ErrorCode gp_list_get_value (HandleRef list, int index, out IntPtr value);
- public void Populate (string format, int count)
+ public string GetValue (int index)
{
- Error.CheckError (gp_list_populate(this.Handle, format, count));
+ IntPtr value;
+ Error.CheckError (gp_list_get_value(this.Handle, index, out value));
+
+ return Marshal.PtrToStringAnsi (value);
}
[DllImport ("libgphoto2.so")]
@@ -123,16 +92,5 @@ namespace LibGPhoto2
{
Error.CheckError (gp_list_sort(this.Handle));
}
-
- public int GetPosition(string name, string value)
- {
- for (int index = 0; index < Count(); index++)
- {
- if (GetName(index) == name && GetValue(index) == value)
- return index;
- }
-
- return -1;
- }
}
}
diff --git a/lib/libgphoto2-sharp/CameraOperation.cs b/lib/libgphoto2-sharp/CameraOperation.cs
new file mode 100644
index 0000000..11a7c3d
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraOperation.cs
@@ -0,0 +1,27 @@
+/*
+ * CameraOperation.cs
+ *
+ * Author(s):
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+
+namespace GPhoto2
+{
+ [Flags]
+ public enum CameraOperation {
+ None = 0,
+ CaptureImage = 1 << 0,
+ CaptureVideo = 1 << 1,
+ CaptureAudio = 1 << 2,
+ CapturePreview = 1 << 3,
+ Config = 1 << 4,
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraText.cs b/lib/libgphoto2-sharp/CameraText.cs
new file mode 100644
index 0000000..3e82814
--- /dev/null
+++ b/lib/libgphoto2-sharp/CameraText.cs
@@ -0,0 +1,27 @@
+/*
+ * CameraText.cs
+ *
+ * Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace GPhoto2
+{
+ [StructLayout(LayoutKind.Sequential)]
+ public unsafe struct CameraText
+ {
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=(32*1024))] string text;
+
+ public string Text {
+ get { return text; }
+ set { text = value; }
+ }
+ }
+}
diff --git a/lib/libgphoto2-sharp/CameraWidget.cs b/lib/libgphoto2-sharp/CameraWidget.cs
deleted file mode 100644
index 96e7c08..0000000
--- a/lib/libgphoto2-sharp/CameraWidget.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * CameraWidget.cs
- *
- * Author(s):
- * Ewen Cheslack-Postava <echeslack at gmail.com>
- * Larry Ewing <lewing at novell.com>
- *
- * This is free software. See COPYING for details.
- */
-using System;
-using System.Runtime.InteropServices;
-
-namespace LibGPhoto2
-{
- public enum CameraWidgetType
- { /* Value (get/set): */
- GP_WIDGET_WINDOW,
- GP_WIDGET_SECTION,
- GP_WIDGET_TEXT, /* char * */
- GP_WIDGET_RANGE, /* float */
- GP_WIDGET_TOGGLE, /* int */
- GP_WIDGET_RADIO, /* char * */
- GP_WIDGET_MENU, /* char * */
- GP_WIDGET_BUTTON, /* CameraWidgetCallback */
- GP_WIDGET_DATE /* int */
- }
-
- public class CameraWidget : IDisposable
- {
- protected HandleRef handle;
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_ref (HandleRef widget);
-
- protected CameraWidget (IntPtr native)
- {
- this.handle = new HandleRef (this, native);
- gp_widget_ref (this.Handle);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_new (CameraWidgetType type, string lable, out IntPtr widget);
-
- public CameraWidget (CameraWidgetType type, string label)
- {
- ErrorCode result;
- unsafe
- {
- IntPtr native;
- result = gp_widget_new(type, label,out native);
- this.handle = new HandleRef (this, native);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- public void Dispose()
- {
- Dispose(true);
- GC.SuppressFinalize(this);
- }
-
- ~CameraWidget()
- {
- Dispose(false);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_unref (HandleRef widget);
-
- protected virtual void Dispose (bool disposing)
- {
- ErrorCode result;
- unsafe
- {
- if (this.Handle.Handle != IntPtr.Zero)
- {
- result = gp_widget_unref(this.Handle);
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
- }
- }
-
- public HandleRef Handle
- {
- get {
- return handle;
- }
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_append (HandleRef widget, HandleRef child);
-
- public void Append(CameraWidget child)
- {
- ErrorCode result;
-
- result = gp_widget_append(this.Handle, child.Handle);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_prepend (HandleRef widget, HandleRef child);
-
- public void Prepend(CameraWidget child)
- {
- ErrorCode result;
-
- result = gp_widget_prepend(this.Handle, child.Handle);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_count_children (HandleRef widget);
-
- public int ChildCount
- {
- get
- {
- ErrorCode result;
-
- result = gp_widget_count_children(this.Handle);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return (int)result;
- }
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_child (HandleRef widget, int child_number, out IntPtr child);
-
- public CameraWidget GetChild (int n)
- {
- ErrorCode result;
- IntPtr native;
-
- result = gp_widget_get_child(this.Handle, n, out native);
-
- CameraWidget child = new CameraWidget(native);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
-
- return child;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_child_by_label (HandleRef widget, string label, out IntPtr child);
-
- public CameraWidget GetChild (string label)
- {
- ErrorCode result;
- IntPtr native;
-
- result = gp_widget_get_child_by_label(this.Handle, label, out native);
-
- CameraWidget child = new CameraWidget (native);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return child;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_child_by_id (HandleRef widget, int id, out IntPtr child);
-
- public CameraWidget GetChildByID (int id)
- {
- ErrorCode result;
- IntPtr native;
-
- result = gp_widget_get_child_by_id(this.Handle, id, out native);
- CameraWidget child = new CameraWidget (native);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return child;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_root (HandleRef widget, out IntPtr root);
-
- public CameraWidget GetRoot ()
- {
- ErrorCode result;
- IntPtr native;
-
- result = gp_widget_get_root (this.Handle, out native);
- CameraWidget root = new CameraWidget(native);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return root;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_set_info (HandleRef widget, string info);
-
- public void SetInfo (string info)
- {
- ErrorCode result;
-
- result = gp_widget_set_info(this.Handle, info);
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_info (HandleRef widget, out string info);
-
- public string GetInfo ()
- {
- ErrorCode result;
- string info;
-
- result = gp_widget_get_info (this.Handle, out info);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return info;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_id (HandleRef widget, out int id);
-
- public int GetID ()
- {
- ErrorCode result;
- int id;
-
- result = gp_widget_get_id (this.Handle, out id);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return id;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_type (HandleRef widget, out CameraWidgetType type);
-
- public CameraWidgetType GetWidgetType ()
- {
- ErrorCode result;
- CameraWidgetType widget_type;
-
- result = gp_widget_get_type(this.Handle, out widget_type);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return widget_type;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_label (HandleRef widget, out string label);
-
- public string GetLabel ()
- {
- ErrorCode result;
- string label;
-
- result = gp_widget_get_label(this.Handle, out label);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return label;
- }
-
- /*public void SetValue (string value)
- {
- ErrorCode result;
- unsafe
- {
- result = _CameraWidget.gp_widget_set_value(obj, Marshal.StringToHGlobalAnsi(value));
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- public void SetValue (float value)
- {
- ErrorCode result;
- unsafe
- {
- IntPtr ptr = (void*)value;
- result = _CameraWidget.gp_widget_set_value(obj, ptr);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- public void SetValue (int value)
- {
- ErrorCode result;
- unsafe
- {
- IntPtr ptr = value;
- result = _CameraWidget.gp_widget_set_value(obj, ptr);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- /*public void SetValue (CameraWidgetCallback value)
- {
- ErrorCode result;
- unsafe
- {
- IntPtr ptr = &value;
- result = _CameraWidget.gp_widget_set_value(obj, ptr);
- }
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }*/
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_range (HandleRef range, out
- float min, out float max, out float increment);
-
- public void GetRange (out float min, out float max, out float increment)
- {
- ErrorCode result;
-
- result = gp_widget_get_range(this.Handle, out min, out max, out increment);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_add_choice (HandleRef widget, string choice);
-
- public void AddChoice (string choice)
- {
- ErrorCode result;
-
- result = gp_widget_add_choice (this.Handle, choice);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_count_choices (HandleRef widget);
-
- public int ChoicesCount ()
- {
- ErrorCode result;
-
- result = gp_widget_count_choices(this.Handle);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return (int)result;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_get_choice (HandleRef widget, int choice_number, out string choice);
-
- public string GetChoice (int n)
- {
- ErrorCode result;
- string choice;
-
- result = gp_widget_get_choice(this.Handle, n, out choice);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
- return choice;
- }
-
- [DllImport ("libgphoto2.so")]
- internal static extern ErrorCode gp_widget_changed (HandleRef widget);
-
- public bool Changed ()
- {
- ErrorCode result;
-
- result = gp_widget_changed(this.Handle);
-
- if (Error.IsError(result)) throw Error.ErrorException(result);
-
- if ((int)result == 1)
- return true;
- else
- return false;
-
- }
- }
-}
diff --git a/lib/libgphoto2-sharp/Context.cs b/lib/libgphoto2-sharp/Context.cs
index 53d3595..53c6728 100644
--- a/lib/libgphoto2-sharp/Context.cs
+++ b/lib/libgphoto2-sharp/Context.cs
@@ -2,33 +2,251 @@
* Context.cs
*
* Author(s):
+ * Stephane Delcroix <stephan @delcroix.org>
* Ewen Cheslack-Postava <echeslack at gmail.com>
* Larry Ewing <lewing at novell.com>
*
- * This is free software. See COPYING for details.
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
*/
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
- public class Context : Object
+ public delegate void IdleFunc ();
+ public delegate void ErrorFunc (string error);
+ public delegate void StatusFunc (string status);
+ public delegate void MessageFunc (string message);
+ public delegate ContextFeedback QuestionFunc (string message);
+ public delegate ContextFeedback CancelFunc (string message);
+ public delegate uint ProgressStartFunc (float target, string message);
+ public delegate void ProgressUpdateFunc (uint id, float progress);
+ public delegate void ProgressStopFunc (uint id);
+
+ public class Context : GPObject
{
[DllImport ("libgphoto2.so")]
internal static extern IntPtr gp_context_new ();
+ [DllImport ("libgphoto2glue.so")]
+ internal static extern IntPtr gp_glue_context_new (HandleRef context);
+
+ [DllImport ("libgphoto2.so")]
+ internal static extern void gp_context_unref (HandleRef context);
+
+ HandleRef gluecontext;
public Context ()
{
this.handle = new HandleRef (this, gp_context_new ());
+ gluecontext = new HandleRef (this, gp_glue_context_new (Handle));
}
- [DllImport ("libgphoto2.so")]
- internal static extern void gp_context_unref (HandleRef context);
+
+ [DllImport ("libgphoto2glue.so")]
+ internal static extern void gp_glue_context_free (HandleRef context);
protected override void Cleanup ()
{
- System.Console.WriteLine ("cleanup context");
- gp_context_unref(handle);
+ gp_glue_context_free (gluecontext);
+ gp_context_unref (handle);
+ }
+
+#region callbacks
+ [DllImport ("libgphoto2.so")]
+ internal static extern void gp_context_set_idle_func (HandleRef context, IdleFuncNative func, IntPtr data);
+
+ IdleFuncWrapper idle_func_wrapper;
+ public void SetIdleFunc (IdleFunc func)
+ {
+ idle_func_wrapper = new IdleFuncWrapper (func);
+ IntPtr data = IntPtr.Zero;
+ if (func != null)
+ data = (IntPtr) GCHandle.Alloc (idle_func_wrapper);
+ gp_context_set_idle_func (Handle, idle_func_wrapper.NativeDelegate, data);
+ }
+
+ [DllImport ("libgphoto2glue.so")]
+ internal static extern void gp_glue_context_set_progress_funcs (HandleRef context, ProgressStartFuncNative start_func, ProgressUpdateFuncNative update_func, ProgressStopFuncNative stop_func, IntPtr data);
+
+ ProgressFuncsWrapper progress_funcs_wrapper;
+ public void SetProgressFuncs (ProgressStartFunc start_func, ProgressUpdateFunc update_func, ProgressStopFunc stop_func)
+ {
+ progress_funcs_wrapper = new ProgressFuncsWrapper (start_func, update_func, stop_func);
+ IntPtr data = IntPtr.Zero;
+ if (start_func != null || update_func != null || stop_func != null)
+ data = (IntPtr) GCHandle.Alloc (progress_funcs_wrapper);
+ gp_glue_context_set_progress_funcs (gluecontext,
+ progress_funcs_wrapper.NativeStartDelegate,
+ progress_funcs_wrapper.NativeUpdateDelegate,
+ progress_funcs_wrapper.NativeStopDelegate,
+ data);
+ }
+
+ [DllImport ("libgphoto2glue.so")]
+ internal static extern void gp_glue_context_set_error_func (HandleRef context, ErrorFuncNative func, IntPtr data);
+
+ ErrorFuncWrapper error_func_wrapper;
+ public void SetErrorFunc (ErrorFunc func)
+ {
+ error_func_wrapper = new ErrorFuncWrapper (func);
+ IntPtr data = IntPtr.Zero;
+ if (func != null)
+ data = (IntPtr) GCHandle.Alloc (error_func_wrapper);
+ gp_glue_context_set_error_func (gluecontext, error_func_wrapper.NativeDelegate, data);
+ }
+
+ [DllImport ("libgphoto2glue.so")]
+ internal static extern void gp_glue_context_set_status_func (HandleRef context, StatusFuncNative func, IntPtr data);
+
+ StatusFuncWrapper status_func_wrapper;
+ public void SetStatusFunc (StatusFunc func)
+ {
+ status_func_wrapper = new StatusFuncWrapper (func);
+ IntPtr data = IntPtr.Zero;
+ if (func != null)
+ data = (IntPtr) GCHandle.Alloc (status_func_wrapper);
+ gp_glue_context_set_status_func (gluecontext, status_func_wrapper.NativeDelegate, data);
+ }
+
+ [DllImport ("libgphoto2.so")]
+ internal static extern void gp_context_set_message_func (HandleRef context, MessageFuncNative func, IntPtr data);
+
+ MessageFuncWrapper message_func_wrapper;
+ public void SetMessageFunc (MessageFunc func)
+ {
+ message_func_wrapper = new MessageFuncWrapper (func);
+ IntPtr data = IntPtr.Zero;
+ if (func != null)
+ data = (IntPtr) GCHandle.Alloc (message_func_wrapper);
+ gp_context_set_message_func (gluecontext, message_func_wrapper.NativeDelegate, data);
+ }
+
+#endregion
+
+#region wrappers for callbacks
+ internal delegate void IdleFuncNative (HandleRef context, IntPtr data);
+ class IdleFuncWrapper
+ {
+ public void NativeCallback (HandleRef context, IntPtr data)
+ {
+ managed ();
+ }
+
+ public IdleFuncNative NativeDelegate;
+ IdleFunc managed;
+
+ public IdleFuncWrapper (IdleFunc managed)
+ {
+ this.managed = managed;
+ if (managed != null)
+ NativeDelegate = NativeCallback;
+ }
+ }
+
+ internal delegate uint ProgressStartFuncNative (HandleRef context, float target, string message, IntPtr data);
+ internal delegate void ProgressUpdateFuncNative (HandleRef context, uint id, float current, IntPtr data);
+ internal delegate void ProgressStopFuncNative (HandleRef context, uint id, IntPtr data);
+ class ProgressFuncsWrapper
+ {
+ public void NativeUpdateCallback (HandleRef context, uint id, float current, IntPtr data)
+ {
+ managed_update (id, current);
+ }
+ public uint NativeStartCallback (HandleRef context, float target, string message, IntPtr data)
+ {
+ return managed_start (target, message);
+ }
+
+
+ public void NativeStopCallback (HandleRef context, uint id, IntPtr data)
+ {
+ managed_stop (id);
+ }
+
+ public ProgressStartFuncNative NativeStartDelegate;
+ public ProgressUpdateFuncNative NativeUpdateDelegate;
+ public ProgressStopFuncNative NativeStopDelegate;
+
+ ProgressStartFunc managed_start;
+ ProgressUpdateFunc managed_update;
+ ProgressStopFunc managed_stop;
+
+ public ProgressFuncsWrapper (ProgressStartFunc start, ProgressUpdateFunc update, ProgressStopFunc stop)
+ {
+ managed_start = start;
+ if (managed_start != null)
+ NativeStartDelegate = new ProgressStartFuncNative (NativeStartCallback);
+
+ managed_update = update;
+ if (managed_update != null)
+ NativeUpdateDelegate = new ProgressUpdateFuncNative (NativeUpdateCallback);
+
+ managed_stop = stop;
+ if (managed_stop != null)
+ NativeStopDelegate = new ProgressStopFuncNative (NativeStopCallback);
+ }
}
+
+ internal delegate void ErrorFuncNative (HandleRef context, string error, IntPtr data);
+ class ErrorFuncWrapper
+ {
+ public void NativeCallback (HandleRef context, string error, IntPtr data)
+ {
+ managed (error);
+ }
+
+ public ErrorFuncNative NativeDelegate;
+ ErrorFunc managed;
+
+ public ErrorFuncWrapper (ErrorFunc managed)
+ {
+ this.managed = managed;
+ if (managed != null)
+ NativeDelegate = NativeCallback;
+ }
+ }
+
+ internal delegate void StatusFuncNative (HandleRef context, string status, IntPtr data);
+ class StatusFuncWrapper
+ {
+ public void NativeCallback (HandleRef context, string status, IntPtr data)
+ {
+ managed (status);
+ }
+
+ public StatusFuncNative NativeDelegate;
+ StatusFunc managed;
+
+ public StatusFuncWrapper (StatusFunc managed)
+ {
+ this.managed = managed;
+ if (managed != null)
+ NativeDelegate = NativeCallback;
+ }
+ }
+
+ internal delegate void MessageFuncNative (HandleRef context, string message, IntPtr data);
+ class MessageFuncWrapper
+ {
+ public void NativeCallback (HandleRef context, string message, IntPtr data)
+ {
+ managed (message);
+ }
+
+ public MessageFuncNative NativeDelegate;
+ MessageFunc managed;
+
+ public MessageFuncWrapper (MessageFunc managed)
+ {
+ this.managed = managed;
+ if (managed != null)
+ NativeDelegate = NativeCallback;
+ }
+ }
+
+
+#endregion
}
}
diff --git a/lib/libgphoto2-sharp/ContextFeedback.cs b/lib/libgphoto2-sharp/ContextFeedback.cs
new file mode 100644
index 0000000..dc864ec
--- /dev/null
+++ b/lib/libgphoto2-sharp/ContextFeedback.cs
@@ -0,0 +1,21 @@
+/*
+ * ContextFeedback.cs
+ *
+ * Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace GPhoto2
+{
+ public enum ContextFeedback {
+ OK,
+ Cancel,
+ }
+}
diff --git a/lib/libgphoto2-sharp/DeviceType.cs b/lib/libgphoto2-sharp/DeviceType.cs
new file mode 100644
index 0000000..b921058
--- /dev/null
+++ b/lib/libgphoto2-sharp/DeviceType.cs
@@ -0,0 +1,22 @@
+/*
+ * DeviceType.cs
+ *
+ * Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+
+using System;
+
+namespace GPhoto2
+{
+ [Flags]
+ public enum DeviceType {
+ StillCamera = 0,
+ AudioPlayer = 1 << 0,
+ }
+}
diff --git a/lib/libgphoto2-sharp/ErrorCodes.cs b/lib/libgphoto2-sharp/ErrorCodes.cs
index 2582fb9..4a89bb7 100644
--- a/lib/libgphoto2-sharp/ErrorCodes.cs
+++ b/lib/libgphoto2-sharp/ErrorCodes.cs
@@ -4,13 +4,16 @@
* Author(s):
* Ewen Cheslack-Postava <echeslack at gmail.com>
* Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
*
- * This is free software. See COPYING for details.
+ * Copyright (c) 2005-2009 Novel, Inc.
+ *
+ * This is open source software. See COPYING for details.
*/
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
public enum ErrorCode
{
@@ -22,6 +25,7 @@ namespace LibGPhoto2
UnknownPort = -5,
NotSupported = -6,
IO = -7,
+ FixedLimitExceeded = -8,
Timout = -10,
SupportedSerial = -20,
SupportedUSB = -21,
@@ -34,76 +38,75 @@ namespace LibGPhoto2
USBFind = -52,
USBClaim = -53,
Lock = -60,
+ Hal = -70,
/* Other Errors*/
CorruptedData = -102,
- PathNotAbsolute = -111,
- DirectoryExists = -109,
FileExists = -103,
- FileNotFound = -108,
+ ModelNotFound = -105,
DirectoryNotFound = -107,
- ModelNotFound = -105
+ FileNotFound = -108,
+ DirectoryExists = -109,
+ CameraBusy = -110,
+ PathNotAbsolute = -111,
+ Cancel = -112,
+ CameraError = -113,
+ OsFailure = -114,
}
- public class Error
+ public static class Error
{
- private static string GetErrorAsString(ErrorCode e)
- {
- IntPtr raw_message = gp_result_as_string(e);
- return Marshal.PtrToStringAnsi(raw_message);
- }
-
- private static string GetIOErrorAsString(ErrorCode e)
- {
- IntPtr raw_message = gp_port_result_as_string(e);
- return Marshal.PtrToStringAnsi(raw_message);
- }
-
public static bool IsError (ErrorCode error_code)
{
return (error_code < 0);
}
- public static GPhotoException ErrorException (ErrorCode error_code)
- {
- string message = "Unknown Error";
- int error_code_int = (int)error_code;
-
- if (error_code_int <= -102 && error_code_int >= -111)
- message = GetErrorAsString(error_code);
- else if (error_code_int <= -1 && error_code_int >= -60)
- message = GetIOErrorAsString(error_code);
-
- return new GPhotoException(error_code, message);
- }
-
- public static ErrorCode CheckError (ErrorCode error)
+ public static int CheckError (ErrorCode error)
{
- if (IsError (error))
- throw ErrorException (error);
+ if (IsError (error)) {
+ string message = "Unknown Error";
+
+ if ((int)error <= -100)
+ message = GetErrorAsString (error);
+ else if ((int)error <= -1 && (int)error >= -99)
+ message = GetIOErrorAsString (error);
+
+ throw new GPhotoException (error, message);
+ }
- return error;
+ return (int)error;
}
[DllImport ("libgphoto2.so")]
internal static extern IntPtr gp_result_as_string (ErrorCode result);
+ static string GetErrorAsString (ErrorCode e)
+ {
+ IntPtr raw_message = gp_result_as_string(e);
+ return Marshal.PtrToStringAnsi(raw_message);
+ }
+
[DllImport ("libgphoto2_port.so")]
internal static extern IntPtr gp_port_result_as_string (ErrorCode result);
+
+ static string GetIOErrorAsString(ErrorCode e)
+ {
+ IntPtr raw_message = gp_port_result_as_string(e);
+ return Marshal.PtrToStringAnsi(raw_message);
+ }
+
}
public class GPhotoException : Exception
{
private ErrorCode error;
- public GPhotoException(ErrorCode error_code)
- : base ("Unknown Error.")
+ public GPhotoException(ErrorCode error_code) : base ("Unknown Error.")
{
error = error_code;
}
- public GPhotoException (ErrorCode error_code, string message)
- : base (message)
+ public GPhotoException (ErrorCode error_code, string message) : base (message)
{
error = error_code;
}
@@ -114,9 +117,7 @@ namespace LibGPhoto2
}
public ErrorCode Error {
- get {
- return error;
- }
+ get { return error; }
}
}
}
diff --git a/lib/libgphoto2-sharp/GPList.cs b/lib/libgphoto2-sharp/GPList.cs
new file mode 100644
index 0000000..613813d
--- /dev/null
+++ b/lib/libgphoto2-sharp/GPList.cs
@@ -0,0 +1,85 @@
+/*
+ * GPList.cs
+ *
+ * Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace GPhoto2
+{
+ public abstract class GPList<T> : GPObject, IEnumerable<T>
+ {
+ IEnumerator<T> IEnumerable<T>.GetEnumerator ()
+ {
+ return new Enumerator<T> (this);
+ }
+
+ IEnumerator IEnumerable.GetEnumerator ()
+ {
+ return new Enumerator<T> (this);
+ }
+
+ public abstract int Count {get; }
+ public abstract T this [int index] { get; }
+
+ public GPList (Func<HandleRef, ErrorCode> cleaner) : base (cleaner)
+ {
+ }
+
+ class Enumerator<U> : IEnumerator<U>, IEnumerator
+ {
+ int current;
+ int count;
+ GPList<U> list;
+
+ public Enumerator (GPList<U> list)
+ {
+ this.list = list;
+ Reset ();
+ }
+
+ public void Reset ()
+ {
+ current = -1;
+ count = list.Count;
+ }
+
+ U IEnumerator<U>.Current {
+ get {
+ if (current < 0 || current >= count)
+ throw new InvalidOperationException ();
+ return list[current];
+ }
+ }
+
+ object IEnumerator.Current {
+ get {
+ if (current < 0 || current >= count)
+ throw new InvalidOperationException ();
+ return list[current];
+ }
+ }
+
+ public bool MoveNext ()
+ {
+ current ++;
+ if (current >= count)
+ return false;
+ return true;
+ }
+
+ public void Dispose ()
+ {
+ }
+ }
+ }
+}
diff --git a/lib/libgphoto2-sharp/GPObject.cs b/lib/libgphoto2-sharp/GPObject.cs
new file mode 100644
index 0000000..768010d
--- /dev/null
+++ b/lib/libgphoto2-sharp/GPObject.cs
@@ -0,0 +1,57 @@
+/*
+ * GPObject.cs
+ *
+ * Author(s):
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2009 Novelll, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+using System;
+using System.Runtime.InteropServices;
+
+namespace GPhoto2 {
+ public abstract class GPObject : System.IDisposable {
+ protected HandleRef handle;
+ Func<HandleRef, ErrorCode> gp_object_cleaner;
+
+ public HandleRef Handle
+ {
+ get { return handle; }
+ }
+
+ public GPObject ()
+ {
+ }
+
+ public GPObject (Func<HandleRef, ErrorCode> gp_object_cleaner)
+ {
+ this.gp_object_cleaner = gp_object_cleaner;
+ }
+
+ protected virtual void Cleanup ()
+ {
+ if (gp_object_cleaner != null)
+ gp_object_cleaner (handle);
+ }
+
+ bool is_disposed = false;
+ public void Dispose () {
+ lock (this) {
+ if (is_disposed)
+ return;
+ is_disposed = true;
+ Cleanup ();
+ System.GC.SuppressFinalize (this);
+ }
+ }
+
+ ~GPObject ()
+ {
+ Cleanup ();
+ }
+ }
+}
diff --git a/lib/libgphoto2-sharp/Makefile.am b/lib/libgphoto2-sharp/Makefile.am
index bd920e5..0e649a2 100644
--- a/lib/libgphoto2-sharp/Makefile.am
+++ b/lib/libgphoto2-sharp/Makefile.am
@@ -1,21 +1,36 @@
+SUBDIRS = glue
+
include $(top_srcdir)/Makefile.include
ASSEMBLY_NAME = libgphoto2-sharp
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Camera.cs \
- $(srcdir)/CameraAbilitiesList.cs\
- $(srcdir)/CameraFile.cs \
- $(srcdir)/CameraFilesystem.cs \
- $(srcdir)/CameraList.cs \
- $(srcdir)/CameraWidget.cs \
- $(srcdir)/Context.cs \
- $(srcdir)/ErrorCodes.cs \
- $(srcdir)/Object.cs \
- $(srcdir)/Port.cs \
- $(srcdir)/PortInfo.cs \
- $(srcdir)/PortInfoList.cs
+ASSEMBLY_SOURCES = \
+ $(srcdir)/AssemblyInfo.cs \
+ $(srcdir)/Camera.cs \
+ $(srcdir)/CameraAbilities.cs \
+ $(srcdir)/CameraAbilitiesList.cs \
+ $(srcdir)/CameraCaptureType.cs \
+ $(srcdir)/CameraDriverStatus.cs \
+ $(srcdir)/CameraEventType.cs \
+ $(srcdir)/CameraFile.cs \
+ $(srcdir)/CameraFilePath.cs \
+ $(srcdir)/CameraFilesystem.cs \
+ $(srcdir)/CameraFileOperation.cs \
+ $(srcdir)/CameraFolderOperation.cs \
+ $(srcdir)/CameraList.cs \
+ $(srcdir)/CameraOperation.cs \
+ $(srcdir)/CameraText.cs \
+ $(srcdir)/Context.cs \
+ $(srcdir)/ContextFeedback.cs \
+ $(srcdir)/DeviceType.cs \
+ $(srcdir)/ErrorCodes.cs \
+ $(srcdir)/GPList.cs \
+ $(srcdir)/GPObject.cs \
+ $(srcdir)/Port.cs \
+ $(srcdir)/PortInfo.cs \
+ $(srcdir)/PortInfoList.cs \
+ $(srcdir)/PortSerialParity.cs \
+ $(srcdir)/PortType.cs
REFS = -r:Mono.Posix
@@ -35,10 +50,11 @@ assembly_DATA = \
EXTRA_DIST = \
$(ASSEMBLY_SOURCES) \
- $(ASSEMBLY).config \
+ $(ASSEMBLY).config.in \
AUTHORS \
COPYING
CLEANFILES = \
$(ASSEMBLY) \
- $(ASSEMBLY).mdb
+ $(ASSEMBLY).mdb \
+ $(ASSEMBLY).config
diff --git a/lib/libgphoto2-sharp/Makefile.in b/lib/libgphoto2-sharp/Makefile.in
index 0e1ac55..62c78d6 100644
--- a/lib/libgphoto2-sharp/Makefile.in
+++ b/lib/libgphoto2-sharp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,19 +35,30 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include AUTHORS COPYING TODO
+ $(srcdir)/libgphoto2-sharp.dll.config.in \
+ $(top_srcdir)/Makefile.include AUTHORS COPYING
subdir = lib/libgphoto2-sharp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = libgphoto2-sharp.dll.config
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -71,18 +82,52 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +144,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +157,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +213,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +235,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +246,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +292,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +318,16 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
+SUBDIRS = glue
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +337,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -299,19 +351,32 @@ MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
ASSEMBLY_NAME = libgphoto2-sharp
ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Camera.cs \
- $(srcdir)/CameraAbilitiesList.cs\
- $(srcdir)/CameraFile.cs \
- $(srcdir)/CameraFilesystem.cs \
- $(srcdir)/CameraList.cs \
- $(srcdir)/CameraWidget.cs \
- $(srcdir)/Context.cs \
- $(srcdir)/ErrorCodes.cs \
- $(srcdir)/Object.cs \
- $(srcdir)/Port.cs \
- $(srcdir)/PortInfo.cs \
- $(srcdir)/PortInfoList.cs
+ $(srcdir)/AssemblyInfo.cs \
+ $(srcdir)/Camera.cs \
+ $(srcdir)/CameraAbilities.cs \
+ $(srcdir)/CameraAbilitiesList.cs \
+ $(srcdir)/CameraCaptureType.cs \
+ $(srcdir)/CameraDriverStatus.cs \
+ $(srcdir)/CameraEventType.cs \
+ $(srcdir)/CameraFile.cs \
+ $(srcdir)/CameraFilePath.cs \
+ $(srcdir)/CameraFilesystem.cs \
+ $(srcdir)/CameraFileOperation.cs \
+ $(srcdir)/CameraFolderOperation.cs \
+ $(srcdir)/CameraList.cs \
+ $(srcdir)/CameraOperation.cs \
+ $(srcdir)/CameraText.cs \
+ $(srcdir)/Context.cs \
+ $(srcdir)/ContextFeedback.cs \
+ $(srcdir)/DeviceType.cs \
+ $(srcdir)/ErrorCodes.cs \
+ $(srcdir)/GPList.cs \
+ $(srcdir)/GPObject.cs \
+ $(srcdir)/Port.cs \
+ $(srcdir)/PortInfo.cs \
+ $(srcdir)/PortInfoList.cs \
+ $(srcdir)/PortSerialParity.cs \
+ $(srcdir)/PortType.cs
REFS = -r:Mono.Posix
PKGS =
@@ -323,15 +388,16 @@ assembly_DATA = \
EXTRA_DIST = \
$(ASSEMBLY_SOURCES) \
- $(ASSEMBLY).config \
+ $(ASSEMBLY).config.in \
AUTHORS \
COPYING
CLEANFILES = \
$(ASSEMBLY) \
- $(ASSEMBLY).mdb
+ $(ASSEMBLY).mdb \
+ $(ASSEMBLY).config
-all: all-am
+all: all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
@@ -343,9 +409,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/libgphoto2-sharp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/libgphoto2-sharp/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/libgphoto2-sharp/Makefile
+ $(AUTOMAKE) --foreign lib/libgphoto2-sharp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -364,6 +430,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+libgphoto2-sharp.dll.config: $(top_builddir)/config.status $(srcdir)/libgphoto2-sharp.dll.config.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-rm -f *.lo
@@ -390,12 +458,141 @@ uninstall-assemblyDATA:
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(assemblydir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(assemblydir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
tags: TAGS
-TAGS:
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
ctags: CTAGS
-CTAGS:
-
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -427,22 +624,51 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(DATA)
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
for dir in "$(DESTDIR)$(assemblydir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -460,85 +686,89 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
install-data-am: install-assemblyDATA
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am: uninstall-assemblyDATA
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-assemblyDATA install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-assemblyDATA \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-assemblyDATA
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-assemblyDATA
all: $(ASSEMBLY)
diff --git a/lib/libgphoto2-sharp/Object.cs b/lib/libgphoto2-sharp/Object.cs
deleted file mode 100644
index 3ab1777..0000000
--- a/lib/libgphoto2-sharp/Object.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Object.cs
- *
- * Author(s):
- * Ewen Cheslack-Postava <echeslack at gmail.com>
- * Larry Ewing <lewing at novell.com>
- *
- * This is free software. See COPYING for details.
- */
-using System;
-using System.Runtime.InteropServices;
-
-namespace LibGPhoto2 {
- public abstract class Object : System.IDisposable {
- protected HandleRef handle;
-
- public HandleRef Handle {
- get {
- return handle;
- }
- }
-
- public Object () {}
-
- public Object (IntPtr ptr)
- {
- handle = new HandleRef (this, ptr);
- }
-
- protected abstract void Cleanup ();
-
- private bool is_disposed = false;
-
- public void Dispose () {
- lock (this) {
- if (is_disposed)
- return;
- is_disposed = true;
- Cleanup ();
- System.GC.SuppressFinalize (this);
- }
- }
-
- ~Object ()
- {
- Cleanup ();
- }
- }
-}
diff --git a/lib/libgphoto2-sharp/Port.cs b/lib/libgphoto2-sharp/Port.cs
index cae8bc4..970024d 100644
--- a/lib/libgphoto2-sharp/Port.cs
+++ b/lib/libgphoto2-sharp/Port.cs
@@ -13,24 +13,9 @@
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
- public enum PortType
- {
- None = 0,
- Serial = 1 << 0,
- USB = 1 << 2,
- Disk = 1 << 3,
-
- }
- public enum PortSerialParity
- {
- Off = 0,
- Even,
- Odd
- }
-
public enum Pin
{
RTS,
@@ -83,108 +68,37 @@ namespace LibGPhoto2
[FieldOffset(0)] public PortSettingsUSB usb;
}
-#if false
- [StructLayout(LayoutKind.Sequential)]
- internal unsafe struct _Port
- {
- PortType type;
-
- PortSettings settings;
- PortSettings settings_pending;
-
- int timout;
-
- PortPrivateLibrary *pl;
- PortPrivateCore *pc;
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_new (out _Port *port);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_free (_Port *port);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_set_info (_Port *port, ref _PortInfo info);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_get_info (_Port *port, out _PortInfo info);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_open (_Port *port);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_close (_Port *port);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_read (_Port *port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_write (_Port *port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_get_settings (_Port *port, out PortSettings settings);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_set_settings (_Port *port, PortSettings settings);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_get_timeout (_Port *port, int *timeout);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_set_timeout (_Port *port, int timeout);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_get_pin (_Port *port, Pin pin, Level *level);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_set_pin (_Port *port, Pin pin, Level level);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern char* gp_port_get_error (_Port *port);
-
- //[DllImport ("libgphoto2.so")]
- //internal static extern int gp_port_set_error (_Port *port, const char *format, ...);
- }
-#endif
-
- public class Port : Object
+ public class Port : GPObject
{
[DllImport ("libgphoto2_port.so")]
internal static extern ErrorCode gp_port_new (out IntPtr port);
+ [DllImport ("libgphoto2_port.so")]
+ internal static extern ErrorCode gp_port_free (HandleRef port);
- public Port()
+ public Port() : base (gp_port_free)
{
IntPtr native;
-
Error.CheckError (gp_port_new (out native));
this.handle = new HandleRef (this, native);
}
[DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_free (HandleRef port);
-
- protected override void Cleanup ()
- {
- Error.CheckError (gp_port_free (this.handle));
- }
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_set_info (HandleRef port, ref _PortInfo info);
+ internal static extern ErrorCode gp_port_set_info (HandleRef port, ref PortInfo info);
public void SetInfo (PortInfo info)
{
- Error.CheckError (gp_port_set_info (this.Handle, ref info.Handle));
+ Error.CheckError (gp_port_set_info (this.Handle, ref info));
}
[DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_get_info (HandleRef port, out _PortInfo info);
+ internal static extern ErrorCode gp_port_get_info (HandleRef port, out PortInfo info);
public PortInfo GetInfo ()
{
PortInfo info = new PortInfo ();
- Error.CheckError (gp_port_get_info (this.Handle, out info.Handle));
+ Error.CheckError (gp_port_get_info (this.Handle, out info));
return info;
}
@@ -271,8 +185,5 @@ namespace LibGPhoto2
[DllImport ("libgphoto2_port.so")]
internal static extern ErrorCode gp_port_set_pin (HandleRef port, Pin pin, Level level);
-
- [DllImport ("libgphoto2_port.so")]
- internal static extern string gp_port_get_error (HandleRef port);
}
}
diff --git a/lib/libgphoto2-sharp/PortInfo.cs b/lib/libgphoto2-sharp/PortInfo.cs
index 6d5c54c..228564b 100644
--- a/lib/libgphoto2-sharp/PortInfo.cs
+++ b/lib/libgphoto2-sharp/PortInfo.cs
@@ -2,48 +2,46 @@
* PortInfo.cs
*
* Author(s):
- * Ewen Cheslack-Postava <echeslack at gmail.com>
- * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
*
- * This is free software. See COPYING for details.
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
*/
+
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
[StructLayout(LayoutKind.Sequential)]
- internal unsafe struct _PortInfo
+ public unsafe struct PortInfo
{
- internal PortType type;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] internal string name;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] internal string path;
+ PortType type;
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] string name;
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] string path;
/* Private */
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst=1024)] internal string library_filename;
- }
-
- public class PortInfo
- {
- internal _PortInfo Handle;
+#pragma warning disable 169
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst=1024)] string library_filename;
+#pragma warning restore 169
+
- internal PortInfo () {
+ public PortType Type {
+ get { return type; }
}
-
+
public string Name {
- get {
- unsafe {
- return Handle.name;
- }
- }
+ get { return name; }
}
-
+
public string Path {
- get {
- unsafe {
- return Handle.path;
- }
- }
+ get { return path; }
+ }
+
+ public override string ToString ()
+ {
+ return String.Format ("PortInfo: {0}\t{1} ({2})", Name, Path, Type);
}
}
}
diff --git a/lib/libgphoto2-sharp/PortInfoList.cs b/lib/libgphoto2-sharp/PortInfoList.cs
index f827fba..db19324 100644
--- a/lib/libgphoto2-sharp/PortInfoList.cs
+++ b/lib/libgphoto2-sharp/PortInfoList.cs
@@ -2,93 +2,74 @@
* PortInfoList.cs
*
* Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
* Ewen Cheslack-Postava <echeslack at gmail.com>
* Larry Ewing <lewing at novell.com>
*
- * This is free software. See COPYING for details.
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
*/
using System;
using System.Runtime.InteropServices;
-namespace LibGPhoto2
+namespace GPhoto2
{
- public class PortInfoList : Object
+ public class PortInfoList : GPList<PortInfo>
{
[DllImport ("libgphoto2_port.so")]
internal static extern ErrorCode gp_port_info_list_new (out IntPtr handle);
+ [DllImport ("libgphoto2_port.so")]
+ internal static extern ErrorCode gp_port_info_list_free (HandleRef handle);
- public PortInfoList()
+ public PortInfoList () : base (gp_port_info_list_free)
{
IntPtr native;
-
Error.CheckError (gp_port_info_list_new (out native));
this.handle = new HandleRef (this, native);
}
[DllImport ("libgphoto2_port.so")]
- internal static extern ErrorCode gp_port_info_list_free (HandleRef handle);
-
- protected override void Cleanup ()
- {
- Error.CheckError (gp_port_info_list_free (this.Handle));
- }
-
- [DllImport ("libgphoto2_port.so")]
internal static extern ErrorCode gp_port_info_list_load (HandleRef handle);
public void Load ()
{
- ErrorCode result = gp_port_info_list_load (this.Handle);
-
- if (Error.IsError (result))
- throw Error.ErrorException (result);
+ Error.CheckError (gp_port_info_list_load (this.Handle));
}
[DllImport ("libgphoto2_port.so")]
internal static extern ErrorCode gp_port_info_list_count (HandleRef handle);
- public int Count()
- {
- return (int) Error.CheckError (gp_port_info_list_count (this.Handle));
+ public override int Count {
+ get { return Error.CheckError (gp_port_info_list_count (this.Handle)); }
}
[DllImport ("libgphoto2_port.so")]
- internal unsafe static extern ErrorCode gp_port_info_list_get_info (HandleRef handle, int n, out _PortInfo info);
+ internal unsafe static extern ErrorCode gp_port_info_list_get_info (HandleRef handle, int n, out PortInfo info);
- public PortInfo GetInfo (int n)
- {
- PortInfo info = new PortInfo ();
- unsafe {
- Error.CheckError (gp_port_info_list_get_info (this.handle, n, out info.Handle));
+ public override PortInfo this [int n] {
+ get {
+ PortInfo info;
+ Error.CheckError (gp_port_info_list_get_info (this.handle, n, out info));
+ return info;
}
- return info;
}
[DllImport ("libgphoto2_port.so")]
internal static extern ErrorCode gp_port_info_list_lookup_path (HandleRef handle, [MarshalAs(UnmanagedType.LPTStr)]string path);
- public int LookupPath (string path)
+ public PortInfo LookupPath (string path)
{
- return (int) Error.CheckError (gp_port_info_list_lookup_path(this.handle, path));
+ return this [Error.CheckError (gp_port_info_list_lookup_path(this.handle, path))];
}
[DllImport ("libgphoto2_port.so")]
internal static extern ErrorCode gp_port_info_list_lookup_name (HandleRef handle, string name);
- public int LookupName(string name)
+ public PortInfo LookupName (string name)
{
- return (int) Error.CheckError (gp_port_info_list_lookup_name (this.Handle, name));
- }
-
- [DllImport ("libgphoto2_port.so")]
- internal unsafe static extern ErrorCode gp_port_info_list_append (HandleRef handle, _PortInfo info);
-
- public int Append (PortInfo info)
- {
- unsafe {
- return (int) Error.CheckError (gp_port_info_list_append (this.Handle, info.Handle));
- }
+ return this [Error.CheckError (gp_port_info_list_lookup_name (this.Handle, name))];
}
}
}
diff --git a/lib/libgphoto2-sharp/PortSerialParity.cs b/lib/libgphoto2-sharp/PortSerialParity.cs
new file mode 100644
index 0000000..e0d976a
--- /dev/null
+++ b/lib/libgphoto2-sharp/PortSerialParity.cs
@@ -0,0 +1,22 @@
+/*
+ * PortSerialParity.cs
+ *
+ * Author(s):
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+namespace GPhoto2
+{
+ public enum PortSerialParity
+ {
+ Off = 0,
+ Even,
+ Odd
+ }
+}
diff --git a/lib/libgphoto2-sharp/PortType.cs b/lib/libgphoto2-sharp/PortType.cs
new file mode 100644
index 0000000..17fc163
--- /dev/null
+++ b/lib/libgphoto2-sharp/PortType.cs
@@ -0,0 +1,27 @@
+/*
+ * xxx.cs
+ *
+ * Author(s):
+ * Ewen Cheslack-Postava <echeslack at gmail.com>
+ * Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+using System;
+
+namespace GPhoto2
+{
+ [Flags]
+ public enum PortType
+ {
+ None = 0,
+ Serial = 1 << 0,
+ USB = 1 << 2,
+ Disk = 1 << 3,
+ PtpIP = 1 << 4,
+ }
+}
diff --git a/lib/libgphoto2-sharp/TODO b/lib/libgphoto2-sharp/TODO
deleted file mode 100644
index 85240b9..0000000
--- a/lib/libgphoto2-sharp/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-Camera.cs:
-- test WaitForEvent
diff --git a/lib/libgphoto2-sharp/glue/Makefile.am b/lib/libgphoto2-sharp/glue/Makefile.am
new file mode 100644
index 0000000..566eae6
--- /dev/null
+++ b/lib/libgphoto2-sharp/glue/Makefile.am
@@ -0,0 +1,15 @@
+INCLUDES = \
+ $(LIBGPHOTO2_CFLAGS)
+
+gphoto2gluelibdir = $(libdir)/f-spot
+gphoto2gluelib_LTLIBRARIES = libgphoto2glue.la
+
+libgphoto2glue_files = \
+ context.c
+
+libgphoto2glue_la_SOURCES = \
+ $(libgphoto2glue_files)
+
+libgphoto2glue_la_LIBADD = \
+ $(LIBGPHOTO2_LIBS)
+
diff --git a/lib/libgphoto2-sharp/glue/Makefile.in b/lib/libgphoto2-sharp/glue/Makefile.in
new file mode 100644
index 0000000..dfc76cb
--- /dev/null
+++ b/lib/libgphoto2-sharp/glue/Makefile.in
@@ -0,0 +1,628 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = lib/libgphoto2-sharp/glue
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(gphoto2gluelibdir)"
+LTLIBRARIES = $(gphoto2gluelib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libgphoto2glue_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__objects_1 = context.lo
+am_libgphoto2glue_la_OBJECTS = $(am__objects_1)
+libgphoto2glue_la_OBJECTS = $(am_libgphoto2glue_la_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(libgphoto2glue_la_SOURCES)
+DIST_SOURCES = $(libgphoto2glue_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+INCLUDES = \
+ $(LIBGPHOTO2_CFLAGS)
+
+gphoto2gluelibdir = $(libdir)/f-spot
+gphoto2gluelib_LTLIBRARIES = libgphoto2glue.la
+libgphoto2glue_files = \
+ context.c
+
+libgphoto2glue_la_SOURCES = \
+ $(libgphoto2glue_files)
+
+libgphoto2glue_la_LIBADD = \
+ $(LIBGPHOTO2_LIBS)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/libgphoto2-sharp/glue/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign lib/libgphoto2-sharp/glue/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-gphoto2gluelibLTLIBRARIES: $(gphoto2gluelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(gphoto2gluelibdir)" || $(MKDIR_P) "$(DESTDIR)$(gphoto2gluelibdir)"
+ @list='$(gphoto2gluelib_LTLIBRARIES)'; test -n "$(gphoto2gluelibdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(gphoto2gluelibdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(gphoto2gluelibdir)"; \
+ }
+
+uninstall-gphoto2gluelibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(gphoto2gluelib_LTLIBRARIES)'; test -n "$(gphoto2gluelibdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(gphoto2gluelibdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(gphoto2gluelibdir)/$$f"; \
+ done
+
+clean-gphoto2gluelibLTLIBRARIES:
+ -test -z "$(gphoto2gluelib_LTLIBRARIES)" || rm -f $(gphoto2gluelib_LTLIBRARIES)
+ @list='$(gphoto2gluelib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libgphoto2glue.la: $(libgphoto2glue_la_OBJECTS) $(libgphoto2glue_la_DEPENDENCIES)
+ $(LINK) -rpath $(gphoto2gluelibdir) $(libgphoto2glue_la_OBJECTS) $(libgphoto2glue_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/context.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+ for dir in "$(DESTDIR)$(gphoto2gluelibdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-gphoto2gluelibLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-gphoto2gluelibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-gphoto2gluelibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-gphoto2gluelibLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am \
+ install-gphoto2gluelibLTLIBRARIES install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am \
+ uninstall-gphoto2gluelibLTLIBRARIES
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/libgphoto2-sharp/glue/context.c b/lib/libgphoto2-sharp/glue/context.c
new file mode 100644
index 0000000..2d85b20
--- /dev/null
+++ b/lib/libgphoto2-sharp/glue/context.c
@@ -0,0 +1,151 @@
+/*
+ * context.c
+ *
+ * Author(s):
+ * Stephane Delcroix <stephan @delcroix.org>
+ *
+ * Copyright (c) 2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
+
+#include <stdlib.h>
+#include <gphoto2-context.h>
+#include <stdarg.h>
+
+struct _GPGlueContext;
+typedef struct _GPGlueContext GPGlueContext;
+
+typedef unsigned int (*GPGlueContextProgressStartFunc) (GPGlueContext *gluecontext, float target, const char *message, void *data);
+typedef void (*GPGlueContextProgressUpdateFunc) (GPGlueContext *gluecontext, unsigned int id, float current, void *data);
+typedef void (*GPGlueContextProgressStopFunc) (GPGlueContext *gluecontext, unsigned int id, void *data);
+
+typedef void (*GPGlueContextErrorFunc) (GPGlueContext *gluecontext, const char *message, void *data);
+typedef void (*GPGlueContextStatusFunc) (GPGlueContext *gluecontext, const char *message, void *data);
+typedef void (*GPGlueContextMessageFunc) (GPGlueContext *gluecontext, const char *message, void *data);
+
+struct _GPGlueContext {
+ GPContext *context;
+ GPGlueContextProgressStartFunc start_func;
+ GPGlueContextProgressUpdateFunc update_func;
+ GPGlueContextProgressStopFunc stop_func;
+ void *progress_data;
+ GPGlueContextErrorFunc error_func;
+ void *error_data;
+ GPGlueContextStatusFunc status_func;
+ void *status_data;
+ GPGlueContextMessageFunc message_func;
+ void *message_data;
+};
+
+GPGlueContext *
+gp_glue_context_new (GPContext *context)
+{
+ GPGlueContext *gluecontext = malloc (sizeof (GPGlueContext));
+ gluecontext->context = context;
+ return gluecontext;
+}
+
+void
+gp_glue_context_free (GPGlueContext *gluecontext)
+{
+ free (gluecontext);
+}
+
+unsigned int
+gp_glue_start_func_wrapper (GPContext *context, float target, const char *format, va_list args, void *data)
+{
+ GPGlueContext *gluecontext = (GPGlueContext *)data;
+ unsigned int ret;
+ char buf[256];
+ vsnprintf (buf, 256, format, args);
+ ret = gluecontext->start_func (gluecontext, target, buf, gluecontext->progress_data);
+
+ return ret;
+}
+
+void
+gp_glue_update_func_wrapper (GPContext *context, unsigned int id, float current, void *data)
+{
+ GPGlueContext *gluecontext = (GPGlueContext *)data;
+ gluecontext->update_func (gluecontext, id, current, gluecontext->progress_data);
+}
+
+void
+gp_glue_stop_func_wrapper (GPContext *context, unsigned int id, void *data)
+{
+ GPGlueContext *gluecontext = (GPGlueContext *)data;
+ gluecontext->stop_func (gluecontext, id, gluecontext->progress_data);
+}
+
+void
+gp_glue_context_set_progress_funcs (GPGlueContext *gluecontext, GPGlueContextProgressStartFunc start_func, GPGlueContextProgressUpdateFunc update_func, GPGlueContextProgressStopFunc stop_func, void *data)
+{
+ gluecontext->start_func = start_func;
+ gluecontext->update_func = update_func;
+ gluecontext->stop_func = stop_func;
+ gluecontext->progress_data = data;
+
+ gp_context_set_progress_funcs (gluecontext->context,
+ gp_glue_start_func_wrapper,
+ gp_glue_update_func_wrapper,
+ gp_glue_stop_func_wrapper,
+ gluecontext);
+}
+
+void
+gp_glue_error_func_wrapper (GPContext *context, const char *format, va_list args, void *data)
+{
+ GPGlueContext *gluecontext = (GPGlueContext *)data;
+ char buf[256];
+ vsnprintf (buf, 256, format, args);
+ gluecontext->error_func (gluecontext, buf, gluecontext->error_data);
+
+}
+
+void
+gp_glue_context_set_error_func (GPGlueContext *gluecontext, GPGlueContextErrorFunc error_func, void *data)
+{
+ gluecontext->error_func = error_func;
+ gluecontext->error_data = data;
+
+ gp_context_set_error_func (gluecontext->context, gp_glue_error_func_wrapper, gluecontext);
+}
+
+void
+gp_glue_status_func_wrapper (GPContext *context, const char *format, va_list args, void *data)
+{
+ GPGlueContext *gluecontext = (GPGlueContext *)data;
+ char buf[256];
+ vsnprintf (buf, 256, format, args);
+ gluecontext->status_func (gluecontext, buf, gluecontext->status_data);
+
+}
+
+void
+gp_glue_context_set_status_func (GPGlueContext *gluecontext, GPGlueContextStatusFunc status_func, void *data)
+{
+ gluecontext->status_func = status_func;
+ gluecontext->status_data = data;
+
+ gp_context_set_status_func (gluecontext->context, gp_glue_status_func_wrapper, gluecontext);
+}
+
+void
+gp_glue_message_func_wrapper (GPContext *context, const char *format, va_list args, void *data)
+{
+ GPGlueContext *gluecontext = (GPGlueContext *)data;
+ char buf[256];
+ vsnprintf (buf, 256, format, args);
+ gluecontext->message_func (gluecontext, buf, gluecontext->message_data);
+
+}
+
+void
+gp_glue_context_set_message_func (GPGlueContext *gluecontext, GPGlueContextMessageFunc message_func, void *data)
+{
+ gluecontext->message_func = message_func;
+ gluecontext->message_data = data;
+
+ gp_context_set_message_func (gluecontext->context, gp_glue_message_func_wrapper, gluecontext);
+}
diff --git a/lib/libgphoto2-sharp/libgphoto2-sharp.dll.config b/lib/libgphoto2-sharp/libgphoto2-sharp.dll.config
deleted file mode 100644
index 9efd6e4..0000000
--- a/lib/libgphoto2-sharp/libgphoto2-sharp.dll.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
- <dllmap dll="libgphoto2.so" target="libgphoto2.so.2"/>
- <dllmap dll="libgphoto2_port.so" target="libgphoto2_port.so.0"/>
-</configuration>
diff --git a/lib/libgphoto2-sharp/libgphoto2-sharp.dll.config.in b/lib/libgphoto2-sharp/libgphoto2-sharp.dll.config.in
new file mode 100644
index 0000000..de0c1b0
--- /dev/null
+++ b/lib/libgphoto2-sharp/libgphoto2-sharp.dll.config.in
@@ -0,0 +1,5 @@
+<configuration>
+ <dllmap dll="libgphoto2.so" target="libgphoto2.so.2"/>
+ <dllmap dll="libgphoto2glue.so" target="@expanded_libdir@/f-spot/libgphoto2glue.so.0"/>
+ <dllmap dll="libgphoto2_port.so" target="libgphoto2_port.so.0"/>
+</configuration>
diff --git a/lib/libjpegtran/Makefile.in b/lib/libjpegtran/Makefile.in
index c5ada62..7e543cb 100644
--- a/lib/libjpegtran/Makefile.in
+++ b/lib/libjpegtran/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,11 +37,14 @@ host_triplet = @host@
subdir = lib/libjpegtran
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -91,16 +94,17 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -117,8 +121,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -131,9 +134,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -182,16 +190,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -202,6 +212,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -212,21 +223,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -254,6 +269,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -278,6 +295,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -317,9 +335,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/libjpegtran/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/libjpegtran/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/libjpegtran/Makefile
+ $(AUTOMAKE) --foreign lib/libjpegtran/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/mono-addins/AUTHORS b/lib/mono-addins/AUTHORS
deleted file mode 100644
index 071a9b3..0000000
--- a/lib/mono-addins/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Lluis Sanchez Gual <lluis at novell.com>
-
diff --git a/lib/mono-addins/Makefile.am b/lib/mono-addins/Makefile.am
deleted file mode 100644
index 9cbe553..0000000
--- a/lib/mono-addins/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = \
- Mono.Addins \
- Mono.Addins.Setup \
- Mono.Addins.Gui
diff --git a/lib/mono-addins/Makefile.in b/lib/mono-addins/Makefile.in
deleted file mode 100644
index abecc07..0000000
--- a/lib/mono-addins/Makefile.in
+++ /dev/null
@@ -1,638 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lib/mono-addins
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = \
- Mono.Addins \
- Mono.Addins.Setup \
- Mono.Addins.Gui
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/mono-addins/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/mono-addins/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/mono-addins/Mono.Addins.Gui/AssemblyInfo.cs b/lib/mono-addins/Mono.Addins.Gui/AssemblyInfo.cs
deleted file mode 100644
index 251fe14..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("Mono.Addins.Gui")]
-[assembly: AssemblyCopyright("Copyright (C) 2007 Novell, Inc (http://www.novell.com)")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("0.3.0.0")]
diff --git a/lib/mono-addins/Mono.Addins.Gui/Makefile.am b/lib/mono-addins/Mono.Addins.Gui/Makefile.am
deleted file mode 100644
index 13e5c2f..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-include $(top_srcdir)/Makefile.include
-
-ASSEMBLY_NAME = Mono.Addins.Gui
-
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/gtk-gui/generated.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinInfoDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinInstallDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinInstaller.cs \
- $(srcdir)/Mono.Addins.Gui/AddinInstallerDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinManagerDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinManagerWindow.cs \
- $(srcdir)/Mono.Addins.Gui/AddinTreeWidget.cs \
- $(srcdir)/Mono.Addins.Gui/ErrorDialog.cs \
- $(srcdir)/Mono.Addins.Gui/ManageSitesDialog.cs \
- $(srcdir)/Mono.Addins.Gui/NewSiteDialog.cs \
- $(srcdir)/Mono.Addins.Gui/Services.cs
-
-REFS = \
- -r:Mono.Posix \
- -r:System \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll
-
-PKGS = \
- -pkg:gnome-sharp-2.0 \
- -pkg:gtk-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/gtk-gui/gui.stetic \
- -resource:$(srcdir)/icons/package-x-generic.png \
- -resource:$(srcdir)/icons/package-x-generic_16.png \
- -resource:$(srcdir)/icons/package-x-generic_22.png \
- -resource:$(srcdir)/icons/system-software-update.png \
- -resource:$(srcdir)/icons/user-package.png
-
-CSC_EXTRA_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
-
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(RESOURCES)
-
-assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY)
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- $(srcdir)/gtk-gui/gui.stetic \
- $(srcdir)/icons/package-x-generic.png \
- $(srcdir)/icons/package-x-generic_16.png \
- $(srcdir)/icons/package-x-generic_22.png \
- $(srcdir)/icons/system-software-update.png \
- $(srcdir)/icons/user-package.png
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
diff --git a/lib/mono-addins/Mono.Addins.Gui/Makefile.in b/lib/mono-addins/Mono.Addins.Gui/Makefile.in
deleted file mode 100644
index 61464d2..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Makefile.in
+++ /dev/null
@@ -1,577 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
-subdir = lib/mono-addins/Mono.Addins.Gui
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(assemblydir)"
-DATA = $(assembly_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
-DIR_DOCS = $(top_builddir)/docs
-DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
-DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
-DIR_SEMWEB = $(top_builddir)/lib/semweb
-DIR_SRC = $(top_builddir)/src
-DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
-LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
-LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-CSC_FLAGS = -debug
-CSC = $(MCS) $(CSC_FLAGS) -target:exe
-CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
-MONO_DEBUGFLAGS = --debug
-RUNTIME = mono $(MONO_DEBUGFLAGS)
-ASSEMBLY_NAME = Mono.Addins.Gui
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/gtk-gui/generated.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs \
- $(srcdir)/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinInfoDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinInstallDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinInstaller.cs \
- $(srcdir)/Mono.Addins.Gui/AddinInstallerDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinManagerDialog.cs \
- $(srcdir)/Mono.Addins.Gui/AddinManagerWindow.cs \
- $(srcdir)/Mono.Addins.Gui/AddinTreeWidget.cs \
- $(srcdir)/Mono.Addins.Gui/ErrorDialog.cs \
- $(srcdir)/Mono.Addins.Gui/ManageSitesDialog.cs \
- $(srcdir)/Mono.Addins.Gui/NewSiteDialog.cs \
- $(srcdir)/Mono.Addins.Gui/Services.cs
-
-REFS = \
- -r:Mono.Posix \
- -r:System \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll
-
-PKGS = \
- -pkg:gnome-sharp-2.0 \
- -pkg:gtk-sharp-2.0
-
-RESOURCES = \
- -resource:$(srcdir)/gtk-gui/gui.stetic \
- -resource:$(srcdir)/icons/package-x-generic.png \
- -resource:$(srcdir)/icons/package-x-generic_16.png \
- -resource:$(srcdir)/icons/package-x-generic_22.png \
- -resource:$(srcdir)/icons/system-software-update.png \
- -resource:$(srcdir)/icons/user-package.png
-
-CSC_EXTRA_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY)
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- $(srcdir)/gtk-gui/gui.stetic \
- $(srcdir)/icons/package-x-generic.png \
- $(srcdir)/icons/package-x-generic_16.png \
- $(srcdir)/icons/package-x-generic_22.png \
- $(srcdir)/icons/system-software-update.png \
- $(srcdir)/icons/user-package.png
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/mono-addins/Mono.Addins.Gui/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/mono-addins/Mono.Addins.Gui/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(assemblydir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(assemblydir)" || exit $$?; \
- done
-
-uninstall-assemblyDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(assemblydir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(assemblydir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-assemblyDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-assemblyDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-assemblyDATA install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(RESOURCES)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs
deleted file mode 100644
index c192ccb..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// AddinInfoDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using Gtk;
-using Mono.Addins;
-using Mono.Addins.Setup;
-using Mono.Addins.Description;
-using Mono.Unix;
-
-namespace Mono.Addins.Gui
-{
- partial class AddinInfoDialog : Dialog
- {
- AddinHeader info;
-
- public AddinInfoDialog (AddinHeader info)
- {
- Build ();
- this.info = info;
- packageImage.Stock = "md-package";
- packageImage.IconSize = (int)IconSize.Dialog;
- Fill ();
- }
-
- void Fill ()
- {
- StringBuilder sb = new StringBuilder ();
- sb.Append ("<b><big>" + info.Name + "</big></b>\n\n");
-
- if (info.Description != "")
- sb.Append (info.Description + "\n\n");
-
- sb.Append ("<small>");
-
- sb.Append ("<b>").Append (Catalog.GetString ("Version:")).Append ("</b>\n").Append (info.Version).Append ("\n\n");
-
- if (info.Author != "")
- sb.Append ("<b>").Append (Catalog.GetString ("Author:")).Append ("</b>\n").Append (info.Author).Append ("\n\n");
-
- if (info.Copyright != "")
- sb.Append ("<b>").Append (Catalog.GetString ("Copyright:")).Append ("</b>\n").Append (info.Copyright).Append ("\n\n");
-
- if (info.Dependencies.Count > 0) {
- sb.Append ("<b>").Append (Catalog.GetString ("Extension Dependencies:")).Append ("</b>\n");
- foreach (Dependency dep in info.Dependencies)
- sb.Append (dep.Name + "\n");
- }
-
- sb.Append ("</small>");
-
-// linkLabel.Visible = info.Url != "";
-
- infoLabel.Markup = sb.ToString ();
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- Destroy ();
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs
deleted file mode 100644
index f0602b8..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs
+++ /dev/null
@@ -1,631 +0,0 @@
-//
-// AddinInstallDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Text;
-using System.Threading;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using Mono.Unix;
-
-using Gtk;
-
-using Mono.Addins.Setup;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Gui
-{
- partial class AddinInstallDialog : Dialog
- {
- ListStore repoStore;
- AddinTreeWidget tree;
- bool installing;
-
- PackageCollection packagesToInstall;
- string uninstallId;
-
- InstallMonitor installMonitor;
- SetupService service;
-
-
- public AddinInstallDialog (SetupService service)
- {
- Build ();
- this.service = service;
- wizardNotebook.ShowTabs = false;
- ActionArea.Hide ();
-
- tree = new InstallAddinTreeWidget (addinTree);
- tree.AllowSelection = true;
- tree.SelectionChanged += new EventHandler (OnAddinSelectionChanged);
-
- repoStore = new ListStore (typeof(string), typeof(string));
- repoCombo.Model = repoStore;
- CellRendererText crt = new CellRendererText ();
- repoCombo.PackStart (crt, true);
- repoCombo.AddAttribute (crt, "text", 0);
- filterComboBox.Active = 1;
-
- imageInstall.Stock = "md-software-update";
- imageInstall.IconSize = (int)IconSize.Dialog;
-
- FillRepos ();
- repoCombo.Active = 0;
- LoadAddins ();
- FillAddinInfo ();
- OnPageChanged ();
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- Destroy ();
- }
-
- void FillRepos ()
- {
- int i = repoCombo.Active;
- repoStore.Clear ();
-
- repoStore.AppendValues (Catalog.GetString ("All registered repositories"), "");
-
- foreach (AddinRepository rep in service.Repositories.GetRepositories ()) {
- repoStore.AppendValues (rep.Title, rep.Url);
- }
- repoCombo.Active = i;
- }
-
- void LoadAddins ()
- {
- object s = tree.SaveStatus ();
-
- tree.Clear ();
-
- Gtk.TreeIter iter;
- if (!repoCombo.GetActiveIter (out iter))
- return;
-
- bool showUpdates = filterComboBox.Active >= 1;
- bool showNotInstalled = filterComboBox.Active <= 1;
-
- string rep = (string) repoStore.GetValue (iter, 1);
-
- AddinRepositoryEntry[] reps;
- if (rep == "")
- reps = service.Repositories.GetAvailableAddins ();
- else
- reps = service.Repositories.GetAvailableAddins (rep);
-
- foreach (AddinRepositoryEntry arep in reps)
- {
- if (!Services.InApplicationNamespace (service, arep.Addin.Id))
- continue;
-
- // Find whatever version is installed
- Addin sinfo = AddinManager.Registry.GetAddin (Addin.GetIdName (arep.Addin.Id));
-
- if (sinfo == null) {
- if (showNotInstalled)
- tree.AddAddin (arep.Addin, arep, true);
- continue;
- }
-
- if (showUpdates && Addin.CompareVersions (sinfo.Version, arep.Addin.Version) <= 0)
- continue;
-
- tree.AddAddin (arep.Addin, arep, true);
- }
- FillAddinInfo ();
-
- // Only show the select all button when "Show updates only" is selected
- btnSelectAll.Visible = filterComboBox.Active == 2;
- btnUnselectAll.Visible = filterComboBox.Active == 2;
-
- tree.RestoreStatus (s);
- }
-
- void OnAddinSelectionChanged (object o, EventArgs e)
- {
- UpdateAddinSelection ();
- }
-
- void UpdateAddinSelection ()
- {
- btnNext.Sensitive = (tree.GetSelectedAddins().Length != 0);
- }
-
- protected void OnActiveAddinChanged (object o, EventArgs e)
- {
- FillAddinInfo ();
- }
-
- protected void OnNextPage (object sender, EventArgs e)
- {
- wizardNotebook.NextPage ();
- OnPageChanged ();
- }
-
- protected void OnPrevPage (object sender, EventArgs e)
- {
- wizardNotebook.PrevPage ();
- OnPageChanged ();
- }
-
- protected void OnCancel (object sender, EventArgs e)
- {
- if (installing) {
- if (Services.AskQuestion (Catalog.GetString ("Are you sure you want to cancel the installation?")))
- installMonitor.Cancel ();
- } else
- Respond (ResponseType.Cancel);
- }
-
- protected void OnOk (object sender, EventArgs e)
- {
- Respond (ResponseType.Ok);
- }
-
- protected void OnManageSites (object sender, EventArgs e)
- {
- ManageSitesDialog dlg = new ManageSitesDialog (service);
- dlg.TransientFor = this;
- try {
- dlg.Run ();
- FillRepos ();
- } finally {
- dlg.Destroy ();
- }
- }
-
-
- bool updateDone;
-
- protected void OnUpdateRepo (object sender, EventArgs e)
- {
- Thread t = new Thread (new ThreadStart (RunUpdate));
- t.Start ();
- updateDone = false;
- while (!updateDone) {
- while (Gtk.Application.EventsPending ())
- Gtk.Application.RunIteration ();
- Thread.Sleep (50);
- }
- LoadAddins ();
- }
-
- void RunUpdate ()
- {
- try {
- service.Repositories.UpdateAllRepositories (null);
- } finally {
- updateDone = true;
- }
- }
-
- protected void OnRepoChanged (object sender, EventArgs e)
- {
- LoadAddins ();
- }
-
- public void OnPageChanged ()
- {
- switch (wizardNotebook.CurrentPage) {
- case 0:
- btnPrev.Sensitive = false;
- btnNext.Sensitive = (tree.GetSelectedAddins().Length != 0);
- break;
- case 1:
- FillSummaryPage ();
- break;
- case 2:
- Install ();
- break;
- case 3:
- btnPrev.Hide ();
- btnNext.Hide ();
- btnCancel.Hide ();
- btnOk.Show ();
- break;
- }
- }
-
- protected void OnGotoWeb (object sender, EventArgs e)
- {
- AddinHeader info = tree.ActiveAddin;
- if (info == null)
- return;
-
- if (info.Url != "")
- Process.Start (info.Url);
- }
-
- protected void OnShowInfo (object sender, EventArgs e)
- {
- AddinHeader info = tree.ActiveAddin;
- if (info == null)
- return;
-
- AddinInfoDialog dlg = new AddinInfoDialog (info);
- try {
- dlg.Run ();
- } finally {
- dlg.Destroy ();
- }
- }
-
- protected void OnFilterChanged (object sender, EventArgs e)
- {
- LoadAddins ();
- UpdateAddinSelection ();
- }
-
- protected void OnSelectAll (object sender, EventArgs e)
- {
- tree.SelectAll ();
- }
-
- protected void OnUnselectAll (object sender, EventArgs e)
- {
- tree.UnselectAll ();
- }
-
- public void SetUninstallMode (AddinHeader info)
- {
- btnPrev.Hide ();
- btnNext.Sensitive = true;
-
- uninstallId = info.Id;
- wizardNotebook.CurrentPage = 1;
-
- StringBuilder sb = new StringBuilder ();
- sb.Append ("<b>").Append (Catalog.GetString ("The following packages will be uninstalled:")).Append ("</b>\n\n");
- sb.Append (info.Name + "\n\n");
-
- Addin[] sinfos = service.GetDependentAddins (info.Id, true);
- if (sinfos.Length > 0) {
- sb.Append ("<b>").Append (Catalog.GetString ("There are other extensions that depend on the previous ones which will also be uninstalled:")).Append ("</b>\n\n");
- foreach (Addin si in sinfos)
- sb.Append (si.Description.Name + "\n");
- }
-
- labelSummary.Markup = sb.ToString ();
- }
-
- void FillAddinInfo ()
- {
- AddinHeader info = tree.ActiveAddin;
- btnInfo.Sensitive = info != null;
-
-/* if (info == null) {
- infoLabel.Markup = "";
- linkLabel.Visible = false;
- return;
- }
-
- StringBuilder sb = new StringBuilder ();
- sb.Append ("<b><big>" + info.Name + "</big></b>\n\n");
-
- if (info.Description != "")
- sb.Append (info.Description + "\n\n");
-
- sb.Append ("<small>");
-
- sb.Append ("<b>").Append (Catalog.GetString ("Version:")).Append ("</b>\n").Append (info.Version).Append ("\n\n");
-
- if (info.Author != "")
- sb.Append ("<b>").Append (Catalog.GetString ("Author:")).Append ("</b>\n").Append (info.Author).Append ("\n\n");
-
- if (info.Copyright != "")
- sb.Append ("<b>").Append (Catalog.GetString ("Copyright:")).Append ("</b>\n").Append (info.Copyright).Append ("\n\n");
-
- if (info.Dependencies.Count > 0) {
- sb.Append ("<b>").Append (Catalog.GetString ("Extension Dependencies:")).Append ("</b>\n");
- foreach (PackageDependency dep in info.Dependencies)
- sb.Append (dep.Name + "\n");
- }
-
- sb.Append ("</small>");
-
- linkLabel.Visible = info.Url != "";
-
- infoLabel.Markup = sb.ToString ();*/
- }
-
-
- void FillSummaryPage ()
- {
- btnPrev.Sensitive = true;
-
- AddinHeader[] infos = tree.GetSelectedAddins ();
- PackageCollection packs = new PackageCollection ();
- foreach (AddinHeader info in infos) {
- AddinRepositoryEntry arep = (AddinRepositoryEntry) tree.GetAddinData (info);
- packs.Add (Package.FromRepository (arep));
- }
-
- packagesToInstall = new PackageCollection (packs);
-
- PackageCollection toUninstall;
- DependencyCollection unresolved;
- bool res;
-
- InstallMonitor m = new InstallMonitor ();
- res = service.ResolveDependencies (m, packs, out toUninstall, out unresolved);
-
- StringBuilder sb = new StringBuilder ();
- if (!res) {
- sb.Append ("<b><span foreground=\"red\">").Append (Catalog.GetString ("The selected extensions can't be installed because there are dependency conflicts.")).Append ("</span></b>\n");
- foreach (string s in m.Errors) {
- sb.Append ("<b><span foreground=\"red\">" + s + "</span></b>\n");
- }
- sb.Append ("\n");
- }
-
- if (m.Warnings.Count != 0) {
- foreach (string w in m.Warnings) {
- sb.Append ("<b><span foreground=\"red\">" + w + "</span></b>\n");
- }
- sb.Append ("\n");
- }
-
- sb.Append ("<b>").Append (Catalog.GetString ("The following packages will be installed:")).Append ("</b>\n\n");
- foreach (Package p in packs) {
- sb.Append (p.Name);
- if (!p.SharedInstall)
- sb.Append (Catalog.GetString (" (in user directory)"));
- sb.Append ("\n");
- }
- sb.Append ("\n");
-
- if (toUninstall.Count > 0) {
- sb.Append ("<b>").Append (Catalog.GetString ("The following packages need to be uninstalled:")).Append ("</b>\n\n");
- foreach (Package p in toUninstall) {
- sb.Append (p.Name + "\n");
- }
- sb.Append ("\n");
- }
-
- if (unresolved.Count > 0) {
- sb.Append ("<b>").Append (Catalog.GetString ("The following dependencies could not be resolved:")).Append ("</b>\n\n");
- foreach (Dependency p in unresolved) {
- sb.Append (p.Name + "\n");
- }
- sb.Append ("\n");
- }
- btnNext.Sensitive = res;
- labelSummary.Markup = sb.ToString ();
- }
-
- void Install ()
- {
- btnPrev.Sensitive = false;
- btnNext.Sensitive = false;
-
- string txt;
- string okmessage;
- string errmessage;
- string warnmessage;
-
- installMonitor = new InstallMonitor (progressLabel, progressBar, mainProgressBar);
- ThreadStart oper;
-
- if (uninstallId == null) {
- oper = new ThreadStart (RunInstall);
- okmessage = Catalog.GetString ("The installation has been successfully completed.");
- errmessage = Catalog.GetString ("The installation failed!");
- warnmessage = Catalog.GetString ("The installation has completed with warnings.");
- } else {
- oper = new ThreadStart (RunUninstall);
- okmessage = Catalog.GetString ("The uninstallation has been successfully completed.");
- errmessage = Catalog.GetString ("The uninstallation failed!");
- warnmessage = Catalog.GetString ("The uninstallation has completed with warnings.");
- }
-
- Thread t = new Thread (oper);
- t.Start ();
-
- installing = true;
- installMonitor.WaitForCompleted ();
- installing = false;
-
- wizardNotebook.NextPage ();
-
- if (installMonitor.Success && installMonitor.Warnings.Count == 0) {
- imageWarn.Visible = false;
- imageError.Visible = false;
- imageInfo.Visible = true;
- txt = "<b>" + okmessage + "</b>\n\n";
- } else if (installMonitor.Success) {
- imageWarn.Visible = true;
- imageInfo.Visible = false;
- imageError.Visible = false;
- txt = "<b>" + warnmessage + "</b>\n\n";
- foreach (string s in installMonitor.Warnings)
- txt += GLib.Markup.EscapeText (s) + "\n";
- } else {
- imageWarn.Visible = false;
- imageInfo.Visible = false;
- imageError.Visible = true;
- txt = "<span foreground=\"red\"><b>" + errmessage + "</b></span>\n\n";
- foreach (string s in installMonitor.Errors)
- txt += GLib.Markup.EscapeText (s) + "\n";
- }
-
- labelResult.Markup = txt;
- OnPageChanged ();
- }
-
- void RunInstall ()
- {
- try {
- service.Install (installMonitor, packagesToInstall);
- } catch {
- // Nothing
- } finally {
- installMonitor.Dispose ();
- }
- }
-
- void RunUninstall ()
- {
- try {
- service.Uninstall (installMonitor, uninstallId);
- } catch {
- // Nothing
- } finally {
- installMonitor.Dispose ();
- }
- }
- }
-
- class InstallMonitor: IProgressStatus, IDisposable
- {
- Label progressLabel;
- ProgressBar progressBar;
- ProgressBar mainProgressBar;
- StringCollection errors = new StringCollection ();
- StringCollection warnings = new StringCollection ();
- bool canceled;
- bool done;
-
- public InstallMonitor (Label progressLabel, ProgressBar progressBar, ProgressBar mainProgressBar)
- {
- this.progressLabel = progressLabel;
- this.progressBar = progressBar;
- this.mainProgressBar = mainProgressBar;
- }
-
- public InstallMonitor ()
- {
- }
-
- public void SetMessage (string msg)
- {
- if (progressLabel != null)
- progressLabel.Text = msg;
- }
-
- public void SetProgress (double progress)
- {
- if (mainProgressBar != null)
- mainProgressBar.Fraction = progress;
- if (progressBar != null)
- progressBar.Fraction = progress;
- }
-
- public void Log (string msg)
- {
- Console.WriteLine (msg);
- }
-
- public void ReportWarning (string message)
- {
- warnings.Add (message);
- }
-
- public void ReportError (string message, Exception exception)
- {
- errors.Add (message);
- }
-
- public bool IsCanceled {
- get { return canceled; }
- }
-
- public StringCollection Errors {
- get { return errors; }
- }
-
- public StringCollection Warnings {
- get { return warnings; }
- }
-
- public void Cancel ()
- {
- canceled = true;
- }
-
- public int LogLevel {
- get { return 1; }
- }
-
- public void Dispose ()
- {
- done = true;
- }
-
- public void WaitForCompleted ()
- {
- while (!done) {
- while (Gtk.Application.EventsPending ())
- Gtk.Application.RunIteration ();
- Thread.Sleep (50);
- }
- }
-
- public bool Success {
- get { return errors.Count == 0; }
- }
- }
-
- class InstallAddinTreeWidget: AddinTreeWidget
- {
- int ncol;
- public InstallAddinTreeWidget (Gtk.TreeView treeView): base (treeView)
- {
- }
-
- protected override void AddStoreTypes (ArrayList list)
- {
- base.AddStoreTypes (list);
- ncol = list.Count;
- list.Add (typeof(string));
- }
-
- protected override void CreateColumns ()
- {
- base.CreateColumns ();
- TreeViewColumn col = new TreeViewColumn ();
- col.Title = Catalog.GetString ("Repository");
- CellRendererText crt = new CellRendererText ();
- col.PackStart (crt, true);
- col.AddAttribute (crt, "text", ncol);
- treeView.AppendColumn (col);
- }
-
- protected override void UpdateRow (TreeIter iter, AddinHeader info, object dataItem, bool enabled, Gdk.Pixbuf icon)
- {
- base.UpdateRow (iter, info, dataItem, enabled, icon);
- AddinRepositoryEntry arep = (AddinRepositoryEntry) dataItem;
- treeStore.SetValue (iter, ncol, arep.RepositoryName);
- }
- }
-}
-
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs
deleted file mode 100644
index b0826be..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-using System;
-using Mono.Addins.Setup;
-using Mono.Unix;
-
-namespace Mono.Addins.Gui
-{
- public class AddinInstaller: IAddinInstaller
- {
- public void InstallAddins (AddinRegistry reg, string message, string[] addinIds)
- {
- AddinInstallerDialog dlg = new AddinInstallerDialog (reg, message, addinIds);
- try {
- if (dlg.Run () == (int) Gtk.ResponseType.Cancel)
- throw new InstallException (Catalog.GetString ("Installation cancelled"));
- else if (dlg.ErrMessage != null)
- throw new InstallException (dlg.ErrMessage);
- }
- finally {
- dlg.Destroy ();
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs
deleted file mode 100644
index 7d7fa0f..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-//
-// AddinInstallerDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Threading;
-using System.Collections;
-using Mono.Addins.Setup;
-using Mono.Addins.Description;
-using Mono.Unix;
-
-namespace Mono.Addins.Gui
-{
- internal partial class AddinInstallerDialog : Gtk.Dialog, IProgressStatus
- {
- PackageCollection entries = new PackageCollection ();
- string[] addinIds;
- bool addinsNotFound;
- string errMessage;
- SetupService setup;
-
- public AddinInstallerDialog (AddinRegistry reg, string message, string[] addinIds)
- {
- this.Build();
-
- this.addinIds = addinIds;
- setup = new SetupService (reg);
-
- if (!CheckAddins (true))
- UpdateRepos ();
- }
-
- bool CheckAddins (bool updating)
- {
- string txt = "";
- entries.Clear ();
- bool addinsNotFound = false;
- foreach (string id in addinIds) {
- string name = Addin.GetIdName (id);
- string version = Addin.GetIdVersion (id);
- AddinRepositoryEntry[] ares = setup.Repositories.GetAvailableAddin (name, version);
- if (ares.Length == 0) {
- addinsNotFound = true;
- if (updating)
- txt += "<span foreground='grey'><b>" + name + " " + version + "</b> (searching add-in)</span>\n";
- else
- txt += "<span foreground='red'><b>" + name + " " + version + "</b> (not found)</span>\n";
- } else {
- entries.Add (Package.FromRepository (ares[0]));
- txt += "<b>" + ares[0].Addin.Name + " " + ares[0].Addin.Version + "</b>\n";
- }
- }
- PackageCollection toUninstall;
- DependencyCollection unresolved;
- if (!setup.ResolveDependencies (this, entries, out toUninstall, out unresolved)) {
- foreach (Dependency dep in unresolved) {
- txt += "<span foreground='red'><b>" + dep.Name + "</b> (not found)</span>\n";
- }
- addinsNotFound = true;
- }
- addinList.Markup = txt;
- return !addinsNotFound;
- }
-
- void UpdateRepos ()
- {
- progressBar.Show ();
- setup.Repositories.UpdateAllRepositories (this);
- progressBar.Hide ();
- addinsNotFound = CheckAddins (false);
- if (errMessage != null) {
- Services.ShowError (null, errMessage, this, true);
- errMessage = null;
- }
- }
-
- public int LogLevel {
- get {
- return 1;
- }
- }
-
- public bool IsCanceled {
- get {
- return false;
- }
- }
-
- public bool AddinsNotFound {
- get {
- return addinsNotFound;
- }
- }
-
- public string ErrMessage {
- get {
- return errMessage;
- }
- }
-
- public void SetMessage (string msg)
- {
- progressBar.Text = msg;
- while (Gtk.Application.EventsPending ())
- Gtk.Application.RunIteration ();
- }
-
- public void SetProgress (double progress)
- {
- progressBar.Fraction = progress;
- while (Gtk.Application.EventsPending ())
- Gtk.Application.RunIteration ();
- }
-
- public void Log (string msg)
- {
- }
-
- public void ReportWarning (string message)
- {
- }
-
- public void ReportError (string message, System.Exception exception)
- {
- errMessage = message;
- }
-
- public void Cancel ()
- {
- }
-
- protected virtual void OnButtonOkClicked (object sender, System.EventArgs e)
- {
- if (addinsNotFound) {
- errMessage = Catalog.GetString ("Some of the required extensions were not found");
- Respond (Gtk.ResponseType.Ok);
- }
- else {
- errMessage = null;
- progressBar.Show ();
- progressBar.Fraction = 0;
- progressBar.Text = "";
- bool res = setup.Install (this, entries);
- if (!res) {
- buttonCancel.Sensitive = buttonOk.Sensitive = false;
- if (errMessage == null)
- errMessage = Catalog.GetString ("Installation failed");
- Services.ShowError (null, errMessage, this, true);
- }
- }
- Respond (Gtk.ResponseType.Ok);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
deleted file mode 100644
index fabd0d8..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-// AddinManagerDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using Mono.Addins.Setup;
-using Mono.Addins;
-
-namespace Mono.Addins.Gui
-{
- partial class AddinManagerDialog : Dialog, IDisposable
- {
- AddinTreeWidget tree;
- SetupService service = new SetupService ();
-
- internal bool AllowInstall
- {
- set {
- this.btnInstall.Visible = value;
- this.btnRepositories.Visible = value;
- this.hseparator4.Visible = value;
- this.btnUninstall.Visible = value;
- }
- }
-
- public AddinManagerDialog (Window parent)
- {
- Build ();
- TransientFor = parent;
-
- tree = new AddinTreeWidget (addinTree);
- LoadAddins ();
- UpdateButtons ();
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- Destroy ();
- }
-
- internal void OnSelectionChanged (object sender, EventArgs args)
- {
- UpdateButtons ();
- }
-
- internal void OnInstall (object sender, EventArgs e)
- {
- AddinInstallDialog dlg = new AddinInstallDialog (service);
- try {
- dlg.Run ();
- LoadAddins ();
- } finally {
- dlg.Destroy ();
- }
- }
-
- internal void OnUpdate (object sender, EventArgs e)
- {
- }
-
- internal void OnUninstall (object sender, EventArgs e)
- {
- AddinHeader info = (AddinHeader) tree.ActiveAddin;
- AddinInstallDialog dlg = new AddinInstallDialog (service);
- try {
- dlg.SetUninstallMode (info);
- dlg.Run ();
- LoadAddins ();
- } finally {
- dlg.Destroy ();
- }
- }
-
- internal void OnEnable (object sender, EventArgs e)
- {
- try {
- Addin sinfo = (Addin) tree.ActiveAddinData;
- if (sinfo == null)
- return;
- sinfo.Enabled = true;
- LoadAddins ();
- }
- catch (Exception ex) {
- Services.ShowError (ex, null, this, true);
- }
- }
-
- internal void OnDisable (object sender, EventArgs e)
- {
- try {
- Addin sinfo = (Addin) tree.ActiveAddinData;
- if (sinfo == null)
- return;
- sinfo.Enabled = false;
- LoadAddins ();
- }
- catch (Exception ex) {
- Services.ShowError (ex, null, this, true);
- }
- }
-
- internal void OnShowInfo (object sender, EventArgs e)
- {
- Addin sinfo = (Addin) tree.ActiveAddinData;
- if (sinfo == null)
- return;
-
- AddinInfoDialog dlg = new AddinInfoDialog (SetupService.GetAddinHeader (sinfo));
- try {
- dlg.Run ();
- } finally {
- dlg.Destroy ();
- }
- }
-
- internal void OnManageRepos (object sender, EventArgs e)
- {
- ManageSitesDialog dlg = new ManageSitesDialog (service);
- dlg.TransientFor = this;
- try {
- dlg.Run ();
- } finally {
- dlg.Destroy ();
- }
- }
-
- void LoadAddins ()
- {
- object s = tree.SaveStatus ();
-
- tree.Clear ();
- foreach (Addin ainfo in AddinManager.Registry.GetAddins ()) {
- if (Services.InApplicationNamespace (service, ainfo.Id))
- tree.AddAddin (SetupService.GetAddinHeader (ainfo), ainfo, ainfo.Enabled, ainfo.IsUserAddin);
- }
-
- tree.RestoreStatus (s);
- UpdateButtons ();
- }
-
- void UpdateButtons ()
- {
- Addin sinfo = (Addin) tree.ActiveAddinData;
- if (sinfo == null) {
- btnEnable.Sensitive = false;
- btnDisable.Sensitive = false;
- btnUninstall.Sensitive = false;
- btnInfo.Sensitive = false;
- } else {
- btnEnable.Sensitive = !sinfo.Enabled;
- btnDisable.Sensitive = sinfo.Enabled;
- btnUninstall.Sensitive = true;
- btnInfo.Sensitive = true;
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerWindow.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerWindow.cs
deleted file mode 100644
index cdb1951..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerWindow.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// AddinManagerWindow.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins.Gui
-{
- public class AddinManagerWindow
- {
- private static bool mAllowInstall = true;
-
- public static bool AllowInstall
- {
- get { return mAllowInstall; }
- set { mAllowInstall = value; }
- }
-
- private AddinManagerWindow()
- {
- }
-
- private static void InitDialog (AddinManagerDialog dlg)
- {
- dlg.AllowInstall = AllowInstall;
- }
-
- public static Gtk.Window Show (Gtk.Window parent)
- {
- AddinManagerDialog dlg = new AddinManagerDialog (parent);
- InitDialog (dlg);
- dlg.Show ();
- return dlg;
- }
-
- public static void Run (Gtk.Window parent)
- {
- AddinManagerDialog dlg = new AddinManagerDialog (parent);
- try {
- InitDialog (dlg);
- dlg.Run ();
- } finally {
- dlg.Destroy ();
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs
deleted file mode 100644
index 90b6d0c..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs
+++ /dev/null
@@ -1,375 +0,0 @@
-//
-// AddinTreeWidget.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using Gtk;
-using Gdk;
-using Mono.Addins;
-using Mono.Addins.Setup;
-using Mono.Unix;
-
-namespace Mono.Addins.Gui
-{
- public class AddinTreeWidget
- {
- protected Gtk.TreeView treeView;
- protected Gtk.TreeStore treeStore;
- bool allowSelection;
- ArrayList selected = new ArrayList ();
- Hashtable addinData = new Hashtable ();
-
- Gdk.Pixbuf package;
- Gdk.Pixbuf userPackage;
-
- public event EventHandler SelectionChanged;
-
- const int ColAddin = 0;
- const int ColData = 1;
- const int ColName = 2;
- const int ColVersion = 3;
- const int ColAllowSelection = 4;
- const int ColSelected = 5;
- const int ColImage = 6;
- const int ColShowImage = 7;
-
- public AddinTreeWidget (Gtk.TreeView treeView)
- {
- package = Gdk.Pixbuf.LoadFromResource ("package-x-generic_22.png");
- userPackage = Gdk.Pixbuf.LoadFromResource ("user-package.png");
-
- this.treeView = treeView;
- ArrayList list = new ArrayList ();
- AddStoreTypes (list);
- Type[] types = (Type[]) list.ToArray (typeof(Type));
- treeStore = new Gtk.TreeStore (types);
- treeView.Model = treeStore;
- CreateColumns ();
- }
-
- protected virtual void AddStoreTypes (ArrayList list)
- {
- list.Add (typeof(object));
- list.Add (typeof(object));
- list.Add (typeof(string));
- list.Add (typeof(string));
- list.Add (typeof(bool));
- list.Add (typeof(bool));
- list.Add (typeof (Pixbuf));
- list.Add (typeof(bool));
- }
-
- protected virtual void CreateColumns ()
- {
- TreeViewColumn col = new TreeViewColumn ();
- col.Title = Catalog.GetString ("Extension");
-
- CellRendererToggle crtog = new CellRendererToggle ();
- crtog.Activatable = true;
- crtog.Toggled += new ToggledHandler (OnAddinToggled);
- col.PackStart (crtog, false);
-
- CellRendererPixbuf pr = new CellRendererPixbuf ();
- col.PackStart (pr, false);
- col.AddAttribute (pr, "pixbuf", ColImage);
- col.AddAttribute (pr, "visible", ColShowImage);
-
- CellRendererText crt = new CellRendererText ();
- col.PackStart (crt, true);
-
- col.AddAttribute (crt, "markup", ColName);
- col.AddAttribute (crtog, "visible", ColAllowSelection);
- col.AddAttribute (crtog, "active", ColSelected);
- treeView.AppendColumn (col);
-
- col = new TreeViewColumn ();
- col.Title = Catalog.GetString ("Version");
- col.PackStart (crt, true);
- col.AddAttribute (crt, "markup", ColVersion);
- treeView.AppendColumn (col);
- }
-
- public bool AllowSelection {
- get { return allowSelection; }
- set { allowSelection = value; }
- }
-
- void OnAddinToggled (object o, ToggledArgs args)
- {
- TreeIter it;
- if (treeStore.GetIter (out it, new TreePath (args.Path))) {
- bool sel = !(bool) treeStore.GetValue (it, 5);
- treeStore.SetValue (it, 5, sel);
- AddinHeader info = (AddinHeader) treeStore.GetValue (it, 0);
- if (sel)
- selected.Add (info);
- else
- selected.Remove (info);
-
- OnSelectionChanged (EventArgs.Empty);
- }
- }
-
- protected virtual void OnSelectionChanged (EventArgs e)
- {
- if (SelectionChanged != null)
- SelectionChanged (this, e);
- }
-
- public void Clear ()
- {
- addinData.Clear ();
- selected.Clear ();
- treeStore.Clear ();
- }
-
- public TreeIter AddAddin (AddinHeader info, object dataItem, bool enabled)
- {
- return AddAddin (info, dataItem, enabled, false);
- }
-
- public TreeIter AddAddin (AddinHeader info, object dataItem, bool enabled, bool userDir)
- {
- Gdk.Pixbuf icon;
- if (userDir)
- icon = userPackage;
- else
- icon = package;
-
- addinData [info] = dataItem;
- TreeIter piter = TreeIter.Zero;
- if (info.Category == "") {
- string otherCat = Catalog.GetString ("Other");
- piter = FindCategory (otherCat);
- } else {
- piter = FindCategory (info.Category);
- }
-
- TreeIter iter = treeStore.AppendNode (piter);
- UpdateRow (iter, info, dataItem, enabled, icon);
- return iter;
- }
-
- protected virtual void UpdateRow (TreeIter iter, AddinHeader info, object dataItem, bool enabled, Gdk.Pixbuf icon)
- {
- bool sel = selected.Contains (info);
-
- treeStore.SetValue (iter, ColAddin, info);
- treeStore.SetValue (iter, ColData, dataItem);
-
- if (enabled) {
- treeStore.SetValue (iter, ColName, info.Name);
- treeStore.SetValue (iter, ColVersion, info.Version);
- treeStore.SetValue (iter, ColAllowSelection, allowSelection);
- }
- else {
- treeStore.SetValue (iter, ColName, "<span foreground=\"grey\">" + info.Name + "</span>");
- treeStore.SetValue (iter, ColVersion, "<span foreground=\"grey\">" + info.Version + "</span>");
- treeStore.SetValue (iter, ColAllowSelection, false);
- }
-
- treeStore.SetValue (iter, ColImage, icon);
- treeStore.SetValue (iter, ColShowImage, true);
-
- treeStore.SetValue (iter, ColSelected, sel);
- }
-
- public object GetAddinData (AddinHeader info)
- {
- return addinData [info];
- }
-
- public AddinHeader[] GetSelectedAddins ()
- {
- return (AddinHeader[]) selected.ToArray (typeof(AddinHeader));
- }
-
- TreeIter FindCategory (string namePath)
- {
- TreeIter iter = TreeIter.Zero;
- string[] paths = namePath.Split ('/');
- foreach (string name in paths) {
- TreeIter child;
- if (!FindCategory (iter, name, out child)) {
- if (iter.Equals (TreeIter.Zero))
- iter = treeStore.AppendValues (null, null, name, "", false, false, null, false);
- else
- iter = treeStore.AppendValues (iter, null, null, name, "", false, false, null, false);
- }
- else
- iter = child;
- }
- return iter;
- }
-
- bool FindCategory (TreeIter piter, string name, out TreeIter child)
- {
- if (piter.Equals (TreeIter.Zero)) {
- if (!treeStore.GetIterFirst (out child))
- return false;
- }
- else if (!treeStore.IterChildren (out child, piter))
- return false;
-
- do {
- if (((string) treeStore.GetValue (child, ColName)) == name) {
- return true;
- }
- } while (treeStore.IterNext (ref child));
-
- return false;
- }
-
- public AddinHeader ActiveAddin {
- get {
- Gtk.TreeModel foo;
- Gtk.TreeIter iter;
- if (!treeView.Selection.GetSelected (out foo, out iter))
- return null;
-
- return (AddinHeader) treeStore.GetValue (iter, 0);
- }
- }
-
- public object ActiveAddinData {
- get {
- AddinHeader ai = ActiveAddin;
- return ai != null ? GetAddinData (ai) : null;
- }
- }
-
- public object SaveStatus ()
- {
- TreeIter iter;
- ArrayList list = new ArrayList ();
-
- // Save the current selection
- Gtk.TreeModel foo;
- if (treeView.Selection.GetSelected (out foo, out iter))
- list.Add (treeStore.GetPath (iter));
- else
- list.Add (null);
-
- if (!treeStore.GetIterFirst (out iter))
- return null;
-
- // Save the expand state
- do {
- SaveStatus (list, iter);
- } while (treeStore.IterNext (ref iter));
-
- return list;
- }
-
- void SaveStatus (ArrayList list, TreeIter iter)
- {
- Gtk.TreePath path = treeStore.GetPath (iter);
- if (treeView.GetRowExpanded (path))
- list.Add (path);
- if (treeStore.IterChildren (out iter, iter)) {
- do {
- SaveStatus (list, iter);
- } while (treeStore.IterNext (ref iter));
- }
- }
-
- public void RestoreStatus (object ob)
- {
- if (ob == null)
- return;
-
- // The first element is the selection
- ArrayList list = (ArrayList) ob;
- TreePath selpath = (TreePath) list [0];
- list.RemoveAt (0);
-
- foreach (TreePath path in list)
- treeView.ExpandRow (path, false);
-
- if (selpath != null)
- treeView.Selection.SelectPath (selpath);
- }
-
- public void SelectAll ()
- {
- TreeIter iter;
-
- if (!treeStore.GetIterFirst (out iter))
- return;
- do {
- SelectAll (iter);
- } while (treeStore.IterNext (ref iter));
- OnSelectionChanged (EventArgs.Empty);
- }
-
- void SelectAll (TreeIter iter)
- {
- AddinHeader info = (AddinHeader) treeStore.GetValue (iter, ColAddin);
-
- if (info != null) {
- treeStore.SetValue (iter, ColSelected, true);
- if (!selected.Contains (info))
- selected.Add (info);
- treeView.ExpandToPath (treeStore.GetPath (iter));
- } else {
- if (treeStore.IterChildren (out iter, iter)) {
- do {
- SelectAll (iter);
- } while (treeStore.IterNext (ref iter));
- }
- }
- }
-
- public void UnselectAll ()
- {
- TreeIter iter;
- if (!treeStore.GetIterFirst (out iter))
- return;
- do {
- UnselectAll (iter);
- } while (treeStore.IterNext (ref iter));
- OnSelectionChanged (EventArgs.Empty);
- }
-
- void UnselectAll (TreeIter iter)
- {
- AddinHeader info = (AddinHeader) treeStore.GetValue (iter, ColAddin);
- if (info != null) {
- treeStore.SetValue (iter, ColSelected, false);
- selected.Remove (info);
- } else {
- if (treeStore.IterChildren (out iter, iter)) {
- do {
- UnselectAll (iter);
- } while (treeStore.IterNext (ref iter));
- }
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ErrorDialog.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ErrorDialog.cs
deleted file mode 100644
index ca9fce0..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ErrorDialog.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// ErrorDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-
-namespace Mono.Addins.Gui
-{
- partial class ErrorDialog : Dialog
- {
- TextTag tagNoWrap;
- TextTag tagWrap;
-
- public ErrorDialog (Window parent)
- {
- Build ();
- TransientFor = parent;
- okButton.Clicked += new EventHandler (OnClose);
- expander.Activated += new EventHandler (OnExpanded);
- descriptionLabel.ModifyBg (StateType.Normal, new Gdk.Color (255,0,0));
-
- tagNoWrap = new TextTag ("nowrap");
- tagNoWrap.WrapMode = WrapMode.None;
- detailsTextView.Buffer.TagTable.Add (tagNoWrap);
-
- tagWrap = new TextTag ("wrap");
- tagWrap.WrapMode = WrapMode.Word;
- detailsTextView.Buffer.TagTable.Add (tagWrap);
-
- expander.Visible = false;
- }
-
- public string Message {
- get { return descriptionLabel.Text; }
- set {
- string message = value;
- while (message.EndsWith ("\r") || message.EndsWith ("\n"))
- message = message.Substring (0, message.Length - 1);
- if (!message.EndsWith (".")) message += ".";
- descriptionLabel.Text = message;
- }
- }
-
- public void AddDetails (string text, bool wrapped)
- {
- TextIter it = detailsTextView.Buffer.EndIter;
- if (wrapped)
- detailsTextView.Buffer.InsertWithTags (ref it, text, tagWrap);
- else
- detailsTextView.Buffer.InsertWithTags (ref it, text, tagNoWrap);
- expander.Visible = true;
- }
-
- void OnClose (object sender, EventArgs args)
- {
- Destroy ();
- }
-
- void OnExpanded (object sender, EventArgs args)
- {
- GLib.Timeout.Add (100, new GLib.TimeoutHandler (UpdateSize));
- }
-
- bool UpdateSize ()
- {
- int w, h;
- GetSize (out w, out h);
- Resize (w, 1);
- return false;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs
deleted file mode 100644
index 7e27bb1..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// ManageSitesDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using Gtk;
-using Mono.Unix;
-
-using Mono.Addins.Setup;
-
-
-namespace Mono.Addins.Gui
-{
- partial class ManageSitesDialog : Dialog
- {
- ListStore treeStore;
- SetupService service;
-
- public ManageSitesDialog (SetupService service)
- {
- Build ();
- this.service = service;
- treeStore = new Gtk.ListStore (typeof (string), typeof (string));
- repoTree.Model = treeStore;
- repoTree.HeadersVisible = true;
- repoTree.AppendColumn (Catalog.GetString ("Name"), new Gtk.CellRendererText (), "text", 1);
- repoTree.AppendColumn (Catalog.GetString ("Url"), new Gtk.CellRendererText (), "text", 0);
- repoTree.Selection.Changed += new EventHandler(OnSelect);
-
- AddinRepository[] reps = service.Repositories.GetRepositories ();
- foreach (AddinRepository rep in reps) {
- treeStore.AppendValues (rep.Url, rep.Title);
- }
-
- btnRemove.Sensitive = false;
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- Destroy ();
- }
-
- protected void OnAdd (object sender, EventArgs e)
- {
- NewSiteDialog dlg = new NewSiteDialog ();
- try {
- if (dlg.Run ()) {
- string url = dlg.Url;
- if (!url.StartsWith ("http://") && !url.StartsWith ("https://") && !url.StartsWith ("file://")) {
- url = "http://" + url;
- }
-
- try {
- new Uri (url);
- } catch {
- Services.ShowError (null, "Invalid url: " + url, null, true);
- }
-
- if (!service.Repositories.ContainsRepository (url)) {
- IProgressStatus m = new ConsoleProgressStatus (false);
- AddinRepository rr = service.Repositories.RegisterRepository (m, url);
- if (rr == null) {
- Services.ShowError (null, "The repository could not be registered", null, true);
- return;
- }
- treeStore.AppendValues (rr.Url, rr.Title);
- }
- }
- } finally {
- dlg.Destroy ();
- }
- }
-
- protected void OnRemove (object sender, EventArgs e)
- {
- Gtk.TreeModel foo;
- Gtk.TreeIter iter;
- if (!repoTree.Selection.GetSelected (out foo, out iter))
- return;
-
- string rep = (string) treeStore.GetValue (iter, 0);
- service.Repositories.RemoveRepository (rep);
-
- treeStore.Remove (ref iter);
- }
-
- protected void OnSelect(object sender, EventArgs e)
- {
- btnRemove.Sensitive = repoTree.Selection.CountSelectedRows() > 0;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/NewSiteDialog.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/NewSiteDialog.cs
deleted file mode 100644
index e2c9c94..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/NewSiteDialog.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// NewSiteDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using Gtk;
-
-namespace Mono.Addins.Gui
-{
- partial class NewSiteDialog : Dialog
- {
- public NewSiteDialog ()
- {
- Build ();
- pathEntry.Sensitive = false;
- CheckValues ();
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- Destroy ();
- }
-
- public string Url {
- get {
- if (btnOnlineRep.Active)
- return urlText.Text;
- else if (pathEntry.Text.Length > 0)
- return "file://" + pathEntry.Text;
- else
- return string.Empty;
- }
- }
-
- void CheckValues ()
- {
- btnOk.Sensitive = (Url != "");
- }
-
- public new bool Run ()
- {
- ShowAll ();
- return ((ResponseType) base.Run ()) == ResponseType.Ok;
- }
-
- protected void OnClose (object sender, EventArgs args)
- {
- Destroy ();
- }
-
- protected void OnOptionClicked (object sender, EventArgs e)
- {
- if (btnOnlineRep.Active) {
- urlText.Sensitive = true;
- pathEntry.Sensitive = false;
- } else {
- urlText.Sensitive = false;
- pathEntry.Sensitive = true;
- }
- CheckValues ();
- }
-
- protected virtual void OnButtonBrowseClicked(object sender, System.EventArgs e)
- {
- FileChooserDialog dlg = new FileChooserDialog ("Select Folder", this, FileChooserAction.SelectFolder);
- try {
- dlg.AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel);
- dlg.AddButton (Gtk.Stock.Open, Gtk.ResponseType.Ok);
-
- dlg.SetFilename (Environment.GetFolderPath (Environment.SpecialFolder.Personal));
- if (dlg.Run () == (int) ResponseType.Ok) {
- pathEntry.Text = dlg.Filename;
- }
- } finally {
- dlg.Destroy ();
- }
- }
-
- protected virtual void OnPathEntryChanged(object sender, System.EventArgs e)
- {
- CheckValues ();
- }
-
- protected virtual void OnUrlTextChanged (object sender, System.EventArgs e)
- {
- CheckValues ();
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs b/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs
deleted file mode 100644
index 76b5cfd..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Services.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using Gtk;
-using Mono.Unix;
-using Mono.Addins.Setup;
-
-namespace Mono.Addins.Gui
-{
- internal class Services
- {
- public static bool InApplicationNamespace (SetupService service, string id)
- {
- return service.ApplicationNamespace == null || id.StartsWith (service.ApplicationNamespace + ".");
- }
-
- public static bool AskQuestion (string question)
- {
- MessageDialog md = new MessageDialog (null, DialogFlags.Modal | DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.YesNo, question);
- try {
- int response = md.Run ();
- return ((ResponseType) response == ResponseType.Yes);
- } finally {
- md.Destroy ();
- }
- }
-
- public static void ShowError (Exception ex, string message, Window parent, bool modal)
- {
- ErrorDialog dlg = new ErrorDialog (parent);
-
- if (message == null) {
- if (ex != null)
- dlg.Message = string.Format (Catalog.GetString ("Exception occurred: {0}"), ex.Message);
- else {
- dlg.Message = "An unknown error occurred";
- dlg.AddDetails (Environment.StackTrace, false);
- }
- } else
- dlg.Message = message;
-
- if (ex != null) {
- dlg.AddDetails (string.Format (Catalog.GetString ("Exception occurred: {0}"), ex.Message) + "\n\n", true);
- dlg.AddDetails (ex.ToString (), false);
- }
-
- if (modal) {
- dlg.Run ();
- dlg.Destroy ();
- } else
- dlg.Show ();
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs
deleted file mode 100644
index 352e04b..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Mono.Addins.Gui {
-
-
- internal partial class AddinInfoDialog {
-
- private Gtk.HBox hbox81;
-
- private Gtk.VBox vbox94;
-
- private Gtk.Image packageImage;
-
- private Gtk.ScrolledWindow scrolledwindow22;
-
- private Gtk.Label infoLabel;
-
- private Gtk.Button closebutton3;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Addins.Gui.AddinInfoDialog
- this.Name = "Mono.Addins.Gui.AddinInfoDialog";
- this.Title = Mono.Unix.Catalog.GetString("Package");
- this.TypeHint = ((Gdk.WindowTypeHint)(1));
- this.BorderWidth = ((uint)(6));
- this.DefaultWidth = 550;
- this.DefaultHeight = 400;
- // Internal child Mono.Addins.Gui.AddinInfoDialog.VBox
- Gtk.VBox w1 = this.VBox;
- w1.Name = "dialog-vbox12";
- w1.Spacing = 6;
- // Container child dialog-vbox12.Gtk.Box+BoxChild
- this.hbox81 = new Gtk.HBox();
- this.hbox81.Name = "hbox81";
- this.hbox81.Spacing = 12;
- this.hbox81.BorderWidth = ((uint)(6));
- // Container child hbox81.Gtk.Box+BoxChild
- this.vbox94 = new Gtk.VBox();
- this.vbox94.Name = "vbox94";
- // Container child vbox94.Gtk.Box+BoxChild
- this.packageImage = new Gtk.Image();
- this.packageImage.Name = "packageImage";
- this.vbox94.Add(this.packageImage);
- Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox94[this.packageImage]));
- w2.Position = 0;
- w2.Expand = false;
- w2.Fill = false;
- this.hbox81.Add(this.vbox94);
- Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox81[this.vbox94]));
- w3.Position = 0;
- w3.Expand = false;
- w3.Fill = false;
- // Container child hbox81.Gtk.Box+BoxChild
- this.scrolledwindow22 = new Gtk.ScrolledWindow();
- this.scrolledwindow22.CanFocus = true;
- this.scrolledwindow22.Name = "scrolledwindow22";
- this.scrolledwindow22.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow22.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- // Container child scrolledwindow22.Gtk.Container+ContainerChild
- Gtk.Viewport w4 = new Gtk.Viewport();
- w4.ShadowType = ((Gtk.ShadowType)(0));
- // Container child viewport4.Gtk.Container+ContainerChild
- this.infoLabel = new Gtk.Label();
- this.infoLabel.WidthRequest = 420;
- this.infoLabel.Name = "infoLabel";
- this.infoLabel.Xpad = 6;
- this.infoLabel.Ypad = 6;
- this.infoLabel.Xalign = 0F;
- this.infoLabel.Yalign = 0F;
- this.infoLabel.LabelProp = "aa a a a a a a a a aa a a a a aaa a a a a a a a a aa a a a a aaa a a a a a a a a aa a a a a a";
- this.infoLabel.Wrap = true;
- w4.Add(this.infoLabel);
- this.scrolledwindow22.Add(w4);
- this.hbox81.Add(this.scrolledwindow22);
- Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox81[this.scrolledwindow22]));
- w7.Position = 1;
- w1.Add(this.hbox81);
- Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(w1[this.hbox81]));
- w8.Position = 0;
- // Internal child Mono.Addins.Gui.AddinInfoDialog.ActionArea
- Gtk.HButtonBox w9 = this.ActionArea;
- w9.Name = "dialog-action_area12";
- w9.Spacing = 10;
- w9.BorderWidth = ((uint)(6));
- w9.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
- // Container child dialog-action_area12.Gtk.ButtonBox+ButtonBoxChild
- this.closebutton3 = new Gtk.Button();
- this.closebutton3.CanDefault = true;
- this.closebutton3.CanFocus = true;
- this.closebutton3.Name = "closebutton3";
- this.closebutton3.UseStock = true;
- this.closebutton3.UseUnderline = true;
- this.closebutton3.Label = "gtk-close";
- this.AddActionWidget(this.closebutton3, -7);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Show();
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
deleted file mode 100644
index c310200..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
+++ /dev/null
@@ -1,572 +0,0 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Mono.Addins.Gui {
-
-
- internal partial class AddinInstallDialog {
-
- private Gtk.Notebook wizardNotebook;
-
- private Gtk.VBox vbox82;
-
- private Gtk.Label label113;
-
- private Gtk.HBox hbox66;
-
- private Gtk.Label label112;
-
- private Gtk.ComboBox repoCombo;
-
- private Gtk.Button button1;
-
- private Gtk.Button btnManageSites;
-
- private Gtk.HBox hbox70;
-
- private Gtk.VBox vbox92;
-
- private Gtk.ScrolledWindow scrolledwindow18;
-
- private Gtk.TreeView addinTree;
-
- private Gtk.HBox hbox83;
-
- private Gtk.ComboBox filterComboBox;
-
- private Gtk.Button btnInfo;
-
- private Gtk.Button btnUnselectAll;
-
- private Gtk.Button btnSelectAll;
-
- private Gtk.Label label108;
-
- private Gtk.ScrolledWindow scrolledwindow19;
-
- private Gtk.HBox hbox82;
-
- private Gtk.Image imageInstall;
-
- private Gtk.Label labelSummary;
-
- private Gtk.Label label124;
-
- private Gtk.VBox vbox86;
-
- private Gtk.Label label126;
-
- private Gtk.ProgressBar mainProgressBar;
-
- private Gtk.Label label129;
-
- private Gtk.Label progressLabel;
-
- private Gtk.ProgressBar progressBar;
-
- private Gtk.Label label110;
-
- private Gtk.ScrolledWindow scrolledwindow20;
-
- private Gtk.VBox vbox91;
-
- private Gtk.Label label130;
-
- private Gtk.Image imageError;
-
- private Gtk.Image imageWarn;
-
- private Gtk.Image imageInfo;
-
- private Gtk.HBox hbox71;
-
- private Gtk.Label labelResult;
-
- private Gtk.Label label131;
-
- private Gtk.Label label111;
-
- private Gtk.HButtonBox dialog_action_area9;
-
- private Gtk.Button btnCancel;
-
- private Gtk.Button btnPrev;
-
- private Gtk.Button btnNext;
-
- private Gtk.Button btnOk;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Addins.Gui.AddinInstallDialog
- this.Name = "Mono.Addins.Gui.AddinInstallDialog";
- this.Title = Mono.Unix.Catalog.GetString("Extension Installation");
- this.TypeHint = ((Gdk.WindowTypeHint)(1));
- this.Modal = true;
- this.BorderWidth = ((uint)(6));
- this.DefaultWidth = 725;
- this.DefaultHeight = 550;
- // Internal child Mono.Addins.Gui.AddinInstallDialog.VBox
- Gtk.VBox w1 = this.VBox;
- w1.Name = "dialog-vbox9";
- w1.Spacing = 6;
- w1.BorderWidth = ((uint)(2));
- // Container child dialog-vbox9.Gtk.Box+BoxChild
- this.wizardNotebook = new Gtk.Notebook();
- this.wizardNotebook.CanFocus = true;
- this.wizardNotebook.Name = "wizardNotebook";
- this.wizardNotebook.CurrentPage = 3;
- this.wizardNotebook.ShowBorder = false;
- this.wizardNotebook.BorderWidth = ((uint)(6));
- // Container child wizardNotebook.Gtk.Notebook+NotebookChild
- this.vbox82 = new Gtk.VBox();
- this.vbox82.Name = "vbox82";
- this.vbox82.Spacing = 12;
- // Container child vbox82.Gtk.Box+BoxChild
- this.label113 = new Gtk.Label();
- this.label113.Name = "label113";
- this.label113.Xalign = 0F;
- this.label113.LabelProp = Mono.Unix.Catalog.GetString("<b>Select the extensions to install and click on Next</b>");
- this.label113.UseMarkup = true;
- this.vbox82.Add(this.label113);
- Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox82[this.label113]));
- w2.Position = 0;
- w2.Expand = false;
- w2.Fill = false;
- // Container child vbox82.Gtk.Box+BoxChild
- this.hbox66 = new Gtk.HBox();
- this.hbox66.Name = "hbox66";
- this.hbox66.Spacing = 6;
- // Container child hbox66.Gtk.Box+BoxChild
- this.label112 = new Gtk.Label();
- this.label112.Name = "label112";
- this.label112.LabelProp = Mono.Unix.Catalog.GetString("Install from:");
- this.hbox66.Add(this.label112);
- Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox66[this.label112]));
- w3.Position = 0;
- w3.Expand = false;
- w3.Fill = false;
- // Container child hbox66.Gtk.Box+BoxChild
- this.repoCombo = new Gtk.ComboBox();
- this.repoCombo.Name = "repoCombo";
- this.hbox66.Add(this.repoCombo);
- Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox66[this.repoCombo]));
- w4.Position = 1;
- // Container child hbox66.Gtk.Box+BoxChild
- this.button1 = new Gtk.Button();
- this.button1.CanFocus = true;
- this.button1.Name = "button1";
- this.button1.UseStock = true;
- this.button1.UseUnderline = true;
- this.button1.Label = "gtk-refresh";
- this.hbox66.Add(this.button1);
- Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox66[this.button1]));
- w5.Position = 2;
- w5.Expand = false;
- w5.Fill = false;
- // Container child hbox66.Gtk.Box+BoxChild
- this.btnManageSites = new Gtk.Button();
- this.btnManageSites.CanFocus = true;
- this.btnManageSites.Name = "btnManageSites";
- this.btnManageSites.UseUnderline = true;
- this.btnManageSites.Label = Mono.Unix.Catalog.GetString("_Repositories...");
- this.hbox66.Add(this.btnManageSites);
- Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox66[this.btnManageSites]));
- w6.Position = 3;
- w6.Expand = false;
- w6.Fill = false;
- this.vbox82.Add(this.hbox66);
- Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox82[this.hbox66]));
- w7.Position = 1;
- w7.Expand = false;
- w7.Fill = false;
- // Container child vbox82.Gtk.Box+BoxChild
- this.hbox70 = new Gtk.HBox();
- this.hbox70.Name = "hbox70";
- this.hbox70.Spacing = 12;
- // Container child hbox70.Gtk.Box+BoxChild
- this.vbox92 = new Gtk.VBox();
- this.vbox92.Name = "vbox92";
- this.vbox92.Spacing = 6;
- // Container child vbox92.Gtk.Box+BoxChild
- this.scrolledwindow18 = new Gtk.ScrolledWindow();
- this.scrolledwindow18.CanFocus = true;
- this.scrolledwindow18.Name = "scrolledwindow18";
- this.scrolledwindow18.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow18.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow18.ShadowType = ((Gtk.ShadowType)(1));
- // Container child scrolledwindow18.Gtk.Container+ContainerChild
- this.addinTree = new Gtk.TreeView();
- this.addinTree.CanFocus = true;
- this.addinTree.Name = "addinTree";
- this.addinTree.HeadersClickable = true;
- this.scrolledwindow18.Add(this.addinTree);
- this.vbox92.Add(this.scrolledwindow18);
- Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox92[this.scrolledwindow18]));
- w9.Position = 0;
- // Container child vbox92.Gtk.Box+BoxChild
- this.hbox83 = new Gtk.HBox();
- this.hbox83.Name = "hbox83";
- this.hbox83.Spacing = 6;
- // Container child hbox83.Gtk.Box+BoxChild
- this.filterComboBox = Gtk.ComboBox.NewText();
- this.filterComboBox.AppendText(Mono.Unix.Catalog.GetString("Show all packages"));
- this.filterComboBox.AppendText(Mono.Unix.Catalog.GetString("Show new versions only"));
- this.filterComboBox.AppendText(Mono.Unix.Catalog.GetString("Show updates only"));
- this.filterComboBox.Name = "filterComboBox";
- this.hbox83.Add(this.filterComboBox);
- Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.hbox83[this.filterComboBox]));
- w10.Position = 0;
- w10.Expand = false;
- w10.Fill = false;
- // Container child hbox83.Gtk.Box+BoxChild
- this.btnInfo = new Gtk.Button();
- this.btnInfo.CanFocus = true;
- this.btnInfo.Name = "btnInfo";
- this.btnInfo.UseStock = true;
- this.btnInfo.UseUnderline = true;
- this.btnInfo.Label = "gtk-dialog-info";
- this.hbox83.Add(this.btnInfo);
- Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.hbox83[this.btnInfo]));
- w11.PackType = ((Gtk.PackType)(1));
- w11.Position = 1;
- w11.Expand = false;
- w11.Fill = false;
- // Container child hbox83.Gtk.Box+BoxChild
- this.btnUnselectAll = new Gtk.Button();
- this.btnUnselectAll.CanFocus = true;
- this.btnUnselectAll.Name = "btnUnselectAll";
- this.btnUnselectAll.UseUnderline = true;
- this.btnUnselectAll.Label = Mono.Unix.Catalog.GetString("_Unselect All");
- this.hbox83.Add(this.btnUnselectAll);
- Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.hbox83[this.btnUnselectAll]));
- w12.PackType = ((Gtk.PackType)(1));
- w12.Position = 2;
- w12.Expand = false;
- w12.Fill = false;
- // Container child hbox83.Gtk.Box+BoxChild
- this.btnSelectAll = new Gtk.Button();
- this.btnSelectAll.CanFocus = true;
- this.btnSelectAll.Name = "btnSelectAll";
- this.btnSelectAll.UseUnderline = true;
- this.btnSelectAll.Label = Mono.Unix.Catalog.GetString("Select _All");
- this.hbox83.Add(this.btnSelectAll);
- Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.hbox83[this.btnSelectAll]));
- w13.PackType = ((Gtk.PackType)(1));
- w13.Position = 3;
- w13.Expand = false;
- w13.Fill = false;
- this.vbox92.Add(this.hbox83);
- Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.vbox92[this.hbox83]));
- w14.Position = 1;
- w14.Expand = false;
- w14.Fill = false;
- this.hbox70.Add(this.vbox92);
- Gtk.Box.BoxChild w15 = ((Gtk.Box.BoxChild)(this.hbox70[this.vbox92]));
- w15.Position = 0;
- this.vbox82.Add(this.hbox70);
- Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox82[this.hbox70]));
- w16.Position = 2;
- this.wizardNotebook.Add(this.vbox82);
- Gtk.Notebook.NotebookChild w17 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.vbox82]));
- w17.TabExpand = false;
- // Notebook tab
- this.label108 = new Gtk.Label();
- this.label108.Name = "label108";
- this.label108.LabelProp = "label108";
- this.wizardNotebook.SetTabLabel(this.vbox82, this.label108);
- this.label108.ShowAll();
- // Container child wizardNotebook.Gtk.Notebook+NotebookChild
- this.scrolledwindow19 = new Gtk.ScrolledWindow();
- this.scrolledwindow19.CanFocus = true;
- this.scrolledwindow19.Name = "scrolledwindow19";
- this.scrolledwindow19.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow19.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- // Container child scrolledwindow19.Gtk.Container+ContainerChild
- Gtk.Viewport w18 = new Gtk.Viewport();
- // Container child viewport1.Gtk.Container+ContainerChild
- this.hbox82 = new Gtk.HBox();
- this.hbox82.Name = "hbox82";
- this.hbox82.Spacing = 12;
- this.hbox82.BorderWidth = ((uint)(12));
- // Container child hbox82.Gtk.Box+BoxChild
- this.imageInstall = new Gtk.Image();
- this.imageInstall.Name = "imageInstall";
- this.imageInstall.Xalign = 0F;
- this.imageInstall.Yalign = 0F;
- this.imageInstall.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-warning", Gtk.IconSize.Dialog, 48);
- this.hbox82.Add(this.imageInstall);
- Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.hbox82[this.imageInstall]));
- w19.Position = 0;
- w19.Expand = false;
- w19.Fill = false;
- // Container child hbox82.Gtk.Box+BoxChild
- this.labelSummary = new Gtk.Label();
- this.labelSummary.Name = "labelSummary";
- this.labelSummary.Xpad = 6;
- this.labelSummary.Ypad = 6;
- this.labelSummary.Xalign = 0F;
- this.labelSummary.Yalign = 0F;
- this.labelSummary.LabelProp = "<b>The following extensions will be installed:</b>\n\nC# language binding\nC# language IDE extension\n\n<b>The following extensions are required by the selected extensions</b>\n\nNUnit extension\nNAnt extension\n\nasd\nasd\na\nsd\nasd\nasd\na\nsda\nsd\nas\nda\nsd\nasd\n";
- this.labelSummary.UseMarkup = true;
- this.labelSummary.Wrap = true;
- this.hbox82.Add(this.labelSummary);
- Gtk.Box.BoxChild w20 = ((Gtk.Box.BoxChild)(this.hbox82[this.labelSummary]));
- w20.Position = 1;
- w20.Expand = false;
- w20.Fill = false;
- w18.Add(this.hbox82);
- this.scrolledwindow19.Add(w18);
- this.wizardNotebook.Add(this.scrolledwindow19);
- Gtk.Notebook.NotebookChild w23 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.scrolledwindow19]));
- w23.Position = 1;
- w23.TabExpand = false;
- // Notebook tab
- this.label124 = new Gtk.Label();
- this.label124.Name = "label124";
- this.label124.LabelProp = Mono.Unix.Catalog.GetString("label124");
- this.wizardNotebook.SetTabLabel(this.scrolledwindow19, this.label124);
- this.label124.ShowAll();
- // Container child wizardNotebook.Gtk.Notebook+NotebookChild
- this.vbox86 = new Gtk.VBox();
- this.vbox86.Name = "vbox86";
- this.vbox86.Spacing = 6;
- this.vbox86.BorderWidth = ((uint)(116));
- // Container child vbox86.Gtk.Box+BoxChild
- this.label126 = new Gtk.Label();
- this.label126.Name = "label126";
- this.label126.Xalign = 0F;
- this.label126.LabelProp = Mono.Unix.Catalog.GetString("Overall Progress:");
- this.vbox86.Add(this.label126);
- Gtk.Box.BoxChild w24 = ((Gtk.Box.BoxChild)(this.vbox86[this.label126]));
- w24.Position = 0;
- w24.Expand = false;
- w24.Fill = false;
- // Container child vbox86.Gtk.Box+BoxChild
- this.mainProgressBar = new Gtk.ProgressBar();
- this.mainProgressBar.Name = "mainProgressBar";
- this.mainProgressBar.PulseStep = 10000000149;
- this.vbox86.Add(this.mainProgressBar);
- Gtk.Box.BoxChild w25 = ((Gtk.Box.BoxChild)(this.vbox86[this.mainProgressBar]));
- w25.Position = 1;
- w25.Expand = false;
- w25.Fill = false;
- // Container child vbox86.Gtk.Box+BoxChild
- this.label129 = new Gtk.Label();
- this.label129.Name = "label129";
- this.label129.LabelProp = "";
- this.vbox86.Add(this.label129);
- Gtk.Box.BoxChild w26 = ((Gtk.Box.BoxChild)(this.vbox86[this.label129]));
- w26.Position = 2;
- w26.Expand = false;
- w26.Fill = false;
- // Container child vbox86.Gtk.Box+BoxChild
- this.progressLabel = new Gtk.Label();
- this.progressLabel.Name = "progressLabel";
- this.progressLabel.Xalign = 0F;
- this.progressLabel.LabelProp = Mono.Unix.Catalog.GetString("Downloading extensions...");
- this.vbox86.Add(this.progressLabel);
- Gtk.Box.BoxChild w27 = ((Gtk.Box.BoxChild)(this.vbox86[this.progressLabel]));
- w27.Position = 3;
- w27.Expand = false;
- w27.Fill = false;
- // Container child vbox86.Gtk.Box+BoxChild
- this.progressBar = new Gtk.ProgressBar();
- this.progressBar.Name = "progressBar";
- this.progressBar.PulseStep = 10000000149;
- this.vbox86.Add(this.progressBar);
- Gtk.Box.BoxChild w28 = ((Gtk.Box.BoxChild)(this.vbox86[this.progressBar]));
- w28.Position = 4;
- w28.Expand = false;
- w28.Fill = false;
- this.wizardNotebook.Add(this.vbox86);
- Gtk.Notebook.NotebookChild w29 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.vbox86]));
- w29.Position = 2;
- w29.TabExpand = false;
- // Notebook tab
- this.label110 = new Gtk.Label();
- this.label110.Name = "label110";
- this.label110.LabelProp = "label110";
- this.wizardNotebook.SetTabLabel(this.vbox86, this.label110);
- this.label110.ShowAll();
- // Container child wizardNotebook.Gtk.Notebook+NotebookChild
- this.scrolledwindow20 = new Gtk.ScrolledWindow();
- this.scrolledwindow20.CanFocus = true;
- this.scrolledwindow20.Name = "scrolledwindow20";
- this.scrolledwindow20.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow20.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- // Container child scrolledwindow20.Gtk.Container+ContainerChild
- Gtk.Viewport w30 = new Gtk.Viewport();
- // Container child viewport3.Gtk.Container+ContainerChild
- this.vbox91 = new Gtk.VBox();
- this.vbox91.Name = "vbox91";
- // Container child vbox91.Gtk.Box+BoxChild
- this.label130 = new Gtk.Label();
- this.label130.Name = "label130";
- this.label130.LabelProp = "";
- this.vbox91.Add(this.label130);
- Gtk.Box.BoxChild w31 = ((Gtk.Box.BoxChild)(this.vbox91[this.label130]));
- w31.Position = 0;
- // Container child vbox91.Gtk.Box+BoxChild
- this.imageError = new Gtk.Image();
- this.imageError.Name = "imageError";
- this.imageError.Yalign = 1F;
- this.imageError.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-error", Gtk.IconSize.Dialog, 48);
- this.vbox91.Add(this.imageError);
- Gtk.Box.BoxChild w32 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageError]));
- w32.Position = 1;
- w32.Expand = false;
- w32.Fill = false;
- w32.Padding = ((uint)(5));
- // Container child vbox91.Gtk.Box+BoxChild
- this.imageWarn = new Gtk.Image();
- this.imageWarn.Name = "imageWarn";
- this.imageWarn.Yalign = 1F;
- this.imageWarn.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-warning", Gtk.IconSize.Dialog, 48);
- this.vbox91.Add(this.imageWarn);
- Gtk.Box.BoxChild w33 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageWarn]));
- w33.Position = 2;
- w33.Expand = false;
- w33.Fill = false;
- // Container child vbox91.Gtk.Box+BoxChild
- this.imageInfo = new Gtk.Image();
- this.imageInfo.Name = "imageInfo";
- this.imageInfo.Yalign = 1F;
- this.imageInfo.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-info", Gtk.IconSize.Dialog, 48);
- this.vbox91.Add(this.imageInfo);
- Gtk.Box.BoxChild w34 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageInfo]));
- w34.Position = 3;
- w34.Expand = false;
- w34.Fill = false;
- // Container child vbox91.Gtk.Box+BoxChild
- this.hbox71 = new Gtk.HBox();
- this.hbox71.Name = "hbox71";
- // Container child hbox71.Gtk.Box+BoxChild
- this.labelResult = new Gtk.Label();
- this.labelResult.WidthRequest = 450;
- this.labelResult.Name = "labelResult";
- this.labelResult.Ypad = 9;
- this.labelResult.Yalign = 0F;
- this.labelResult.LabelProp = "Done";
- this.labelResult.UseMarkup = true;
- this.labelResult.Wrap = true;
- this.labelResult.Justify = ((Gtk.Justification)(2));
- this.hbox71.Add(this.labelResult);
- Gtk.Box.BoxChild w35 = ((Gtk.Box.BoxChild)(this.hbox71[this.labelResult]));
- w35.PackType = ((Gtk.PackType)(1));
- w35.Position = 0;
- this.vbox91.Add(this.hbox71);
- Gtk.Box.BoxChild w36 = ((Gtk.Box.BoxChild)(this.vbox91[this.hbox71]));
- w36.Position = 4;
- w36.Expand = false;
- w36.Fill = false;
- // Container child vbox91.Gtk.Box+BoxChild
- this.label131 = new Gtk.Label();
- this.label131.Name = "label131";
- this.label131.LabelProp = "";
- this.vbox91.Add(this.label131);
- Gtk.Box.BoxChild w37 = ((Gtk.Box.BoxChild)(this.vbox91[this.label131]));
- w37.Position = 5;
- w30.Add(this.vbox91);
- this.scrolledwindow20.Add(w30);
- this.wizardNotebook.Add(this.scrolledwindow20);
- Gtk.Notebook.NotebookChild w40 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.scrolledwindow20]));
- w40.Position = 3;
- w40.TabExpand = false;
- // Notebook tab
- this.label111 = new Gtk.Label();
- this.label111.Name = "label111";
- this.label111.LabelProp = "label111";
- this.wizardNotebook.SetTabLabel(this.scrolledwindow20, this.label111);
- this.label111.ShowAll();
- w1.Add(this.wizardNotebook);
- Gtk.Box.BoxChild w41 = ((Gtk.Box.BoxChild)(w1[this.wizardNotebook]));
- w41.Position = 0;
- // Container child dialog-vbox9.Gtk.Box+BoxChild
- this.dialog_action_area9 = new Gtk.HButtonBox();
- this.dialog_action_area9.Name = "dialog_action_area9";
- this.dialog_action_area9.Spacing = 9;
- this.dialog_action_area9.BorderWidth = ((uint)(6));
- this.dialog_action_area9.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
- // Container child dialog_action_area9.Gtk.ButtonBox+ButtonBoxChild
- this.btnCancel = new Gtk.Button();
- this.btnCancel.CanDefault = true;
- this.btnCancel.CanFocus = true;
- this.btnCancel.Name = "btnCancel";
- this.btnCancel.UseStock = true;
- this.btnCancel.UseUnderline = true;
- this.btnCancel.Label = "gtk-cancel";
- this.dialog_action_area9.Add(this.btnCancel);
- // Container child dialog_action_area9.Gtk.ButtonBox+ButtonBoxChild
- this.btnPrev = new Gtk.Button();
- this.btnPrev.CanDefault = true;
- this.btnPrev.CanFocus = true;
- this.btnPrev.Name = "btnPrev";
- this.btnPrev.UseStock = true;
- this.btnPrev.UseUnderline = true;
- this.btnPrev.Label = "gtk-go-back";
- this.dialog_action_area9.Add(this.btnPrev);
- Gtk.ButtonBox.ButtonBoxChild w43 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnPrev]));
- w43.Position = 1;
- // Container child dialog_action_area9.Gtk.ButtonBox+ButtonBoxChild
- this.btnNext = new Gtk.Button();
- this.btnNext.CanDefault = true;
- this.btnNext.CanFocus = true;
- this.btnNext.Name = "btnNext";
- this.btnNext.UseStock = true;
- this.btnNext.UseUnderline = true;
- this.btnNext.Label = "gtk-go-forward";
- this.dialog_action_area9.Add(this.btnNext);
- Gtk.ButtonBox.ButtonBoxChild w44 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnNext]));
- w44.Position = 2;
- // Container child dialog_action_area9.Gtk.ButtonBox+ButtonBoxChild
- this.btnOk = new Gtk.Button();
- this.btnOk.CanDefault = true;
- this.btnOk.CanFocus = true;
- this.btnOk.Name = "btnOk";
- this.btnOk.UseStock = true;
- this.btnOk.UseUnderline = true;
- this.btnOk.Label = "gtk-ok";
- this.dialog_action_area9.Add(this.btnOk);
- Gtk.ButtonBox.ButtonBoxChild w45 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnOk]));
- w45.Position = 3;
- w1.Add(this.dialog_action_area9);
- Gtk.Box.BoxChild w46 = ((Gtk.Box.BoxChild)(w1[this.dialog_action_area9]));
- w46.PackType = ((Gtk.PackType)(1));
- w46.Position = 2;
- w46.Expand = false;
- w46.Fill = false;
- // Internal child Mono.Addins.Gui.AddinInstallDialog.ActionArea
- Gtk.HButtonBox w47 = this.ActionArea;
- w47.Name = "hbuttonbox1";
- w47.Spacing = 10;
- w47.BorderWidth = ((uint)(5));
- w47.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.btnOk.Hide();
- w47.Hide();
- this.Show();
- this.repoCombo.Changed += new System.EventHandler(this.OnRepoChanged);
- this.button1.Clicked += new System.EventHandler(this.OnUpdateRepo);
- this.btnManageSites.Clicked += new System.EventHandler(this.OnManageSites);
- this.addinTree.CursorChanged += new System.EventHandler(this.OnActiveAddinChanged);
- this.filterComboBox.Changed += new System.EventHandler(this.OnFilterChanged);
- this.btnSelectAll.Clicked += new System.EventHandler(this.OnSelectAll);
- this.btnUnselectAll.Clicked += new System.EventHandler(this.OnUnselectAll);
- this.btnInfo.Clicked += new System.EventHandler(this.OnShowInfo);
- this.btnCancel.Clicked += new System.EventHandler(this.OnCancel);
- this.btnPrev.Clicked += new System.EventHandler(this.OnPrevPage);
- this.btnNext.Clicked += new System.EventHandler(this.OnNextPage);
- this.btnOk.Clicked += new System.EventHandler(this.OnOk);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs
deleted file mode 100644
index 64afbaf..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Mono.Addins.Gui {
-
-
- internal partial class AddinInstallerDialog {
-
- private Gtk.VBox vbox2;
-
- private Gtk.Label label1;
-
- private Gtk.Label label2;
-
- private Gtk.ScrolledWindow scrolledwindow1;
-
- private Gtk.Label addinList;
-
- private Gtk.ProgressBar progressBar;
-
- private Gtk.Button buttonCancel;
-
- private Gtk.Button buttonOk;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Addins.Gui.AddinInstallerDialog
- this.Name = "Mono.Addins.Gui.AddinInstallerDialog";
- this.Title = Mono.Unix.Catalog.GetString("Extension Manager");
- this.WindowPosition = ((Gtk.WindowPosition)(4));
- this.BorderWidth = ((uint)(6));
- this.HasSeparator = false;
- // Internal child Mono.Addins.Gui.AddinInstallerDialog.VBox
- Gtk.VBox w1 = this.VBox;
- w1.Name = "dialog1_VBox";
- w1.Spacing = 6;
- w1.BorderWidth = ((uint)(2));
- // Container child dialog1_VBox.Gtk.Box+BoxChild
- this.vbox2 = new Gtk.VBox();
- this.vbox2.Name = "vbox2";
- this.vbox2.Spacing = 6;
- this.vbox2.BorderWidth = ((uint)(6));
- // Container child vbox2.Gtk.Box+BoxChild
- this.label1 = new Gtk.Label();
- this.label1.Name = "label1";
- this.label1.Xalign = 0F;
- this.label1.LabelProp = Mono.Unix.Catalog.GetString("Additional extensions are required to perform this operation.");
- this.vbox2.Add(this.label1);
- Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox2[this.label1]));
- w2.Position = 0;
- w2.Expand = false;
- w2.Fill = false;
- // Container child vbox2.Gtk.Box+BoxChild
- this.label2 = new Gtk.Label();
- this.label2.Name = "label2";
- this.label2.Xalign = 0F;
- this.label2.LabelProp = Mono.Unix.Catalog.GetString("The following extensions will be installed:");
- this.vbox2.Add(this.label2);
- Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox2[this.label2]));
- w3.Position = 1;
- w3.Expand = false;
- w3.Fill = false;
- // Container child vbox2.Gtk.Box+BoxChild
- this.scrolledwindow1 = new Gtk.ScrolledWindow();
- this.scrolledwindow1.CanFocus = true;
- this.scrolledwindow1.Name = "scrolledwindow1";
- this.scrolledwindow1.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow1.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow1.ShadowType = ((Gtk.ShadowType)(1));
- // Container child scrolledwindow1.Gtk.Container+ContainerChild
- Gtk.Viewport w4 = new Gtk.Viewport();
- w4.ShadowType = ((Gtk.ShadowType)(0));
- // Container child GtkViewport.Gtk.Container+ContainerChild
- this.addinList = new Gtk.Label();
- this.addinList.Name = "addinList";
- this.addinList.Xpad = 6;
- this.addinList.Ypad = 6;
- this.addinList.Xalign = 0F;
- this.addinList.Yalign = 0F;
- this.addinList.LabelProp = "label3";
- w4.Add(this.addinList);
- this.scrolledwindow1.Add(w4);
- this.vbox2.Add(this.scrolledwindow1);
- Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox2[this.scrolledwindow1]));
- w7.Position = 2;
- // Container child vbox2.Gtk.Box+BoxChild
- this.progressBar = new Gtk.ProgressBar();
- this.progressBar.Name = "progressBar";
- this.progressBar.Text = "";
- this.vbox2.Add(this.progressBar);
- Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox2[this.progressBar]));
- w8.Position = 3;
- w8.Expand = false;
- w8.Fill = false;
- w1.Add(this.vbox2);
- Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
- w9.Position = 0;
- // Internal child Mono.Addins.Gui.AddinInstallerDialog.ActionArea
- Gtk.HButtonBox w10 = this.ActionArea;
- w10.Name = "dialog1_ActionArea";
- w10.Spacing = 10;
- w10.BorderWidth = ((uint)(6));
- w10.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
- // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
- this.buttonCancel = new Gtk.Button();
- this.buttonCancel.CanDefault = true;
- this.buttonCancel.CanFocus = true;
- this.buttonCancel.Name = "buttonCancel";
- this.buttonCancel.UseStock = true;
- this.buttonCancel.UseUnderline = true;
- this.buttonCancel.Label = "gtk-cancel";
- this.AddActionWidget(this.buttonCancel, -6);
- Gtk.ButtonBox.ButtonBoxChild w11 = ((Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonCancel]));
- w11.Expand = false;
- w11.Fill = false;
- // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
- this.buttonOk = new Gtk.Button();
- this.buttonOk.CanDefault = true;
- this.buttonOk.CanFocus = true;
- this.buttonOk.Name = "buttonOk";
- this.buttonOk.UseStock = true;
- this.buttonOk.UseUnderline = true;
- this.buttonOk.Label = "gtk-ok";
- w10.Add(this.buttonOk);
- Gtk.ButtonBox.ButtonBoxChild w12 = ((Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonOk]));
- w12.Position = 1;
- w12.Expand = false;
- w12.Fill = false;
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.DefaultWidth = 593;
- this.DefaultHeight = 433;
- this.progressBar.Hide();
- this.Show();
- this.buttonOk.Clicked += new System.EventHandler(this.OnButtonOkClicked);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
deleted file mode 100644
index 0d51a44..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Mono.Addins.Gui {
-
-
- internal partial class AddinManagerDialog {
-
- private Gtk.VBox vbox93;
-
- private Gtk.HBox hbox85;
-
- private Gtk.Image imageInstall;
-
- private Gtk.Label label144;
-
- private Gtk.HBox hbox73;
-
- private Gtk.Label label134;
-
- private Gtk.HBox hbox65;
-
- private Gtk.HBox hbox72;
-
- private Gtk.ScrolledWindow scrolledwindow13;
-
- private Gtk.TreeView addinTree;
-
- private Gtk.VBox vbox933;
-
- private Gtk.Button btnInstall;
-
- private Gtk.Button btnRepositories;
-
- private Gtk.HSeparator hseparator4;
-
- private Gtk.Button btnUninstall;
-
- private Gtk.Button btnEnable;
-
- private Gtk.Button btnDisable;
-
- private Gtk.Button btnInfo;
-
- private Gtk.Button btnClose;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Addins.Gui.AddinManagerDialog
- this.Name = "Mono.Addins.Gui.AddinManagerDialog";
- this.Title = Mono.Unix.Catalog.GetString("Extension Manager");
- this.TypeHint = ((Gdk.WindowTypeHint)(1));
- this.BorderWidth = ((uint)(6));
- this.DefaultWidth = 700;
- this.DefaultHeight = 550;
- // Internal child Mono.Addins.Gui.AddinManagerDialog.VBox
- Gtk.VBox w1 = this.VBox;
- w1.Name = "dialog-vbox8";
- w1.Spacing = 3;
- w1.BorderWidth = ((uint)(2));
- // Container child dialog-vbox8.Gtk.Box+BoxChild
- this.vbox93 = new Gtk.VBox();
- this.vbox93.Name = "vbox93";
- this.vbox93.Spacing = 6;
- this.vbox93.BorderWidth = ((uint)(6));
- // Container child vbox93.Gtk.Box+BoxChild
- this.hbox85 = new Gtk.HBox();
- this.hbox85.Name = "hbox85";
- this.hbox85.Spacing = 12;
- // Container child hbox85.Gtk.Box+BoxChild
- this.imageInstall = new Gtk.Image();
- this.imageInstall.Name = "imageInstall";
- this.imageInstall.Yalign = 0F;
- this.imageInstall.Pixbuf = Gdk.Pixbuf.LoadFromResource("system-software-update.png");
- this.hbox85.Add(this.imageInstall);
- Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox85[this.imageInstall]));
- w2.Position = 0;
- w2.Expand = false;
- w2.Fill = false;
- // Container child hbox85.Gtk.Box+BoxChild
- this.label144 = new Gtk.Label();
- this.label144.Name = "label144";
- this.label144.LabelProp = Mono.Unix.Catalog.GetString("<big><b>Extension Manager</b></big>");
- this.label144.UseMarkup = true;
- this.hbox85.Add(this.label144);
- Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox85[this.label144]));
- w3.Position = 1;
- w3.Expand = false;
- w3.Fill = false;
- this.vbox93.Add(this.hbox85);
- Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox93[this.hbox85]));
- w4.Position = 0;
- w4.Expand = false;
- w4.Fill = false;
- // Container child vbox93.Gtk.Box+BoxChild
- this.hbox73 = new Gtk.HBox();
- this.hbox73.Name = "hbox73";
- this.hbox73.Spacing = 12;
- // Container child hbox73.Gtk.Box+BoxChild
- this.label134 = new Gtk.Label();
- this.label134.Name = "label134";
- this.label134.Xalign = 0F;
- this.label134.LabelProp = Mono.Unix.Catalog.GetString("The following extensions are currently installed:");
- this.hbox73.Add(this.label134);
- Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox73[this.label134]));
- w5.Position = 0;
- w5.Expand = false;
- w5.Fill = false;
- this.vbox93.Add(this.hbox73);
- Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox93[this.hbox73]));
- w6.Position = 1;
- w6.Expand = false;
- w6.Fill = false;
- // Container child vbox93.Gtk.Box+BoxChild
- this.hbox65 = new Gtk.HBox();
- this.hbox65.Name = "hbox65";
- this.hbox65.Spacing = 12;
- // Container child hbox65.Gtk.Box+BoxChild
- this.hbox72 = new Gtk.HBox();
- this.hbox72.Name = "hbox72";
- this.hbox72.Spacing = 12;
- // Container child hbox72.Gtk.Box+BoxChild
- this.scrolledwindow13 = new Gtk.ScrolledWindow();
- this.scrolledwindow13.CanFocus = true;
- this.scrolledwindow13.Name = "scrolledwindow13";
- this.scrolledwindow13.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow13.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow13.ShadowType = ((Gtk.ShadowType)(1));
- // Container child scrolledwindow13.Gtk.Container+ContainerChild
- this.addinTree = new Gtk.TreeView();
- this.addinTree.CanFocus = true;
- this.addinTree.Name = "addinTree";
- this.addinTree.HeadersClickable = true;
- this.scrolledwindow13.Add(this.addinTree);
- this.hbox72.Add(this.scrolledwindow13);
- Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox72[this.scrolledwindow13]));
- w8.Position = 0;
- // Container child hbox72.Gtk.Box+BoxChild
- this.vbox933 = new Gtk.VBox();
- this.vbox933.Name = "vbox933";
- this.vbox933.Spacing = 5;
- // Container child vbox933.Gtk.Box+BoxChild
- this.btnInstall = new Gtk.Button();
- this.btnInstall.CanFocus = true;
- this.btnInstall.Name = "btnInstall";
- this.btnInstall.UseUnderline = true;
- // Container child btnInstall.Gtk.Container+ContainerChild
- Gtk.Alignment w9 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
- // Container child GtkAlignment.Gtk.Container+ContainerChild
- Gtk.HBox w10 = new Gtk.HBox();
- w10.Spacing = 2;
- // Container child GtkHBox.Gtk.Container+ContainerChild
- Gtk.Image w11 = new Gtk.Image();
- w11.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-add", Gtk.IconSize.Button, 20);
- w10.Add(w11);
- // Container child GtkHBox.Gtk.Container+ContainerChild
- Gtk.Label w13 = new Gtk.Label();
- w13.LabelProp = Mono.Unix.Catalog.GetString("_Install Extensions...");
- w13.UseUnderline = true;
- w10.Add(w13);
- w9.Add(w10);
- this.btnInstall.Add(w9);
- this.vbox933.Add(this.btnInstall);
- Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.vbox933[this.btnInstall]));
- w17.Position = 0;
- w17.Expand = false;
- w17.Fill = false;
- // Container child vbox933.Gtk.Box+BoxChild
- this.btnRepositories = new Gtk.Button();
- this.btnRepositories.CanFocus = true;
- this.btnRepositories.Name = "btnRepositories";
- this.btnRepositories.UseUnderline = true;
- this.btnRepositories.Label = Mono.Unix.Catalog.GetString("_Repositories...");
- this.vbox933.Add(this.btnRepositories);
- Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.vbox933[this.btnRepositories]));
- w18.Position = 1;
- w18.Expand = false;
- w18.Fill = false;
- // Container child vbox933.Gtk.Box+BoxChild
- this.hseparator4 = new Gtk.HSeparator();
- this.hseparator4.Name = "hseparator4";
- this.vbox933.Add(this.hseparator4);
- Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.vbox933[this.hseparator4]));
- w19.Position = 2;
- w19.Expand = false;
- w19.Fill = false;
- // Container child vbox933.Gtk.Box+BoxChild
- this.btnUninstall = new Gtk.Button();
- this.btnUninstall.CanFocus = true;
- this.btnUninstall.Name = "btnUninstall";
- this.btnUninstall.UseUnderline = true;
- // Container child btnUninstall.Gtk.Container+ContainerChild
- Gtk.Alignment w20 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
- // Container child GtkAlignment1.Gtk.Container+ContainerChild
- Gtk.HBox w21 = new Gtk.HBox();
- w21.Spacing = 2;
- // Container child GtkHBox1.Gtk.Container+ContainerChild
- Gtk.Image w22 = new Gtk.Image();
- w22.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-remove", Gtk.IconSize.Button, 20);
- w21.Add(w22);
- // Container child GtkHBox1.Gtk.Container+ContainerChild
- Gtk.Label w24 = new Gtk.Label();
- w24.LabelProp = Mono.Unix.Catalog.GetString("_Uninstall...");
- w24.UseUnderline = true;
- w21.Add(w24);
- w20.Add(w21);
- this.btnUninstall.Add(w20);
- this.vbox933.Add(this.btnUninstall);
- Gtk.Box.BoxChild w28 = ((Gtk.Box.BoxChild)(this.vbox933[this.btnUninstall]));
- w28.Position = 3;
- w28.Expand = false;
- w28.Fill = false;
- // Container child vbox933.Gtk.Box+BoxChild
- this.btnEnable = new Gtk.Button();
- this.btnEnable.CanFocus = true;
- this.btnEnable.Name = "btnEnable";
- this.btnEnable.UseUnderline = true;
- // Container child btnEnable.Gtk.Container+ContainerChild
- Gtk.Alignment w29 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
- // Container child GtkAlignment2.Gtk.Container+ContainerChild
- Gtk.HBox w30 = new Gtk.HBox();
- w30.Spacing = 2;
- // Container child GtkHBox2.Gtk.Container+ContainerChild
- Gtk.Image w31 = new Gtk.Image();
- w31.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-yes", Gtk.IconSize.Button, 20);
- w30.Add(w31);
- // Container child GtkHBox2.Gtk.Container+ContainerChild
- Gtk.Label w33 = new Gtk.Label();
- w33.LabelProp = Mono.Unix.Catalog.GetString("Enable");
- w33.UseUnderline = true;
- w30.Add(w33);
- w29.Add(w30);
- this.btnEnable.Add(w29);
- this.vbox933.Add(this.btnEnable);
- Gtk.Box.BoxChild w37 = ((Gtk.Box.BoxChild)(this.vbox933[this.btnEnable]));
- w37.Position = 4;
- w37.Expand = false;
- w37.Fill = false;
- // Container child vbox933.Gtk.Box+BoxChild
- this.btnDisable = new Gtk.Button();
- this.btnDisable.CanFocus = true;
- this.btnDisable.Name = "btnDisable";
- this.btnDisable.UseUnderline = true;
- // Container child btnDisable.Gtk.Container+ContainerChild
- Gtk.Alignment w38 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
- // Container child GtkAlignment3.Gtk.Container+ContainerChild
- Gtk.HBox w39 = new Gtk.HBox();
- w39.Spacing = 2;
- // Container child GtkHBox3.Gtk.Container+ContainerChild
- Gtk.Image w40 = new Gtk.Image();
- w40.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-no", Gtk.IconSize.Button, 20);
- w39.Add(w40);
- // Container child GtkHBox3.Gtk.Container+ContainerChild
- Gtk.Label w42 = new Gtk.Label();
- w42.LabelProp = Mono.Unix.Catalog.GetString("Disable");
- w42.UseUnderline = true;
- w39.Add(w42);
- w38.Add(w39);
- this.btnDisable.Add(w38);
- this.vbox933.Add(this.btnDisable);
- Gtk.Box.BoxChild w46 = ((Gtk.Box.BoxChild)(this.vbox933[this.btnDisable]));
- w46.Position = 5;
- w46.Expand = false;
- w46.Fill = false;
- // Container child vbox933.Gtk.Box+BoxChild
- this.btnInfo = new Gtk.Button();
- this.btnInfo.CanFocus = true;
- this.btnInfo.Name = "btnInfo";
- this.btnInfo.UseStock = true;
- this.btnInfo.UseUnderline = true;
- this.btnInfo.Label = "gtk-dialog-info";
- this.vbox933.Add(this.btnInfo);
- Gtk.Box.BoxChild w47 = ((Gtk.Box.BoxChild)(this.vbox933[this.btnInfo]));
- w47.Position = 6;
- w47.Expand = false;
- w47.Fill = false;
- this.hbox72.Add(this.vbox933);
- Gtk.Box.BoxChild w48 = ((Gtk.Box.BoxChild)(this.hbox72[this.vbox933]));
- w48.Position = 1;
- w48.Expand = false;
- w48.Fill = false;
- this.hbox65.Add(this.hbox72);
- Gtk.Box.BoxChild w49 = ((Gtk.Box.BoxChild)(this.hbox65[this.hbox72]));
- w49.Position = 0;
- this.vbox93.Add(this.hbox65);
- Gtk.Box.BoxChild w50 = ((Gtk.Box.BoxChild)(this.vbox93[this.hbox65]));
- w50.Position = 2;
- w1.Add(this.vbox93);
- Gtk.Box.BoxChild w51 = ((Gtk.Box.BoxChild)(w1[this.vbox93]));
- w51.Position = 0;
- // Internal child Mono.Addins.Gui.AddinManagerDialog.ActionArea
- Gtk.HButtonBox w52 = this.ActionArea;
- w52.Name = "dialog-action_area8";
- w52.Spacing = 10;
- w52.BorderWidth = ((uint)(5));
- w52.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
- // Container child dialog-action_area8.Gtk.ButtonBox+ButtonBoxChild
- this.btnClose = new Gtk.Button();
- this.btnClose.CanDefault = true;
- this.btnClose.CanFocus = true;
- this.btnClose.Name = "btnClose";
- this.btnClose.UseStock = true;
- this.btnClose.UseUnderline = true;
- this.btnClose.Label = "gtk-close";
- this.AddActionWidget(this.btnClose, -7);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Show();
- this.addinTree.CursorChanged += new System.EventHandler(this.OnSelectionChanged);
- this.btnInstall.Clicked += new System.EventHandler(this.OnInstall);
- this.btnRepositories.Clicked += new System.EventHandler(this.OnManageRepos);
- this.btnUninstall.Clicked += new System.EventHandler(this.OnUninstall);
- this.btnEnable.Clicked += new System.EventHandler(this.OnEnable);
- this.btnDisable.Clicked += new System.EventHandler(this.OnDisable);
- this.btnInfo.Clicked += new System.EventHandler(this.OnShowInfo);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
deleted file mode 100644
index 8075db9..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Mono.Addins.Gui {
-
-
- internal partial class ErrorDialog {
-
- private Gtk.HBox hbox59;
-
- private Gtk.VBox vbox72;
-
- private Gtk.Image icon;
-
- private Gtk.VBox vbox73;
-
- private Gtk.Label descriptionLabel;
-
- private Gtk.Expander expander;
-
- private Gtk.ScrolledWindow scrolledwindow10;
-
- private Gtk.TextView detailsTextView;
-
- private Gtk.Label label102;
-
- private Gtk.Button okButton;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Addins.Gui.ErrorDialog
- this.Name = "Mono.Addins.Gui.ErrorDialog";
- this.Title = Mono.Unix.Catalog.GetString("Error");
- this.TypeHint = ((Gdk.WindowTypeHint)(1));
- this.BorderWidth = ((uint)(6));
- // Internal child Mono.Addins.Gui.ErrorDialog.VBox
- Gtk.VBox w1 = this.VBox;
- w1.Name = "dialog-vbox5";
- w1.Spacing = 6;
- // Container child dialog-vbox5.Gtk.Box+BoxChild
- this.hbox59 = new Gtk.HBox();
- this.hbox59.Name = "hbox59";
- this.hbox59.Spacing = 6;
- this.hbox59.BorderWidth = ((uint)(6));
- // Container child hbox59.Gtk.Box+BoxChild
- this.vbox72 = new Gtk.VBox();
- this.vbox72.Name = "vbox72";
- // Container child vbox72.Gtk.Box+BoxChild
- this.icon = new Gtk.Image();
- this.icon.Name = "icon";
- this.icon.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-error", Gtk.IconSize.Dialog, 48);
- this.vbox72.Add(this.icon);
- Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox72[this.icon]));
- w2.Position = 0;
- w2.Expand = false;
- w2.Fill = false;
- this.hbox59.Add(this.vbox72);
- Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox59[this.vbox72]));
- w3.Position = 0;
- w3.Expand = false;
- w3.Fill = false;
- // Container child hbox59.Gtk.Box+BoxChild
- this.vbox73 = new Gtk.VBox();
- this.vbox73.Name = "vbox73";
- this.vbox73.Spacing = 12;
- // Container child vbox73.Gtk.Box+BoxChild
- this.descriptionLabel = new Gtk.Label();
- this.descriptionLabel.WidthRequest = 540;
- this.descriptionLabel.CanFocus = true;
- this.descriptionLabel.Name = "descriptionLabel";
- this.descriptionLabel.Xalign = 0F;
- this.descriptionLabel.LabelProp = "An exception has been thrown 1 2 3 4 5 6 7 8 9 10 11 12 13 14";
- this.descriptionLabel.Wrap = true;
- this.descriptionLabel.Selectable = true;
- this.vbox73.Add(this.descriptionLabel);
- Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox73[this.descriptionLabel]));
- w4.Position = 0;
- w4.Expand = false;
- w4.Fill = false;
- // Container child vbox73.Gtk.Box+BoxChild
- this.expander = new Gtk.Expander(null);
- this.expander.CanFocus = true;
- this.expander.Name = "expander";
- // Container child expander.Gtk.Container+ContainerChild
- this.scrolledwindow10 = new Gtk.ScrolledWindow();
- this.scrolledwindow10.CanFocus = true;
- this.scrolledwindow10.Name = "scrolledwindow10";
- this.scrolledwindow10.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow10.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow10.ShadowType = ((Gtk.ShadowType)(1));
- // Container child scrolledwindow10.Gtk.Container+ContainerChild
- this.detailsTextView = new Gtk.TextView();
- this.detailsTextView.HeightRequest = 250;
- this.detailsTextView.CanFocus = true;
- this.detailsTextView.Name = "detailsTextView";
- this.detailsTextView.PixelsAboveLines = 2;
- this.detailsTextView.PixelsBelowLines = 2;
- this.detailsTextView.LeftMargin = 6;
- this.detailsTextView.RightMargin = 6;
- this.scrolledwindow10.Add(this.detailsTextView);
- this.expander.Add(this.scrolledwindow10);
- this.label102 = new Gtk.Label();
- this.label102.Name = "label102";
- this.label102.LabelProp = Mono.Unix.Catalog.GetString("Details");
- this.expander.LabelWidget = this.label102;
- this.vbox73.Add(this.expander);
- Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox73[this.expander]));
- w7.Position = 1;
- this.hbox59.Add(this.vbox73);
- Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox59[this.vbox73]));
- w8.Position = 1;
- w1.Add(this.hbox59);
- Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(w1[this.hbox59]));
- w9.Position = 0;
- // Internal child Mono.Addins.Gui.ErrorDialog.ActionArea
- Gtk.HButtonBox w10 = this.ActionArea;
- w10.Name = "dialog-action_area5";
- w10.Spacing = 10;
- w10.BorderWidth = ((uint)(5));
- w10.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
- // Container child dialog-action_area5.Gtk.ButtonBox+ButtonBoxChild
- this.okButton = new Gtk.Button();
- this.okButton.CanDefault = true;
- this.okButton.CanFocus = true;
- this.okButton.Name = "okButton";
- this.okButton.UseStock = true;
- this.okButton.UseUnderline = true;
- this.okButton.Label = "gtk-ok";
- this.AddActionWidget(this.okButton, -5);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.DefaultWidth = 632;
- this.DefaultHeight = 155;
- this.Show();
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs
deleted file mode 100644
index c8b69f4..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Mono.Addins.Gui {
-
-
- internal partial class ManageSitesDialog {
-
- private Gtk.HBox hbox67;
-
- private Gtk.ScrolledWindow scrolledwindow17;
-
- private Gtk.TreeView repoTree;
-
- private Gtk.VBox vbox88;
-
- private Gtk.Button btnAdd;
-
- private Gtk.Button btnRemove;
-
- private Gtk.Button closebutton2;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Addins.Gui.ManageSitesDialog
- this.Name = "Mono.Addins.Gui.ManageSitesDialog";
- this.Title = Mono.Unix.Catalog.GetString("Extension Repository Management");
- this.TypeHint = ((Gdk.WindowTypeHint)(1));
- this.BorderWidth = ((uint)(6));
- this.DefaultWidth = 600;
- this.DefaultHeight = 300;
- // Internal child Mono.Addins.Gui.ManageSitesDialog.VBox
- Gtk.VBox w1 = this.VBox;
- w1.Name = "dialog-vbox10";
- w1.Spacing = 6;
- // Container child dialog-vbox10.Gtk.Box+BoxChild
- this.hbox67 = new Gtk.HBox();
- this.hbox67.Name = "hbox67";
- this.hbox67.Spacing = 12;
- this.hbox67.BorderWidth = ((uint)(6));
- // Container child hbox67.Gtk.Box+BoxChild
- this.scrolledwindow17 = new Gtk.ScrolledWindow();
- this.scrolledwindow17.CanFocus = true;
- this.scrolledwindow17.Name = "scrolledwindow17";
- this.scrolledwindow17.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow17.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindow17.ShadowType = ((Gtk.ShadowType)(1));
- // Container child scrolledwindow17.Gtk.Container+ContainerChild
- this.repoTree = new Gtk.TreeView();
- this.repoTree.CanFocus = true;
- this.repoTree.Name = "repoTree";
- this.repoTree.HeadersVisible = false;
- this.repoTree.HeadersClickable = true;
- this.scrolledwindow17.Add(this.repoTree);
- this.hbox67.Add(this.scrolledwindow17);
- Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox67[this.scrolledwindow17]));
- w3.Position = 0;
- // Container child hbox67.Gtk.Box+BoxChild
- this.vbox88 = new Gtk.VBox();
- this.vbox88.Name = "vbox88";
- this.vbox88.Spacing = 6;
- // Container child vbox88.Gtk.Box+BoxChild
- this.btnAdd = new Gtk.Button();
- this.btnAdd.CanFocus = true;
- this.btnAdd.Name = "btnAdd";
- this.btnAdd.UseStock = true;
- this.btnAdd.UseUnderline = true;
- this.btnAdd.Label = "gtk-add";
- this.vbox88.Add(this.btnAdd);
- Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox88[this.btnAdd]));
- w4.Position = 0;
- w4.Expand = false;
- w4.Fill = false;
- // Container child vbox88.Gtk.Box+BoxChild
- this.btnRemove = new Gtk.Button();
- this.btnRemove.CanFocus = true;
- this.btnRemove.Name = "btnRemove";
- this.btnRemove.UseStock = true;
- this.btnRemove.UseUnderline = true;
- this.btnRemove.Label = "gtk-delete";
- this.vbox88.Add(this.btnRemove);
- Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.vbox88[this.btnRemove]));
- w5.Position = 1;
- w5.Expand = false;
- w5.Fill = false;
- this.hbox67.Add(this.vbox88);
- Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox67[this.vbox88]));
- w6.Position = 1;
- w6.Expand = false;
- w6.Fill = false;
- w1.Add(this.hbox67);
- Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(w1[this.hbox67]));
- w7.Position = 0;
- // Internal child Mono.Addins.Gui.ManageSitesDialog.ActionArea
- Gtk.HButtonBox w8 = this.ActionArea;
- w8.Name = "dialog-action_area10";
- w8.Spacing = 10;
- w8.BorderWidth = ((uint)(6));
- w8.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
- // Container child dialog-action_area10.Gtk.ButtonBox+ButtonBoxChild
- this.closebutton2 = new Gtk.Button();
- this.closebutton2.CanDefault = true;
- this.closebutton2.CanFocus = true;
- this.closebutton2.Name = "closebutton2";
- this.closebutton2.UseStock = true;
- this.closebutton2.UseUnderline = true;
- this.closebutton2.Label = "gtk-close";
- this.AddActionWidget(this.closebutton2, -7);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Show();
- this.btnAdd.Clicked += new System.EventHandler(this.OnAdd);
- this.btnRemove.Clicked += new System.EventHandler(this.OnRemove);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs
deleted file mode 100644
index 6e37ee6..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Mono.Addins.Gui {
-
-
- internal partial class NewSiteDialog {
-
- private Gtk.VBox vbox89;
-
- private Gtk.Label label121;
-
- private Gtk.RadioButton btnOnlineRep;
-
- private Gtk.HBox hbox68;
-
- private Gtk.Label label122;
-
- private Gtk.Label label119;
-
- private Gtk.Entry urlText;
-
- private Gtk.RadioButton btnLocalRep;
-
- private Gtk.HBox hbox69;
-
- private Gtk.Label label123;
-
- private Gtk.Label label120;
-
- private Gtk.HBox hbox1;
-
- private Gtk.Entry pathEntry;
-
- private Gtk.Button buttonBrowse;
-
- private Gtk.Button cancelbutton1;
-
- private Gtk.Button btnOk;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Addins.Gui.NewSiteDialog
- this.Name = "Mono.Addins.Gui.NewSiteDialog";
- this.Title = Mono.Unix.Catalog.GetString("Add New Repository");
- this.TypeHint = ((Gdk.WindowTypeHint)(1));
- this.BorderWidth = ((uint)(6));
- this.DefaultWidth = 550;
- // Internal child Mono.Addins.Gui.NewSiteDialog.VBox
- Gtk.VBox w1 = this.VBox;
- w1.Name = "dialog-vbox11";
- w1.Spacing = 6;
- w1.BorderWidth = ((uint)(2));
- // Container child dialog-vbox11.Gtk.Box+BoxChild
- this.vbox89 = new Gtk.VBox();
- this.vbox89.Name = "vbox89";
- this.vbox89.Spacing = 6;
- this.vbox89.BorderWidth = ((uint)(6));
- // Container child vbox89.Gtk.Box+BoxChild
- this.label121 = new Gtk.Label();
- this.label121.Name = "label121";
- this.label121.Xalign = 0F;
- this.label121.LabelProp = Mono.Unix.Catalog.GetString("Select the location of the repository you want to register:");
- this.vbox89.Add(this.label121);
- Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox89[this.label121]));
- w2.Position = 0;
- w2.Expand = false;
- w2.Fill = false;
- // Container child vbox89.Gtk.Box+BoxChild
- this.btnOnlineRep = new Gtk.RadioButton(Mono.Unix.Catalog.GetString("Register an on-line repository"));
- this.btnOnlineRep.CanFocus = true;
- this.btnOnlineRep.Name = "btnOnlineRep";
- this.btnOnlineRep.Active = true;
- this.btnOnlineRep.DrawIndicator = true;
- this.btnOnlineRep.UseUnderline = true;
- this.btnOnlineRep.Group = new GLib.SList(System.IntPtr.Zero);
- this.vbox89.Add(this.btnOnlineRep);
- Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox89[this.btnOnlineRep]));
- w3.Position = 1;
- w3.Expand = false;
- w3.Fill = false;
- // Container child vbox89.Gtk.Box+BoxChild
- this.hbox68 = new Gtk.HBox();
- this.hbox68.Name = "hbox68";
- this.hbox68.Spacing = 6;
- // Container child hbox68.Gtk.Box+BoxChild
- this.label122 = new Gtk.Label();
- this.label122.WidthRequest = 32;
- this.label122.Name = "label122";
- this.label122.LabelProp = "";
- this.hbox68.Add(this.label122);
- Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox68[this.label122]));
- w4.Position = 0;
- w4.Expand = false;
- w4.Fill = false;
- // Container child hbox68.Gtk.Box+BoxChild
- this.label119 = new Gtk.Label();
- this.label119.Name = "label119";
- this.label119.LabelProp = Mono.Unix.Catalog.GetString("Url:");
- this.hbox68.Add(this.label119);
- Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox68[this.label119]));
- w5.Position = 1;
- w5.Expand = false;
- w5.Fill = false;
- // Container child hbox68.Gtk.Box+BoxChild
- this.urlText = new Gtk.Entry();
- this.urlText.CanFocus = true;
- this.urlText.Name = "urlText";
- this.urlText.IsEditable = true;
- this.urlText.InvisibleChar = '●';
- this.hbox68.Add(this.urlText);
- Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox68[this.urlText]));
- w6.Position = 2;
- this.vbox89.Add(this.hbox68);
- Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox89[this.hbox68]));
- w7.Position = 2;
- w7.Expand = false;
- w7.Fill = false;
- // Container child vbox89.Gtk.Box+BoxChild
- this.btnLocalRep = new Gtk.RadioButton(Mono.Unix.Catalog.GetString("Register a local repository"));
- this.btnLocalRep.CanFocus = true;
- this.btnLocalRep.Name = "btnLocalRep";
- this.btnLocalRep.DrawIndicator = true;
- this.btnLocalRep.UseUnderline = true;
- this.btnLocalRep.Group = this.btnOnlineRep.Group;
- this.vbox89.Add(this.btnLocalRep);
- Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox89[this.btnLocalRep]));
- w8.Position = 3;
- w8.Expand = false;
- w8.Fill = false;
- // Container child vbox89.Gtk.Box+BoxChild
- this.hbox69 = new Gtk.HBox();
- this.hbox69.Name = "hbox69";
- this.hbox69.Spacing = 6;
- // Container child hbox69.Gtk.Box+BoxChild
- this.label123 = new Gtk.Label();
- this.label123.WidthRequest = 32;
- this.label123.Name = "label123";
- this.label123.LabelProp = "";
- this.hbox69.Add(this.label123);
- Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox69[this.label123]));
- w9.Position = 0;
- w9.Expand = false;
- w9.Fill = false;
- // Container child hbox69.Gtk.Box+BoxChild
- this.label120 = new Gtk.Label();
- this.label120.Name = "label120";
- this.label120.LabelProp = Mono.Unix.Catalog.GetString("Path:");
- this.hbox69.Add(this.label120);
- Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.hbox69[this.label120]));
- w10.Position = 1;
- w10.Expand = false;
- w10.Fill = false;
- // Container child hbox69.Gtk.Box+BoxChild
- this.hbox1 = new Gtk.HBox();
- this.hbox1.Name = "hbox1";
- this.hbox1.Spacing = 6;
- // Container child hbox1.Gtk.Box+BoxChild
- this.pathEntry = new Gtk.Entry();
- this.pathEntry.CanFocus = true;
- this.pathEntry.Name = "pathEntry";
- this.pathEntry.IsEditable = true;
- this.pathEntry.InvisibleChar = '●';
- this.hbox1.Add(this.pathEntry);
- Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.hbox1[this.pathEntry]));
- w11.Position = 0;
- // Container child hbox1.Gtk.Box+BoxChild
- this.buttonBrowse = new Gtk.Button();
- this.buttonBrowse.CanFocus = true;
- this.buttonBrowse.Name = "buttonBrowse";
- this.buttonBrowse.UseUnderline = true;
- this.buttonBrowse.Label = Mono.Unix.Catalog.GetString("Browse...");
- this.hbox1.Add(this.buttonBrowse);
- Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.hbox1[this.buttonBrowse]));
- w12.Position = 1;
- w12.Expand = false;
- w12.Fill = false;
- this.hbox69.Add(this.hbox1);
- Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.hbox69[this.hbox1]));
- w13.Position = 2;
- this.vbox89.Add(this.hbox69);
- Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.vbox89[this.hbox69]));
- w14.Position = 4;
- w14.Expand = false;
- w14.Fill = false;
- w1.Add(this.vbox89);
- Gtk.Box.BoxChild w15 = ((Gtk.Box.BoxChild)(w1[this.vbox89]));
- w15.Position = 0;
- // Internal child Mono.Addins.Gui.NewSiteDialog.ActionArea
- Gtk.HButtonBox w16 = this.ActionArea;
- w16.Name = "dialog-action_area11";
- w16.Spacing = 10;
- w16.BorderWidth = ((uint)(5));
- w16.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
- // Container child dialog-action_area11.Gtk.ButtonBox+ButtonBoxChild
- this.cancelbutton1 = new Gtk.Button();
- this.cancelbutton1.CanDefault = true;
- this.cancelbutton1.CanFocus = true;
- this.cancelbutton1.Name = "cancelbutton1";
- this.cancelbutton1.UseStock = true;
- this.cancelbutton1.UseUnderline = true;
- this.cancelbutton1.Label = "gtk-cancel";
- this.AddActionWidget(this.cancelbutton1, -6);
- // Container child dialog-action_area11.Gtk.ButtonBox+ButtonBoxChild
- this.btnOk = new Gtk.Button();
- this.btnOk.CanDefault = true;
- this.btnOk.CanFocus = true;
- this.btnOk.Name = "btnOk";
- this.btnOk.UseStock = true;
- this.btnOk.UseUnderline = true;
- this.btnOk.Label = "gtk-ok";
- this.AddActionWidget(this.btnOk, -5);
- Gtk.ButtonBox.ButtonBoxChild w18 = ((Gtk.ButtonBox.ButtonBoxChild)(w16[this.btnOk]));
- w18.Position = 1;
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.DefaultHeight = 249;
- this.Show();
- this.btnOnlineRep.Clicked += new System.EventHandler(this.OnOptionClicked);
- this.urlText.Changed += new System.EventHandler(this.OnUrlTextChanged);
- this.btnLocalRep.Clicked += new System.EventHandler(this.OnOptionClicked);
- this.pathEntry.Changed += new System.EventHandler(this.OnPathEntryChanged);
- this.buttonBrowse.Clicked += new System.EventHandler(this.OnButtonBrowseClicked);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/generated.cs b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/generated.cs
deleted file mode 100644
index dd18ad7..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/generated.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Stetic {
-
-
- internal class Gui {
-
- private static bool initialized;
-
- internal static void Initialize(Gtk.Widget iconRenderer) {
- if ((Stetic.Gui.initialized == false)) {
- Stetic.Gui.initialized = true;
- }
- }
- }
-
- internal class IconLoader {
-
- public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size, int sz) {
- Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
- if ((res != null)) {
- return res;
- }
- else {
- try {
- return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
- }
- catch (System.Exception ) {
- if ((name != "gtk-missing-image")) {
- return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size, sz);
- }
- else {
- Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
- Gdk.GC gc = new Gdk.GC(pmap);
- gc.RgbFgColor = new Gdk.Color(255, 255, 255);
- pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
- gc.RgbFgColor = new Gdk.Color(0, 0, 0);
- pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
- gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
- gc.RgbFgColor = new Gdk.Color(255, 0, 0);
- pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
- pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
- return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
- }
- }
- }
- }
- }
-
- internal class ActionGroups {
-
- public static Gtk.ActionGroup GetActionGroup(System.Type type) {
- return Stetic.ActionGroups.GetActionGroup(type.FullName);
- }
-
- public static Gtk.ActionGroup GetActionGroup(string name) {
- return null;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic b/lib/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic
deleted file mode 100644
index 7237570..0000000
--- a/lib/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic
+++ /dev/null
@@ -1,1648 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<stetic-interface>
- <configuration>
- <images-root-path>..</images-root-path>
- <target-gtk-version>2.8.3</target-gtk-version>
- </configuration>
- <widget class="Gtk.Dialog" id="Mono.Addins.Gui.ErrorDialog" design-size="632 155">
- <property name="MemberName" />
- <property name="GeneratePublic">False</property>
- <property name="Title" translatable="yes">Error</property>
- <property name="TypeHint">Dialog</property>
- <property name="BorderWidth">6</property>
- <property name="Buttons">1</property>
- <property name="HelpButton">False</property>
- <child internal-child="VBox">
- <widget class="Gtk.VBox" id="dialog-vbox5">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.HBox" id="hbox59">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <property name="BorderWidth">6</property>
- <child>
- <widget class="Gtk.VBox" id="vbox72">
- <property name="MemberName" />
- <child>
- <widget class="Gtk.Image" id="icon">
- <property name="MemberName" />
- <property name="Pixbuf">stock:gtk-dialog-error Dialog</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.VBox" id="vbox73">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <child>
- <widget class="Gtk.Label" id="descriptionLabel">
- <property name="MemberName" />
- <property name="WidthRequest">540</property>
- <property name="CanFocus">True</property>
- <property name="Xalign">0</property>
- <property name="LabelProp">An exception has been thrown 1 2 3 4 5 6 7 8 9 10 11 12 13 14</property>
- <property name="Wrap">True</property>
- <property name="Selectable">True</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Expander" id="expander">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow10">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <property name="ShadowType">In</property>
- <child>
- <widget class="Gtk.TextView" id="detailsTextView">
- <property name="MemberName" />
- <property name="HeightRequest">250</property>
- <property name="CanFocus">True</property>
- <property name="Text" translatable="yes" />
- <property name="PixelsAboveLines">2</property>
- <property name="PixelsBelowLines">2</property>
- <property name="LeftMargin">6</property>
- <property name="RightMargin">6</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="Gtk.Label" id="label102">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes">Details</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- </child>
- <child internal-child="ActionArea">
- <widget class="Gtk.HButtonBox" id="dialog-action_area5">
- <property name="MemberName" />
- <property name="Spacing">10</property>
- <property name="BorderWidth">5</property>
- <property name="Size">1</property>
- <property name="LayoutStyle">End</property>
- <child>
- <widget class="Gtk.Button" id="okButton">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-ok</property>
- <property name="ResponseId">-5</property>
- <property name="label">gtk-ok</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="Gtk.Dialog" id="Mono.Addins.Gui.AddinManagerDialog" design-size="524 432">
- <property name="MemberName" />
- <property name="GeneratePublic">False</property>
- <property name="Title" translatable="yes">Extension Manager</property>
- <property name="TypeHint">Dialog</property>
- <property name="BorderWidth">6</property>
- <property name="DefaultWidth">700</property>
- <property name="DefaultHeight">550</property>
- <property name="Buttons">1</property>
- <property name="HelpButton">False</property>
- <child internal-child="VBox">
- <widget class="Gtk.VBox" id="dialog-vbox8">
- <property name="MemberName" />
- <property name="Spacing">3</property>
- <property name="BorderWidth">2</property>
- <child>
- <widget class="Gtk.VBox" id="vbox93">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <property name="BorderWidth">6</property>
- <child>
- <widget class="Gtk.HBox" id="hbox85">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <child>
- <widget class="Gtk.Image" id="imageInstall">
- <property name="MemberName" />
- <property name="Yalign">0</property>
- <property name="Pixbuf">resource:system-software-update.png</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label144">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes"><big><b>Extension Manager</b></big></property>
- <property name="UseMarkup">True</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox73">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <child>
- <widget class="Gtk.Label" id="label134">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="LabelProp" translatable="yes">The following extensions are currently installed:</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox65">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <child>
- <widget class="Gtk.HBox" id="hbox72">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow13">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <property name="ShadowType">In</property>
- <child>
- <widget class="Gtk.TreeView" id="addinTree">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="HeadersClickable">True</property>
- <signal name="CursorChanged" handler="OnSelectionChanged" />
- </widget>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.VBox" id="vbox933">
- <property name="MemberName" />
- <property name="Spacing">5</property>
- <child>
- <widget class="Gtk.Button" id="btnInstall">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextAndIcon</property>
- <property name="Icon">stock:gtk-add Button</property>
- <property name="Label" translatable="yes">_Install extensions...</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnInstall" />
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnRepositories">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextOnly</property>
- <property name="Label" translatable="yes">_Repositories...</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnManageRepos" />
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HSeparator" id="hseparator4">
- <property name="MemberName" />
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnUninstall">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextAndIcon</property>
- <property name="Icon">stock:gtk-remove Button</property>
- <property name="Label" translatable="yes">_Uninstall...</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnUninstall" />
- </widget>
- <packing>
- <property name="Position">3</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnEnable">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextAndIcon</property>
- <property name="Icon">stock:gtk-yes Button</property>
- <property name="Label" translatable="yes">Enable</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnEnable" />
- </widget>
- <packing>
- <property name="Position">4</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnDisable">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextAndIcon</property>
- <property name="Icon">stock:gtk-no Button</property>
- <property name="Label" translatable="yes">Disable</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnDisable" />
- </widget>
- <packing>
- <property name="Position">5</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnInfo">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-dialog-info</property>
- <signal name="Clicked" handler="OnShowInfo" />
- <property name="label">gtk-dialog-info</property>
- </widget>
- <packing>
- <property name="Position">6</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- </child>
- <child internal-child="ActionArea">
- <widget class="Gtk.HButtonBox" id="dialog-action_area8">
- <property name="MemberName" />
- <property name="Spacing">10</property>
- <property name="BorderWidth">5</property>
- <property name="Size">1</property>
- <property name="LayoutStyle">End</property>
- <child>
- <widget class="Gtk.Button" id="btnClose">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-close</property>
- <property name="ResponseId">-7</property>
- <property name="label">gtk-close</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="Gtk.Dialog" id="Mono.Addins.Gui.AddinInstallDialog" design-size="698 521">
- <property name="MemberName" />
- <property name="GeneratePublic">False</property>
- <property name="Title" translatable="yes">Extension Installation</property>
- <property name="TypeHint">Dialog</property>
- <property name="Modal">True</property>
- <property name="BorderWidth">6</property>
- <property name="DefaultWidth">725</property>
- <property name="DefaultHeight">550</property>
- <property name="Buttons">0</property>
- <property name="HelpButton">False</property>
- <child internal-child="VBox">
- <widget class="Gtk.VBox" id="dialog-vbox9">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <property name="BorderWidth">2</property>
- <child>
- <widget class="Gtk.Notebook" id="wizardNotebook">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="CurrentPage">3</property>
- <property name="ShowBorder">False</property>
- <property name="BorderWidth">6</property>
- <child>
- <widget class="Gtk.VBox" id="vbox82">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <child>
- <widget class="Gtk.Label" id="label113">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="LabelProp" translatable="yes"><b>Select the extensions to install and click on Next</b></property>
- <property name="UseMarkup">True</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox66">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.Label" id="label112">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes">Install from:</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ComboBox" id="repoCombo">
- <property name="MemberName" />
- <property name="IsTextCombo">False</property>
- <property name="Items" translatable="yes" />
- <signal name="Changed" handler="OnRepoChanged" />
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="button1">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-refresh</property>
- <signal name="Clicked" handler="OnUpdateRepo" />
- <property name="label">gtk-refresh</property>
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnManageSites">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextOnly</property>
- <property name="Label" translatable="yes">_Repositories...</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnManageSites" />
- </widget>
- <packing>
- <property name="Position">3</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox70">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <child>
- <widget class="Gtk.VBox" id="vbox92">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow18">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <property name="ShadowType">In</property>
- <child>
- <widget class="Gtk.TreeView" id="addinTree">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="HeadersClickable">True</property>
- <signal name="CursorChanged" handler="OnActiveAddinChanged" />
- </widget>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox83">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.ComboBox" id="filterComboBox">
- <property name="MemberName" />
- <property name="IsTextCombo">True</property>
- <property name="Items" translatable="yes">Show all packages
-Show new versions only
-Show updates only</property>
- <signal name="Changed" handler="OnFilterChanged" />
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnInfo">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-dialog-info</property>
- <signal name="Clicked" handler="OnShowInfo" />
- <property name="label">gtk-dialog-info</property>
- </widget>
- <packing>
- <property name="PackType">End</property>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnUnselectAll">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextOnly</property>
- <property name="Label" translatable="yes">_Unselect All</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnUnselectAll" />
- </widget>
- <packing>
- <property name="PackType">End</property>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnSelectAll">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextOnly</property>
- <property name="Label" translatable="yes">Select _All</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnSelectAll" />
- </widget>
- <packing>
- <property name="PackType">End</property>
- <property name="Position">3</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="TabExpand">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label108">
- <property name="MemberName" />
- <property name="LabelProp">label108</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow19">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <child>
- <widget class="Gtk.Viewport" id="viewport1">
- <property name="MemberName" />
- <child>
- <widget class="Gtk.HBox" id="hbox82">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <property name="BorderWidth">12</property>
- <child>
- <widget class="Gtk.Image" id="imageInstall">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="Yalign">0</property>
- <property name="Pixbuf">stock:gtk-dialog-warning Dialog</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="labelSummary">
- <property name="MemberName" />
- <property name="Xpad">6</property>
- <property name="Ypad">6</property>
- <property name="Xalign">0</property>
- <property name="Yalign">0</property>
- <property name="LabelProp"><b>The following extensions will be installed:</b>
-
-C# language binding
-C# language IDE extension
-
-<b>The following extensions are required by the selected extensions</b>
-
-NUnit extension
-NAnt extension
-
-asd
-asd
-a
-sd
-asd
-asd
-a
-sda
-sd
-as
-da
-sd
-asd
-</property>
- <property name="UseMarkup">True</property>
- <property name="Wrap">True</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="TabExpand">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label124">
- <property name="MemberName" />
- <property name="LabelProp" translatable="no">label124</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.VBox" id="vbox86">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <property name="BorderWidth">116</property>
- <child>
- <widget class="Gtk.Label" id="label126">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="LabelProp" translatable="yes">Overall Progress:</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ProgressBar" id="mainProgressBar">
- <property name="MemberName" />
- <property name="PulseStep">10000000149</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label129">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes" />
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="progressLabel">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="LabelProp" translatable="yes">Downloading extensions...</property>
- </widget>
- <packing>
- <property name="Position">3</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ProgressBar" id="progressBar">
- <property name="MemberName" />
- <property name="PulseStep">10000000149</property>
- </widget>
- <packing>
- <property name="Position">4</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="TabExpand">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label110">
- <property name="MemberName" />
- <property name="LabelProp">label110</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow20">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <child>
- <widget class="Gtk.Viewport" id="viewport3">
- <property name="MemberName" />
- <child>
- <widget class="Gtk.VBox" id="vbox91">
- <property name="MemberName" />
- <child>
- <widget class="Gtk.Label" id="label130">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes" />
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Image" id="imageError">
- <property name="MemberName" />
- <property name="Yalign">1</property>
- <property name="Pixbuf">stock:gtk-dialog-error Dialog</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- <property name="Padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Image" id="imageWarn">
- <property name="MemberName" />
- <property name="Yalign">1</property>
- <property name="Pixbuf">stock:gtk-dialog-warning Dialog</property>
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Image" id="imageInfo">
- <property name="MemberName" />
- <property name="Yalign">1</property>
- <property name="Pixbuf">stock:gtk-dialog-info Dialog</property>
- </widget>
- <packing>
- <property name="Position">3</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox71">
- <property name="MemberName" />
- <child>
- <widget class="Gtk.Label" id="labelResult">
- <property name="MemberName" />
- <property name="WidthRequest">450</property>
- <property name="Ypad">9</property>
- <property name="Yalign">0</property>
- <property name="LabelProp">Done</property>
- <property name="UseMarkup">True</property>
- <property name="Wrap">True</property>
- <property name="Justify">Center</property>
- </widget>
- <packing>
- <property name="PackType">End</property>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">4</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label131">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes" />
- </widget>
- <packing>
- <property name="Position">5</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="Position">3</property>
- <property name="TabExpand">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label111">
- <property name="MemberName" />
- <property name="LabelProp">label111</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HButtonBox" id="dialog_action_area9">
- <property name="MemberName" />
- <property name="Spacing">9</property>
- <property name="BorderWidth">6</property>
- <property name="Size">4</property>
- <property name="LayoutStyle">End</property>
- <child>
- <widget class="Gtk.Button" id="btnCancel">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-cancel</property>
- <signal name="Clicked" handler="OnCancel" />
- <property name="label">gtk-cancel</property>
- </widget>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnPrev">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-go-back</property>
- <signal name="Clicked" handler="OnPrevPage" />
- <property name="label">gtk-go-back</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnNext">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-go-forward</property>
- <signal name="Clicked" handler="OnNextPage" />
- <property name="label">gtk-go-forward</property>
- </widget>
- <packing>
- <property name="Position">2</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnOk">
- <property name="MemberName" />
- <property name="Visible">False</property>
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-ok</property>
- <signal name="Clicked" handler="OnOk" />
- <property name="label">gtk-ok</property>
- </widget>
- <packing>
- <property name="Position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="PackType">End</property>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- <child internal-child="ActionArea">
- <widget class="Gtk.HButtonBox" id="hbuttonbox1">
- <property name="MemberName" />
- <property name="Visible">False</property>
- <property name="Spacing">10</property>
- <property name="BorderWidth">5</property>
- <property name="Size">0</property>
- <property name="LayoutStyle">End</property>
- </widget>
- </child>
- </widget>
- <widget class="Gtk.Dialog" id="Mono.Addins.Gui.ManageSitesDialog" design-size="538 357">
- <property name="MemberName" />
- <property name="GeneratePublic">False</property>
- <property name="Title" translatable="yes">Extension Repository Management</property>
- <property name="TypeHint">Dialog</property>
- <property name="BorderWidth">6</property>
- <property name="DefaultWidth">600</property>
- <property name="DefaultHeight">300</property>
- <property name="Buttons">1</property>
- <property name="HelpButton">False</property>
- <child internal-child="VBox">
- <widget class="Gtk.VBox" id="dialog-vbox10">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.HBox" id="hbox67">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <property name="BorderWidth">6</property>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow17">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <property name="ShadowType">In</property>
- <child>
- <widget class="Gtk.TreeView" id="repoTree">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="HeadersVisible">False</property>
- <property name="HeadersClickable">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.VBox" id="vbox88">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.Button" id="btnAdd">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-add</property>
- <signal name="Clicked" handler="OnAdd" />
- <property name="label">gtk-add</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnRemove">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-delete</property>
- <signal name="Clicked" handler="OnRemove" />
- <property name="label">gtk-delete</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- </child>
- <child internal-child="ActionArea">
- <widget class="Gtk.HButtonBox" id="dialog-action_area10">
- <property name="MemberName" />
- <property name="Spacing">10</property>
- <property name="BorderWidth">6</property>
- <property name="Size">1</property>
- <property name="LayoutStyle">End</property>
- <child>
- <widget class="Gtk.Button" id="closebutton2">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-close</property>
- <property name="ResponseId">-7</property>
- <property name="label">gtk-close</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="Gtk.Dialog" id="Mono.Addins.Gui.NewSiteDialog" design-size="576 249">
- <property name="MemberName" />
- <property name="GeneratePublic">False</property>
- <property name="Title" translatable="yes">Add New Repository</property>
- <property name="TypeHint">Dialog</property>
- <property name="BorderWidth">6</property>
- <property name="DefaultWidth">550</property>
- <property name="Buttons">2</property>
- <property name="HelpButton">False</property>
- <child internal-child="VBox">
- <widget class="Gtk.VBox" id="dialog-vbox11">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <property name="BorderWidth">2</property>
- <child>
- <widget class="Gtk.VBox" id="vbox89">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <property name="BorderWidth">6</property>
- <child>
- <widget class="Gtk.Label" id="label121">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="LabelProp" translatable="yes">Select the location of the repository you want to register:</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.RadioButton" id="btnOnlineRep">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Label" translatable="yes">Register an on-line repository</property>
- <property name="Active">True</property>
- <property name="DrawIndicator">True</property>
- <property name="HasLabel">True</property>
- <property name="UseUnderline">True</property>
- <property name="Group">btnOnlineRep</property>
- <signal name="Clicked" handler="OnOptionClicked" />
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox68">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.Label" id="label122">
- <property name="MemberName" />
- <property name="WidthRequest">32</property>
- <property name="LabelProp" translatable="yes" />
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label119">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes">Url:</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Entry" id="urlText">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="IsEditable">True</property>
- <property name="InvisibleChar">●</property>
- <signal name="Changed" handler="OnUrlTextChanged" />
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.RadioButton" id="btnLocalRep">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Label" translatable="yes">Register a local repository</property>
- <property name="DrawIndicator">True</property>
- <property name="HasLabel">True</property>
- <property name="UseUnderline">True</property>
- <property name="Group">btnOnlineRep</property>
- <signal name="Clicked" handler="OnOptionClicked" />
- </widget>
- <packing>
- <property name="Position">3</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox69">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.Label" id="label123">
- <property name="MemberName" />
- <property name="WidthRequest">32</property>
- <property name="LabelProp" translatable="yes" />
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label120">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes">Path:</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.HBox" id="hbox1">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.Entry" id="pathEntry">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="IsEditable">True</property>
- <property name="InvisibleChar">●</property>
- <signal name="Changed" handler="OnPathEntryChanged" />
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="buttonBrowse">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="Type">TextOnly</property>
- <property name="Label" translatable="yes">Browse...</property>
- <property name="UseUnderline">True</property>
- <signal name="Clicked" handler="OnButtonBrowseClicked" />
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">4</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- </child>
- <child internal-child="ActionArea">
- <widget class="Gtk.HButtonBox" id="dialog-action_area11">
- <property name="MemberName" />
- <property name="Spacing">10</property>
- <property name="BorderWidth">5</property>
- <property name="Size">2</property>
- <property name="LayoutStyle">End</property>
- <child>
- <widget class="Gtk.Button" id="cancelbutton1">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-cancel</property>
- <property name="ResponseId">-6</property>
- <property name="label">gtk-cancel</property>
- </widget>
- </child>
- <child>
- <widget class="Gtk.Button" id="btnOk">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-ok</property>
- <property name="ResponseId">-5</property>
- <property name="label">gtk-ok</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="Gtk.Dialog" id="Mono.Addins.Gui.AddinInfoDialog" design-size="496 368">
- <property name="MemberName" />
- <property name="GeneratePublic">False</property>
- <property name="Title" translatable="yes">Package</property>
- <property name="TypeHint">Dialog</property>
- <property name="BorderWidth">6</property>
- <property name="DefaultWidth">550</property>
- <property name="DefaultHeight">400</property>
- <property name="Buttons">1</property>
- <property name="HelpButton">False</property>
- <child internal-child="VBox">
- <widget class="Gtk.VBox" id="dialog-vbox12">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.HBox" id="hbox81">
- <property name="MemberName" />
- <property name="Spacing">12</property>
- <property name="BorderWidth">6</property>
- <child>
- <widget class="Gtk.VBox" id="vbox94">
- <property name="MemberName" />
- <child>
- <widget class="Gtk.Image" id="packageImage">
- <property name="MemberName" />
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <placeholder />
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow22">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <child>
- <widget class="Gtk.Viewport" id="viewport4">
- <property name="MemberName" />
- <property name="ShadowType">None</property>
- <child>
- <widget class="Gtk.Label" id="infoLabel">
- <property name="MemberName" />
- <property name="WidthRequest">420</property>
- <property name="Xpad">6</property>
- <property name="Ypad">6</property>
- <property name="Xalign">0</property>
- <property name="Yalign">0</property>
- <property name="LabelProp">aa a a a a a a a a aa a a a a aaa a a a a a a a a aa a a a a aaa a a a a a a a a aa a a a a a</property>
- <property name="Wrap">True</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">False</property>
- </packing>
- </child>
- </widget>
- </child>
- <child internal-child="ActionArea">
- <widget class="Gtk.HButtonBox" id="dialog-action_area12">
- <property name="MemberName" />
- <property name="Spacing">10</property>
- <property name="BorderWidth">6</property>
- <property name="Size">1</property>
- <property name="LayoutStyle">End</property>
- <child>
- <widget class="Gtk.Button" id="closebutton3">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-close</property>
- <property name="ResponseId">-7</property>
- <property name="label">gtk-close</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="Gtk.Dialog" id="Mono.Addins.Gui.AddinInstallerDialog" design-size="593 433">
- <property name="MemberName" />
- <property name="GeneratePublic">False</property>
- <property name="Title" translatable="yes">Extension Manager</property>
- <property name="WindowPosition">CenterOnParent</property>
- <property name="BorderWidth">6</property>
- <property name="Buttons">2</property>
- <property name="HelpButton">False</property>
- <property name="HasSeparator">False</property>
- <child internal-child="VBox">
- <widget class="Gtk.VBox" id="dialog1_VBox">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <property name="BorderWidth">2</property>
- <child>
- <widget class="Gtk.VBox" id="vbox2">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <property name="BorderWidth">6</property>
- <child>
- <widget class="Gtk.Label" id="label1">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="LabelProp" translatable="yes">Additional extensions are required to perform this operation.</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Label" id="label2">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="LabelProp" translatable="yes">The following extensions will be installed:</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <property name="ShadowType">In</property>
- <child>
- <widget class="Gtk.Viewport" id="GtkViewport">
- <property name="MemberName" />
- <property name="ShadowType">None</property>
- <child>
- <widget class="Gtk.Label" id="addinList">
- <property name="MemberName" />
- <property name="Xpad">6</property>
- <property name="Ypad">6</property>
- <property name="Xalign">0</property>
- <property name="Yalign">0</property>
- <property name="LabelProp">label3</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ProgressBar" id="progressBar">
- <property name="MemberName" />
- <property name="Visible">False</property>
- <property name="Text" translatable="yes" />
- </widget>
- <packing>
- <property name="Position">3</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
- </widget>
- </child>
- <child internal-child="ActionArea">
- <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
- <property name="MemberName" />
- <property name="Spacing">10</property>
- <property name="BorderWidth">6</property>
- <property name="Size">2</property>
- <property name="LayoutStyle">End</property>
- <child>
- <widget class="Gtk.Button" id="buttonCancel">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-cancel</property>
- <property name="ResponseId">-6</property>
- <property name="label">gtk-cancel</property>
- </widget>
- <packing>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="buttonOk">
- <property name="MemberName" />
- <property name="CanDefault">True</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-ok</property>
- <property name="ResponseId">-1</property>
- <signal name="Clicked" handler="OnButtonOkClicked" />
- <property name="label">gtk-ok</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</stetic-interface>
diff --git a/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic.png b/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic.png
deleted file mode 100644
index c6e58ae..0000000
Binary files a/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic.png and /dev/null differ
diff --git a/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic_16.png b/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic_16.png
deleted file mode 100644
index 9015426..0000000
Binary files a/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic_16.png and /dev/null differ
diff --git a/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic_22.png b/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic_22.png
deleted file mode 100644
index dc76287..0000000
Binary files a/lib/mono-addins/Mono.Addins.Gui/icons/package-x-generic_22.png and /dev/null differ
diff --git a/lib/mono-addins/Mono.Addins.Gui/icons/system-software-update.png b/lib/mono-addins/Mono.Addins.Gui/icons/system-software-update.png
deleted file mode 100644
index 9f019ac..0000000
Binary files a/lib/mono-addins/Mono.Addins.Gui/icons/system-software-update.png and /dev/null differ
diff --git a/lib/mono-addins/Mono.Addins.Gui/icons/user-package.png b/lib/mono-addins/Mono.Addins.Gui/icons/user-package.png
deleted file mode 100644
index 1c4a51c..0000000
Binary files a/lib/mono-addins/Mono.Addins.Gui/icons/user-package.png and /dev/null differ
diff --git a/lib/mono-addins/Mono.Addins.Setup/AssemblyInfo.cs b/lib/mono-addins/Mono.Addins.Setup/AssemblyInfo.cs
deleted file mode 100644
index 273b2c8..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("Mono.Addins.Setup")]
-[assembly: AssemblyCopyright("Copyright (C) 2007 Novell, Inc (http://www.novell.com)")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("0.3.0.0")]
diff --git a/lib/mono-addins/Mono.Addins.Setup/Makefile.am b/lib/mono-addins/Mono.Addins.Setup/Makefile.am
deleted file mode 100644
index e1a2012..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-include $(top_srcdir)/Makefile.include
-
-ASSEMBLY_NAME = Mono.Addins.Setup
-
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/LogTextWriter.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/NullProgressMonitor.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/ProgressStatusMonitor.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/ProgressTracker.cs \
- $(srcdir)/Mono.Addins.Setup/AddinInfo.cs \
- $(srcdir)/Mono.Addins.Setup/AddinInfoCollection.cs \
- $(srcdir)/Mono.Addins.Setup/AddinPackage.cs \
- $(srcdir)/Mono.Addins.Setup/AddinRepositoryEntry.cs \
- $(srcdir)/Mono.Addins.Setup/AddinStore.cs \
- $(srcdir)/Mono.Addins.Setup/AddinSystemConfiguration.cs \
- $(srcdir)/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs \
- $(srcdir)/Mono.Addins.Setup/AddinSystemConfigurationSerializer.cs \
- $(srcdir)/Mono.Addins.Setup/ConsoleAddinInstaller.cs \
- $(srcdir)/Mono.Addins.Setup/InstallException.cs \
- $(srcdir)/Mono.Addins.Setup/IProgressMonitor.cs \
- $(srcdir)/Mono.Addins.Setup/Package.cs \
- $(srcdir)/Mono.Addins.Setup/PackageCollection.cs \
- $(srcdir)/Mono.Addins.Setup/ReferenceRepositoryEntry.cs \
- $(srcdir)/Mono.Addins.Setup/Repository.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryEntry.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryEntryCollection.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryReaderWriter.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryRecord.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryRegistry.cs \
- $(srcdir)/Mono.Addins.Setup/RepositorySerializer.cs \
- $(srcdir)/Mono.Addins.Setup/SetupService.cs \
- $(srcdir)/Mono.Addins.Setup/SetupTool.cs
-
-REFS = \
- -r:ICSharpCode.SharpZipLib \
- -r:Mono.Posix \
- -r:System \
- -r:System.Xml \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll
-
-PKGS =
-
-CSC_EXTRA_FLAGS = -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
-
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY)
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES)
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
diff --git a/lib/mono-addins/Mono.Addins.Setup/Makefile.in b/lib/mono-addins/Mono.Addins.Setup/Makefile.in
deleted file mode 100644
index 9ed21f5..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Makefile.in
+++ /dev/null
@@ -1,570 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
-subdir = lib/mono-addins/Mono.Addins.Setup
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(assemblydir)"
-DATA = $(assembly_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
-DIR_DOCS = $(top_builddir)/docs
-DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
-DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
-DIR_SEMWEB = $(top_builddir)/lib/semweb
-DIR_SRC = $(top_builddir)/src
-DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
-LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
-LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-CSC_FLAGS = -debug
-CSC = $(MCS) $(CSC_FLAGS) -target:exe
-CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
-MONO_DEBUGFLAGS = --debug
-RUNTIME = mono $(MONO_DEBUGFLAGS)
-ASSEMBLY_NAME = Mono.Addins.Setup
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/LogTextWriter.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/NullProgressMonitor.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/ProgressStatusMonitor.cs \
- $(srcdir)/Mono.Addins.Setup.ProgressMonitoring/ProgressTracker.cs \
- $(srcdir)/Mono.Addins.Setup/AddinInfo.cs \
- $(srcdir)/Mono.Addins.Setup/AddinInfoCollection.cs \
- $(srcdir)/Mono.Addins.Setup/AddinPackage.cs \
- $(srcdir)/Mono.Addins.Setup/AddinRepositoryEntry.cs \
- $(srcdir)/Mono.Addins.Setup/AddinStore.cs \
- $(srcdir)/Mono.Addins.Setup/AddinSystemConfiguration.cs \
- $(srcdir)/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs \
- $(srcdir)/Mono.Addins.Setup/AddinSystemConfigurationSerializer.cs \
- $(srcdir)/Mono.Addins.Setup/ConsoleAddinInstaller.cs \
- $(srcdir)/Mono.Addins.Setup/InstallException.cs \
- $(srcdir)/Mono.Addins.Setup/IProgressMonitor.cs \
- $(srcdir)/Mono.Addins.Setup/Package.cs \
- $(srcdir)/Mono.Addins.Setup/PackageCollection.cs \
- $(srcdir)/Mono.Addins.Setup/ReferenceRepositoryEntry.cs \
- $(srcdir)/Mono.Addins.Setup/Repository.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryEntry.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryEntryCollection.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryReaderWriter.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryRecord.cs \
- $(srcdir)/Mono.Addins.Setup/RepositoryRegistry.cs \
- $(srcdir)/Mono.Addins.Setup/RepositorySerializer.cs \
- $(srcdir)/Mono.Addins.Setup/SetupService.cs \
- $(srcdir)/Mono.Addins.Setup/SetupTool.cs
-
-REFS = \
- -r:ICSharpCode.SharpZipLib \
- -r:Mono.Posix \
- -r:System \
- -r:System.Xml \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll
-
-PKGS =
-CSC_EXTRA_FLAGS = -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY)
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES)
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/mono-addins/Mono.Addins.Setup/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/mono-addins/Mono.Addins.Setup/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(assemblydir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(assemblydir)" || exit $$?; \
- done
-
-uninstall-assemblyDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(assemblydir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(assemblydir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-assemblyDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-assemblyDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-assemblyDATA install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC_LIB) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs
deleted file mode 100644
index 918960b..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// ConsoleProgressMonitor.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-namespace Mono.Addins.Setup.ProgressMonitoring
-{
- internal class ConsoleProgressMonitor: NullProgressMonitor
- {
- int columns = 80;
- bool indent = true;
- bool wrap = true;
- int ilevel = 0;
- int isize = 3;
- int col = -1;
- int logLevel;
- LogTextWriter logger;
-
- public ConsoleProgressMonitor (): this (1)
- {
- }
-
- public ConsoleProgressMonitor (int logLevel)
- {
- this.logLevel = logLevel;
- logger = new LogTextWriter ();
- logger.TextWritten += new LogTextEventHandler (WriteLog);
- }
-
- public bool WrapText {
- get { return wrap; }
- set { wrap = value; }
- }
-
- public int WrapColumns {
- get { return columns; }
- set { columns = value; }
- }
-
- public bool IndentTasks {
- get { return indent; }
- set { indent = value; }
- }
-
- public override int LogLevel {
- get { return logLevel; }
- }
-
- public override void BeginTask (string name, int totalWork)
- {
- WriteText (name);
- Indent ();
- }
-
- public override void BeginStepTask (string name, int totalWork, int stepSize)
- {
- BeginTask (name, totalWork);
- }
-
- public override void EndTask ()
- {
- Unindent ();
- }
-
- void WriteLog (string text)
- {
- WriteText (text);
- }
-
- public override TextWriter Log {
- get { return logger; }
- }
-
- public override void ReportSuccess (string message)
- {
- WriteText (message);
- }
-
- public override void ReportWarning (string message)
- {
- if (logLevel != 0)
- WriteText ("WARNING: " + message + "\n");
- }
-
- public override void ReportError (string message, Exception ex)
- {
- if (logLevel == 0)
- return;
-
- if (message != null && ex != null) {
- WriteText ("ERROR: " + message + "\n");
- if (logLevel > 1)
- WriteText (ex + "\n");
- }
- if (message != null)
- WriteText ("ERROR: " + message + "\n");
- else if (ex != null) {
- if (logLevel > 1)
- WriteText ("ERROR: " + ex + "\n");
- else
- WriteText ("ERROR: " + ex.Message + "\n");
- }
- }
-
- void WriteText (string text)
- {
- if (indent)
- WriteText (text, ilevel);
- else
- WriteText (text, 0);
- }
-
- void WriteText (string text, int leftMargin)
- {
- if (text == null || text.Length == 0)
- return;
-
- int n = 0;
- int maxCols = wrap ? columns : int.MaxValue;
-
- while (n < text.Length)
- {
- if (col == -1) {
- Console.Write (new String (' ', leftMargin));
- col = leftMargin;
- }
-
- int lastWhite = -1;
- int sn = n;
- bool eol = false;
-
- while (col < maxCols && n < text.Length) {
- char c = text [n];
- if (c == '\r') {
- n++;
- continue;
- }
- if (c == '\n') {
- eol = true;
- break;
- }
- if (char.IsWhiteSpace (c))
- lastWhite = n;
- col++;
- n++;
- }
-
- if (lastWhite == -1 || col < maxCols)
- lastWhite = n;
- else if (col >= maxCols)
- n = lastWhite + 1;
-
- Console.Write (text.Substring (sn, lastWhite - sn));
-
- if (eol || col >= maxCols) {
- col = -1;
- Console.WriteLine ();
- if (eol) n++;
- }
- }
- }
-
- void Indent ()
- {
- ilevel += isize;
- if (col != -1) {
- Console.WriteLine ();
- col = -1;
- }
- }
-
- void Unindent ()
- {
- ilevel -= isize;
- if (ilevel < 0) ilevel = 0;
- if (col != -1) {
- Console.WriteLine ();
- col = -1;
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/LogTextWriter.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/LogTextWriter.cs
deleted file mode 100644
index 67a063f..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/LogTextWriter.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// LogTextWriter.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-using System.Text;
-using System.Collections;
-
-namespace Mono.Addins.Setup.ProgressMonitoring
-{
- internal delegate void LogTextEventHandler (string writtenText);
-
- internal class LogTextWriter: TextWriter
- {
- ArrayList chainedWriters;
-
- public void ChainWriter (TextWriter writer)
- {
- if (chainedWriters == null) chainedWriters = new ArrayList ();
- chainedWriters.Add (writer);
- }
-
- public void UnchainWriter (TextWriter writer)
- {
- if (chainedWriters != null) {
- chainedWriters.Remove (writer);
- if (chainedWriters.Count == 0)
- chainedWriters = null;
- }
- }
-
- public override Encoding Encoding {
- get { return Encoding.Default; }
- }
-
- public override void Close ()
- {
- if (Closed != null)
- Closed (this, null);
- }
-
- public override void Write (char value)
- {
- if (TextWritten != null)
- TextWritten (value.ToString ());
- if (chainedWriters != null)
- foreach (TextWriter cw in chainedWriters)
- cw.Write (value);
- }
-
- public override void Write (string value)
- {
- if (TextWritten != null)
- TextWritten (value);
- if (chainedWriters != null)
- foreach (TextWriter cw in chainedWriters)
- cw.Write (value);
- }
-
- public event LogTextEventHandler TextWritten;
- public event EventHandler Closed;
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/NullProgressMonitor.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/NullProgressMonitor.cs
deleted file mode 100644
index d4d3c3b..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/NullProgressMonitor.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// NullProgressMonitor.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.Threading;
-using System.IO;
-
-namespace Mono.Addins.Setup.ProgressMonitoring
-{
- internal class NullProgressMonitor: MarshalByRefObject, IProgressMonitor
- {
- bool done, canceled;
- ArrayList errors;
- ArrayList warnings;
- ArrayList messages;
-
- public string[] Messages {
- get {
- if (messages != null)
- return (string[]) messages.ToArray (typeof(string));
- else
- return new string [0];
- }
- }
-
- public string[] Warnings {
- get {
- if (warnings != null)
- return (string[]) warnings.ToArray (typeof(string));
- else
- return new string [0];
- }
- }
-
- public ProgressError[] Errors {
- get {
- if (errors != null)
- return (ProgressError[]) errors.ToArray (typeof(ProgressError));
- else
- return new ProgressError [0];
- }
- }
-
- public virtual void BeginTask (string name, int totalWork)
- {
- }
-
- public virtual void EndTask ()
- {
- }
-
- public virtual void BeginStepTask (string name, int totalWork, int stepSize)
- {
- }
-
- public virtual void Step (int work)
- {
- }
-
- public virtual TextWriter Log {
- get { return TextWriter.Null; }
- }
-
- public virtual void ReportSuccess (string message)
- {
- if (messages == null)
- messages = new ArrayList ();
- messages.Add (message);
- }
-
- public virtual void ReportWarning (string message)
- {
- if (warnings == null)
- warnings = new ArrayList ();
- messages.Add (message);
- }
-
- public virtual void ReportError (string message, Exception ex)
- {
- if (errors == null)
- errors = new ArrayList ();
-
- if (message == null && ex != null)
- message = ex.Message;
- else if (message != null && ex != null) {
- if (!message.EndsWith (".")) message += ".";
- message += " " + ex.Message;
- }
-
- errors.Add (new ProgressError (message, ex));
- }
-
- public bool IsCancelRequested {
- get { return canceled; }
- }
-
- public void Cancel ()
- {
- canceled = true;
- }
-
- public virtual int LogLevel {
- get { return 1; }
- }
-
- public virtual void Dispose ()
- {
- lock (this) {
- if (done) return;
- done = true;
- }
- OnCompleted ();
- }
-
- protected virtual void OnCompleted ()
- {
- }
- }
-
- internal class ProgressError
- {
- Exception ex;
- string message;
-
- public ProgressError (string message, Exception ex)
- {
- this.ex = ex;
- this.message = message;
- }
-
- public string Message {
- get { return message; }
- }
-
- public Exception Exception {
- get { return ex; } }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ProgressStatusMonitor.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ProgressStatusMonitor.cs
deleted file mode 100644
index f4f2c61..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ProgressStatusMonitor.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// ProgressStatusMonitor.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-
-namespace Mono.Addins.Setup.ProgressMonitoring
-{
- internal class ProgressStatusMonitor: MarshalByRefObject, IProgressMonitor
- {
- IProgressStatus status;
- LogTextWriter logger;
- ProgressTracker tracker = new ProgressTracker ();
-
- public ProgressStatusMonitor (IProgressStatus status)
- {
- this.status = status;
- logger = new LogTextWriter ();
- logger.TextWritten += new LogTextEventHandler (WriteLog);
- }
-
- public static IProgressMonitor GetProgressMonitor (IProgressStatus status)
- {
- if (status == null)
- return new NullProgressMonitor ();
- else
- return new ProgressStatusMonitor (status);
- }
-
- public void BeginTask (string name, int totalWork)
- {
- tracker.BeginTask (name, totalWork);
- status.SetMessage (tracker.CurrentTask);
- status.SetProgress (tracker.GlobalWork);
- }
-
- public void BeginStepTask (string name, int totalWork, int stepSize)
- {
- tracker.BeginStepTask (name, totalWork, stepSize);
- status.SetMessage (tracker.CurrentTask);
- status.SetProgress (tracker.GlobalWork);
- }
-
- public void Step (int work)
- {
- tracker.Step (work);
- status.SetProgress (tracker.GlobalWork);
- }
-
- public void EndTask ()
- {
- tracker.EndTask ();
- status.SetMessage (tracker.CurrentTask);
- status.SetProgress (tracker.GlobalWork);
- }
-
- void WriteLog (string text)
- {
- status.Log (text);
- }
-
- public TextWriter Log {
- get { return logger; }
- }
-
- public void ReportWarning (string message)
- {
- status.ReportWarning (message);
- }
-
- public void ReportError (string message, Exception ex)
- {
- status.ReportError (message, ex);
- }
-
- public bool IsCancelRequested {
- get { return status.IsCanceled; }
- }
-
- public void Cancel ()
- {
- status.Cancel ();
- }
-
- public int LogLevel {
- get { return status.LogLevel; }
- }
-
- public void Dispose ()
- {
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ProgressTracker.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ProgressTracker.cs
deleted file mode 100644
index 5698ea9..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ProgressTracker.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// ProgressTracker.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Setup.ProgressMonitoring
-{
- internal class ProgressTracker
- {
- bool done;
-
- ArrayList tasks = new ArrayList ();
- class Task
- {
- public string Name;
- public int TotalWork;
- public int CurrentWork;
- public int StepSize = 1;
- public bool IsStep;
-
- public double GetWorkPercent (double part)
- {
- if (TotalWork <= 0) return 0;
- if (CurrentWork >= TotalWork) return 1.0;
- return ((double)CurrentWork + part) / (double)TotalWork;
- }
- }
-
- public void Reset ()
- {
- done = false;
- tasks.Clear ();
- }
-
- public void BeginTask (string name, int totalWork)
- {
- Task t = new Task ();
- t.Name = name;
- t.TotalWork = totalWork;
- tasks.Add (t);
- }
-
- public void BeginStepTask (string name, int totalWork, int stepSize)
- {
- Task t = new Task ();
- t.StepSize = stepSize;
- t.IsStep = true;
- t.Name = name;
- t.TotalWork = totalWork;
- tasks.Add (t);
- }
-
- public void EndTask ()
- {
- if (tasks.Count > 0) {
- Task t = LastTask;
- tasks.RemoveAt (tasks.Count - 1);
- if (t.IsStep)
- Step (t.StepSize);
- }
- }
-
- public void Step (int work)
- {
- if (tasks.Count == 0) return;
- Task t = LastTask;
- t.CurrentWork += work;
- if (t.CurrentWork > t.TotalWork)
- t.CurrentWork = t.TotalWork;
- }
-
- Task LastTask {
- get { return (Task)tasks [tasks.Count-1]; }
- }
-
- public string CurrentTask {
- get {
- if (tasks.Count == 0) return null;
- return LastTask.Name;
- }
- }
-
- public double CurrentTaskWork {
- get {
- if (tasks.Count == 0) return 0;
- return LastTask.GetWorkPercent (0);
- }
- }
-
- public bool UnknownWork {
- get {
- if (tasks.Count == 0) return false;
- return LastTask.TotalWork <= 1;
- }
- }
-
- public double GlobalWork {
- get {
- if (done) return 1.0;
-
- double work = 0;
- for (int n = tasks.Count - 1; n >= 0; n--) {
- Task t = (Task) tasks [n];
- work = t.GetWorkPercent (work) * (double)t.StepSize;
- }
- return work;
- }
- }
-
- public bool InProgress {
- get { return !done; }
- }
-
- public void Done ()
- {
- done = true;
- tasks.Clear ();
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinInfo.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinInfo.cs
deleted file mode 100644
index 9da1353..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinInfo.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-//
-// AddinInfo.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Xml;
-using System.Xml.Serialization;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Setup
-{
- internal class AddinInfo: AddinHeader
- {
- string id = "";
- string namspace = "";
- string name = "";
- string version = "";
- string baseVersion = "";
- string author = "";
- string copyright = "";
- string url = "";
- string description = "";
- string category = "";
- DependencyCollection dependencies;
- DependencyCollection optionalDependencies;
-
- public AddinInfo ()
- {
- dependencies = new DependencyCollection ();
- optionalDependencies = new DependencyCollection ();
- }
-
- public string Id {
- get { return Addin.GetFullId (namspace, id, version); }
- }
-
- [XmlElement ("Id")]
- public string LocalId {
- get { return id; }
- set { id = value; }
- }
-
- public string Namespace {
- get { return namspace; }
- set { namspace = value; }
- }
-
- public string Name {
- get {
- if (name != null && name.Length > 0)
- return name;
- string sid = id;
- if (sid.StartsWith ("__"))
- sid = sid.Substring (2);
- return Addin.GetFullId (namspace, sid, null);
- }
- set { name = value; }
- }
-
- public string Version {
- get { return version; }
- set { version = value; }
- }
-
- public string BaseVersion {
- get { return baseVersion; }
- set { baseVersion = value; }
- }
-
- public string Author {
- get { return author; }
- set { author = value; }
- }
-
- public string Copyright {
- get { return copyright; }
- set { copyright = value; }
- }
-
- public string Url {
- get { return url; }
- set { url = value; }
- }
-
- public string Description {
- get { return description; }
- set { description = value; }
- }
-
- public string Category {
- get { return category; }
- set { category = value; }
- }
-
- [XmlArrayItem ("AddinDependency", typeof(AddinDependency))]
- [XmlArrayItem ("NativeDependency", typeof(NativeDependency))]
- [XmlArrayItem ("AssemblyDependency", typeof(AssemblyDependency))]
- public DependencyCollection Dependencies {
- get { return dependencies; }
- }
-
- [XmlArrayItem ("AddinDependency", typeof(AddinDependency))]
- [XmlArrayItem ("NativeDependency", typeof(NativeDependency))]
- [XmlArrayItem ("AssemblyDependency", typeof(AssemblyDependency))]
- public DependencyCollection OptionalDependencies {
- get { return optionalDependencies; }
- }
-
- public static AddinInfo ReadFromAddinFile (StreamReader r)
- {
- XmlDocument doc = new XmlDocument ();
- doc.Load (r);
- r.Close ();
-
- AddinInfo info = new AddinInfo ();
- info.id = doc.DocumentElement.GetAttribute ("id");
- info.namspace = doc.DocumentElement.GetAttribute ("namespace");
- info.name = doc.DocumentElement.GetAttribute ("name");
- if (info.id == "") info.id = info.name;
- info.version = doc.DocumentElement.GetAttribute ("version");
- info.author = doc.DocumentElement.GetAttribute ("author");
- info.copyright = doc.DocumentElement.GetAttribute ("copyright");
- info.url = doc.DocumentElement.GetAttribute ("url");
- info.description = doc.DocumentElement.GetAttribute ("description");
- info.category = doc.DocumentElement.GetAttribute ("category");
- info.baseVersion = doc.DocumentElement.GetAttribute ("compatVersion");
-
- ReadDependencies (info.Dependencies, info.OptionalDependencies, doc.DocumentElement);
-
- return info;
- }
-
- static void ReadDependencies (DependencyCollection deps, DependencyCollection opDeps, XmlElement elem)
- {
- foreach (XmlElement dep in elem.SelectNodes ("Dependencies/Addin")) {
- AddinDependency adep = new AddinDependency ();
- adep.AddinId = dep.GetAttribute ("id");
- string v = dep.GetAttribute ("version");
- if (v.Length != 0)
- adep.Version = v;
- deps.Add (adep);
- }
-
- foreach (XmlElement dep in elem.SelectNodes ("Dependencies/Assembly")) {
- AssemblyDependency adep = new AssemblyDependency ();
- adep.FullName = dep.GetAttribute ("name");
- adep.Package = dep.GetAttribute ("package");
- deps.Add (adep);
- }
-
- foreach (XmlElement mod in elem.SelectNodes ("Module"))
- ReadDependencies (opDeps, opDeps, mod);
- }
-
- internal static AddinInfo ReadFromDescription (AddinDescription description)
- {
- AddinInfo info = new AddinInfo ();
- info.id = description.LocalId;
- info.namspace = description.Namespace;
- info.name = description.Name;
- info.version = description.Version;
- info.author = description.Author;
- info.copyright = description.Copyright;
- info.url = description.Url;
- info.description = description.Description;
- info.category = description.Category;
- info.baseVersion = description.CompatVersion;
-
- foreach (Dependency dep in description.MainModule.Dependencies)
- info.Dependencies.Add (dep);
-
- foreach (ModuleDescription mod in description.OptionalModules) {
- foreach (Dependency dep in mod.Dependencies)
- info.OptionalDependencies.Add (dep);
- }
- return info;
- }
-
- public bool SupportsVersion (string version)
- {
- if (Addin.CompareVersions (Version, version) > 0)
- return false;
- if (baseVersion == "")
- return true;
- return Addin.CompareVersions (BaseVersion, version) >= 0;
- }
-
- public int CompareVersionTo (AddinHeader other)
- {
- return Addin.CompareVersions (this.version, other.Version);
- }
- }
-
- public interface AddinHeader
- {
- string Id {
- get;
- }
-
- string Name {
- get;
- }
-
- string Namespace {
- get;
- }
-
- string Version {
- get;
- }
-
- string BaseVersion {
- get;
- }
-
- string Author {
- get;
- }
-
- string Copyright {
- get;
- }
-
- string Url {
- get;
- }
-
- string Description {
- get;
- }
-
- string Category {
- get;
- }
-
- DependencyCollection Dependencies {
- get;
- }
-
- DependencyCollection OptionalDependencies {
- get;
- }
-
- int CompareVersionTo (AddinHeader other);
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinInfoCollection.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinInfoCollection.cs
deleted file mode 100644
index c7ef3e2..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinInfoCollection.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// AddinInfoCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Setup
-{
- internal class AddinInfoCollection: CollectionBase
- {
- public AddinInfo this [int n] {
- get { return (AddinInfo) List [n]; }
- }
-
- public void Add (AddinInfo p)
- {
- List.Add (p);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs
deleted file mode 100644
index 75a8bdf..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-//
-// AddinPackage.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Reflection;
-using System.Diagnostics;
-using System.Collections.Specialized;
-using System.Net;
-
-using ICSharpCode.SharpZipLib.Zip;
-using Mono.Addins;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Setup
-{
- internal class AddinPackage: Package
- {
- AddinInfo info;
- string packFile;
- string url;
- string tempFolder;
- string configFile;
- bool installed;
- Addin iaddin;
-
- public AddinHeader Addin {
- get { return info; }
- }
-
- public override string Name {
- get { return info.Name + " v" + info.Version; }
- }
-
- public static AddinPackage PackageFromRepository (AddinRepositoryEntry repAddin)
- {
- AddinPackage pack = new AddinPackage ();
- pack.info = (AddinInfo) repAddin.Addin;
- pack.url = new Uri (new Uri (repAddin.RepositoryUrl), repAddin.Url).ToString ();
- return pack;
- }
-
- public static AddinPackage PackageFromFile (string file)
- {
- AddinPackage pack = new AddinPackage ();
- pack.info = ReadAddinInfo (file);
- pack.packFile = file;
- return pack;
- }
-
- public static AddinPackage FromInstalledAddin (Addin sinfo)
- {
- AddinPackage pack = new AddinPackage ();
- pack.info = AddinInfo.ReadFromDescription (sinfo.Description);
- return pack;
- }
-
- static AddinInfo ReadAddinInfo (string file)
- {
- ZipFile zfile = new ZipFile (file);
- foreach (ZipEntry ze in zfile) {
- if (ze.Name == "addin.info") {
- using (Stream s = zfile.GetInputStream (ze)) {
- return AddinInfo.ReadFromAddinFile (new StreamReader (s));
- }
- }
- }
- throw new InstallException ("Addin configuration file not found in package.");
- }
-
- internal override bool IsUpgradeOf (Package p)
- {
- AddinPackage ap = p as AddinPackage;
- if (ap == null) return false;
- return info.SupportsVersion (ap.info.Version);
- }
-
- public override bool Equals (object ob)
- {
- AddinPackage ap = ob as AddinPackage;
- if (ap == null) return false;
- return ap.info.Id == info.Id && ap.info.Version == info.Version;
- }
-
- public override int GetHashCode ()
- {
- return (info.Id + info.Version).GetHashCode ();
- }
-
- internal override void PrepareInstall (IProgressMonitor monitor, AddinStore service)
- {
- if (service.Registry.GetAddin (Mono.Addins.Addin.GetFullId (info.Namespace, info.Id, info.Version), true) != null)
- throw new InstallException ("The extension " + info.Name + " v" + info.Version + " is already installed.");
-
- if (url != null)
- packFile = service.DownloadFile (monitor, url);
-
- tempFolder = CreateTempFolder ();
-
- // Extract the files
- using (FileStream fs = new FileStream (packFile, FileMode.Open, FileAccess.Read)) {
- ZipFile zip = new ZipFile (fs);
- foreach (ZipEntry entry in zip) {
- string path = Path.Combine (tempFolder, entry.Name);
- string dir = Path.GetDirectoryName (path);
- if (!Directory.Exists (dir))
- Directory.CreateDirectory (dir);
-
- byte[] buffer = new byte [8192];
- int n=0;
- Stream inStream = zip.GetInputStream (entry);
- Stream outStream = null;
- try {
- outStream = File.Create (path);
- while ((n = inStream.Read (buffer, 0, buffer.Length)) > 0)
- outStream.Write (buffer, 0, n);
- } finally {
- inStream.Close ();
- if (outStream != null)
- outStream.Close ();
- }
- }
- }
-
- foreach (string s in Directory.GetFiles (tempFolder)) {
- if (Path.GetFileName (s) == "addin.info") {
- configFile = s;
- break;
- }
- }
-
- if (configFile == null)
- throw new InstallException ("Extension information file not found in package.");
- }
-
- internal override void CommitInstall (IProgressMonitor monitor, AddinStore service)
- {
- service.RegisterAddin (monitor, info, tempFolder);
- installed = true;
- }
-
- internal override void RollbackInstall (IProgressMonitor monitor, AddinStore service)
- {
- if (installed) {
- iaddin = service.Registry.GetAddin (info.Id);
- if (iaddin != null)
- CommitUninstall (monitor, service);
- }
- }
-
- internal override void EndInstall (IProgressMonitor monitor, AddinStore service)
- {
- if (url != null && packFile != null)
- File.Delete (packFile);
- if (tempFolder != null)
- Directory.Delete (tempFolder, true);
- }
-
- internal override void Resolve (IProgressMonitor monitor, AddinStore service, PackageCollection toInstall, PackageCollection toUninstall, PackageCollection installedRequired, DependencyCollection unresolved)
- {
- Addin ia = service.Registry.GetAddin (Mono.Addins.Addin.GetIdName (info.Id));
-
- if (ia != null) {
- Package p = AddinPackage.FromInstalledAddin (ia);
- if (!toUninstall.Contains (p))
- toUninstall.Add (p);
-
- if (!info.SupportsVersion (ia.Version)) {
-
- // This addin breaks the api of the currently installed one,
- // it has to be removed, together with all dependencies
-
- Addin[] ainfos = service.GetDependentAddins (info.Id, true);
- foreach (Addin ainfo in ainfos) {
- p = AddinPackage.FromInstalledAddin (ainfo);
- if (!toUninstall.Contains (p))
- toUninstall.Add (p);
- }
- }
- }
-
- foreach (Dependency dep in info.Dependencies) {
- service.ResolveDependency (monitor, dep, this, toInstall, toUninstall, installedRequired, unresolved);
- }
- }
-
- internal override void PrepareUninstall (IProgressMonitor monitor, AddinStore service)
- {
- iaddin = service.Registry.GetAddin (info.Id, true);
- if (iaddin == null)
- throw new InstallException (string.Format ("The extension '{0}' is not installed.", info.Name));
-
- AddinDescription conf = iaddin.Description;
- string basePath = Path.GetDirectoryName (conf.AddinFile);
-
- if (!File.Exists (iaddin.AddinFile)) {
- monitor.ReportWarning (string.Format ("The extension '{0}' is scheduled for uninstalling, but the extension file could not be found.", info.Name));
- return;
- }
-
- if (!service.HasWriteAccess (iaddin.AddinFile))
- throw new InstallException (AddinStore.GetUninstallErrorNoRoot (info));
-
- foreach (string relPath in conf.AllFiles) {
- string path = Path.Combine (basePath, relPath);
- if (!File.Exists (path))
- continue;
- if (!service.HasWriteAccess (path))
- throw new InstallException (AddinStore.GetUninstallErrorNoRoot (info));
- }
-
- tempFolder = CreateTempFolder ();
- CopyAddinFiles (monitor, conf, iaddin.AddinFile, tempFolder);
- }
-
- internal override void CommitUninstall (IProgressMonitor monitor, AddinStore service)
- {
- if (tempFolder == null)
- return;
-
- monitor.Log.WriteLine ("Uninstalling " + info.Name + " v" + info.Version);
-
- AddinDescription conf = iaddin.Description;
- string basePath = Path.GetDirectoryName (conf.AddinFile);
-
- foreach (string relPath in conf.AllFiles) {
- string path = Path.Combine (basePath, relPath);
- if (!File.Exists (path))
- continue;
- File.Delete (path);
- }
-
- File.Delete (iaddin.AddinFile);
-
- if (Directory.GetFiles (basePath).Length == 0) {
- try {
- Directory.Delete (basePath);
- } catch {
- monitor.ReportWarning ("Directory " + basePath + " could not be deleted.");
- }
- }
-
- monitor.Log.WriteLine ("Done");
- }
-
- internal override void RollbackUninstall (IProgressMonitor monitor, AddinStore service)
- {
- if (tempFolder != null) {
- AddinDescription conf = iaddin.Description;
- string configFile = Path.Combine (tempFolder, Path.GetFileName (iaddin.AddinFile));
-
- string addinDir = Path.GetDirectoryName (iaddin.AddinFile);
- CopyAddinFiles (monitor, conf, configFile, addinDir);
- }
- }
-
- internal override void EndUninstall (IProgressMonitor monitor, AddinStore service)
- {
- if (tempFolder != null)
- Directory.Delete (tempFolder, true);
- tempFolder = null;
- }
-
- void CopyAddinFiles (IProgressMonitor monitor, AddinDescription conf, string configFile, string destPath)
- {
- if (!Directory.Exists (destPath))
- Directory.CreateDirectory (destPath);
-
- string dfile = Path.Combine (destPath, Path.GetFileName (configFile));
- if (File.Exists (dfile))
- File.Delete (dfile);
-
- File.Copy (configFile, dfile);
-
- string basePath = Path.GetDirectoryName (configFile);
-
- foreach (string relPath in conf.AllFiles) {
- string path = Path.Combine (basePath, relPath);
- if (!File.Exists (path))
- continue;
-
- string destf = Path.Combine (destPath, Path.GetDirectoryName (relPath));
- if (!Directory.Exists (destf))
- Directory.CreateDirectory (destf);
-
- dfile = Path.Combine (destPath, relPath);
- if (File.Exists (dfile))
- File.Delete (dfile);
-
- File.Copy (path, dfile);
- }
- }
-
-
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinRepositoryEntry.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinRepositoryEntry.cs
deleted file mode 100644
index cfc12a7..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinRepositoryEntry.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// PackageRepositoryEntry.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace Mono.Addins.Setup
-{
- internal class PackageRepositoryEntry: RepositoryEntry, AddinRepositoryEntry, IComparable
- {
- AddinInfo addin;
-
- public AddinInfo Addin {
- get { return addin; }
- set { addin = value; }
- }
-
- AddinHeader AddinRepositoryEntry.Addin {
- get { return addin; }
- }
-
- public string RepositoryUrl {
- get { return Repository.Url; }
- }
-
- public string RepositoryName {
- get { return Repository.Name; }
- }
-
- public int CompareTo (object other)
- {
- PackageRepositoryEntry rep = (PackageRepositoryEntry) other;
- string n1 = Mono.Addins.Addin.GetIdName (Addin.Id);
- string n2 = Mono.Addins.Addin.GetIdName (rep.Addin.Id);
- if (n1 != n2)
- return n1.CompareTo (n2);
- else
- return Mono.Addins.Addin.CompareVersions (rep.Addin.Version, Addin.Version);
- }
- }
-
- public interface AddinRepositoryEntry
- {
- AddinHeader Addin {
- get;
- }
-
- string Url {
- get;
- }
-
- string RepositoryUrl {
- get;
- }
-
- string RepositoryName {
- get;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs
deleted file mode 100644
index 6c862bc..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs
+++ /dev/null
@@ -1,675 +0,0 @@
-//
-// AddinStore.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Reflection;
-using System.Diagnostics;
-using System.Net;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-
-using ICSharpCode.SharpZipLib.Zip;
-using Mono.Addins;
-using Mono.Addins.Setup.ProgressMonitoring;
-using Mono.Addins.Description;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Setup
-{
- internal class AddinStore
- {
- SetupService service;
-
- public AddinStore (SetupService service)
- {
- this.service = service;
- }
-
- internal void ResetCachedData ()
- {
- }
-
- public AddinRegistry Registry {
- get { return service.Registry; }
- }
-
- public bool Install (IProgressStatus statusMonitor, params string[] files)
- {
- Package[] packages = new Package [files.Length];
- for (int n=0; n<files.Length; n++)
- packages [n] = AddinPackage.FromFile (files [n]);
-
- return Install (statusMonitor, packages);
- }
-
- public bool Install (IProgressStatus statusMonitor, params AddinRepositoryEntry[] addins)
- {
- Package[] packages = new Package [addins.Length];
- for (int n=0; n<addins.Length; n++)
- packages [n] = AddinPackage.FromRepository (addins [n]);
-
- return Install (statusMonitor, packages);
- }
-
- internal bool Install (IProgressStatus monitor, params Package[] packages)
- {
- PackageCollection packs = new PackageCollection ();
- packs.AddRange (packages);
- return Install (monitor, packs);
- }
-
- internal bool Install (IProgressStatus statusMonitor, PackageCollection packs)
- {
- // Make sure the registry is up to date
- service.Registry.Update (statusMonitor);
-
- IProgressMonitor monitor = ProgressStatusMonitor.GetProgressMonitor (statusMonitor);
-
- PackageCollection toUninstall;
- DependencyCollection unresolved;
- if (!ResolveDependencies (monitor, packs, out toUninstall, out unresolved)) {
- monitor.ReportError ("Not all dependencies could be resolved.", null);
- return false;
- }
-
- ArrayList prepared = new ArrayList ();
- ArrayList uninstallPrepared = new ArrayList ();
- bool rollback = false;
-
- monitor.BeginTask ("Installing extensions...", 100);
-
- // Prepare install
-
- monitor.BeginStepTask ("Initializing installation", toUninstall.Count + packs.Count + 1, 75);
-
- foreach (Package mpack in toUninstall) {
- try {
- mpack.PrepareUninstall (monitor, this);
- uninstallPrepared.Add (mpack);
- if (monitor.IsCancelRequested)
- throw new InstallException ("Installation cancelled.");
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- rollback = true;
- break;
- }
- }
-
- monitor.Step (1);
-
- foreach (Package mpack in packs) {
- try {
- mpack.PrepareInstall (monitor, this);
- if (monitor.IsCancelRequested)
- throw new InstallException ("Installation cancelled.");
- prepared.Add (mpack);
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- rollback = true;
- break;
- }
- }
-
- monitor.EndTask ();
-
- monitor.BeginStepTask ("Installing", toUninstall.Count + packs.Count + 1, 20);
-
- // Commit install
-
- if (!rollback) {
- foreach (Package mpack in toUninstall) {
- try {
- mpack.CommitUninstall (monitor, this);
- if (monitor.IsCancelRequested)
- throw new InstallException ("Installation cancelled.");
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- rollback = true;
- break;
- }
- }
- }
-
- monitor.Step (1);
-
- if (!rollback) {
- foreach (Package mpack in packs) {
- try {
- mpack.CommitInstall (monitor, this);
- if (monitor.IsCancelRequested)
- throw new InstallException ("Installation cancelled.");
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- rollback = true;
- break;
- }
- }
- }
-
- monitor.EndTask ();
-
- // Rollback if failed
-
- if (monitor.IsCancelRequested)
- monitor = new NullProgressMonitor ();
-
- if (rollback) {
- monitor.BeginStepTask ("Finishing installation", (prepared.Count + uninstallPrepared.Count)*2 + 1, 5);
-
- foreach (Package mpack in prepared) {
- try {
- mpack.RollbackInstall (monitor, this);
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- }
- }
-
- foreach (Package mpack in uninstallPrepared) {
- try {
- mpack.RollbackUninstall (monitor, this);
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- }
- }
- } else
- monitor.BeginStepTask ("Finishing installation", prepared.Count + uninstallPrepared.Count + 1, 5);
-
- // Cleanup
-
- foreach (Package mpack in prepared) {
- try {
- mpack.EndInstall (monitor, this);
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.Log.WriteLine (ex);
- }
- }
-
- monitor.Step (1);
-
- foreach (Package mpack in uninstallPrepared) {
- try {
- mpack.EndUninstall (monitor, this);
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.Log.WriteLine (ex);
- }
- }
-
- // Update the extension maps
- service.Registry.Update (statusMonitor);
-
- monitor.EndTask ();
-
- monitor.EndTask ();
-
- service.SaveConfiguration ();
- ResetCachedData ();
-
- return !rollback;
- }
-
- public void Uninstall (IProgressStatus statusMonitor, string id)
- {
- IProgressMonitor monitor = ProgressStatusMonitor.GetProgressMonitor (statusMonitor);
-
- bool rollback = false;
- ArrayList toUninstall = new ArrayList ();
- ArrayList uninstallPrepared = new ArrayList ();
-
- Addin ia = service.Registry.GetAddin (id);
- if (ia == null)
- throw new InstallException ("The extension '" + id + "' is not installed.");
-
- toUninstall.Add (AddinPackage.FromInstalledAddin (ia));
-
- Addin[] deps = GetDependentAddins (id, true);
- foreach (Addin dep in deps)
- toUninstall.Add (AddinPackage.FromInstalledAddin (dep));
-
- monitor.BeginTask ("Uninstalling extensions", toUninstall.Count*2 + uninstallPrepared.Count + 1);
-
- // Prepare install
-
- foreach (Package mpack in toUninstall) {
- try {
- mpack.PrepareUninstall (monitor, this);
- monitor.Step (1);
- uninstallPrepared.Add (mpack);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- rollback = true;
- break;
- }
- }
-
- // Commit install
-
- if (!rollback) {
- foreach (Package mpack in toUninstall) {
- try {
- mpack.CommitUninstall (monitor, this);
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- rollback = true;
- break;
- }
- }
- }
-
- // Rollback if failed
-
- if (rollback) {
- monitor.BeginTask ("Rolling back uninstall", uninstallPrepared.Count);
- foreach (Package mpack in uninstallPrepared) {
- try {
- mpack.RollbackUninstall (monitor, this);
- } catch (Exception ex) {
- monitor.ReportError (null, ex);
- }
- }
- monitor.EndTask ();
- }
- monitor.Step (1);
-
- // Cleanup
-
- foreach (Package mpack in uninstallPrepared) {
- try {
- mpack.EndUninstall (monitor, this);
- monitor.Step (1);
- } catch (Exception ex) {
- monitor.Log.WriteLine (ex);
- }
- }
-
- // Update the extension maps
- service.Registry.Update (statusMonitor);
-
- monitor.EndTask ();
-
- service.SaveConfiguration ();
- ResetCachedData ();
- }
-
- public Addin[] GetDependentAddins (string id, bool recursive)
- {
- ArrayList list = new ArrayList ();
- FindDependentAddins (list, id, recursive);
- return (Addin[]) list.ToArray (typeof (Addin));
- }
-
- void FindDependentAddins (ArrayList list, string id, bool recursive)
- {
- foreach (Addin iaddin in service.Registry.GetAddins ()) {
- if (list.Contains (iaddin))
- continue;
- foreach (Dependency dep in iaddin.Description.MainModule.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep != null && adep.AddinId == id) {
- list.Add (iaddin);
- if (recursive)
- FindDependentAddins (list, iaddin.Id, true);
- }
- }
- }
- }
-
- public bool ResolveDependencies (IProgressStatus statusMonitor, AddinRepositoryEntry[] addins, out PackageCollection resolved, out PackageCollection toUninstall, out DependencyCollection unresolved)
- {
- resolved = new PackageCollection ();
- for (int n=0; n<addins.Length; n++)
- resolved.Add (AddinPackage.FromRepository (addins [n]));
- return ResolveDependencies (statusMonitor, resolved, out toUninstall, out unresolved);
- }
-
- public bool ResolveDependencies (IProgressStatus statusMonitor, PackageCollection packages, out PackageCollection toUninstall, out DependencyCollection unresolved)
- {
- IProgressMonitor monitor = ProgressStatusMonitor.GetProgressMonitor (statusMonitor);
- return ResolveDependencies (monitor, packages, out toUninstall, out unresolved);
- }
-
- internal bool ResolveDependencies (IProgressMonitor monitor, PackageCollection packages, out PackageCollection toUninstall, out DependencyCollection unresolved)
- {
- PackageCollection requested = new PackageCollection();
- requested.AddRange (packages);
-
- unresolved = new DependencyCollection ();
- toUninstall = new PackageCollection ();
- PackageCollection installedRequired = new PackageCollection ();
-
- for (int n=0; n<packages.Count; n++) {
- Package p = packages [n];
- p.Resolve (monitor, this, packages, toUninstall, installedRequired, unresolved);
- }
-
- if (unresolved.Count != 0) {
- foreach (Dependency dep in unresolved)
- monitor.ReportError (string.Format ("The package '{0}' could not be found in any repository", dep.Name), null);
- return false;
- }
-
- // Check that we are not uninstalling packages that are required
- // by packages being installed.
-
- foreach (Package p in installedRequired) {
- if (toUninstall.Contains (p)) {
- // Only accept to uninstall this package if we are
- // going to install a newer version.
- bool foundUpgrade = false;
- foreach (Package tbi in packages)
- if (tbi.Equals (p) || tbi.IsUpgradeOf (p)) {
- foundUpgrade = true;
- break;
- }
- if (!foundUpgrade)
- return false;
- }
- }
-
- // Check that we are not trying to uninstall from a directory from
- // which we don't have write permissions
-
- foreach (Package p in toUninstall) {
- AddinPackage ap = p as AddinPackage;
- if (ap != null) {
- Addin ia = service.Registry.GetAddin (ap.Addin.Id);
- if (File.Exists (ia.AddinFile) && !HasWriteAccess (ia.AddinFile)) {
- monitor.ReportError (GetUninstallErrorNoRoot (ap.Addin), null);
- return false;
- }
- }
- }
-
- // Check that we are not installing two versions of the same addin
-
- PackageCollection resolved = new PackageCollection();
- resolved.AddRange (packages);
-
- bool error = false;
-
- for (int n=0; n<packages.Count; n++) {
- AddinPackage ap = packages [n] as AddinPackage;
- if (ap == null) continue;
-
- for (int k=n+1; k<packages.Count; k++) {
- AddinPackage otherap = packages [k] as AddinPackage;
- if (otherap == null) continue;
-
- if (ap.Addin.Id == otherap.Addin.Id) {
- if (ap.IsUpgradeOf (otherap)) {
- if (requested.Contains (otherap)) {
- monitor.ReportError ("Can't install two versions of the same extension: '" + ap.Addin.Name + "'.", null);
- error = true;
- } else {
- packages.RemoveAt (k);
- }
- } else if (otherap.IsUpgradeOf (ap)) {
- if (requested.Contains (ap)) {
- monitor.ReportError ("Can't install two versions of the same extension: '" + ap.Addin.Name + "'.", null);
- error = true;
- } else {
- packages.RemoveAt (n);
- n--;
- }
- } else {
- error = true;
- monitor.ReportError ("Can't install two versions of the same extension: '" + ap.Addin.Name + "'.", null);
- }
- break;
- }
- }
- }
-
- return !error;
- }
-
- internal void ResolveDependency (IProgressMonitor monitor, Dependency dep, AddinPackage parentPackage, PackageCollection toInstall, PackageCollection toUninstall, PackageCollection installedRequired, DependencyCollection unresolved)
- {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null)
- return;
-
- string nsid = Addin.GetFullId (parentPackage.Addin.Namespace, adep.AddinId, null);
-
- foreach (Package p in toInstall) {
- AddinPackage ap = p as AddinPackage;
- if (ap != null) {
- if (Addin.GetIdName (ap.Addin.Id) == nsid && ((AddinInfo)ap.Addin).SupportsVersion (adep.Version))
- return;
- }
- }
-
- ArrayList addins = new ArrayList ();
- addins.AddRange (service.Registry.GetAddins ());
- addins.AddRange (service.Registry.GetAddinRoots ());
-
- foreach (Addin addin in addins) {
- if (Addin.GetIdName (addin.Id) == nsid && addin.SupportsVersion (adep.Version)) {
- AddinPackage p = AddinPackage.FromInstalledAddin (addin);
- if (!installedRequired.Contains (p))
- installedRequired.Add (p);
- return;
- }
- }
-
- AddinRepositoryEntry[] avaddins = service.Repositories.GetAvailableAddins ();
- foreach (PackageRepositoryEntry avAddin in avaddins) {
- if (Addin.GetIdName (avAddin.Addin.Id) == nsid && ((AddinInfo)avAddin.Addin).SupportsVersion (adep.Version)) {
- toInstall.Add (AddinPackage.FromRepository (avAddin));
- return;
- }
- }
- unresolved.Add (adep);
- }
-
- internal string GetAddinDirectory (AddinInfo info)
- {
- return Path.Combine (service.InstallDirectory, info.Id.Replace (',','.'));
- }
-
- internal void RegisterAddin (IProgressMonitor monitor, AddinInfo info, string sourceDir)
- {
- monitor.Log.WriteLine ("Installing " + info.Name + " v" + info.Version);
- string addinDir = GetAddinDirectory (info);
- if (!Directory.Exists (addinDir))
- Directory.CreateDirectory (addinDir);
- CopyDirectory (sourceDir, addinDir);
-
- ResetCachedData ();
- }
-
- void CopyDirectory (string src, string dest)
- {
- CopyDirectory (src, dest, "");
- }
-
- void CopyDirectory (string src, string dest, string subdir)
- {
- string destDir = Path.Combine (dest, subdir);
-
- if (!Directory.Exists (destDir))
- Directory.CreateDirectory (destDir);
-
- foreach (string file in Directory.GetFiles (src)) {
- if (Path.GetFileName (file) != "addin.info")
- File.Copy (file, Path.Combine (destDir, Path.GetFileName (file)));
- }
-
- foreach (string dir in Directory.GetDirectories (src))
- CopyDirectory (dir, dest, Path.Combine (subdir, Path.GetFileName (dir)));
- }
-
- internal object DownloadObject (IProgressMonitor monitor, string url, Type type)
- {
- string file = null;
- try {
- file = DownloadFile (monitor, url);
- return ReadObject (file, type);
- } finally {
- if (file != null)
- File.Delete (file);
- }
- }
-
- static XmlSerializer GetSerializer (Type type)
- {
- if (type == typeof(AddinSystemConfiguration))
- return new AddinSystemConfigurationSerializer ();
- else if (type == typeof(Repository))
- return new RepositorySerializer ();
- else
- return new XmlSerializer (type);
- }
-
- internal static object ReadObject (string file, Type type)
- {
- if (!File.Exists (file))
- return null;
-
- StreamReader r = new StreamReader (file);
- try {
- XmlSerializer ser = GetSerializer (type);
- return ser.Deserialize (r);
- } catch {
- return null;
- } finally {
- r.Close ();
- }
- }
-
- internal static void WriteObject (string file, object obj)
- {
- string dir = Path.GetDirectoryName (file);
- if (!Directory.Exists (dir))
- Directory.CreateDirectory (dir);
- StreamWriter s = new StreamWriter (file);
- try {
- XmlSerializer ser = GetSerializer (obj.GetType());
- ser.Serialize (s, obj);
- s.Close ();
- } catch {
- s.Close ();
- if (File.Exists (file))
- File.Delete (file);
- throw;
- }
- }
-
- internal string DownloadFile (IProgressMonitor monitor, string url)
- {
- if (url.StartsWith ("file://")) {
- string tmpfile = Path.GetTempFileName ();
- string path = url.Substring (7);
- File.Delete (tmpfile);
- File.Copy (path, tmpfile);
- return tmpfile;
- }
-
- monitor.BeginTask ("Requesting " + url, 2);
- HttpWebRequest req = (HttpWebRequest) WebRequest.Create (url);
- req.Headers ["Pragma"] = "no-cache";
- HttpWebResponse resp = (HttpWebResponse) req.GetResponse ();
- monitor.Step (1);
-
- monitor.BeginTask ("Downloading " + url, (int) resp.ContentLength);
-
- string file = Path.GetTempFileName ();
- FileStream fs = null;
- Stream s = null;
- try {
- fs = new FileStream (file, FileMode.Create, FileAccess.Write);
- s = req.GetResponse ().GetResponseStream ();
- byte[] buffer = new byte [4096];
-
- int n;
- while ((n = s.Read (buffer, 0, buffer.Length)) != 0) {
- monitor.Step (n);
- fs.Write (buffer, 0, n);
- if (monitor.IsCancelRequested)
- throw new InstallException ("Installation cancelled.");
- }
- fs.Close ();
- s.Close ();
- return file;
- } catch {
- if (fs != null)
- fs.Close ();
- if (s != null)
- s.Close ();
- File.Delete (file);
- throw;
- } finally {
- monitor.EndTask ();
- monitor.EndTask ();
- }
- }
-
- internal bool HasWriteAccess (string file)
- {
- if (File.Exists (file)) {
- try {
- File.OpenWrite (file).Close ();
- return true;
- } catch {
- return false;
- }
- }
- else if (Directory.Exists (file)) {
- string tpath = Path.Combine (file, ".test");
- int n = 0;
- while (Directory.Exists (tpath + n)) n++;
- try {
- Directory.CreateDirectory (tpath + n);
- Directory.Delete (tpath + n);
- return true;
- } catch {
- return false;
- }
- } else
- return false;
- }
-
- internal static string GetUninstallErrorNoRoot (AddinHeader ainfo)
- {
- return string.Format ("The extension '{0} v{1}' can't be uninstalled with the current user permissions.", ainfo.Name, ainfo.Version);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfiguration.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfiguration.cs
deleted file mode 100644
index 0a972ae..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfiguration.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// AddinSystemConfiguration.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml;
-using System.Xml.Serialization;
-
-namespace Mono.Addins.Setup
-{
- internal class AddinSystemConfiguration
- {
- ArrayList repositories = new ArrayList ();
- int repositoryIdCount = 0;
- StringCollection disabledAddins = new StringCollection ();
- StringCollection addinPaths = new StringCollection ();
-
- [XmlArrayItem ("Repository", typeof(RepositoryRecord))]
- public ArrayList Repositories {
- get { return repositories; }
- }
-
- public int RepositoryIdCount {
- get { return repositoryIdCount; }
- set { repositoryIdCount = value; }
- }
-
- [XmlArrayItem ("Addin")]
- public StringCollection DisabledAddins {
- get { return disabledAddins; }
- }
-
- [XmlArrayItem ("Addin")]
- public StringCollection AddinPaths {
- get { return addinPaths; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs
deleted file mode 100644
index fd7380c..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs
+++ /dev/null
@@ -1,387 +0,0 @@
-//
-// AddinSystemConfigurationReader.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using System.Text;
-using System.Collections;
-using System.Globalization;
-
-namespace Mono.Addins.Setup
-{
- internal class AddinSystemConfigurationReader : XmlSerializationReader
- {
- public object ReadRoot_AddinSystemConfiguration ()
- {
- Reader.MoveToContent();
- if (Reader.LocalName != "AddinSystemConfiguration" || Reader.NamespaceURI != "")
- throw CreateUnknownNodeException();
- return ReadObject_AddinSystemConfiguration (true, true);
- }
-
- public Mono.Addins.Setup.AddinSystemConfiguration ReadObject_AddinSystemConfiguration (bool isNullable, bool checkType)
- {
- Mono.Addins.Setup.AddinSystemConfiguration ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "AddinSystemConfiguration" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Setup.AddinSystemConfiguration ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- bool b0=false, b1=false, b2=false, b3=false;
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "AddinPaths" && Reader.NamespaceURI == "" && !b3) {
- if (((object)ob. at AddinPaths) == null)
- throw CreateReadOnlyCollectionException ("System.Collections.Specialized.StringCollection");
- if (Reader.IsEmptyElement) {
- Reader.Skip();
- } else {
- int n4 = 0;
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Addin" && Reader.NamespaceURI == "") {
- if (((object)ob. at AddinPaths) == null)
- throw CreateReadOnlyCollectionException ("System.Collections.Specialized.StringCollection");
- ob. at AddinPaths.Add (Reader.ReadElementString ());
- n4++;
- }
- else UnknownNode (null);
- }
- else UnknownNode (null);
-
- Reader.MoveToContent();
- }
- ReadEndElement();
- }
- b3 = true;
- }
- else if (Reader.LocalName == "RepositoryIdCount" && Reader.NamespaceURI == "" && !b1) {
- b1 = true;
- ob. at RepositoryIdCount = Int32.Parse (Reader.ReadElementString (), CultureInfo.InvariantCulture);
- }
- else if (Reader.LocalName == "DisabledAddins" && Reader.NamespaceURI == "" && !b2) {
- if (((object)ob. at DisabledAddins) == null)
- throw CreateReadOnlyCollectionException ("System.Collections.Specialized.StringCollection");
- if (Reader.IsEmptyElement) {
- Reader.Skip();
- } else {
- int n5 = 0;
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Addin" && Reader.NamespaceURI == "") {
- if (((object)ob. at DisabledAddins) == null)
- throw CreateReadOnlyCollectionException ("System.Collections.Specialized.StringCollection");
- ob. at DisabledAddins.Add (Reader.ReadElementString ());
- n5++;
- }
- else UnknownNode (null);
- }
- else UnknownNode (null);
-
- Reader.MoveToContent();
- }
- ReadEndElement();
- }
- b2 = true;
- }
- else if (Reader.LocalName == "Repositories" && Reader.NamespaceURI == "" && !b0) {
- if (((object)ob. at Repositories) == null)
- throw CreateReadOnlyCollectionException ("System.Collections.ArrayList");
- if (Reader.IsEmptyElement) {
- Reader.Skip();
- } else {
- int n6 = 0;
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Repository" && Reader.NamespaceURI == "") {
- if (((object)ob. at Repositories) == null)
- throw CreateReadOnlyCollectionException ("System.Collections.ArrayList");
- ob. at Repositories.Add (ReadObject_RepositoryRecord (false, true));
- n6++;
- }
- else UnknownNode (null);
- }
- else UnknownNode (null);
-
- Reader.MoveToContent();
- }
- ReadEndElement();
- }
- b0 = true;
- }
- else {
- UnknownNode (ob);
- }
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
- ReadEndElement();
-
- return ob;
- }
-
- public Mono.Addins.Setup.RepositoryRecord ReadObject_RepositoryRecord (bool isNullable, bool checkType)
- {
- Mono.Addins.Setup.RepositoryRecord ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "RepositoryRecord" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Setup.RepositoryRecord ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (Reader.LocalName == "id" && Reader.NamespaceURI == "") {
- ob. at Id = Reader.Value;
- }
- else if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- bool b7=false, b8=false, b9=false, b10=false, b11=false;
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "File" && Reader.NamespaceURI == "" && !b8) {
- b8 = true;
- ob. at File = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "IsReference" && Reader.NamespaceURI == "" && !b7) {
- b7 = true;
- ob. at IsReference = XmlConvert.ToBoolean (Reader.ReadElementString ());
- }
- else if (Reader.LocalName == "Name" && Reader.NamespaceURI == "" && !b10) {
- b10 = true;
- ob. at Name = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Url" && Reader.NamespaceURI == "" && !b9) {
- b9 = true;
- ob. at Url = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "LastModified" && Reader.NamespaceURI == "" && !b11) {
- b11 = true;
- ob. at LastModified = XmlConvert.ToDateTime (Reader.ReadElementString ());
- }
- else {
- UnknownNode (ob);
- }
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
- ReadEndElement();
-
- return ob;
- }
-
- protected override void InitCallbacks ()
- {
- }
-
- protected override void InitIDs ()
- {
- }
-
- }
-
- internal class AddinSystemConfigurationWriter : XmlSerializationWriter
- {
- const string xmlNamespace = "http://www.w3.org/2000/xmlns/";
- public void WriteRoot_AddinSystemConfiguration (object o)
- {
- WriteStartDocument ();
- Mono.Addins.Setup.AddinSystemConfiguration ob = (Mono.Addins.Setup.AddinSystemConfiguration) o;
- TopLevelElement ();
- WriteObject_AddinSystemConfiguration (ob, "AddinSystemConfiguration", "", true, false, true);
- }
-
- void WriteObject_AddinSystemConfiguration (Mono.Addins.Setup.AddinSystemConfiguration ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Setup.AddinSystemConfiguration))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("AddinSystemConfiguration", "");
-
- if (ob. at Repositories != null) {
- WriteStartElement ("Repositories", "", ob. at Repositories);
- for (int n12 = 0; n12 < ob. at Repositories.Count; n12++) {
- WriteObject_RepositoryRecord (((Mono.Addins.Setup.RepositoryRecord) ob. at Repositories[n12]), "Repository", "", false, false, true);
- }
- WriteEndElement (ob. at Repositories);
- }
- WriteElementString ("RepositoryIdCount", "", ob. at RepositoryIdCount.ToString(CultureInfo.InvariantCulture));
- if (ob. at DisabledAddins != null) {
- WriteStartElement ("DisabledAddins", "", ob. at DisabledAddins);
- for (int n13 = 0; n13 < ob. at DisabledAddins.Count; n13++) {
- WriteElementString ("Addin", "", ob. at DisabledAddins[n13]);
- }
- WriteEndElement (ob. at DisabledAddins);
- }
- if (ob. at AddinPaths != null) {
- WriteStartElement ("AddinPaths", "", ob. at AddinPaths);
- for (int n14 = 0; n14 < ob. at AddinPaths.Count; n14++) {
- WriteElementString ("Addin", "", ob. at AddinPaths[n14]);
- }
- WriteEndElement (ob. at AddinPaths);
- }
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- void WriteObject_RepositoryRecord (Mono.Addins.Setup.RepositoryRecord ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Setup.RepositoryRecord))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("RepositoryRecord", "");
-
- WriteAttribute ("id", "", ob. at Id);
-
- WriteElementString ("IsReference", "", (ob. at IsReference?"true":"false"));
- WriteElementString ("File", "", ob. at File);
- WriteElementString ("Url", "", ob. at Url);
- WriteElementString ("Name", "", ob. at Name);
- WriteElementString ("LastModified", "", ob. at LastModified.ToString("yyyy-MM-ddTHH:mm:ss.fffffffzzz", CultureInfo.InvariantCulture));
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- protected override void InitCallbacks ()
- {
- }
-
- }
-
-}
-
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationSerializer.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationSerializer.cs
deleted file mode 100644
index 7ff6ff1..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationSerializer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// AddinSystemConfigurationSerializer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using System.Text;
-using System.Collections;
-using System.Globalization;
-
-namespace Mono.Addins.Setup
-{
- internal class AddinSystemConfigurationSerializer : XmlSerializer
- {
- protected override void Serialize (object o, XmlSerializationWriter writer)
- {
- AddinSystemConfigurationWriter xsWriter = writer as AddinSystemConfigurationWriter;
- xsWriter.WriteRoot_AddinSystemConfiguration (o);
- }
-
- protected override object Deserialize (XmlSerializationReader reader)
- {
- AddinSystemConfigurationReader xsReader = reader as AddinSystemConfigurationReader;
- return xsReader.ReadRoot_AddinSystemConfiguration ();
- }
-
- protected override XmlSerializationWriter CreateWriter ()
- {
- return new AddinSystemConfigurationWriter ();
- }
-
- protected override XmlSerializationReader CreateReader ()
- {
- return new AddinSystemConfigurationReader ();
- }
- }
-}
-
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/ConsoleAddinInstaller.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/ConsoleAddinInstaller.cs
deleted file mode 100644
index 757081e..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/ConsoleAddinInstaller.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// ConsoleAddinInstaller.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Setup
-{
- public class ConsoleAddinInstaller: IAddinInstaller
- {
- bool prompt;
- bool repoUpdated;
- int logLevel = 1;
-
- public ConsoleAddinInstaller ()
- {
- }
-
- public bool UserPrompt {
- get { return prompt; }
- set {
- prompt = value;
- if (prompt && logLevel == 0)
- logLevel = 1;
- }
- }
-
- public int LogLevel {
- get { return logLevel; }
- set { logLevel = value; }
- }
-
- void IAddinInstaller.InstallAddins (AddinRegistry reg, string message, string[] addinIds)
- {
- if (logLevel > 0) {
- if (message != null && message.Length > 0) {
- Console.WriteLine (message);
- } else {
- Console.WriteLine ("Additional extensions are required to perform this operation.");
- }
- }
- ArrayList entries = new ArrayList ();
- SetupService setup = new SetupService (reg);
- string idNotFound;
- do {
- idNotFound = null;
- foreach (string id in addinIds) {
- string name = Addin.GetIdName (id);
- string version = Addin.GetIdVersion (id);
- AddinRepositoryEntry[] ares = setup.Repositories.GetAvailableAddin (name, version);
- if (ares.Length == 0) {
- idNotFound = id;
- entries.Clear ();
- break;
- } else
- entries.Add (ares[0]);
- }
- if (idNotFound != null) {
- if (repoUpdated)
- throw new InstallException ("Extension '" + idNotFound + "' not found in the registered extension repositories");
- if (prompt) {
- Console.WriteLine ("The extension '" + idNotFound + "' could not be found in the registered repositories.");
- Console.WriteLine ("The repository indices may be outdated.");
- if (!Confirm ("Do you wan't to update them now?"))
- throw new InstallException ("Extension '" + idNotFound + "' not found in the registered extension repositories");
- }
- setup.Repositories.UpdateAllRepositories (new ConsoleProgressStatus (logLevel));
- repoUpdated = true;
- }
- }
- while (idNotFound != null);
-
- if (logLevel > 0) {
- Console.WriteLine ("The following extensions will be installed:");
- foreach (AddinRepositoryEntry addin in entries)
- Console.WriteLine (" - " + addin.Addin.Name + " v" + addin.Addin.Version);
-
- if (prompt) {
- if (!Confirm ("Do you want to continue with the installation?"))
- throw new InstallException ("Installation cancelled");
- }
- }
- setup.Install (new ConsoleProgressStatus (logLevel), (AddinRepositoryEntry[]) entries.ToArray (typeof(AddinRepositoryEntry)));
- }
-
- bool Confirm (string msg)
- {
- string res;
- do {
- Console.Write (msg + " (Y/n): ");
- res = Console.ReadLine ();
- if (res.Length > 0 && res.ToLower()[0] == 'n')
- return false;
- } while (res.Length > 0 && res.ToLower()[0] != 'y');
- return true;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/IProgressMonitor.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/IProgressMonitor.cs
deleted file mode 100644
index 12a5818..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/IProgressMonitor.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// IProgressMonitor.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-
-namespace Mono.Addins
-{
- internal interface IProgressMonitor: IDisposable
- {
- void BeginTask (string name, int totalWork);
- void BeginStepTask (string name, int totalWork, int stepSize);
- void EndTask ();
- void Step (int work);
-
- TextWriter Log { get; }
- int LogLevel { get; }
-
- void ReportWarning (string message);
- void ReportError (string message, Exception exception);
-
- bool IsCancelRequested { get; }
- void Cancel ();
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/InstallException.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/InstallException.cs
deleted file mode 100644
index 72d3365..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/InstallException.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// InstallException.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace Mono.Addins.Setup
-{
- public class InstallException: Exception
- {
- public InstallException (string msg): base (msg)
- {
- }
-
- public InstallException (string msg, Exception ex): base (msg, ex)
- {
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/Package.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/Package.cs
deleted file mode 100644
index c6a8ecd..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/Package.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Package.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Setup
-{
- public abstract class Package
- {
- internal Package ()
- {
- }
-
- public abstract string Name { get; }
-
- // Returns true if the package will be installed in the shared directory,
- // false if it will be installed in the user directory.
- public virtual bool SharedInstall {
- get { return false; }
- }
-
- public static Package FromRepository (AddinRepositoryEntry repAddin)
- {
- return AddinPackage.PackageFromRepository (repAddin);
- }
-
- public static Package FromFile (string file)
- {
- return AddinPackage.PackageFromFile (file);
- }
-
-
- internal abstract void Resolve (IProgressMonitor monitor, AddinStore service, PackageCollection toInstall, PackageCollection toUninstall, PackageCollection required, DependencyCollection unresolved);
-
- internal abstract void PrepareInstall (IProgressMonitor monitor, AddinStore service);
- internal abstract void CommitInstall (IProgressMonitor monitor, AddinStore service);
- internal abstract void RollbackInstall (IProgressMonitor monitor, AddinStore service);
-
- internal abstract void PrepareUninstall (IProgressMonitor monitor, AddinStore service);
- internal abstract void CommitUninstall (IProgressMonitor monitor, AddinStore service);
- internal abstract void RollbackUninstall (IProgressMonitor monitor, AddinStore service);
-
- internal abstract bool IsUpgradeOf (Package p);
-
- internal virtual void EndInstall (IProgressMonitor monitor, AddinStore service)
- {
- }
-
- internal virtual void EndUninstall (IProgressMonitor monitor, AddinStore service)
- {
- }
-
- internal string CreateTempFolder ()
- {
- string bname = Path.Combine (Path.GetTempPath (), "mdtmp");
- string tempFolder = bname;
- int n = 0;
- while (Directory.Exists (tempFolder))
- tempFolder = bname + (++n);
- return tempFolder;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/PackageCollection.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/PackageCollection.cs
deleted file mode 100644
index 5599190..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/PackageCollection.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// PackageCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Collections.Specialized;
-
-namespace Mono.Addins.Setup
-{
- public class PackageCollection: CollectionBase
- {
- public PackageCollection ()
- {
- }
-
- public PackageCollection (ICollection col)
- {
- AddRange (col);
- }
-
- public Package this [int n] {
- get { return (Package) List [n]; }
- }
-
- public void Add (Package p)
- {
- List.Add (p);
- }
-
- public bool Contains (Package p)
- {
- return List.Contains (p);
- }
-
- public void AddRange (ICollection col)
- {
- foreach (Package p in col)
- Add (p);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/ReferenceRepositoryEntry.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/ReferenceRepositoryEntry.cs
deleted file mode 100644
index af17839..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/ReferenceRepositoryEntry.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// ReferenceRepositoryEntry.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-
-namespace Mono.Addins.Setup
-{
- internal class ReferenceRepositoryEntry: RepositoryEntry
- {
- DateTime lastModified;
-
- public DateTime LastModified {
- get { return lastModified; }
- set { lastModified = value; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/Repository.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/Repository.cs
deleted file mode 100644
index c4de1ae..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/Repository.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Repository.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Xml;
-using System.Xml.Serialization;
-
-namespace Mono.Addins.Setup
-{
- internal class Repository
- {
- RepositoryEntryCollection repositories;
- RepositoryEntryCollection addins;
- string name;
- internal string url;
-
- public string Name {
- get { return name; }
- set { name = value; }
- }
-
- public string Url {
- get { return url; }
- set { url = value; }
- }
-
- [XmlElement ("Repository", Type = typeof(ReferenceRepositoryEntry))]
- public RepositoryEntryCollection Repositories {
- get {
- if (repositories == null)
- repositories = new RepositoryEntryCollection (this);
- return repositories;
- }
- }
-
- [XmlElement ("Addin", Type = typeof(PackageRepositoryEntry))]
- public RepositoryEntryCollection Addins {
- get {
- if (addins == null)
- addins = new RepositoryEntryCollection (this);
- return addins;
- }
- }
-
- public RepositoryEntry FindEntry (string url)
- {
- if (Repositories != null) {
- foreach (RepositoryEntry e in Repositories)
- if (e.Url == url) return e;
- }
- if (Addins != null) {
- foreach (RepositoryEntry e in Addins)
- if (e.Url == url) return e;
- }
- return null;
- }
-
- public void AddEntry (RepositoryEntry entry)
- {
- entry.owner = this;
- if (entry is ReferenceRepositoryEntry) {
- Repositories.Add (entry);
- } else {
- Addins.Add (entry);
- }
- }
-
- public void RemoveEntry (RepositoryEntry entry)
- {
- if (entry is PackageRepositoryEntry)
- Addins.Remove (entry);
- else
- Repositories.Remove (entry);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryEntry.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryEntry.cs
deleted file mode 100644
index 6ce998a..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryEntry.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// RepositoryEntry.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-
-namespace Mono.Addins.Setup
-{
- internal class RepositoryEntry
- {
- string url;
- internal Repository owner;
-
- public string Url {
- get { return url; }
- set { url = value; }
- }
-
- internal Repository Repository {
- get { return owner; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryEntryCollection.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryEntryCollection.cs
deleted file mode 100644
index eca6472..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryEntryCollection.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// RepositoryEntryCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Setup
-{
- internal class RepositoryEntryCollection: CollectionBase
- {
- Repository owner;
-
- internal RepositoryEntryCollection (Repository owner)
- {
- this.owner = owner;
- }
-
- public RepositoryEntry this [int n] {
- get { return (RepositoryEntry) List [n]; }
- }
-
- public void Add (RepositoryEntry entry)
- {
- List.Add (entry);
- }
-
- public void Remove (RepositoryEntry entry)
- {
- List.Remove (entry);
- }
-
- protected override void OnInsert(int index, object value)
- {
- ((RepositoryEntry)value).owner = owner;
- }
-
- protected override void OnSet(int index, object oldValue, object newValue)
- {
- ((RepositoryEntry)newValue).owner = owner;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryReaderWriter.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryReaderWriter.cs
deleted file mode 100644
index 32f78a4..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryReaderWriter.cs
+++ /dev/null
@@ -1,894 +0,0 @@
-//
-// RepositoryReader.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using System.Text;
-using System.Collections;
-using System.Globalization;
-
-namespace Mono.Addins.Setup
-{
- internal class RepositoryReader : XmlSerializationReader
- {
- public object ReadRoot_Repository ()
- {
- Reader.MoveToContent();
- if (Reader.LocalName != "Repository" || Reader.NamespaceURI != "")
- throw CreateUnknownNodeException();
- return ReadObject_Repository (true, true);
- }
-
- public Mono.Addins.Setup.Repository ReadObject_Repository (bool isNullable, bool checkType)
- {
- Mono.Addins.Setup.Repository ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "Repository" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Setup.Repository ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- bool b0=false, b1=false, b2=false, b3=false;
-
- Mono.Addins.Setup.RepositoryEntryCollection o5;
- o5 = ob. at Repositories;
- Mono.Addins.Setup.RepositoryEntryCollection o7;
- o7 = ob. at Addins;
- int n4=0, n6=0;
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Addin" && Reader.NamespaceURI == "" && !b3) {
- if (((object)o7) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.RepositoryEntryCollection");
- o7.Add (ReadObject_AddinRepositoryEntry (false, true));
- n6++;
- }
- else if (Reader.LocalName == "Repository" && Reader.NamespaceURI == "" && !b2) {
- if (((object)o5) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.RepositoryEntryCollection");
- o5.Add (ReadObject_ReferenceRepositoryEntry (false, true));
- n4++;
- }
- else if (Reader.LocalName == "Name" && Reader.NamespaceURI == "" && !b0) {
- b0 = true;
- ob. at Name = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Url" && Reader.NamespaceURI == "" && !b1) {
- b1 = true;
- ob. at Url = Reader.ReadElementString ();
- }
- else {
- UnknownNode (ob);
- }
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
-
- ReadEndElement();
-
- return ob;
- }
-
- public Mono.Addins.Setup.PackageRepositoryEntry ReadObject_AddinRepositoryEntry (bool isNullable, bool checkType)
- {
- Mono.Addins.Setup.PackageRepositoryEntry ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "PackageRepositoryEntry" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Setup.PackageRepositoryEntry ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- bool b8=false, b9=false;
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Addin" && Reader.NamespaceURI == "" && !b9) {
- b9 = true;
- ob. at Addin = ReadObject_AddinInfo (false, true);
- }
- else if (Reader.LocalName == "Url" && Reader.NamespaceURI == "" && !b8) {
- b8 = true;
- ob. at Url = Reader.ReadElementString ();
- }
- else {
- UnknownNode (ob);
- }
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
- ReadEndElement();
-
- return ob;
- }
-
- public Mono.Addins.Setup.ReferenceRepositoryEntry ReadObject_ReferenceRepositoryEntry (bool isNullable, bool checkType)
- {
- Mono.Addins.Setup.ReferenceRepositoryEntry ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "ReferenceRepositoryEntry" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Setup.ReferenceRepositoryEntry ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- bool b10=false, b11=false;
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Url" && Reader.NamespaceURI == "" && !b10) {
- b10 = true;
- ob. at Url = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "LastModified" && Reader.NamespaceURI == "" && !b11) {
- b11 = true;
- ob. at LastModified = XmlConvert.ToDateTime (Reader.ReadElementString ());
- }
- else {
- UnknownNode (ob);
- }
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
- ReadEndElement();
-
- return ob;
- }
-
- public Mono.Addins.Setup.AddinInfo ReadObject_AddinInfo (bool isNullable, bool checkType)
- {
- Mono.Addins.Setup.AddinInfo ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "AddinInfo" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Setup.AddinInfo ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- bool b12=false, b13=false, b14=false, b15=false, b16=false, b17=false, b18=false, b19=false, b20=false, b21=false, b22=false, b23=false;
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Version" && Reader.NamespaceURI == "" && !b15) {
- b15 = true;
- ob. at Version = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Dependencies" && Reader.NamespaceURI == "" && !b22) {
- if (((object)ob. at Dependencies) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.DependencyCollection");
- if (Reader.IsEmptyElement) {
- Reader.Skip();
- } else {
- int n24 = 0;
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "AssemblyDependency" && Reader.NamespaceURI == "") {
- if (((object)ob. at Dependencies) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.DependencyCollection");
- ob. at Dependencies.Add (ReadObject_AssemblyDependency (false, true));
- n24++;
- }
- else if (Reader.LocalName == "NativeDependency" && Reader.NamespaceURI == "") {
- if (((object)ob. at Dependencies) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.DependencyCollection");
- ob. at Dependencies.Add (ReadObject_NativeReference (false, true));
- n24++;
- }
- else if (Reader.LocalName == "AddinDependency" && Reader.NamespaceURI == "") {
- if (((object)ob. at Dependencies) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.DependencyCollection");
- ob. at Dependencies.Add (ReadObject_AddinReference (false, true));
- n24++;
- }
- else UnknownNode (null);
- }
- else UnknownNode (null);
-
- Reader.MoveToContent();
- }
- ReadEndElement();
- }
- b22 = true;
- }
- else if (Reader.LocalName == "Name" && Reader.NamespaceURI == "" && !b14) {
- b14 = true;
- ob. at Name = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "BaseVersion" && Reader.NamespaceURI == "" && !b16) {
- b16 = true;
- ob. at BaseVersion = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Id" && Reader.NamespaceURI == "" && !b12) {
- b12 = true;
- ob. at LocalId = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Url" && Reader.NamespaceURI == "" && !b19) {
- b19 = true;
- ob. at Url = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Copyright" && Reader.NamespaceURI == "" && !b18) {
- b18 = true;
- ob. at Copyright = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Description" && Reader.NamespaceURI == "" && !b20) {
- b20 = true;
- ob. at Description = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Author" && Reader.NamespaceURI == "" && !b17) {
- b17 = true;
- ob. at Author = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "OptionalDependencies" && Reader.NamespaceURI == "" && !b23) {
- if (((object)ob. at OptionalDependencies) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.DependencyCollection");
- if (Reader.IsEmptyElement) {
- Reader.Skip();
- } else {
- int n25 = 0;
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "AssemblyDependency" && Reader.NamespaceURI == "") {
- if (((object)ob. at OptionalDependencies) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.DependencyCollection");
- ob. at OptionalDependencies.Add (ReadObject_AssemblyDependency (false, true));
- n25++;
- }
- else if (Reader.LocalName == "NativeDependency" && Reader.NamespaceURI == "") {
- if (((object)ob. at OptionalDependencies) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.DependencyCollection");
- ob. at OptionalDependencies.Add (ReadObject_NativeReference (false, true));
- n25++;
- }
- else if (Reader.LocalName == "AddinDependency" && Reader.NamespaceURI == "") {
- if (((object)ob. at OptionalDependencies) == null)
- throw CreateReadOnlyCollectionException ("Mono.Addins.Setup.DependencyCollection");
- ob. at OptionalDependencies.Add (ReadObject_AddinReference (false, true));
- n25++;
- }
- else UnknownNode (null);
- }
- else UnknownNode (null);
-
- Reader.MoveToContent();
- }
- ReadEndElement();
- }
- b23 = true;
- }
- else if (Reader.LocalName == "Namespace" && Reader.NamespaceURI == "" && !b13) {
- b13 = true;
- ob. at Namespace = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "Category" && Reader.NamespaceURI == "" && !b21) {
- b21 = true;
- ob. at Category = Reader.ReadElementString ();
- }
- else {
- UnknownNode (ob);
- }
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
- ReadEndElement();
-
- return ob;
- }
-
- public Mono.Addins.Description.AssemblyDependency ReadObject_AssemblyDependency (bool isNullable, bool checkType)
- {
- Mono.Addins.Description.AssemblyDependency ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "AssemblyDependency" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Description.AssemblyDependency ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- bool b26=false, b27=false;
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Package" && Reader.NamespaceURI == "" && !b27) {
- b27 = true;
- ob. at Package = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "FullName" && Reader.NamespaceURI == "" && !b26) {
- b26 = true;
- ob. at FullName = Reader.ReadElementString ();
- }
- else {
- UnknownNode (ob);
- }
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
- ReadEndElement();
-
- return ob;
- }
-
- public Mono.Addins.Description.NativeDependency ReadObject_NativeReference (bool isNullable, bool checkType)
- {
- Mono.Addins.Description.NativeDependency ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "NativeReference" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Description.NativeDependency ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- UnknownNode (ob);
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
- ReadEndElement();
-
- return ob;
- }
-
- public Mono.Addins.Description.AddinDependency ReadObject_AddinReference (bool isNullable, bool checkType)
- {
- Mono.Addins.Description.AddinDependency ob = null;
- if (isNullable && ReadNull()) return null;
-
- if (checkType)
- {
- System.Xml.XmlQualifiedName t = GetXsiType();
- if (t == null)
- { }
- else if (t.Name != "AddinReference" || t.Namespace != "")
- throw CreateUnknownTypeException(t);
- }
-
- ob = new Mono.Addins.Description.AddinDependency ();
-
- Reader.MoveToElement();
-
- while (Reader.MoveToNextAttribute())
- {
- if (IsXmlnsAttribute (Reader.Name)) {
- }
- else {
- UnknownNode (ob);
- }
- }
-
- Reader.MoveToElement();
- if (Reader.IsEmptyElement) {
- Reader.Skip ();
- return ob;
- }
-
- Reader.ReadStartElement();
- Reader.MoveToContent();
-
- bool b28=false, b29=false;
-
- while (Reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- if (Reader.NodeType == System.Xml.XmlNodeType.Element)
- {
- if (Reader.LocalName == "Version" && Reader.NamespaceURI == "" && !b29) {
- b29 = true;
- ob. at Version = Reader.ReadElementString ();
- }
- else if (Reader.LocalName == "AddinId" && Reader.NamespaceURI == "" && !b28) {
- b28 = true;
- ob. at AddinId = Reader.ReadElementString ();
- }
- else {
- UnknownNode (ob);
- }
- }
- else
- UnknownNode(ob);
-
- Reader.MoveToContent();
- }
-
- ReadEndElement();
-
- return ob;
- }
-
- protected override void InitCallbacks ()
- {
- }
-
- protected override void InitIDs ()
- {
- }
-
- }
-
- internal class RepositoryWriter : XmlSerializationWriter
- {
- const string xmlNamespace = "http://www.w3.org/2000/xmlns/";
- public void WriteRoot_Repository (object o)
- {
- WriteStartDocument ();
- Mono.Addins.Setup.Repository ob = (Mono.Addins.Setup.Repository) o;
- TopLevelElement ();
- WriteObject_Repository (ob, "Repository", "", true, false, true);
- }
-
- void WriteObject_Repository (Mono.Addins.Setup.Repository ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Setup.Repository))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("Repository", "");
-
- WriteElementString ("Name", "", ob. at Name);
- WriteElementString ("Url", "", ob. at Url);
- if (ob. at Repositories != null) {
- for (int n30 = 0; n30 < ob. at Repositories.Count; n30++) {
- WriteObject_ReferenceRepositoryEntry (((Mono.Addins.Setup.ReferenceRepositoryEntry) ob. at Repositories[n30]), "Repository", "", false, false, true);
- }
- }
- if (ob. at Addins != null) {
- for (int n31 = 0; n31 < ob. at Addins.Count; n31++) {
- WriteObject_AddinRepositoryEntry (((Mono.Addins.Setup.PackageRepositoryEntry) ob. at Addins[n31]), "Addin", "", false, false, true);
- }
- }
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- void WriteObject_ReferenceRepositoryEntry (Mono.Addins.Setup.ReferenceRepositoryEntry ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Setup.ReferenceRepositoryEntry))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("ReferenceRepositoryEntry", "");
-
- WriteElementString ("Url", "", ob. at Url);
- WriteElementString ("LastModified", "", ob. at LastModified.ToString("yyyy-MM-ddTHH:mm:ss.fffffffzzz", CultureInfo.InvariantCulture));
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- void WriteObject_AddinRepositoryEntry (Mono.Addins.Setup.PackageRepositoryEntry ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Setup.PackageRepositoryEntry))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("PackageRepositoryEntry", "");
-
- WriteElementString ("Url", "", ob. at Url);
- WriteObject_AddinInfo (ob. at Addin, "Addin", "", false, false, true);
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- void WriteObject_AddinInfo (Mono.Addins.Setup.AddinInfo ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Setup.AddinInfo))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("AddinInfo", "");
-
- WriteElementString ("Id", "", ob. at LocalId);
- WriteElementString ("Namespace", "", ob. at Namespace);
- WriteElementString ("Name", "", ob. at Name);
- WriteElementString ("Version", "", ob. at Version);
- WriteElementString ("BaseVersion", "", ob. at BaseVersion);
- WriteElementString ("Author", "", ob. at Author);
- WriteElementString ("Copyright", "", ob. at Copyright);
- WriteElementString ("Url", "", ob. at Url);
- WriteElementString ("Description", "", ob. at Description);
- WriteElementString ("Category", "", ob. at Category);
- if (ob. at Dependencies != null) {
- WriteStartElement ("Dependencies", "", ob. at Dependencies);
- for (int n32 = 0; n32 < ob. at Dependencies.Count; n32++) {
- if (((object)ob. at Dependencies[n32]) == null) { }
- else if (ob. at Dependencies[n32].GetType() == typeof(Mono.Addins.Description.AssemblyDependency)) {
- WriteObject_AssemblyDependency (((Mono.Addins.Description.AssemblyDependency) ob. at Dependencies[n32]), "AssemblyDependency", "", false, false, true);
- }
- else if (ob. at Dependencies[n32].GetType() == typeof(Mono.Addins.Description.NativeDependency)) {
- WriteObject_NativeReference (((Mono.Addins.Description.NativeDependency) ob. at Dependencies[n32]), "NativeDependency", "", false, false, true);
- }
- else if (ob. at Dependencies[n32].GetType() == typeof(Mono.Addins.Description.AddinDependency)) {
- WriteObject_AddinReference (((Mono.Addins.Description.AddinDependency) ob. at Dependencies[n32]), "AddinDependency", "", false, false, true);
- }
- else throw CreateUnknownTypeException (ob. at Dependencies[n32]);
- }
- WriteEndElement (ob. at Dependencies);
- }
- if (ob. at OptionalDependencies != null) {
- WriteStartElement ("OptionalDependencies", "", ob. at OptionalDependencies);
- for (int n33 = 0; n33 < ob. at OptionalDependencies.Count; n33++) {
- if (((object)ob. at OptionalDependencies[n33]) == null) { }
- else if (ob. at OptionalDependencies[n33].GetType() == typeof(Mono.Addins.Description.AssemblyDependency)) {
- WriteObject_AssemblyDependency (((Mono.Addins.Description.AssemblyDependency) ob. at OptionalDependencies[n33]), "AssemblyDependency", "", false, false, true);
- }
- else if (ob. at OptionalDependencies[n33].GetType() == typeof(Mono.Addins.Description.NativeDependency)) {
- WriteObject_NativeReference (((Mono.Addins.Description.NativeDependency) ob. at OptionalDependencies[n33]), "NativeDependency", "", false, false, true);
- }
- else if (ob. at OptionalDependencies[n33].GetType() == typeof(Mono.Addins.Description.AddinDependency)) {
- WriteObject_AddinReference (((Mono.Addins.Description.AddinDependency) ob. at OptionalDependencies[n33]), "AddinDependency", "", false, false, true);
- }
- else throw CreateUnknownTypeException (ob. at OptionalDependencies[n33]);
- }
- WriteEndElement (ob. at OptionalDependencies);
- }
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- void WriteObject_AssemblyDependency (Mono.Addins.Description.AssemblyDependency ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Description.AssemblyDependency))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("AssemblyDependency", "");
-
- WriteElementString ("FullName", "", ob. at FullName);
- WriteElementString ("Package", "", ob. at Package);
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- void WriteObject_NativeReference (Mono.Addins.Description.NativeDependency ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Description.NativeDependency))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("NativeReference", "");
-
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- void WriteObject_AddinReference (Mono.Addins.Description.AddinDependency ob, string element, string namesp, bool isNullable, bool needType, bool writeWrappingElem)
- {
- if (((object)ob) == null)
- {
- if (isNullable)
- WriteNullTagLiteral(element, namesp);
- return;
- }
-
- System.Type type = ob.GetType ();
- if (type == typeof(Mono.Addins.Description.AddinDependency))
- { }
- else {
- throw CreateUnknownTypeException (ob);
- }
-
- if (writeWrappingElem) {
- WriteStartElement (element, namesp, ob);
- }
-
- if (needType) WriteXsiType("AddinReference", "");
-
- WriteElementString ("AddinId", "", ob. at AddinId);
- WriteElementString ("Version", "", ob. at Version);
- if (writeWrappingElem) WriteEndElement (ob);
- }
-
- protected override void InitCallbacks ()
- {
- }
-
- }
-
-}
-
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRecord.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRecord.cs
deleted file mode 100644
index b408667..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRecord.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// RepositoryRecord.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-
-
-namespace Mono.Addins.Setup
-{
- internal class RepositoryRecord: AddinRepository
- {
- string id;
- bool isReference;
- string file;
- string url;
- string name;
- DateTime lastModified = new DateTime (1900,1,1);
-
- [XmlAttribute ("id")]
- public string Id {
- get { return id; }
- set { id = value; }
- }
-
- public bool IsReference {
- get { return isReference; }
- set { isReference = value; }
- }
-
- public string File {
- get { return file; }
- set { file = value; }
- }
-
- public string Url {
- get { return url; }
- set { url = value; }
- }
-
- public string Name {
- get { return name; }
- set { name = value; }
- }
-
- public string Title {
- get { return Name != null && Name != "" ? Name : Url; }
- }
-
- public DateTime LastModified {
- get { return lastModified; }
- set { lastModified = value; }
- }
-
- public Repository GetCachedRepository ()
- {
- return (Repository) AddinStore.ReadObject (File, typeof(Repository));
- }
-
- public void ClearCachedRepository ()
- {
- if (System.IO.File.Exists (File))
- System.IO.File.Delete (File);
- }
-
- internal void UpdateCachedRepository (Repository newRep)
- {
- newRep.url = Url;
- if (newRep.Name == null)
- newRep.Name = new Uri (Url).Host;
- AddinStore.WriteObject (File, newRep);
- if (name == null)
- name = newRep.Name;
- }
- }
-
- public interface AddinRepository
- {
- string File {
- get;
- }
-
- string Url {
- get;
- }
-
- string Name {
- get;
- }
-
- string Title {
- get;
- }
-
- DateTime LastModified {
- get;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs
deleted file mode 100644
index 179d7ad..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-//
-// RepositoryRegistry.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-using System.Collections;
-using Mono.Addins.Setup.ProgressMonitoring;
-
-namespace Mono.Addins.Setup
-{
- public class RepositoryRegistry
- {
- ArrayList repoList;
- SetupService service;
-
- internal RepositoryRegistry (SetupService service)
- {
- this.service = service;
- }
-
- public AddinRepository RegisterRepository (IProgressStatus monitor, string url)
- {
- return RegisterRepository (monitor, url, false);
- }
-
- public AddinRepository RegisterRepository (IProgressStatus monitor, string url, bool updateNow)
- {
- if (!url.EndsWith (".mrep"))
- url = url + "/main.mrep";
-
- RepositoryRecord rr = FindRepositoryRecord (url);
- if (rr != null)
- return rr;
-
- rr = RegisterRepository (url, false);
-
- try {
- if (updateNow) {
- UpdateRepository (monitor, url);
- rr = FindRepositoryRecord (url);
- Repository rep = rr.GetCachedRepository ();
- rr.Name = rep.Name;
- }
- service.SaveConfiguration ();
- return rr;
- } catch (Exception ex) {
- if (monitor != null)
- monitor.ReportError ("The repository could not be registered", ex);
- if (ContainsRepository (url))
- RemoveRepository (url);
- return null;
- }
- }
-
- internal RepositoryRecord RegisterRepository (string url, bool isReference)
- {
- RepositoryRecord rr = FindRepositoryRecord (url);
- if (rr != null) {
- if (rr.IsReference && !isReference) {
- rr.IsReference = false;
- service.SaveConfiguration ();
- }
- return rr;
- }
-
- rr = new RepositoryRecord ();
- rr.Url = url;
- rr.IsReference = isReference;
-
- string name = service.RepositoryCachePath;
- if (!Directory.Exists (name))
- Directory.CreateDirectory (name);
- string host = new Uri (url).Host;
- if (host.Length == 0)
- host = "repo";
- name = Path.Combine (name, host);
- rr.File = name + "_" + service.Configuration.RepositoryIdCount + ".mrep";
-
- rr.Id = "rep" + service.Configuration.RepositoryIdCount;
- service.Configuration.Repositories.Add (rr);
- service.Configuration.RepositoryIdCount++;
- service.SaveConfiguration ();
- repoList = null;
- return rr;
- }
-
- internal RepositoryRecord FindRepositoryRecord (string url)
- {
- foreach (RepositoryRecord rr in service.Configuration.Repositories)
- if (rr.Url == url) return rr;
- return null;
- }
-
- public void RemoveRepository (string url)
- {
- RepositoryRecord rep = FindRepositoryRecord (url);
- if (rep == null)
- throw new InstallException ("The repository at url '" + url + "' is not registered");
-
- foreach (RepositoryRecord rr in service.Configuration.Repositories) {
- if (rr == rep) continue;
- Repository newRep = rr.GetCachedRepository ();
- if (newRep == null) continue;
- foreach (ReferenceRepositoryEntry re in newRep.Repositories) {
- if (re.Url == url) {
- rep.IsReference = true;
- return;
- }
- }
- }
-
- // There are no other repositories referencing this one, so we can safely delete
-
- Repository delRep = rep.GetCachedRepository ();
- service.Configuration.Repositories.Remove (rep);
- rep.ClearCachedRepository ();
-
- if (delRep != null) {
- foreach (ReferenceRepositoryEntry re in delRep.Repositories)
- RemoveRepository (new Uri (new Uri (url), re.Url).ToString ());
- }
-
- service.SaveConfiguration ();
- repoList = null;
- }
-
- public bool ContainsRepository (string url)
- {
- return FindRepositoryRecord (url) != null;
- }
-
- ArrayList RepositoryList {
- get {
- if (repoList == null) {
- ArrayList list = new ArrayList ();
- foreach (RepositoryRecord rep in service.Configuration.Repositories) {
- if (!rep.IsReference)
- list.Add (rep);
- }
- repoList = list;
- }
- return repoList;
- }
- }
-
- public AddinRepository[] GetRepositories ()
- {
- return (AddinRepository[]) RepositoryList.ToArray (typeof(AddinRepository));
- }
-
-
- public void UpdateAllRepositories (IProgressStatus monitor)
- {
- UpdateRepository (monitor, (string)null);
- }
-
- public void UpdateRepository (IProgressStatus statusMonitor, string url)
- {
- repoList = null;
-
- IProgressMonitor monitor = ProgressStatusMonitor.GetProgressMonitor (statusMonitor);
-
- monitor.BeginTask ("Updating repositories", service.Configuration.Repositories.Count);
- try {
- int num = service.Configuration.Repositories.Count;
- for (int n=0; n<num; n++) {
- RepositoryRecord rr = (RepositoryRecord) service.Configuration.Repositories [n];
- if ((url == null || rr.Url == url) && !rr.IsReference)
- UpdateRepository (monitor, new Uri (rr.Url), rr);
- monitor.Step (1);
- }
- } finally {
- monitor.EndTask ();
- }
- service.SaveConfiguration ();
- }
-
- void UpdateRepository (IProgressMonitor monitor, Uri baseUri, RepositoryRecord rr)
- {
- Uri absUri = new Uri (baseUri, rr.Url);
- monitor.BeginTask ("Updating from " + absUri.ToString (), 2);
- Repository newRep;
- try {
- newRep = (Repository) service.Store.DownloadObject (monitor, absUri.ToString (), typeof(Repository));
- } catch (Exception ex) {
- monitor.ReportError ("Could not get information from repository" + ": " + absUri.ToString (), ex);
- return;
- }
-
- monitor.Step (1);
-
- foreach (ReferenceRepositoryEntry re in newRep.Repositories) {
- Uri refRepUri = new Uri (absUri, re.Url);
- string refRepUrl = refRepUri.ToString ();
- RepositoryRecord refRep = FindRepositoryRecord (refRepUrl);
- if (refRep == null)
- refRep = RegisterRepository (refRepUrl, true);
- if (refRep.LastModified < re.LastModified) {
- UpdateRepository (monitor, refRepUri, refRep);
- }
- }
- monitor.EndTask ();
- rr.UpdateCachedRepository (newRep);
- }
-
- public AddinRepositoryEntry[] GetAvailableUpdates ()
- {
- return GetAvailableAddin (null, null, null, true);
- }
-
- public AddinRepositoryEntry[] GetAvailableUpdates (string repositoryUrl)
- {
- return GetAvailableAddin (repositoryUrl, null, null, true);
- }
-
- public AddinRepositoryEntry[] GetAvailableUpdates (string id, string version)
- {
- return GetAvailableAddin (null, id, version, true);
- }
-
- public AddinRepositoryEntry[] GetAvailableUpdates (string repositoryUrl, string id, string version)
- {
- return GetAvailableAddin (repositoryUrl, id, version, true);
- }
-
- public AddinRepositoryEntry[] GetAvailableAddins ()
- {
- return GetAvailableAddin (null, null, null, false);
- }
-
- public AddinRepositoryEntry[] GetAvailableAddins (string repositoryUrl)
- {
- return GetAvailableAddin (repositoryUrl, null, null);
- }
-
- public AddinRepositoryEntry[] GetAvailableAddin (string id, string version)
- {
- return GetAvailableAddin (null, id, version);
- }
-
- public AddinRepositoryEntry[] GetAvailableAddin (string repositoryUrl, string id, string version)
- {
- return GetAvailableAddin (repositoryUrl, id, version, false);
- }
-
- PackageRepositoryEntry[] GetAvailableAddin (string repositoryUrl, string id, string version, bool updates)
- {
- ArrayList list = new ArrayList ();
-
- IEnumerable ee;
- if (repositoryUrl != null) {
- ArrayList repos = new ArrayList ();
- GetRepositoryTree (repositoryUrl, repos);
- ee = repos;
- } else
- ee = service.Configuration.Repositories;
-
- foreach (RepositoryRecord rr in ee) {
- Repository rep = rr.GetCachedRepository();
- if (rep == null) continue;
- foreach (PackageRepositoryEntry addin in rep.Addins) {
- if ((id == null || Addin.GetIdName (addin.Addin.Id) == id) && (version == null || addin.Addin.Version == version)) {
- if (updates) {
- Addin ainfo = service.Registry.GetAddin (addin.Addin.Id);
- if (ainfo == null || Addin.CompareVersions (ainfo.Version, addin.Addin.Version) <= 0)
- continue;
- }
- list.Add (addin);
- }
- }
- }
- // Old versions are returned first
- list.Sort ();
- return (PackageRepositoryEntry[]) list.ToArray (typeof(PackageRepositoryEntry));
- }
-
- void GetRepositoryTree (string url, ArrayList list)
- {
- RepositoryRecord rr = FindRepositoryRecord (url);
- if (rr == null) return;
-
- if (list.Contains (rr))
- return;
-
- list.Add (rr);
- Repository rep = rr.GetCachedRepository ();
- if (rep == null)
- return;
-
- Uri absUri = new Uri (url);
- foreach (ReferenceRepositoryEntry re in rep.Repositories) {
- Uri refRepUri = new Uri (absUri, re.Url);
- GetRepositoryTree (refRepUri.ToString (), list);
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositorySerializer.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositorySerializer.cs
deleted file mode 100644
index 5311915..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/RepositorySerializer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// RepositorySerializer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using System.Text;
-using System.Collections;
-using System.Globalization;
-
-namespace Mono.Addins.Setup
-{
- internal class RepositorySerializer : XmlSerializer
- {
- protected override void Serialize (object o, XmlSerializationWriter writer)
- {
- RepositoryWriter xsWriter = writer as RepositoryWriter;
- xsWriter.WriteRoot_Repository (o);
- }
-
- protected override object Deserialize (XmlSerializationReader reader)
- {
- RepositoryReader xsReader = reader as RepositoryReader;
- return xsReader.ReadRoot_Repository ();
- }
-
- protected override XmlSerializationWriter CreateWriter ()
- {
- return new RepositoryWriter ();
- }
-
- protected override XmlSerializationReader CreateReader ()
- {
- return new RepositoryReader ();
- }
- }
-}
-
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs
deleted file mode 100644
index 46a94dc..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs
+++ /dev/null
@@ -1,370 +0,0 @@
-//
-// SetupService.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.IO;
-using System.Collections;
-using ICSharpCode.SharpZipLib.Zip;
-using Mono.Addins.Description;
-using Mono.Addins.Setup.ProgressMonitoring;
-
-namespace Mono.Addins.Setup
-{
- public class SetupService
- {
- RepositoryRegistry repositories;
- string applicationNamespace;
- string installDirectory;
- AddinStore store;
- AddinSystemConfiguration config;
-
- AddinRegistry registry;
-
- public SetupService ()
- {
- if (AddinManager.IsInitialized)
- registry = AddinManager.Registry;
- else
- registry = AddinRegistry.GetGlobalRegistry ();
-
- repositories = new RepositoryRegistry (this);
- store = new AddinStore (this);
- }
-
- public SetupService (AddinRegistry registry)
- {
- this.registry = registry;
- repositories = new RepositoryRegistry (this);
- store = new AddinStore (this);
- }
-
- public AddinRegistry Registry {
- get { return registry; }
- }
-
- internal string RepositoryCachePath {
- get { return Path.Combine (registry.RegistryPath, "repository-cache"); }
- }
-
- string RootConfigFile {
- get { return Path.Combine (registry.RegistryPath, "addins-setup.config"); }
- }
-
- public string ApplicationNamespace {
- get { return applicationNamespace; }
- set { applicationNamespace = value; }
- }
-
- public string InstallDirectory {
- get {
- if (installDirectory != null && installDirectory.Length > 0)
- return installDirectory;
- else
- return registry.DefaultAddinsFolder;
- }
- set { installDirectory = value; }
- }
-
- public RepositoryRegistry Repositories {
- get { return repositories; }
- }
-
- internal AddinStore Store {
- get { return store; }
- }
-
- public bool ResolveDependencies (IProgressStatus statusMonitor, AddinRepositoryEntry[] addins, out PackageCollection resolved, out PackageCollection toUninstall, out DependencyCollection unresolved)
- {
- return store.ResolveDependencies (statusMonitor, addins, out resolved, out toUninstall, out unresolved);
- }
-
- public bool ResolveDependencies (IProgressStatus statusMonitor, PackageCollection packages, out PackageCollection toUninstall, out DependencyCollection unresolved)
- {
- return store.ResolveDependencies (statusMonitor, packages, out toUninstall, out unresolved);
- }
-
- public bool Install (IProgressStatus statusMonitor, params string[] files)
- {
- return store.Install (statusMonitor, files);
- }
-
- public bool Install (IProgressStatus statusMonitor, params AddinRepositoryEntry[] addins)
- {
- return store.Install (statusMonitor, addins);
- }
-
- public bool Install (IProgressStatus statusMonitor, PackageCollection packages)
- {
- return store.Install (statusMonitor, packages);
- }
-
- public void Uninstall (IProgressStatus statusMonitor, string id)
- {
- store.Uninstall (statusMonitor, id);
- }
-
- public static AddinHeader GetAddinHeader (Addin addin)
- {
- return AddinInfo.ReadFromDescription (addin.Description);
- }
-
- public Addin[] GetDependentAddins (string id, bool recursive)
- {
- return store.GetDependentAddins (id, recursive);
- }
-
- public void BuildPackage (IProgressStatus statusMonitor, string targetDirectory, params string[] filePaths)
- {
- foreach (string file in filePaths)
- BuildPackageInternal (statusMonitor, targetDirectory, file);
- }
-
- void BuildPackageInternal (IProgressStatus monitor, string targetDirectory, string filePath)
- {
- AddinDescription conf = registry.GetAddinDescription (monitor, filePath);
- if (conf == null) {
- monitor.ReportError ("Could not read add-in file: " + filePath, null);
- return;
- }
-
- string basePath = Path.GetDirectoryName (filePath);
-
- if (targetDirectory == null)
- targetDirectory = basePath;
-
- // Generate the file name
-
- string name;
- if (conf.LocalId.Length == 0)
- name = Path.GetFileNameWithoutExtension (filePath);
- else
- name = conf.LocalId;
- name = Addin.GetFullId (conf.Namespace, name, conf.Version);
- name = name.Replace (',','_').Replace (".__", ".");
-
- string outFilePath = Path.Combine (targetDirectory, name) + ".mpack";
-
- ZipOutputStream s = new ZipOutputStream (File.Create (outFilePath));
- s.SetLevel(5);
-
- // Generate a stripped down description of the add-in in a file, since the complete
- // description may be declared as assembly attributes
-
- XmlDocument doc = new XmlDocument ();
- doc.PreserveWhitespace = false;
- doc.LoadXml (conf.SaveToXml ().OuterXml);
- CleanDescription (doc.DocumentElement);
- MemoryStream ms = new MemoryStream ();
- XmlTextWriter tw = new XmlTextWriter (ms, System.Text.Encoding.UTF8);
- tw.Formatting = Formatting.Indented;
- doc.WriteTo (tw);
- tw.Flush ();
- byte[] data = ms.ToArray ();
-
- ZipEntry infoEntry = new ZipEntry ("addin.info");
- s.PutNextEntry (infoEntry);
- s.Write (data, 0, data.Length);
-
- // Now add the add-in files
-
- ArrayList list = new ArrayList ();
- if (!conf.AllFiles.Contains (Path.GetFileName (filePath)))
- list.Add (Path.GetFileName (filePath));
- foreach (string f in conf.AllFiles) {
- list.Add (f);
- }
-
- monitor.Log ("Creating package " + Path.GetFileName (outFilePath));
-
- foreach (string file in list) {
- string fp = Path.Combine (basePath, file);
- using (FileStream fs = File.OpenRead (fp)) {
- byte[] buffer = new byte [fs.Length];
- fs.Read (buffer, 0, buffer.Length);
-
- ZipEntry entry = new ZipEntry (file);
- s.PutNextEntry (entry);
- s.Write (buffer, 0, buffer.Length);
- }
- }
-
- s.Finish();
- s.Close();
- }
-
- void CleanDescription (XmlElement parent)
- {
- ArrayList todelete = new ArrayList ();
-
- foreach (XmlNode nod in parent.ChildNodes) {
- XmlElement elem = nod as XmlElement;
- if (elem == null)
- continue;
- if (elem.LocalName == "Module")
- CleanDescription (elem);
- else if (elem.LocalName != "Dependencies" && elem.LocalName != "Runtime")
- todelete.Add (elem);
- }
- foreach (XmlElement e in todelete)
- parent.RemoveChild (e);
- }
-
- public void BuildRepository (IProgressStatus statusMonitor, string path)
- {
- string mainPath = Path.Combine (path, "main.mrep");
- ArrayList allAddins = new ArrayList ();
-
- Repository rootrep = (Repository) AddinStore.ReadObject (mainPath, typeof(Repository));
- if (rootrep == null) {
- rootrep = new Repository ();
- }
-
- IProgressMonitor monitor = ProgressStatusMonitor.GetProgressMonitor (statusMonitor);
- BuildRepository (monitor, rootrep, path, "root.mrep", allAddins);
- AddinStore.WriteObject (mainPath, rootrep);
- GenerateIndexPage (rootrep, allAddins, path);
- monitor.Log.WriteLine ("Updated main.mrep");
- }
-
- void BuildRepository (IProgressMonitor monitor, Repository rootrep, string rootPath, string relFilePath, ArrayList allAddins)
- {
- DateTime lastModified = DateTime.MinValue;
-
- string mainFile = Path.Combine (rootPath, relFilePath);
- string mainPath = Path.GetDirectoryName (mainFile);
-
- Repository mainrep = (Repository) AddinStore.ReadObject (mainFile, typeof(Repository));
- if (mainrep == null) {
- mainrep = new Repository ();
- }
-
- bool modified = false;
-
- monitor.Log.WriteLine ("Checking directory: " + mainPath);
- foreach (string file in Directory.GetFiles (mainPath, "*.mpack")) {
- string fname = Path.GetFileName (file);
- PackageRepositoryEntry entry = (PackageRepositoryEntry) mainrep.FindEntry (fname);
- if (entry == null) {
- entry = new PackageRepositoryEntry ();
- AddinPackage p = (AddinPackage) Package.FromFile (file);
- entry.Addin = (AddinInfo) p.Addin;
- entry.Url = fname;
- mainrep.AddEntry (entry);
- modified = true;
- monitor.Log.WriteLine ("Added addin: " + fname);
- }
- allAddins.Add (entry);
-
- DateTime date = File.GetLastWriteTime (file);
- if (date > lastModified)
- lastModified = date;
- }
-
- ArrayList toRemove = new ArrayList ();
- foreach (PackageRepositoryEntry entry in mainrep.Addins)
- if (!File.Exists (Path.Combine (mainPath, entry.Url)))
- toRemove.Add (entry);
-
- foreach (PackageRepositoryEntry entry in toRemove)
- mainrep.RemoveEntry (entry);
-
- if (modified || toRemove.Count > 0) {
- AddinStore.WriteObject (mainFile, mainrep);
- monitor.Log.WriteLine ("Updated " + relFilePath);
- }
-
- ReferenceRepositoryEntry repEntry = (ReferenceRepositoryEntry) rootrep.FindEntry (relFilePath);
- if (repEntry != null) {
- if (repEntry.LastModified < lastModified)
- repEntry.LastModified = lastModified;
- } else {
- repEntry = new ReferenceRepositoryEntry ();
- repEntry.LastModified = lastModified;
- repEntry.Url = relFilePath;
- rootrep.AddEntry (repEntry);
- }
-
- foreach (string dir in Directory.GetDirectories (mainPath)) {
- string based = dir.Substring (rootPath.Length + 1);
- BuildRepository (monitor, rootrep, rootPath, Path.Combine (based, "main.mrep"), allAddins);
- }
- }
-
- void GenerateIndexPage (Repository rep, ArrayList addins, string basePath)
- {
- StreamWriter sw = new StreamWriter (Path.Combine (basePath, "index.html"));
- sw.WriteLine ("<html><body>");
- sw.WriteLine ("<h1>Add-in Repository</h1>");
- if (rep.Name != null && rep.Name != "")
- sw.WriteLine ("<h2>" + rep.Name + "</h2>");
- sw.WriteLine ("<p>This is a list of add-ins available in this repository.</p>");
- sw.WriteLine ("<table border=1><thead><tr><th>Add-in</th><th>Version</th><th>Description</th></tr></thead>");
-
- foreach (PackageRepositoryEntry entry in addins) {
- sw.WriteLine ("<tr><td>" + entry.Addin.Name + "</td><td>" + entry.Addin.Version + "</td><td>" + entry.Addin.Description + "</td></tr>");
- }
-
- sw.WriteLine ("</table>");
- sw.WriteLine ("</body></html>");
- sw.Close ();
- }
-
- internal AddinSystemConfiguration Configuration {
- get {
- if (config == null) {
- config = (AddinSystemConfiguration) AddinStore.ReadObject (RootConfigFile, typeof(AddinSystemConfiguration));
- if (config == null)
- config = new AddinSystemConfiguration ();
- }
- return config;
- }
- }
-
- internal void SaveConfiguration ()
- {
- if (config != null) {
- AddinStore.WriteObject (RootConfigFile, config);
- }
- }
-
- internal void ResetConfiguration ()
- {
- if (File.Exists (RootConfigFile))
- File.Delete (RootConfigFile);
- ResetAddinInfo ();
- }
-
- internal void ResetAddinInfo ()
- {
- if (Directory.Exists (RepositoryCachePath))
- Directory.Delete (RepositoryCachePath, true);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/SetupTool.cs b/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/SetupTool.cs
deleted file mode 100644
index 73bf625..0000000
--- a/lib/mono-addins/Mono.Addins.Setup/Mono.Addins.Setup/SetupTool.cs
+++ /dev/null
@@ -1,964 +0,0 @@
-//
-// mdsetup.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Collections;
-using Mono.Addins;
-using Mono.Addins.Setup.ProgressMonitoring;
-using Mono.Addins.Setup;
-using System.IO;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Setup
-{
- public class SetupTool
- {
- Hashtable options = new Hashtable ();
- string[] arguments;
- string applicationName = "Mono";
- SetupService service;
- AddinRegistry registry;
- ArrayList commands = new ArrayList ();
- string setupAppName = "";
- int uniqueId = 0;
-
- bool verbose;
-
- public SetupTool (AddinRegistry registry)
- {
- this.registry = registry;
- service = new SetupService (registry);
- CreateCommands ();
- }
-
- public string ApplicationName {
- get { return applicationName; }
- set { applicationName = value; }
- }
-
- public string ApplicationNamespace {
- get { return service.ApplicationNamespace; }
- set { service.ApplicationNamespace = value; }
- }
-
- public bool VerboseOutput {
- get { return verbose; }
- set { verbose = value; }
- }
-
- public int Run (string[] args, int firstArgumentIndex)
- {
- string[] aa = new string [args.Length - firstArgumentIndex];
- Array.Copy (args, firstArgumentIndex, aa, 0, aa.Length);
- return Run (aa);
- }
-
- public int Run (string[] args)
- {
- if (args.Length == 0) {
- PrintHelp ();
- return 0;
- }
-
- string[] parms = new string [args.Length - 1];
- Array.Copy (args, 1, parms, 0, args.Length - 1);
-
- try {
- ReadOptions (parms);
- verbose = verbose || HasOption ("v");
- return RunCommand (args [0], parms);
- } catch (InstallException ex) {
- Console.WriteLine (ex.Message);
- return -1;
- }
- }
-
- int RunCommand (string cmd, string[] parms)
- {
- SetupCommand cc = FindCommand (cmd);
- if (cc != null) {
- cc.Handler (parms);
- return 0;
- }
- else {
- Console.WriteLine ("Unknown command: " + cmd);
- return 1;
- }
- }
-
- void Install (string[] args)
- {
- if (args.Length < 1) {
- PrintHelp ("install");
- return;
- }
-
- PackageCollection packs = new PackageCollection ();
- for (int n=0; n<args.Length; n++) {
- if (File.Exists (args [n])) {
- packs.Add (AddinPackage.FromFile (args [n]));
- } else {
- string aname = Addin.GetIdName (GetFullId (args[n]));
- string aversion = Addin.GetIdVersion (args[n]);
- if (aversion.Length == 0) aversion = null;
-
- AddinRepositoryEntry[] ads = service.Repositories.GetAvailableAddin (aname, aversion);
- if (ads.Length == 0)
- throw new InstallException ("The extension '" + args[n] + "' is not available for install.");
- packs.Add (AddinPackage.FromRepository (ads[ads.Length-1]));
- }
- }
- Install (packs, true);
- }
-
- void CheckInstall (string[] args)
- {
- if (args.Length < 1) {
- PrintHelp ("check-install");
- return;
- }
-
- PackageCollection packs = new PackageCollection ();
- for (int n=0; n<args.Length; n++) {
- Addin addin = registry.GetAddin (GetFullId (args[n]));
- if (addin != null)
- continue;
- string aname = Addin.GetIdName (GetFullId (args[n]));
- string aversion = Addin.GetIdVersion (args[n]);
- if (aversion.Length == 0) aversion = null;
-
- AddinRepositoryEntry[] ads = service.Repositories.GetAvailableAddin (aname, aversion);
- if (ads.Length == 0)
- throw new InstallException ("The extension '" + args[n] + "' is not available for install.");
- packs.Add (AddinPackage.FromRepository (ads[ads.Length-1]));
- }
- Install (packs, false);
- }
-
- void Install (PackageCollection packs, bool prompt)
- {
- PackageCollection toUninstall;
- DependencyCollection unresolved;
-
- IProgressStatus m = new ConsoleProgressStatus (verbose);
- int n = packs.Count;
- if (!service.Store.ResolveDependencies (m, packs, out toUninstall, out unresolved))
- throw new InstallException ("Not all dependencies could be resolved.");
-
- bool ask = false;
- if (prompt && (packs.Count != n || toUninstall.Count != 0)) {
- Console.WriteLine ("The following packages will be installed:");
- foreach (Package p in packs)
- Console.WriteLine (" - " + p.Name);
- ask = true;
- }
- if (prompt && (toUninstall.Count != 0)) {
- Console.WriteLine ("The following packages need to be uninstalled:");
- foreach (Package p in toUninstall)
- Console.WriteLine (" - " + p.Name);
- ask = true;
- }
- if (ask) {
- Console.WriteLine ();
- Console.Write ("Are you sure you want to continue? (y/N): ");
- string res = Console.ReadLine ();
- if (res != "y" && res != "Y")
- return;
- }
-
- if (!service.Store.Install (m, packs)) {
- Console.WriteLine ("Install operation failed.");
- }
- }
-
- void Uninstall (string[] args)
- {
- if (args.Length < 1)
- throw new InstallException ("The extension id is required.");
-
- Addin ads = registry.GetAddin (GetFullId (args[0]));
- if (ads == null)
- throw new InstallException ("The extension '" + args[0] + "' is not installed.");
-
- Console.WriteLine ("The following extensions will be uninstalled:");
- Console.WriteLine (" - " + ads.Description.Name);
- foreach (Addin si in service.GetDependentAddins (args[0], true))
- Console.WriteLine (" - " + si.Description.Name);
-
- Console.WriteLine ();
- Console.Write ("Are you sure you want to continue? (y/N): ");
- string res = Console.ReadLine ();
- if (res == "y" || res == "Y")
- service.Uninstall (new ConsoleProgressStatus (verbose), ads.Id);
- }
-
- bool IsHidden (Addin ainfo)
- {
- return service.ApplicationNamespace != null && !(ainfo.Namespace + ".").StartsWith (service.ApplicationNamespace + ".");
- }
-
- bool IsHidden (AddinHeader ainfo)
- {
- return service.ApplicationNamespace != null && !(ainfo.Namespace + ".").StartsWith (service.ApplicationNamespace + ".");
- }
-
- string GetId (AddinHeader ainfo)
- {
- if (service.ApplicationNamespace != null && (ainfo.Namespace + ".").StartsWith (service.ApplicationNamespace + "."))
- return ainfo.Id.Substring (service.ApplicationNamespace.Length + 1);
- else
- return ainfo.Id;
- }
-
- string GetFullId (string id)
- {
- if (service.ApplicationNamespace != null)
- return service.ApplicationNamespace + "." + id;
- else
- return id;
- }
-
- void ListInstalled (string[] args)
- {
- IList alist = args;
- bool showAll = alist.Contains ("-a");
- Console.WriteLine ("Installed extensions:");
- ArrayList list = new ArrayList ();
- list.AddRange (registry.GetAddins ());
- if (alist.Contains ("-r"))
- list.AddRange (registry.GetAddinRoots ());
- foreach (Addin addin in list) {
- if (!showAll && IsHidden (addin))
- continue;
- Console.Write (" - " + addin.Name + " " + addin.Version);
- if (showAll)
- Console.Write (" (" + addin.AddinFile + ")");
- Console.WriteLine ();
- }
- }
-
- void ListAvailable (string[] args)
- {
- bool showAll = args.Length > 0 && args [0] == "-a";
- Console.WriteLine ("Available extensions:");
- AddinRepositoryEntry[] addins = service.Repositories.GetAvailableAddins ();
- foreach (PackageRepositoryEntry addin in addins) {
- if (!showAll && IsHidden (addin.Addin))
- continue;
- Console.WriteLine (" - " + GetId (addin.Addin) + " (" + addin.Repository.Name + ")");
- }
- }
-
- void ListUpdates (string[] args)
- {
- bool showAll = args.Length > 0 && args [0] == "-a";
-
- Console.WriteLine ("Looking for updates...");
- service.Repositories.UpdateAllRepositories (null);
- Console.WriteLine ("Available extension updates:");
- AddinRepositoryEntry[] addins = service.Repositories.GetAvailableAddins ();
- bool found = false;
- foreach (PackageRepositoryEntry addin in addins) {
- Addin sinfo = registry.GetAddin (addin.Addin.Id);
- if (!showAll && IsHidden (sinfo))
- continue;
- if (sinfo != null && Addin.CompareVersions (sinfo.Version, addin.Addin.Version) == 1) {
- Console.WriteLine (" - " + addin.Addin.Id + " " + addin.Addin.Version + " (" + addin.Repository.Name + ")");
- found = true;
- }
- }
- if (!found)
- Console.WriteLine ("No updates found.");
- }
-
- void Update (string [] args)
- {
- bool showAll = args.Length > 0 && args [0] == "-a";
-
- Console.WriteLine ("Looking for updates...");
- service.Repositories.UpdateAllRepositories (null);
-
- PackageCollection packs = new PackageCollection ();
- AddinRepositoryEntry[] addins = service.Repositories.GetAvailableAddins ();
- foreach (PackageRepositoryEntry addin in addins) {
- Addin sinfo = registry.GetAddin (addin.Addin.Id);
- if (!showAll && IsHidden (sinfo))
- continue;
- if (sinfo != null && Addin.CompareVersions (sinfo.Version, addin.Addin.Version) == 1)
- packs.Add (AddinPackage.FromRepository (addin));
- }
- if (packs.Count > 0)
- Install (packs, true);
- else
- Console.WriteLine ("No updates found.");
- }
-
- void UpdateAvailableAddins (string[] args)
- {
- service.Repositories.UpdateAllRepositories (new ConsoleProgressStatus (verbose));
- }
-
- void AddRepository (string[] args)
- {
- foreach (string rep in args)
- service.Repositories.RegisterRepository (new ConsoleProgressStatus (verbose), rep);
- }
-
- void RemoveRepository (string[] args)
- {
- foreach (string rep in args)
- service.Repositories.RemoveRepository (rep);
- }
-
- void ListRepositories (string[] args)
- {
- AddinRepository[] reps = service.Repositories.GetRepositories ();
- if (reps.Length == 0) {
- Console.WriteLine ("No repositories have been registered.");
- return;
- }
- Console.WriteLine ("Registered repositories:");
- foreach (RepositoryRecord rep in reps) {
- Console.WriteLine (" - " + rep.Title);
- }
- }
-
- void BuildRepository (string[] args)
- {
- if (args.Length < 1)
- throw new InstallException ("A directory name is required.");
- service.BuildRepository (new ConsoleProgressStatus (verbose), args[0]);
- }
-
- void BuildPackage (string[] args)
- {
- if (args.Length < 1)
- throw new InstallException ("A file name is required.");
-
- service.BuildPackage (new ConsoleProgressStatus (verbose), GetOption ("d", "."), GetArguments ());
- }
-
- void UpdateRegistry (string[] args)
- {
- registry.Update (new ConsoleProgressStatus (verbose));
- }
-
- void RepairRegistry (string[] args)
- {
- registry.Rebuild (new ConsoleProgressStatus (verbose));
- }
-
- void DumpRegistryFile (string[] args)
- {
- if (args.Length < 1)
- throw new InstallException ("A file name is required.");
- registry.DumpFile (args[0]);
- }
-
- void PrintAddinInfo (string[] args)
- {
- bool generateXml = false;
- bool generateAll = false;
- bool pickNamespace = false;
- bool extensionModel = true;
-
- ArrayList addins = new ArrayList ();
- ArrayList namespaces = new ArrayList ();
-
- foreach (string a in args) {
- if (pickNamespace) {
- namespaces.Add (a);
- pickNamespace = false;
- continue;
- }
- if (a == "--xml") {
- generateXml = true;
- continue;
- }
- if (a == "--namespace" || a == "-n") {
- pickNamespace = true;
- continue;
- }
- if (a == "--all") {
- generateAll = true;
- continue;
- }
- if (a == "--full") {
- extensionModel = false;
- continue;
- }
- AddinDescription desc = null;
- if (File.Exists (args[0]))
- desc = registry.GetAddinDescription (new Mono.Addins.ConsoleProgressStatus (verbose), args[0]);
- else {
- Addin addin = registry.GetAddin (args [0]);
- if (addin != null)
- desc = addin.Description;
- }
- if (desc == null)
- throw new InstallException (string.Format ("Extension '{0}' not found.", a));
- if (desc != null)
- addins.Add (desc);
- }
-
- if (generateAll) {
- ArrayList list = new ArrayList ();
- list.AddRange (registry.GetAddinRoots ());
- list.AddRange (registry.GetAddins ());
- foreach (Addin addin in list) {
- if (namespaces.Count > 0) {
- foreach (string ns in namespaces) {
- if (addin.Id.StartsWith (ns + ".")) {
- addins.Add (addin.Description);
- break;
- }
- }
- } else {
- addins.Add (addin.Description);
- }
- }
- }
-
- if (addins.Count == 0)
- throw new InstallException ("A file name or extension ID is required.");
-
-
- if (generateXml) {
- XmlTextWriter tw = new XmlTextWriter (Console.Out);
- tw.Formatting = Formatting.Indented;
- tw.WriteStartElement ("Addins");
- foreach (AddinDescription desc in addins) {
- if (extensionModel && desc.ExtensionPoints.Count == 0)
- continue;
- PrintAddinXml (tw, desc);
- }
- tw.Close ();
- }
- else {
- foreach (AddinDescription des in addins)
- PrintAddin (des);
- }
- }
-
- void PrintAddinXml (XmlWriter tw, AddinDescription desc)
- {
- tw.WriteStartElement ("Addin");
- tw.WriteAttributeString ("name", desc.Name);
- tw.WriteAttributeString ("addinId", desc.LocalId);
- tw.WriteAttributeString ("fullId", desc.AddinId);
- tw.WriteAttributeString ("id", "addin_" + uniqueId);
- uniqueId++;
- if (desc.Namespace.Length > 0)
- tw.WriteAttributeString ("namespace", desc.Namespace);
- tw.WriteAttributeString ("isroot", desc.IsRoot.ToString ());
-
- tw.WriteAttributeString ("version", desc.Version);
- if (desc.CompatVersion.Length > 0)
- tw.WriteAttributeString ("compatVersion", desc.CompatVersion);
-
- if (desc.Author.Length > 0)
- tw.WriteAttributeString ("author", desc.Author);
- if (desc.Category.Length > 0)
- tw.WriteAttributeString ("category", desc.Category);
- if (desc.Copyright.Length > 0)
- tw.WriteAttributeString ("copyright", desc.Copyright);
- if (desc.Url.Length > 0)
- tw.WriteAttributeString ("url", desc.Url);
-
- if (desc.Description.Length > 0)
- tw.WriteElementString ("Description", desc.Description);
-
- if (desc.ExtensionPoints.Count > 0) {
- ArrayList list = new ArrayList ();
- Hashtable visited = new Hashtable ();
- foreach (ExtensionPoint ep in desc.ExtensionPoints) {
- tw.WriteStartElement ("ExtensionPoint");
- tw.WriteAttributeString ("path", ep.Path);
- if (ep.Name.Length > 0)
- tw.WriteAttributeString ("name", ep.Name);
- else
- tw.WriteAttributeString ("name", ep.Path);
- if (ep.Description.Length > 0)
- tw.WriteElementString ("Description", ep.Description);
- PrintExtensionNodeSetXml (tw, desc, ep.NodeSet, list, visited);
- tw.WriteEndElement ();
- }
-
- for (int n=0; n<list.Count; n++) {
-
- ExtensionNodeType nt = (ExtensionNodeType) list [n];
-
- tw.WriteStartElement ("ExtensionNodeType");
- tw.WriteAttributeString ("name", nt.Id);
- tw.WriteAttributeString ("id", visited [nt.Id + " " + nt.TypeName].ToString ());
-
- if (nt.Description.Length > 0)
- tw.WriteElementString ("Description", nt.Description);
-
- if (nt.Attributes.Count > 0) {
- tw.WriteStartElement ("Attributes");
- foreach (NodeTypeAttribute att in nt.Attributes) {
- tw.WriteStartElement ("Attribute");
- tw.WriteAttributeString ("name", att.Name);
- tw.WriteAttributeString ("type", att.Type);
- tw.WriteAttributeString ("required", att.Required.ToString ());
- tw.WriteAttributeString ("localizable", att.Localizable.ToString ());
- if (att.Description.Length > 0)
- tw.WriteElementString ("Description", att.Description);
- tw.WriteEndElement ();
- }
- tw.WriteEndElement ();
- }
-
- if (nt.NodeTypes.Count > 0 || nt.NodeSets.Count > 0) {
- tw.WriteStartElement ("ChildNodes");
- PrintExtensionNodeSetXml (tw, desc, nt, list, visited);
- tw.WriteEndElement ();
- }
- tw.WriteEndElement ();
- }
- }
- tw.WriteEndElement ();
- }
-
- void PrintExtensionNodeSetXml (XmlWriter tw, AddinDescription desc, ExtensionNodeSet nset, ArrayList list, Hashtable visited)
- {
- foreach (ExtensionNodeType nt in nset.GetAllowedNodeTypes ()) {
- tw.WriteStartElement ("ExtensionNode");
- tw.WriteAttributeString ("name", nt.Id);
- string id = RegisterNodeXml (nt, list, visited);
- tw.WriteAttributeString ("id", id.ToString ());
- if (nt.Description.Length > 0)
- tw.WriteElementString ("Description", nt.Description);
- tw.WriteEndElement ();
- }
- }
-
- string RegisterNodeXml (ExtensionNodeType nt, ArrayList list, Hashtable visited)
- {
- string key = nt.Id + " " + nt.TypeName;
- if (visited.Contains (key))
- return (string) visited [key];
- string k = "ntype_" + uniqueId;
- uniqueId++;
- visited [key] = k;
- list.Add (nt);
- return k;
- }
-
- void PrintAddin (AddinDescription desc)
- {
- Console.WriteLine ();
- Console.WriteLine ("Addin Header");
- Console.WriteLine ("------------");
- Console.WriteLine ();
- Console.WriteLine ("Name: " + desc.Name);
- Console.WriteLine ("Id: " + desc.LocalId);
- if (desc.Namespace.Length > 0)
- Console.WriteLine ("Namespace: " + desc.Namespace);
-
- Console.Write ("Version: " + desc.Version);
- if (desc.CompatVersion.Length > 0)
- Console.WriteLine (" (compatible with: " + desc.CompatVersion + ")");
- else
- Console.WriteLine ();
-
- if (desc.AddinFile.Length > 0)
- Console.WriteLine ("File: " + desc.AddinFile);
- if (desc.Author.Length > 0)
- Console.WriteLine ("Author: " + desc.Author);
- if (desc.Category.Length > 0)
- Console.WriteLine ("Category: " + desc.Category);
- if (desc.Copyright.Length > 0)
- Console.WriteLine ("Copyright: " + desc.Copyright);
- if (desc.Url.Length > 0)
- Console.WriteLine ("Url: " + desc.Url);
-
- if (desc.Description.Length > 0) {
- Console.WriteLine ();
- Console.WriteLine ("Description: \n" + desc.Description);
- }
-
- if (desc.ExtensionPoints.Count > 0) {
- Console.WriteLine ();
- Console.WriteLine ("Extenstion Points");
- Console.WriteLine ("-----------------");
- foreach (ExtensionPoint ep in desc.ExtensionPoints)
- PrintExtensionPoint (desc, ep);
- }
- }
-
- void PrintExtensionPoint (AddinDescription desc, ExtensionPoint ep)
- {
- Console.WriteLine ();
- Console.WriteLine ("* Extension Point: " + ep.Path);
- if (ep.Description.Length > 0)
- Console.WriteLine (ep.Description);
-
- ArrayList list = new ArrayList ();
- Hashtable visited = new Hashtable ();
-
- Console.WriteLine ();
- Console.WriteLine (" Extension nodes:");
- GetNodes (desc, ep.NodeSet, list, new Hashtable ());
-
- foreach (ExtensionNodeType nt in list)
- Console.WriteLine (" - " + nt.Id + ": " + nt.Description);
-
- Console.WriteLine ();
- Console.WriteLine (" Node description:");
-
- string sind = " ";
-
- for (int n=0; n<list.Count; n++) {
-
- ExtensionNodeType nt = (ExtensionNodeType) list [n];
- if (visited.Contains (nt.Id + " " + nt.TypeName))
- continue;
-
- visited.Add (nt.Id + " " + nt.TypeName, nt);
- Console.WriteLine ();
-
- Console.WriteLine (sind + "- " + nt.Id + ": " + nt.Description);
- string nsind = sind + " ";
- if (nt.Attributes.Count > 0) {
- Console.WriteLine (nsind + "Attributes:");
- foreach (NodeTypeAttribute att in nt.Attributes) {
- string req = att.Required ? " (required)" : "";
- Console.WriteLine (nsind + " " + att.Name + " (" + att.Type + "): " + att.Description + req);
- }
- }
-
- if (nt.NodeTypes.Count > 0 || nt.NodeSets.Count > 0) {
- Console.WriteLine (nsind + "Child nodes:");
- ArrayList newList = new ArrayList ();
- GetNodes (desc, nt, newList, new Hashtable ());
- list.AddRange (newList);
- foreach (ExtensionNodeType cnt in newList)
- Console.WriteLine (" " + cnt.Id + ": " + cnt.Description);
- }
- }
- Console.WriteLine ();
- }
-
- void GetNodes (AddinDescription desc, ExtensionNodeSet nset, ArrayList list, Hashtable visited)
- {
- if (visited.Contains (nset))
- return;
- visited.Add (nset, nset);
-
- foreach (ExtensionNodeType nt in nset.NodeTypes) {
- if (!visited.Contains (nt.Id + " " + nt.TypeName)) {
- list.Add (nt);
- visited.Add (nt.Id + " " + nt.TypeName, nt);
- }
- }
-
- foreach (string nsid in nset.NodeSets) {
- ExtensionNodeSet rset = desc.ExtensionNodeSets [nsid];
- if (rset != null)
- GetNodes (desc, rset, list, visited);
- }
- }
-
- string[] GetArguments ()
- {
- return arguments;
- }
-
- bool HasOption (string key)
- {
- return options.Contains (key);
- }
-
- string GetOption (string key, string defValue)
- {
- object val = options [key];
- if (val == null || val == (object) this)
- return defValue;
- else
- return (string) val;
- }
-
- void ReadOptions (string[] args)
- {
- options = new Hashtable ();
- ArrayList list = new ArrayList ();
-
- foreach (string arg in args) {
- if (arg.StartsWith ("-")) {
- int i = arg.IndexOf (':');
- if (i == -1)
- options [arg.Substring (1)] = this;
- else
- options [arg.Substring (1, i-1)] = arg.Substring (i+1);
- } else
- list.Add (arg);
- }
-
- arguments = (string[]) list.ToArray (typeof(string));
- }
-
- public void AddCommand (string category, string command, string shortName, string arguments, string description, string longDescription, SetupCommandHandler handler)
- {
- SetupCommand cmd = new SetupCommand (category, command, shortName, handler);
- cmd.Usage = arguments;
- cmd.Description = description;
- cmd.LongDescription = longDescription;
-
- int lastCatPos = -1;
- for (int n=0; n<commands.Count; n++) {
- SetupCommand ec = (SetupCommand) commands [n];
- if (ec.Category == category)
- lastCatPos = n;
- }
- if (lastCatPos == -1)
- commands.Add (cmd);
- else
- commands.Insert (lastCatPos+1, cmd);
- }
-
- SetupCommand FindCommand (string id)
- {
- foreach (SetupCommand cmd in commands)
- if (cmd.Command == id || cmd.ShortCommand == id)
- return cmd;
- return null;
- }
-
- public void PrintHelp (params string[] parms)
- {
- if (parms.Length == 0) {
- string lastCat = null;
- foreach (SetupCommand cmd in commands) {
- if (lastCat != cmd.Category) {
- Console.WriteLine ();
- Console.WriteLine (cmd.Category + ":");
- lastCat = cmd.Category;
- }
- string cc = cmd.CommandDesc;
- if (cc.Length < 16)
- cc += new string (' ', 16 - cc.Length);
- Console.WriteLine (" " + cc + " " + cmd.Description);
- }
- Console.WriteLine ();
- Console.WriteLine ("Run '" + setupAppName + "help <command>' to get help about a specific command.");
- Console.WriteLine ();
- return;
- }
- else {
- Console.WriteLine ();
- SetupCommand cmd = FindCommand (parms [0]);
- if (cmd != null) {
- Console.WriteLine ("{0}: {1}", cmd.CommandDesc, cmd.Description);
- Console.WriteLine ();
- Console.WriteLine ("Usage: {0}{1}", setupAppName, cmd.Usage);
- Console.WriteLine ();
- Console.WriteLine (cmd.LongDescription);
- }
- else
- Console.WriteLine ("Unknown command: " + parms [0]);
- Console.WriteLine ();
- }
- }
-
- void CreateCommands ()
- {
- SetupCommand cmd;
- string cat = "Add-in commands";
-
- cmd = new SetupCommand (cat, "install", "i", new SetupCommandHandler (Install));
- cmd.Description = "Installs add-ins.";
- cmd.Usage = "[package-name|package-file] ...";
- cmd.AppendDesc ("Installs an add-in or set of addins. The command argument is a list");
- cmd.AppendDesc ("of files and/or package names. If a package name is provided");
- cmd.AppendDesc ("the package will be looked out in the registered repositories.");
- cmd.AppendDesc ("A specific add-in version can be specified by appending it to.");
- cmd.AppendDesc ("the package name using '/' as a separator, like in this example:");
- cmd.AppendDesc ("MonoDevelop.SourceEditor/0.9.1");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "uninstall", "u", new SetupCommandHandler (Uninstall));
- cmd.Description = "Uninstalls add-ins.";
- cmd.Usage = "<package-name>";
- cmd.AppendDesc ("Uninstalls an add-in. The command argument is the name");
- cmd.AppendDesc ("of the add-in to uninstall.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "check-install", "ci", new SetupCommandHandler (CheckInstall));
- cmd.Description = "Checks installed add-ins.";
- cmd.Usage = "[package-name|package-file] ...";
- cmd.AppendDesc ("Checks if a package is installed. If it is not, it looks for");
- cmd.AppendDesc ("the package in the registered repositories, and if found");
- cmd.AppendDesc ("the package is downloaded and installed, including all");
- cmd.AppendDesc ("needed dependencies.");
- commands.Add (cmd);
-
-
- cmd = new SetupCommand (cat, "update", "up", new SetupCommandHandler (Update));
- cmd.Description = "Updates installed add-ins.";
- cmd.AppendDesc ("Downloads and installs available updates for installed add-ins.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "list", "l", new SetupCommandHandler (ListInstalled));
- cmd.Description = "Lists installed add-ins.";
- cmd.AppendDesc ("Prints a list of all installed add-ins.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "list-av", "la", new SetupCommandHandler (ListAvailable));
- cmd.Description = "Lists add-ins available in registered repositories.";
- cmd.AppendDesc ("Prints a list of add-ins available to install in the");
- cmd.AppendDesc ("registered repositories.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "list-update", "lu", new SetupCommandHandler (ListUpdates));
- cmd.Description = "Lists available add-in updates.";
- cmd.AppendDesc ("Prints a list of available add-in updates in the registered repositories.");
- commands.Add (cmd);
-
- cat = "Repository Commands";
-
- cmd = new SetupCommand (cat, "rep-add", "ra", new SetupCommandHandler (AddRepository));
- cmd.Description = "Registers repositories.";
- cmd.Usage = "<url> ...";
- cmd.AppendDesc ("Registers an add-in repository. Several URLs can be provided.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "rep-remove", "rr", new SetupCommandHandler (RemoveRepository));
- cmd.Description = "Unregisters repositories.";
- cmd.Usage = "<url> ...";
- cmd.AppendDesc ("Unregisters an add-in repository. Several URLs can be provided.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "rep-update", "ru", new SetupCommandHandler (UpdateAvailableAddins));
- cmd.Description = "Updates the lists of available addins.";
- cmd.AppendDesc ("Updates the lists of addins available in all registered repositories.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "rep-list", "rl", new SetupCommandHandler (ListRepositories));
- cmd.Description = "Lists registered repositories.";
- cmd.AppendDesc ("Shows a list of all registered repositories.");
- commands.Add (cmd);
-
- cat = "Add-in Registry Commands";
-
- cmd = new SetupCommand (cat, "reg-update", "rgu", new SetupCommandHandler (UpdateRegistry));
- cmd.Description = "Updates the add-in registry.";
- cmd.AppendDesc ("Looks for changes in add-in directories and updates the registry.");
- cmd.AppendDesc ("New add-ins will be added and deleted add-ins will be removed.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "reg-build", "rgu", new SetupCommandHandler (RepairRegistry));
- cmd.Description = "Rebuilds the add-in registry.";
- cmd.AppendDesc ("Regenerates the add-in registry");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "info", null, new SetupCommandHandler (PrintAddinInfo));
- cmd.Description = "Prints information about an add-in.";
- cmd.AppendDesc ("Prints information about an add-in.");
- commands.Add (cmd);
-
- cat = "Packaging Commands";
-
- cmd = new SetupCommand (cat, "rep-build", "rb", new SetupCommandHandler (BuildRepository));
- cmd.Description = "Creates a repository index file for a directory structure.";
- cmd.Usage = "<path>";
- cmd.AppendDesc ("Scans the provided directory and generates a set of index files with entries");
- cmd.AppendDesc ("for all add-in packages found in the directory tree. The resulting file");
- cmd.AppendDesc ("structure is an add-in repository that can be published in a web site or a");
- cmd.AppendDesc ("shared directory.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "pack", "p", new SetupCommandHandler (BuildPackage));
- cmd.Description = "Creates a package from an add-in configuration file.";
- cmd.Usage = "<file-path>";
- cmd.AppendDesc ("Creates an add-in package (.mpack file) which includes all files ");
- cmd.AppendDesc ("needed to deploy an add-in. The command parameter is the path to");
- cmd.AppendDesc ("the add-in's configuration file.");
- commands.Add (cmd);
-
- cmd = new SetupCommand (cat, "help", "h", new SetupCommandHandler (PrintHelp));
- cmd.Description = "Shows help about a command.";
- cmd.Usage = "<command>";
- commands.Add (cmd);
-
- cat = "Debug Commands";
-
- cmd = new SetupCommand (cat, "dump-file", null, new SetupCommandHandler (DumpRegistryFile));
- cmd.Description = "Prints the contents of a registry file.";
- cmd.Usage = "<file-path>";
- cmd.AppendDesc ("Prints the contents of a registry file for debugging.");
- commands.Add (cmd);
- }
- }
-
- class SetupCommand
- {
- string usage;
-
- public SetupCommand (string cat, string cmd, string shortCmd, SetupCommandHandler handler)
- {
- Category = cat;
- Command = cmd;
- ShortCommand = shortCmd;
- Handler = handler;
- }
-
- public void AppendDesc (string s)
- {
- LongDescription += s + "\n";
- }
-
- public string Category;
- public string Command;
- public string ShortCommand;
- public SetupCommandHandler Handler;
-
- public string Usage {
- get { return usage != null ? Command + " " + usage : Command; }
- set { usage = value; }
- }
-
- public string CommandDesc {
- get {
- if (ShortCommand != null && ShortCommand.Length > 0)
- return Command + " (" + ShortCommand + ")";
- else
- return Command;
- }
- }
-
- public string Description = "";
- public string LongDescription = "";
- }
-
- public delegate void SetupCommandHandler (string[] args);
-}
-
diff --git a/lib/mono-addins/Mono.Addins/AssemblyInfo.cs b/lib/mono-addins/Mono.Addins/AssemblyInfo.cs
deleted file mode 100644
index cd6c671..0000000
--- a/lib/mono-addins/Mono.Addins/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("Mono.Addins")]
-[assembly: AssemblyCopyright("Copyright (C) 2007 Novell, Inc (http://www.novell.com)")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("0.3.0.0")]
diff --git a/lib/mono-addins/Mono.Addins/Makefile.am b/lib/mono-addins/Mono.Addins/Makefile.am
deleted file mode 100644
index 849a98c..0000000
--- a/lib/mono-addins/Mono.Addins/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-include $(top_srcdir)/Makefile.include
-
-ASSEMBLY_NAME = Mono.Addins
-
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Mono.Addins.Database/AddinDatabase.cs \
- $(srcdir)/Mono.Addins.Database/AddinHostIndex.cs \
- $(srcdir)/Mono.Addins.Database/AddinScanFolderInfo.cs \
- $(srcdir)/Mono.Addins.Database/AddinScanner.cs \
- $(srcdir)/Mono.Addins.Database/AddinScanResult.cs \
- $(srcdir)/Mono.Addins.Database/AddinUpdateData.cs \
- $(srcdir)/Mono.Addins.Database/DatabaseConfiguration.cs \
- $(srcdir)/Mono.Addins.Database/FileDatabase.cs \
- $(srcdir)/Mono.Addins.Database/ProcessProgressStatus.cs \
- $(srcdir)/Mono.Addins.Database/SetupProcess.cs \
- $(srcdir)/Mono.Addins.Database/Util.cs \
- $(srcdir)/Mono.Addins.Description/AddinDependency.cs \
- $(srcdir)/Mono.Addins.Description/AddinDescription.cs \
- $(srcdir)/Mono.Addins.Description/AssemblyDependency.cs \
- $(srcdir)/Mono.Addins.Description/ConditionTypeDescription.cs \
- $(srcdir)/Mono.Addins.Description/ConditionTypeDescriptionCollection.cs \
- $(srcdir)/Mono.Addins.Description/Dependency.cs \
- $(srcdir)/Mono.Addins.Description/DependencyCollection.cs \
- $(srcdir)/Mono.Addins.Description/Extension.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionCollection.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeDescription.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeDescriptionCollection.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeSet.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeSetCollection.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeType.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeTypeCollection.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionPoint.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionPointCollection.cs \
- $(srcdir)/Mono.Addins.Description/ModuleDescription.cs \
- $(srcdir)/Mono.Addins.Description/ModuleDescriptionCollection.cs \
- $(srcdir)/Mono.Addins.Description/NativeDependency.cs \
- $(srcdir)/Mono.Addins.Description/NodeTypeAttribute.cs \
- $(srcdir)/Mono.Addins.Description/NodeTypeAttributeCollection.cs \
- $(srcdir)/Mono.Addins.Description/ObjectDescription.cs \
- $(srcdir)/Mono.Addins.Description/ObjectDescriptionCollection.cs \
- $(srcdir)/Mono.Addins.Localization/IAddinLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/IPluralAddinLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/GettextDomain.cs \
- $(srcdir)/Mono.Addins.Localization/StringResourceLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/StringTableLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/IAddinLocalizerFactory.cs \
- $(srcdir)/Mono.Addins.Localization/NullLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/GettextLocalizer.cs \
- $(srcdir)/Mono.Addins.Serialization/BinaryXmlReader.cs \
- $(srcdir)/Mono.Addins.Serialization/BinaryXmlTypeMap.cs \
- $(srcdir)/Mono.Addins.Serialization/BinaryXmlWriter.cs \
- $(srcdir)/Mono.Addins.Serialization/IBinaryXmlElement.cs \
- $(srcdir)/Mono.Addins/Addin.cs \
- $(srcdir)/Mono.Addins/AddinAttribute.cs \
- $(srcdir)/Mono.Addins/AddinDependencyAttribute.cs \
- $(srcdir)/Mono.Addins/AddinErrorEventArgs.cs \
- $(srcdir)/Mono.Addins/AddinEventArgs.cs \
- $(srcdir)/Mono.Addins/AddinInfo.cs \
- $(srcdir)/Mono.Addins/AddinManager.cs \
- $(srcdir)/Mono.Addins/AddinLocalizer.cs \
- $(srcdir)/Mono.Addins/AddinRegistry.cs \
- $(srcdir)/Mono.Addins/AddinRootAttribute.cs \
- $(srcdir)/Mono.Addins/AddinSessionService.cs \
- $(srcdir)/Mono.Addins/ConditionType.cs \
- $(srcdir)/Mono.Addins/ConsoleProgressStatus.cs \
- $(srcdir)/Mono.Addins/ExtensionAttribute.cs \
- $(srcdir)/Mono.Addins/ExtensionContext.cs \
- $(srcdir)/Mono.Addins/ExtensionNode.cs \
- $(srcdir)/Mono.Addins/ExtensionNodeAttribute.cs \
- $(srcdir)/Mono.Addins/ExtensionNodeChildAttribute.cs \
- $(srcdir)/Mono.Addins/ExtensionNodeList.cs \
- $(srcdir)/Mono.Addins/ExtensionPointAttribute.cs \
- $(srcdir)/Mono.Addins/ExtensionTree.cs \
- $(srcdir)/Mono.Addins/GettextCatalog.cs \
- $(srcdir)/Mono.Addins/InstanceExtensionNode.cs \
- $(srcdir)/Mono.Addins/IAddinInstaller.cs \
- $(srcdir)/Mono.Addins/IProgressStatus.cs \
- $(srcdir)/Mono.Addins/MissingDependencyException.cs \
- $(srcdir)/Mono.Addins/NodeAttributeAttribute.cs \
- $(srcdir)/Mono.Addins/NodeElement.cs \
- $(srcdir)/Mono.Addins/RuntimeAddin.cs \
- $(srcdir)/Mono.Addins/TreeNode.cs \
- $(srcdir)/Mono.Addins/TreeNodeCollection.cs \
- $(srcdir)/Mono.Addins/TypeExtensionNode.cs \
- $(srcdir)/Mono.Addins/TypeExtensionPointAttribute.cs
-
-REFS = \
- -r:Mono.Posix \
- -r:System \
- -r:System.Xml
-
-PKGS =
-
-CSC_EXTRA_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG "-main:Mono.Addins.Database.SetupProcess"
-
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY) \
- $(ASSEMBLY).config
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- $(ASSEMBLY).config
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
diff --git a/lib/mono-addins/Mono.Addins/Makefile.in b/lib/mono-addins/Mono.Addins/Makefile.in
deleted file mode 100644
index acf32ee..0000000
--- a/lib/mono-addins/Mono.Addins/Makefile.in
+++ /dev/null
@@ -1,622 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.include
-subdir = lib/mono-addins/Mono.Addins
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(assemblydir)"
-DATA = $(assembly_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSC_DEFINES = @CSC_DEFINES@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXIF_CFLAGS = @EXIF_CFLAGS@
-EXIF_LIBS = @EXIF_LIBS@
-EXIF_SOVERSION = @EXIF_SOVERSION@
-FGREP = @FGREP@
-F_CFLAGS = @F_CFLAGS@
-F_LIBS = @F_LIBS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
-GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
-GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
-GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
-GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
-GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
-GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-ICONS_DIRECTORY = @ICONS_DIRECTORY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
-LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
-LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
-LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCS = @MCS@
-MKDIR_P = @MKDIR_P@
-MONO = @MONO@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_DEFINES = @NUNIT_DEFINES@
-NUNIT_LIBS = @NUNIT_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TURTLEDIR = @TURTLEDIR@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-expanded_libdir = @expanded_libdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
-DIR_DOCS = $(top_builddir)/docs
-DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
-DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
-DIR_SEMWEB = $(top_builddir)/lib/semweb
-DIR_SRC = $(top_builddir)/src
-DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
-LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
-LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-CSC_FLAGS = -debug
-CSC = $(MCS) $(CSC_FLAGS) -target:exe
-CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
-MONO_DEBUGFLAGS = --debug
-RUNTIME = mono $(MONO_DEBUGFLAGS)
-ASSEMBLY_NAME = Mono.Addins
-ASSEMBLY_SOURCES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Mono.Addins.Database/AddinDatabase.cs \
- $(srcdir)/Mono.Addins.Database/AddinHostIndex.cs \
- $(srcdir)/Mono.Addins.Database/AddinScanFolderInfo.cs \
- $(srcdir)/Mono.Addins.Database/AddinScanner.cs \
- $(srcdir)/Mono.Addins.Database/AddinScanResult.cs \
- $(srcdir)/Mono.Addins.Database/AddinUpdateData.cs \
- $(srcdir)/Mono.Addins.Database/DatabaseConfiguration.cs \
- $(srcdir)/Mono.Addins.Database/FileDatabase.cs \
- $(srcdir)/Mono.Addins.Database/ProcessProgressStatus.cs \
- $(srcdir)/Mono.Addins.Database/SetupProcess.cs \
- $(srcdir)/Mono.Addins.Database/Util.cs \
- $(srcdir)/Mono.Addins.Description/AddinDependency.cs \
- $(srcdir)/Mono.Addins.Description/AddinDescription.cs \
- $(srcdir)/Mono.Addins.Description/AssemblyDependency.cs \
- $(srcdir)/Mono.Addins.Description/ConditionTypeDescription.cs \
- $(srcdir)/Mono.Addins.Description/ConditionTypeDescriptionCollection.cs \
- $(srcdir)/Mono.Addins.Description/Dependency.cs \
- $(srcdir)/Mono.Addins.Description/DependencyCollection.cs \
- $(srcdir)/Mono.Addins.Description/Extension.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionCollection.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeDescription.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeDescriptionCollection.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeSet.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeSetCollection.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeType.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionNodeTypeCollection.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionPoint.cs \
- $(srcdir)/Mono.Addins.Description/ExtensionPointCollection.cs \
- $(srcdir)/Mono.Addins.Description/ModuleDescription.cs \
- $(srcdir)/Mono.Addins.Description/ModuleDescriptionCollection.cs \
- $(srcdir)/Mono.Addins.Description/NativeDependency.cs \
- $(srcdir)/Mono.Addins.Description/NodeTypeAttribute.cs \
- $(srcdir)/Mono.Addins.Description/NodeTypeAttributeCollection.cs \
- $(srcdir)/Mono.Addins.Description/ObjectDescription.cs \
- $(srcdir)/Mono.Addins.Description/ObjectDescriptionCollection.cs \
- $(srcdir)/Mono.Addins.Localization/IAddinLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/IPluralAddinLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/GettextDomain.cs \
- $(srcdir)/Mono.Addins.Localization/StringResourceLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/StringTableLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/IAddinLocalizerFactory.cs \
- $(srcdir)/Mono.Addins.Localization/NullLocalizer.cs \
- $(srcdir)/Mono.Addins.Localization/GettextLocalizer.cs \
- $(srcdir)/Mono.Addins.Serialization/BinaryXmlReader.cs \
- $(srcdir)/Mono.Addins.Serialization/BinaryXmlTypeMap.cs \
- $(srcdir)/Mono.Addins.Serialization/BinaryXmlWriter.cs \
- $(srcdir)/Mono.Addins.Serialization/IBinaryXmlElement.cs \
- $(srcdir)/Mono.Addins/Addin.cs \
- $(srcdir)/Mono.Addins/AddinAttribute.cs \
- $(srcdir)/Mono.Addins/AddinDependencyAttribute.cs \
- $(srcdir)/Mono.Addins/AddinErrorEventArgs.cs \
- $(srcdir)/Mono.Addins/AddinEventArgs.cs \
- $(srcdir)/Mono.Addins/AddinInfo.cs \
- $(srcdir)/Mono.Addins/AddinManager.cs \
- $(srcdir)/Mono.Addins/AddinLocalizer.cs \
- $(srcdir)/Mono.Addins/AddinRegistry.cs \
- $(srcdir)/Mono.Addins/AddinRootAttribute.cs \
- $(srcdir)/Mono.Addins/AddinSessionService.cs \
- $(srcdir)/Mono.Addins/ConditionType.cs \
- $(srcdir)/Mono.Addins/ConsoleProgressStatus.cs \
- $(srcdir)/Mono.Addins/ExtensionAttribute.cs \
- $(srcdir)/Mono.Addins/ExtensionContext.cs \
- $(srcdir)/Mono.Addins/ExtensionNode.cs \
- $(srcdir)/Mono.Addins/ExtensionNodeAttribute.cs \
- $(srcdir)/Mono.Addins/ExtensionNodeChildAttribute.cs \
- $(srcdir)/Mono.Addins/ExtensionNodeList.cs \
- $(srcdir)/Mono.Addins/ExtensionPointAttribute.cs \
- $(srcdir)/Mono.Addins/ExtensionTree.cs \
- $(srcdir)/Mono.Addins/GettextCatalog.cs \
- $(srcdir)/Mono.Addins/InstanceExtensionNode.cs \
- $(srcdir)/Mono.Addins/IAddinInstaller.cs \
- $(srcdir)/Mono.Addins/IProgressStatus.cs \
- $(srcdir)/Mono.Addins/MissingDependencyException.cs \
- $(srcdir)/Mono.Addins/NodeAttributeAttribute.cs \
- $(srcdir)/Mono.Addins/NodeElement.cs \
- $(srcdir)/Mono.Addins/RuntimeAddin.cs \
- $(srcdir)/Mono.Addins/TreeNode.cs \
- $(srcdir)/Mono.Addins/TreeNodeCollection.cs \
- $(srcdir)/Mono.Addins/TypeExtensionNode.cs \
- $(srcdir)/Mono.Addins/TypeExtensionPointAttribute.cs
-
-REFS = \
- -r:Mono.Posix \
- -r:System \
- -r:System.Xml
-
-PKGS =
-CSC_EXTRA_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG "-main:Mono.Addins.Database.SetupProcess"
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY) \
- $(ASSEMBLY).config
-
-EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- $(ASSEMBLY).config
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/mono-addins/Mono.Addins/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/mono-addins/Mono.Addins/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(assemblydir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(assemblydir)" || exit $$?; \
- done
-
-uninstall-assemblyDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(assemblydir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(assemblydir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-assemblyDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-assemblyDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-assemblyDATA install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(CSC) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
deleted file mode 100644
index 0154108..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
+++ /dev/null
@@ -1,1466 +0,0 @@
-//
-// AddinDatabase.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Threading;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Xml;
-using System.Reflection;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Database
-{
- class AddinDatabase
- {
- public const string GlobalDomain = "global";
-
- public const string VersionTag = "001";
-
- ArrayList allSetupInfos;
- ArrayList addinSetupInfos;
- ArrayList rootSetupInfos;
- internal static bool RunningSetupProcess;
- bool fatalDatabseError;
- Hashtable cachedAddinSetupInfos = new Hashtable ();
- AddinScanResult currentScanResult;
- AddinHostIndex hostIndex;
- FileDatabase fileDatabase;
- string addinDbDir;
- DatabaseConfiguration config = null;
- AddinRegistry registry;
- int lastDomainId;
-
- public AddinDatabase (AddinRegistry registry)
- {
- this.registry = registry;
- addinDbDir = Path.Combine (registry.RegistryPath, "addin-db-" + VersionTag);
- fileDatabase = new FileDatabase (AddinDbDir);
- }
-
- string AddinDbDir {
- get { return addinDbDir; }
- }
-
- public string AddinCachePath {
- get { return Path.Combine (AddinDbDir, "addin-data"); }
- }
-
- public string AddinFolderCachePath {
- get { return Path.Combine (AddinDbDir, "addin-dir-data"); }
- }
-
- public string AddinPrivateDataPath {
- get { return Path.Combine (AddinDbDir, "addin-priv-data"); }
- }
-
- public string HostsPath {
- get { return Path.Combine (AddinDbDir, "hosts"); }
- }
-
- string HostIndexFile {
- get { return Path.Combine (AddinDbDir, "host-index"); }
- }
-
- string ConfigFile {
- get { return Path.Combine (AddinDbDir, "config.xml"); }
- }
-
- internal bool IsGlobalRegistry {
- get {
- return registry.RegistryPath == AddinRegistry.GlobalRegistryPath;
- }
- }
-
- public void Clear ()
- {
- if (Directory.Exists (AddinCachePath))
- Directory.Delete (AddinCachePath, true);
- if (Directory.Exists (AddinFolderCachePath))
- Directory.Delete (AddinFolderCachePath, true);
- }
-
- public ExtensionNodeSet FindNodeSet (string domain, string addinId, string id)
- {
- return FindNodeSet (domain, addinId, id, new Hashtable ());
- }
-
- ExtensionNodeSet FindNodeSet (string domain, string addinId, string id, Hashtable visited)
- {
- if (visited.Contains (addinId))
- return null;
- visited.Add (addinId, addinId);
- Addin addin = GetInstalledAddin (domain, addinId, true, false);
- if (addin == null)
- return null;
- AddinDescription desc = addin.Description;
- if (desc == null)
- return null;
- foreach (ExtensionNodeSet nset in desc.ExtensionNodeSets)
- if (nset.Id == id)
- return nset;
-
- // Not found in the add-in. Look on add-ins on which it depends
-
- foreach (Dependency dep in desc.MainModule.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null) continue;
-
- string aid = Addin.GetFullId (desc.Namespace, adep.AddinId, adep.Version);
- ExtensionNodeSet nset = FindNodeSet (domain, aid, id, visited);
- if (nset != null)
- return nset;
- }
- return null;
- }
-
- public ArrayList GetInstalledAddins (string domain, AddinType type)
- {
- if (type == AddinType.All) {
- if (allSetupInfos != null)
- return allSetupInfos;
- }
- else if (type == AddinType.Addin) {
- if (addinSetupInfos != null)
- return addinSetupInfos;
- }
- else {
- if (rootSetupInfos != null)
- return rootSetupInfos;
- }
-
- InternalCheck (domain);
-
- using (fileDatabase.LockRead ()) {
- return InternalGetInstalledAddins (domain, null, type);
- }
- }
-
- ArrayList InternalGetInstalledAddins (string domain, AddinType type)
- {
- return InternalGetInstalledAddins (domain, null, type);
- }
-
- ArrayList InternalGetInstalledAddins (string domain, string idFilter, AddinType type)
- {
- if (allSetupInfos == null) {
- ArrayList alist = new ArrayList ();
-
- // Global add-ins are valid for any private domain
- if (domain != AddinDatabase.GlobalDomain)
- FindInstalledAddins (alist, AddinDatabase.GlobalDomain, idFilter);
-
- FindInstalledAddins (alist, domain, idFilter);
- if (idFilter != null)
- return alist;
- allSetupInfos = alist;
- }
- if (type == AddinType.All)
- return FilterById (allSetupInfos, idFilter);
-
- if (type == AddinType.Addin) {
- if (addinSetupInfos == null) {
- addinSetupInfos = new ArrayList ();
- foreach (Addin adn in allSetupInfos)
- if (!adn.Description.IsRoot)
- addinSetupInfos.Add (adn);
- }
- return FilterById (addinSetupInfos, idFilter);
- }
- else {
- if (rootSetupInfos == null) {
- rootSetupInfos = new ArrayList ();
- foreach (Addin adn in allSetupInfos)
- if (adn.Description.IsRoot)
- rootSetupInfos.Add (adn);
- }
- return FilterById (rootSetupInfos, idFilter);
- }
- }
-
- ArrayList FilterById (ArrayList addins, string id)
- {
- if (id == null)
- return addins;
- ArrayList list = new ArrayList ();
- foreach (Addin adn in addins) {
- if (Addin.GetIdName (adn.Id) == id)
- list.Add (adn);
- }
- return list;
- }
-
- void FindInstalledAddins (ArrayList result, string domain, string idFilter)
- {
- if (idFilter == null)
- idFilter = "*";
- string dir = Path.Combine (AddinCachePath, domain);
- if (Directory.Exists (dir)) {
- foreach (string file in fileDatabase.GetDirectoryFiles (dir, idFilter + ",*.maddin")) {
- string id = Path.GetFileNameWithoutExtension (file);
- result.Add (GetInstalledDomainAddin (domain, id, true, false, false));
- }
- }
- }
-
- public Addin GetInstalledAddin (string domain, string id)
- {
- return GetInstalledAddin (domain, id, false, false);
- }
-
- public Addin GetInstalledAddin (string domain, string id, bool exactVersionMatch)
- {
- return GetInstalledAddin (domain, id, exactVersionMatch, false);
- }
-
- public Addin GetInstalledAddin (string domain, string id, bool exactVersionMatch, bool enabledOnly)
- {
- // Try the given domain, and if not found, try the shared domain
- Addin ad = GetInstalledDomainAddin (domain, id, exactVersionMatch, enabledOnly, true);
- if (ad != null)
- return ad;
- if (domain != AddinDatabase.GlobalDomain)
- return GetInstalledDomainAddin (AddinDatabase.GlobalDomain, id, exactVersionMatch, enabledOnly, true);
- else
- return null;
- }
-
- Addin GetInstalledDomainAddin (string domain, string id, bool exactVersionMatch, bool enabledOnly, bool dbLockCheck)
- {
- Addin sinfo = null;
- string idd = id + " " + domain;
- object ob = cachedAddinSetupInfos [idd];
- if (ob != null) {
- sinfo = ob as Addin;
- if (sinfo != null) {
- if (!enabledOnly || sinfo.Enabled)
- return sinfo;
- if (exactVersionMatch)
- return null;
- }
- else if (enabledOnly)
- // Ignore the 'not installed' flag when disabled add-ins are allowed
- return null;
- }
-
- if (dbLockCheck)
- InternalCheck (domain);
-
- using ((dbLockCheck ? fileDatabase.LockRead () : null))
- {
- string path = GetDescriptionPath (domain, id);
- if (sinfo == null && fileDatabase.Exists (path)) {
- sinfo = new Addin (this, path);
- cachedAddinSetupInfos [idd] = sinfo;
- if (!enabledOnly || sinfo.Enabled)
- return sinfo;
- if (exactVersionMatch) {
- // Cache lookups with negative result
- cachedAddinSetupInfos [idd] = this;
- return null;
- }
- }
-
- // Exact version not found. Look for a compatible version
- if (!exactVersionMatch) {
- sinfo = null;
- string version, name, bestVersion = null;
- Addin.GetIdParts (id, out name, out version);
-
- foreach (Addin ia in InternalGetInstalledAddins (domain, name, AddinType.All))
- {
- if ((!enabledOnly || ia.Enabled) &&
- (version.Length == 0 || ia.SupportsVersion (version)) &&
- (bestVersion == null || Addin.CompareVersions (bestVersion, ia.Version) > 0))
- {
- bestVersion = ia.Version;
- sinfo = ia;
- }
- }
- if (sinfo != null) {
- cachedAddinSetupInfos [idd] = sinfo;
- return sinfo;
- }
- }
-
- // Cache lookups with negative result
- // Ignore the 'not installed' flag when disabled add-ins are allowed
- if (enabledOnly)
- cachedAddinSetupInfos [idd] = this;
- return null;
- }
- }
-
- public void Shutdown ()
- {
- ResetCachedData ();
- }
-
- public Addin GetAddinForHostAssembly (string domain, string assemblyLocation)
- {
- InternalCheck (domain);
- Addin ainfo = null;
-
- object ob = cachedAddinSetupInfos [assemblyLocation];
- if (ob != null)
- return ob as Addin; // Don't use a cast here is ob may not be an Addin.
-
- AddinHostIndex index = GetAddinHostIndex ();
- string addin, addinFile, rdomain;
- if (index.GetAddinForAssembly (assemblyLocation, out addin, out addinFile, out rdomain)) {
- string sid = addin + " " + rdomain;
- ainfo = cachedAddinSetupInfos [sid] as Addin;
- if (ainfo == null)
- ainfo = new Addin (this, GetDescriptionPath (rdomain, addin));
- cachedAddinSetupInfos [assemblyLocation] = ainfo;
- cachedAddinSetupInfos [addin + " " + rdomain] = ainfo;
- }
-
- return ainfo;
- }
-
-
- public bool IsAddinEnabled (string domain, string id)
- {
- Addin ainfo = GetInstalledAddin (domain, id);
- if (ainfo != null)
- return ainfo.Enabled;
- else
- return false;
- }
-
- internal bool IsAddinEnabled (string domain, string id, bool exactVersionMatch)
- {
- if (!exactVersionMatch)
- return IsAddinEnabled (domain, id);
- Addin ainfo = GetInstalledAddin (domain, id, exactVersionMatch, false);
- if (ainfo == null)
- return false;
- return Configuration.IsEnabled (id, ainfo.AddinInfo.EnabledByDefault);
- }
-
- public void EnableAddin (string domain, string id)
- {
- EnableAddin (domain, id, true);
- }
-
- internal void EnableAddin (string domain, string id, bool exactVersionMatch)
- {
- Addin ainfo = GetInstalledAddin (domain, id, exactVersionMatch, false);
- if (ainfo == null)
- // It may be an add-in root
- return;
-
- if (IsAddinEnabled (domain, id))
- return;
-
- // Enable required add-ins
-
- foreach (Dependency dep in ainfo.AddinInfo.Dependencies) {
- if (dep is AddinDependency) {
- AddinDependency adep = dep as AddinDependency;
- string adepid = Addin.GetFullId (ainfo.AddinInfo.Namespace, adep.AddinId, adep.Version);
- EnableAddin (domain, adepid, false);
- }
- }
-
- Configuration.SetStatus (id, true, ainfo.AddinInfo.EnabledByDefault);
- SaveConfiguration ();
-
- if (AddinManager.IsInitialized && AddinManager.Registry.RegistryPath == registry.RegistryPath)
- AddinManager.SessionService.ActivateAddin (id);
- }
-
- public void DisableAddin (string domain, string id)
- {
- Addin ai = GetInstalledAddin (domain, id, true);
- if (ai == null)
- throw new InvalidOperationException ("Extension '" + id + "' not installed.");
-
- if (!IsAddinEnabled (domain, id))
- return;
-
- Configuration.SetStatus (id, false, ai.AddinInfo.EnabledByDefault);
- SaveConfiguration ();
-
- // Disable all add-ins which depend on it
-
- try {
- string idName = Addin.GetIdName (id);
-
- foreach (Addin ainfo in GetInstalledAddins (domain, AddinType.Addin)) {
- foreach (Dependency dep in ainfo.AddinInfo.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null)
- continue;
-
- string adepid = Addin.GetFullId (ainfo.AddinInfo.Namespace, adep.AddinId, null);
- if (adepid != idName)
- continue;
-
- // The add-in that has been disabled, might be a requeriment of this one, or maybe not
- // if there is an older version available. Check it now.
-
- adepid = Addin.GetFullId (ainfo.AddinInfo.Namespace, adep.AddinId, adep.Version);
- Addin adepinfo = GetInstalledAddin (domain, adepid, false, true);
-
- if (adepinfo == null) {
- DisableAddin (domain, ainfo.Id);
- break;
- }
- }
- }
- }
- catch {
- // If something goes wrong, enable the add-in again
- Configuration.SetStatus (id, true, ai.AddinInfo.EnabledByDefault);
- SaveConfiguration ();
- throw;
- }
-
- if (AddinManager.IsInitialized && AddinManager.Registry.RegistryPath == registry.RegistryPath)
- AddinManager.SessionService.UnloadAddin (id);
- }
-
- internal string GetDescriptionPath (string domain, string id)
- {
- return Path.Combine (Path.Combine (AddinCachePath, domain), id + ".maddin");
- }
-
- void InternalCheck (string domain)
- {
- // If the database is broken, don't try to regenerate it at every check.
- if (fatalDatabseError)
- return;
-
- bool update = false;
- using (fileDatabase.LockRead ()) {
- if (!Directory.Exists (AddinCachePath)) {
- update = true;
- }
- }
- if (update)
- Update (null, domain);
- }
-
- void GenerateAddinExtensionMapsInternal (IProgressStatus monitor, ArrayList addinsToUpdate, ArrayList removedAddins)
- {
- AddinUpdateData updateData = new AddinUpdateData (this, monitor);
-
- // Clear cached data
- cachedAddinSetupInfos.Clear ();
-
- // Collect all information
-
- AddinIndex addinHash = new AddinIndex ();
-
- if (monitor.LogLevel > 1)
- monitor.Log ("Generating add-in extension maps");
-
- Hashtable changedAddins = null;
- ArrayList descriptionsToSave = new ArrayList ();
- ArrayList files = new ArrayList ();
-
- bool partialGeneration = addinsToUpdate != null;
- string[] domains = GetDomains ();
-
- // Get the files to be updated
-
- if (partialGeneration) {
- changedAddins = new Hashtable ();
- foreach (string sa in addinsToUpdate) {
- changedAddins [sa] = sa;
-
- // Look for all versions of the add-in, because this id may be the id of a reference,
- // and the exact reference version may not be installed.
- string s = sa;
- int i = s.LastIndexOf (',');
- if (i != -1)
- s = s.Substring (0, i);
- s += ",*";
-
- // Look for the add-in in any of the existing folders
- foreach (string domain in domains) {
- string mp = GetDescriptionPath (domain, s);
- string dir = Path.GetDirectoryName (mp);
- string pat = Path.GetFileName (mp);
- foreach (string fmp in fileDatabase.GetDirectoryFiles (dir, pat)) {
- if (files.Contains (fmp))
- continue;
- files.Add (fmp);
- string an = Path.GetFileNameWithoutExtension (fmp);
- changedAddins [an] = an;
- }
- }
- }
- foreach (string s in removedAddins)
- changedAddins [s] = s;
- }
- else {
- foreach (string dom in domains)
- files.AddRange (fileDatabase.GetDirectoryFiles (Path.Combine (AddinCachePath, dom), "*.maddin"));
- }
-
- // Load the descriptions.
- foreach (string file in files) {
-
- AddinDescription conf;
- if (!ReadAddinDescription (monitor, file, out conf)) {
- SafeDelete (monitor, file);
- continue;
- }
-
- // If the original file does not exist, the description can be deleted
- if (!File.Exists (conf.AddinFile)) {
- SafeDelete (monitor, file);
- continue;
- }
-
- // Remove old data from the description. If changedAddins==null, removes all data.
- // Otherwise, removes data only from the addins in the table.
-
- conf.UnmergeExternalData (changedAddins);
- descriptionsToSave.Add (conf);
-
- addinHash.Add (conf);
- }
-
- // Sort the add-ins, to make sure add-ins are processed before
- // all their dependencies
- ArrayList sorted = addinHash.GetSortedAddins ();
-
- // Register extension points and node sets
- foreach (AddinDescription conf in sorted)
- CollectExtensionPointData (conf, updateData);
-
- // Register extensions
- foreach (AddinDescription conf in sorted)
- CollectExtensionData (conf, updateData);
-
- // Save the maps
- foreach (AddinDescription conf in descriptionsToSave)
- conf.SaveBinary (fileDatabase);
-
- if (monitor.LogLevel > 1) {
- monitor.Log ("Addin relation map generated.");
- monitor.Log (" Addins Updated: " + descriptionsToSave.Count);
- monitor.Log (" Extension points: " + updateData.RelExtensionPoints);
- monitor.Log (" Extensions: " + updateData.RelExtensions);
- monitor.Log (" Extension nodes: " + updateData.RelExtensionNodes);
- monitor.Log (" Node sets: " + updateData.RelNodeSetTypes);
- }
- }
-
- // Collects extension data in a hash table. The key is the path, the value is a list
- // of add-ins ids that extend that path
-
- void CollectExtensionPointData (AddinDescription conf, AddinUpdateData updateData)
- {
- foreach (ExtensionNodeSet nset in conf.ExtensionNodeSets) {
- try {
- updateData.RegisterNodeSet (conf, nset);
- updateData.RelNodeSetTypes++;
- } catch (Exception ex) {
- throw new InvalidOperationException ("Error reading node set: " + nset.Id, ex);
- }
- }
-
- foreach (ExtensionPoint ep in conf.ExtensionPoints) {
- try {
- updateData.RegisterExtensionPoint (conf, ep);
- updateData.RelExtensionPoints++;
- } catch (Exception ex) {
- throw new InvalidOperationException ("Error reading extension point: " + ep.Path, ex);
- }
- }
- }
-
- void CollectExtensionData (AddinDescription conf, AddinUpdateData updateData)
- {
- foreach (ModuleDescription module in conf.AllModules) {
- foreach (Extension ext in module.Extensions) {
- updateData.RelExtensions++;
- updateData.RegisterExtension (conf, module, ext);
- AddChildExtensions (conf, module, updateData, ext.Path, ext.ExtensionNodes, false);
- }
- }
- }
-
- void AddChildExtensions (AddinDescription conf, ModuleDescription module, AddinUpdateData updateData, string path, ExtensionNodeDescriptionCollection nodes, bool conditionChildren)
- {
- // Don't register conditions as extension nodes.
- if (!conditionChildren)
- updateData.RegisterExtension (conf, module, path);
-
- foreach (ExtensionNodeDescription node in nodes) {
- if (node.NodeName == "ComplexCondition")
- continue;
- updateData.RelExtensionNodes++;
- string id = node.GetAttribute ("id");
- if (id.Length != 0)
- AddChildExtensions (conf, module, updateData, path + "/" + id, node.ChildNodes, node.NodeName == "Condition");
- }
- }
-
- string[] GetDomains ()
- {
- string[] dirs = fileDatabase.GetDirectories (AddinCachePath);
- string[] ids = new string [dirs.Length];
- for (int n=0; n<dirs.Length; n++)
- ids [n] = Path.GetFileName (dirs [n]);
- return ids;
- }
-
- public string GetUniqueDomainId ()
- {
- if (lastDomainId != 0) {
- lastDomainId++;
- return lastDomainId.ToString ();
- }
- lastDomainId = 1;
- foreach (string s in fileDatabase.GetDirectories (AddinCachePath)) {
- string dn = Path.GetFileName (s);
- if (dn == GlobalDomain)
- continue;
- try {
- int n = int.Parse (dn);
- if (n >= lastDomainId)
- lastDomainId = n + 1;
- } catch {
- }
- }
- return lastDomainId.ToString ();
- }
-
- internal void ResetCachedData ()
- {
- allSetupInfos = null;
- addinSetupInfos = null;
- rootSetupInfos = null;
- hostIndex = null;
- cachedAddinSetupInfos.Clear ();
- }
-
-
- public bool AddinDependsOn (string domain, string id1, string id2)
- {
- Addin addin1 = GetInstalledAddin (domain, id1, false);
-
- // We can assumbe that if the add-in is not returned here, it may be a root addin.
- if (addin1 == null)
- return false;
-
- id2 = Addin.GetIdName (id2);
- foreach (Dependency dep in addin1.AddinInfo.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null)
- continue;
- string depid = Addin.GetFullId (addin1.AddinInfo.Namespace, adep.AddinId, null);
- if (depid == id2)
- return true;
- else if (AddinDependsOn (domain, depid, id2))
- return true;
- }
- return false;
- }
-
- public void Repair (IProgressStatus monitor, string domain)
- {
- using (fileDatabase.LockWrite ()) {
- try {
- if (Directory.Exists (AddinCachePath))
- Directory.Delete (AddinCachePath, true);
- if (Directory.Exists (AddinFolderCachePath))
- Directory.Delete (AddinFolderCachePath, true);
- if (File.Exists (HostIndexFile))
- File.Delete (HostIndexFile);
- }
- catch (Exception ex) {
- monitor.ReportError ("The add-in registry could not be rebuilt. It may be due to lack of write permissions to the directory: " + AddinDbDir, ex);
- }
- }
- Update (monitor, domain);
- }
-
- public void Update (IProgressStatus monitor, string domain)
- {
- if (monitor == null)
- monitor = new ConsoleProgressStatus (false);
-
- if (RunningSetupProcess)
- return;
-
- fatalDatabseError = false;
-
- DateTime tim = DateTime.Now;
-
- Hashtable installed = new Hashtable ();
- bool changesFound = CheckFolders (monitor);
-
- if (monitor.IsCanceled)
- return;
-
- if (monitor.LogLevel > 1)
- monitor.Log ("Folders checked (" + (int) (DateTime.Now - tim).TotalMilliseconds + " ms)");
-
- if (changesFound) {
- // Something has changed, the add-ins need to be re-scanned, but it has
- // to be done in an external process
-
- if (domain != null) {
- using (fileDatabase.LockRead ()) {
- foreach (Addin ainfo in InternalGetInstalledAddins (domain, AddinType.Addin)) {
- installed [ainfo.Id] = ainfo.Id;
- }
- }
- }
-
- RunScannerProcess (monitor);
-
- ResetCachedData ();
-
- registry.NotifyDatabaseUpdated ();
- }
-
- if (fatalDatabseError)
- monitor.ReportError ("The add-in database could not be updated. It may be due to file corruption. Try running the setup repair utility", null);
-
- // Update the currently loaded add-ins
- if (changesFound && domain != null && AddinManager.IsInitialized && AddinManager.Registry.RegistryPath == registry.RegistryPath) {
- Hashtable newInstalled = new Hashtable ();
- foreach (Addin ainfo in GetInstalledAddins (domain, AddinType.Addin)) {
- newInstalled [ainfo.Id] = ainfo.Id;
- }
-
- foreach (string aid in installed.Keys) {
- if (!newInstalled.Contains (aid))
- AddinManager.SessionService.UnloadAddin (aid);
- }
-
- foreach (string aid in newInstalled.Keys) {
- if (!installed.Contains (aid)) {
- AddinManager.SessionService.ActivateAddin (aid);
- }
- }
- }
- }
-
- void RunScannerProcess (IProgressStatus monitor)
- {
- IProgressStatus scanMonitor = monitor;
- ArrayList pparams = new ArrayList ();
- pparams.Add (null); // scan folder
-
- bool retry = false;
- do {
- try {
- if (monitor.LogLevel > 1)
- monitor.Log ("Looking for addins");
- SetupProcess.ExecuteCommand (scanMonitor, registry.RegistryPath, AddinManager.StartupDirectory, "scan", (string[]) pparams.ToArray (typeof(string)));
- retry = false;
- }
- catch (Exception ex) {
- ProcessFailedException pex = ex as ProcessFailedException;
- if (pex != null) {
- // Get the last logged operation.
- if (pex.LastLog.StartsWith ("scan:")) {
- // It crashed while scanning a file. Add the file to the ignore list and try again.
- string file = pex.LastLog.Substring (5);
- pparams.Add (file);
- monitor.ReportWarning ("Could not scan file: " + file);
- retry = true;
- continue;
- }
- }
- fatalDatabseError = true;
- // If the process has crashed, try to do a new scan, this time using verbose log,
- // to give the user more information about the origin of the crash.
- if (pex != null && !retry) {
- monitor.ReportError ("Add-in scan operation failed. The Mono runtime may have encountered an error while trying to load an assembly.", null);
- if (monitor.LogLevel <= 1) {
- // Re-scan again using verbose log, to make it easy to find the origin of the error.
- retry = true;
- scanMonitor = new ConsoleProgressStatus (true);
- }
- } else
- retry = false;
-
- if (!retry) {
- monitor.ReportError ("Add-in scan operation failed", (ex is ProcessFailedException ? null : ex));
- monitor.Cancel ();
- return;
- }
- }
- }
- while (retry);
- }
-
- bool DatabaseInfrastructureCheck (IProgressStatus monitor)
- {
- // Do some sanity check, to make sure the basic database infrastructure can be created
-
- bool hasChanges = false;
-
- try {
-
- if (!Directory.Exists (AddinCachePath)) {
- Directory.CreateDirectory (AddinCachePath);
- hasChanges = true;
- }
-
- if (!Directory.Exists (AddinFolderCachePath)) {
- Directory.CreateDirectory (AddinFolderCachePath);
- hasChanges = true;
- }
-
- // Make sure we can write in those folders
-
- Util.CheckWrittableFloder (AddinCachePath);
- Util.CheckWrittableFloder (AddinFolderCachePath);
-
- fatalDatabseError = false;
- }
- catch (Exception ex) {
- monitor.ReportError ("Add-in cache directory could not be created", ex);
- fatalDatabseError = true;
- monitor.Cancel ();
- }
- return hasChanges;
- }
-
-
- internal bool CheckFolders (IProgressStatus monitor)
- {
- using (fileDatabase.LockRead ()) {
- AddinScanResult scanResult = new AddinScanResult ();
- scanResult.CheckOnly = true;
- InternalScanFolders (monitor, scanResult);
- return scanResult.ChangesFound;
- }
- }
-
- internal void ScanFolders (IProgressStatus monitor, string folderToScan, StringCollection filesToIgnore)
- {
- AddinScanResult res = new AddinScanResult ();
- res.FilesToIgnore = filesToIgnore;
- ScanFolders (monitor, res);
- }
-
- internal void ScanFolders (IProgressStatus monitor, AddinScanResult scanResult)
- {
- IDisposable checkLock = null;
-
- if (scanResult.CheckOnly)
- checkLock = fileDatabase.LockRead ();
- else {
- // All changes are done in a transaction, which won't be committed until
- // all files have been updated.
-
- if (!fileDatabase.BeginTransaction ()) {
- // The database is already being updated. Can't do anything for now.
- return;
- }
- }
-
- EventInfo einfo = typeof(AppDomain).GetEvent ("ReflectionOnlyAssemblyResolve");
- ResolveEventHandler resolver = new ResolveEventHandler (OnResolveAddinAssembly);
-
- try
- {
- // Perform the add-in scan
-
- if (!scanResult.CheckOnly) {
- AppDomain.CurrentDomain.AssemblyResolve += resolver;
- if (einfo != null) einfo.AddEventHandler (AppDomain.CurrentDomain, resolver);
- }
-
- InternalScanFolders (monitor, scanResult);
-
- if (!scanResult.CheckOnly)
- fileDatabase.CommitTransaction ();
- }
- catch {
- if (!scanResult.CheckOnly)
- fileDatabase.RollbackTransaction ();
- throw;
- }
- finally {
- currentScanResult = null;
-
- if (scanResult.CheckOnly)
- checkLock.Dispose ();
- else {
- AppDomain.CurrentDomain.AssemblyResolve -= resolver;
- if (einfo != null) einfo.RemoveEventHandler (AppDomain.CurrentDomain, resolver);
- }
- }
- }
-
- void InternalScanFolders (IProgressStatus monitor, AddinScanResult scanResult)
- {
- DateTime tim = DateTime.Now;
-
- DatabaseInfrastructureCheck (monitor);
- if (monitor.IsCanceled)
- return;
-
- try {
- scanResult.HostIndex = GetAddinHostIndex ();
- }
- catch (Exception ex) {
- if (scanResult.CheckOnly) {
- scanResult.ChangesFound = true;
- return;
- }
- monitor.ReportError ("Add-in root index is corrupt. The add-in database will be regenerated.", ex);
- scanResult.RegenerateAllData = true;
- }
-
- AddinScanner scanner = new AddinScanner (this);
-
- // Check if any of the previously scanned folders has been deleted
-
- foreach (string file in Directory.GetFiles (AddinFolderCachePath, "*.data")) {
- AddinScanFolderInfo folderInfo;
- bool res = ReadFolderInfo (monitor, file, out folderInfo);
- if (!res || !Directory.Exists (folderInfo.Folder)) {
- if (res) {
- // Folder has been deleted. Remove the add-ins it had.
- scanner.UpdateDeletedAddins (monitor, folderInfo, scanResult);
- }
- else {
- // Folder info file corrupt. Regenerate all.
- scanResult.ChangesFound = true;
- scanResult.RegenerateRelationData = true;
- }
-
- if (!scanResult.CheckOnly)
- SafeDelete (monitor, file);
- else
- return;
- }
- }
-
- // Look for changes in the add-in folders
-
- foreach (string dir in registry.AddinDirectories) {
- if (dir == registry.DefaultAddinsFolder)
- scanner.ScanFolderRec (monitor, dir, GlobalDomain, scanResult);
- else
- scanner.ScanFolder (monitor, dir, GlobalDomain, scanResult);
- if (scanResult.CheckOnly) {
- if (scanResult.ChangesFound || monitor.IsCanceled)
- return;
- }
- }
-
- if (scanResult.CheckOnly)
- return;
-
- // Scan the files which have been modified
-
- currentScanResult = scanResult;
-
- foreach (FileToScan file in scanResult.FilesToScan)
- scanner.ScanFile (monitor, file.File, file.AddinScanFolderInfo, scanResult);
-
- // Save folder info
-
- foreach (AddinScanFolderInfo finfo in scanResult.ModifiedFolderInfos)
- SaveFolderInfo (monitor, finfo);
-
- if (monitor.LogLevel > 1)
- monitor.Log ("Folders scan completed (" + (int) (DateTime.Now - tim).TotalMilliseconds + " ms)");
-
- SaveAddinHostIndex ();
- ResetCachedData ();
-
- if (!scanResult.ChangesFound) {
- if (monitor.LogLevel > 1)
- monitor.Log ("No changes found");
- return;
- }
-
- tim = DateTime.Now;
- try {
- if (scanResult.RegenerateRelationData)
- scanResult.AddinsToUpdateRelations = null;
-
- GenerateAddinExtensionMapsInternal (monitor, scanResult.AddinsToUpdateRelations, scanResult.RemovedAddins);
- }
- catch (Exception ex) {
- fatalDatabseError = true;
- monitor.ReportError ("The add-in database could not be updated. It may be due to file corruption. Try running the setup repair utility", ex);
- }
-
- if (monitor.LogLevel > 1)
- monitor.Log ("Add-in relations analyzed (" + (int) (DateTime.Now - tim).TotalMilliseconds + " ms)");
-
- SaveAddinHostIndex ();
- }
-
- public void ParseAddin (IProgressStatus progressStatus, string file, string outFile, bool inProcess)
- {
- if (!inProcess) {
- SetupProcess.ExecuteCommand (progressStatus, registry.RegistryPath, AddinManager.StartupDirectory, "get-desc", Path.GetFullPath (file), outFile);
- return;
- }
-
- using (fileDatabase.LockRead ())
- {
- // First of all, check if the file belongs to a registered add-in
- AddinScanFolderInfo finfo;
- if (GetFolderInfoForPath (progressStatus, Path.GetDirectoryName (file), out finfo) && finfo != null) {
- AddinFileInfo afi = finfo.GetAddinFileInfo (file);
- if (afi != null && afi.IsAddin) {
- AddinDescription adesc;
- GetAddinDescription (progressStatus, afi.Domain, afi.AddinId, out adesc);
- if (adesc != null)
- adesc.Save (outFile);
- return;
- }
- }
-
-
- AddinScanner scanner = new AddinScanner (this);
-
- SingleFileAssemblyResolver res = new SingleFileAssemblyResolver (progressStatus, registry, scanner);
- ResolveEventHandler resolver = new ResolveEventHandler (res.Resolve);
-
- EventInfo einfo = typeof(AppDomain).GetEvent ("ReflectionOnlyAssemblyResolve");
-
- try {
- AppDomain.CurrentDomain.AssemblyResolve += resolver;
- if (einfo != null) einfo.AddEventHandler (AppDomain.CurrentDomain, resolver);
-
- AddinDescription desc = scanner.ScanSingleFile (progressStatus, file, new AddinScanResult ());
- if (desc != null)
- desc.Save (outFile);
- }
- finally {
- AppDomain.CurrentDomain.AssemblyResolve -= resolver;
- if (einfo != null) einfo.RemoveEventHandler (AppDomain.CurrentDomain, resolver);
- }
- }
- }
-
- public string GetFolderDomain (IProgressStatus progressStatus, string path)
- {
- AddinScanFolderInfo folderInfo;
- if (GetFolderInfoForPath (progressStatus, path, out folderInfo) && folderInfo != null && !folderInfo.SharedFolder)
- return folderInfo.Domain;
- else
- return GlobalDomain;
- }
-
- Assembly OnResolveAddinAssembly (object s, ResolveEventArgs args)
- {
- string file = currentScanResult.GetAssemblyLocation (args.Name);
- if (file != null)
- return Util.LoadAssemblyForReflection (file);
- else {
- Console.WriteLine ("Assembly not found: " + args.Name);
- return null;
- }
- }
-
- public string GetFolderConfigFile (string path)
- {
- path = Path.GetFullPath (path);
-
- string s = path.Replace ("_", "__");
- s = s.Replace (Path.DirectorySeparatorChar, '_');
- s = s.Replace (Path.AltDirectorySeparatorChar, '_');
- s = s.Replace (Path.VolumeSeparatorChar, '_');
-
- return Path.Combine (AddinFolderCachePath, s + ".data");
- }
-
- internal void UninstallAddin (IProgressStatus monitor, string domain, string addinId, AddinScanResult scanResult)
- {
- scanResult.AddRemovedAddin (addinId);
- string file = GetDescriptionPath (domain, addinId);
- if (!fileDatabase.Exists (file)) {
- return;
- }
-
- // Add-in already existed. The dependencies of the old add-in need to be re-analized
-
- AddinDescription desc;
- if (ReadAddinDescription (monitor, file, out desc)) {
- Util.AddDependencies (desc, scanResult);
- if (desc.IsRoot)
- scanResult.HostIndex.RemoveHostData (desc.AddinId, desc.AddinFile);
- } else
- // If we can't get information about the old assembly, just regenerate all relation data
- scanResult.RegenerateRelationData = true;
-
- SafeDelete (monitor, file);
- string dir = Path.GetDirectoryName (file);
- if (fileDatabase.DirectoryIsEmpty (dir))
- SafeDeleteDir (monitor, dir);
- SafeDeleteDir (monitor, Path.Combine (AddinPrivateDataPath, Path.GetFileNameWithoutExtension (file)));
- }
-
- public bool GetAddinDescription (IProgressStatus monitor, string domain, string addinId, out AddinDescription description)
- {
- string file = GetDescriptionPath (domain, addinId);
- return ReadAddinDescription (monitor, file, out description);
- }
-
- public bool ReadAddinDescription (IProgressStatus monitor, string file, out AddinDescription description)
- {
- try {
- description = AddinDescription.ReadBinary (fileDatabase, file);
- if (description != null)
- description.OwnerDatabase = this;
- return true;
- }
- catch (Exception ex) {
- if (monitor == null)
- throw;
- description = null;
- monitor.ReportError ("Could not read folder info file", ex);
- return false;
- }
- }
-
- public bool SaveDescription (IProgressStatus monitor, AddinDescription desc, string replaceFileName)
- {
- try {
- if (replaceFileName != null)
- desc.SaveBinary (fileDatabase, replaceFileName);
- else {
- string file = GetDescriptionPath (desc.Domain, desc.AddinId);
- string dir = Path.GetDirectoryName (file);
- if (!fileDatabase.DirExists (dir))
- fileDatabase.CreateDir (dir);
- desc.SaveBinary (fileDatabase, file);
- }
- return true;
- }
- catch (Exception ex) {
- monitor.ReportError ("Add-in info file could not be saved", ex);
- return false;
- }
- }
-
- public bool AddinDescriptionExists (string domain, string addinId)
- {
- string file = GetDescriptionPath (domain, addinId);
- return fileDatabase.Exists (file);
- }
-
- public bool ReadFolderInfo (IProgressStatus monitor, string file, out AddinScanFolderInfo folderInfo)
- {
- try {
- folderInfo = AddinScanFolderInfo.Read (fileDatabase, file);
- return true;
- }
- catch (Exception ex) {
- folderInfo = null;
- monitor.ReportError ("Could not read folder info file", ex);
- return false;
- }
- }
-
- public bool GetFolderInfoForPath (IProgressStatus monitor, string path, out AddinScanFolderInfo folderInfo)
- {
- try {
- folderInfo = AddinScanFolderInfo.Read (fileDatabase, AddinFolderCachePath, path);
- return true;
- }
- catch (Exception ex) {
- folderInfo = null;
- if (monitor != null)
- monitor.ReportError ("Could not read folder info file", ex);
- return false;
- }
- }
-
- public bool SaveFolderInfo (IProgressStatus monitor, AddinScanFolderInfo folderInfo)
- {
- try {
- folderInfo.Write (fileDatabase, AddinFolderCachePath);
- return true;
- }
- catch (Exception ex) {
- monitor.ReportError ("Could not write folder info file", ex);
- return false;
- }
- }
-
- public bool DeleteFolderInfo (IProgressStatus monitor, AddinScanFolderInfo folderInfo)
- {
- return SafeDelete (monitor, folderInfo.FileName);
- }
-
- public bool SafeDelete (IProgressStatus monitor, string file)
- {
- try {
- fileDatabase.Delete (file);
- return true;
- }
- catch (Exception ex) {
- if (monitor.LogLevel > 1) {
- monitor.Log ("Could not delete file: " + file);
- monitor.Log (ex.ToString ());
- }
- return false;
- }
- }
-
- public bool SafeDeleteDir (IProgressStatus monitor, string dir)
- {
- try {
- fileDatabase.DeleteDir (dir);
- return true;
- }
- catch (Exception ex) {
- if (monitor.LogLevel > 1) {
- monitor.Log ("Could not delete directory: " + dir);
- monitor.Log (ex.ToString ());
- }
- return false;
- }
- }
-
- AddinHostIndex GetAddinHostIndex ()
- {
- if (hostIndex != null)
- return hostIndex;
-
- using (fileDatabase.LockRead ()) {
- if (fileDatabase.Exists (HostIndexFile))
- hostIndex = AddinHostIndex.Read (fileDatabase, HostIndexFile);
- else
- hostIndex = new AddinHostIndex ();
- }
- return hostIndex;
- }
-
- void SaveAddinHostIndex ()
- {
- if (hostIndex != null)
- hostIndex.Write (fileDatabase, HostIndexFile);
- }
-
- internal string GetUniqueAddinId (string file, string oldId, string ns, string version)
- {
- string baseId = "__" + Path.GetFileNameWithoutExtension (file);
-
- if (Path.GetExtension (baseId) == ".addin")
- baseId = Path.GetFileNameWithoutExtension (baseId);
-
- string name = baseId;
- string id = Addin.GetFullId (ns, name, version);
-
- // If the old Id is already an automatically generated one, reuse it
- if (oldId != null && oldId.StartsWith (id))
- return name;
-
- int n = 1;
- while (AddinIdExists (id)) {
- name = baseId + "_" + n;
- id = Addin.GetFullId (ns, name, version);
- n++;
- }
- return name;
- }
-
- bool AddinIdExists (string id)
- {
- foreach (string d in fileDatabase.GetDirectories (AddinCachePath)) {
- if (fileDatabase.Exists (Path.Combine (d, id + ".addin")))
- return true;
- }
- return false;
- }
-
- public void ResetConfiguration ()
- {
- if (File.Exists (ConfigFile))
- File.Delete (ConfigFile);
- }
-
- DatabaseConfiguration Configuration {
- get {
- if (config == null) {
- using (fileDatabase.LockRead ()) {
- if (fileDatabase.Exists (ConfigFile))
- config = DatabaseConfiguration.Read (ConfigFile);
- else
- config = new DatabaseConfiguration ();
- }
- }
- return config;
- }
- }
-
- void SaveConfiguration ()
- {
- if (config != null) {
- using (fileDatabase.LockWrite ()) {
- config.Write (ConfigFile);
- }
- }
- }
- }
-
- class SingleFileAssemblyResolver
- {
- AddinScanResult scanResult;
- AddinScanner scanner;
- AddinRegistry registry;
- IProgressStatus progressStatus;
-
- public SingleFileAssemblyResolver (IProgressStatus progressStatus, AddinRegistry registry, AddinScanner scanner)
- {
- this.scanner = scanner;
- this.registry = registry;
- this.progressStatus = progressStatus;
- }
-
- public Assembly Resolve (object s, ResolveEventArgs args)
- {
- if (scanResult == null) {
- scanResult = new AddinScanResult ();
- scanResult.LocateAssembliesOnly = true;
-
- foreach (string dir in registry.AddinDirectories)
- scanner.ScanFolder (progressStatus, dir, AddinDatabase.GlobalDomain, scanResult);
- }
-
- string afile = scanResult.GetAssemblyLocation (args.Name);
- if (afile != null)
- return Util.LoadAssemblyForReflection (afile);
- else
- return null;
- }
- }
-
- class AddinIndex
- {
- Hashtable addins = new Hashtable ();
-
- public void Add (AddinDescription desc)
- {
- string id = Addin.GetFullId (desc.Namespace, desc.LocalId, null);
- ArrayList list = (ArrayList) addins [id];
- if (list == null) {
- list = new ArrayList ();
- addins [id] = list;
- }
- list.Add (desc);
- }
-
- ArrayList FindDescriptions (string domain, string fullid)
- {
- // Returns all registered add-ins which are compatible with the provided
- // fullid. Compatible means that the id is the same and the version is within
- // the range of compatible versions of the add-in.
-
- ArrayList res = new ArrayList ();
- string id = Addin.GetIdName (fullid);
- ArrayList list = (ArrayList) addins [id];
- if (list == null)
- return res;
- string version = Addin.GetIdVersion (fullid);
- foreach (AddinDescription desc in list) {
- if ((desc.Domain == domain || domain == AddinDatabase.GlobalDomain) && desc.SupportsVersion (version))
- res.Add (desc);
- }
- return res;
- }
-
- public ArrayList GetSortedAddins ()
- {
- Hashtable inserted = new Hashtable ();
- Hashtable lists = new Hashtable ();
-
- foreach (ArrayList dlist in addins.Values) {
- foreach (AddinDescription desc in dlist)
- InsertSortedAddin (inserted, lists, desc);
- }
-
- // Merge all domain lists into a single list.
- // Make sure the global domain is inserted the last
-
- ArrayList global = (ArrayList) lists [AddinDatabase.GlobalDomain];
- lists.Remove (AddinDatabase.GlobalDomain);
-
- ArrayList list = new ArrayList ();
- foreach (ArrayList dl in lists.Values) {
- list.AddRange (dl);
- }
- if (global != null)
- list.AddRange (global);
- return list;
- }
-
- void InsertSortedAddin (Hashtable inserted, Hashtable lists, AddinDescription desc)
- {
- string sid = desc.AddinId + " " + desc.Domain;
- if (inserted.ContainsKey (sid))
- return;
- inserted [sid] = desc;
- foreach (ModuleDescription mod in desc.AllModules) {
- foreach (Dependency dep in mod.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null)
- continue;
- ArrayList descs = FindDescriptions (desc.Domain, adep.FullAddinId);
- if (descs.Count > 0) {
- foreach (AddinDescription sd in descs)
- InsertSortedAddin (inserted, lists, sd);
- }
-// else
-// Console.WriteLine ("NOT FOUND: " + adep.FullAddinId + " " + desc.Domain + " from " + sid);
- }
- }
- ArrayList list = (ArrayList) lists [desc.Domain];
- if (list == null) {
- list = new ArrayList ();
- lists [desc.Domain] = list;
- }
-
- list.Add (desc);
- }
- }
-
- enum AddinType
- {
- Addin,
- Root,
- All
- }
-}
-
-
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinHostIndex.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinHostIndex.cs
deleted file mode 100644
index d7b5174..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinHostIndex.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// AddinHostIndex.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Database
-{
- class AddinHostIndex: IBinaryXmlElement
- {
- static BinaryXmlTypeMap typeMap = new BinaryXmlTypeMap (typeof(AddinHostIndex));
-
- Hashtable index = new Hashtable ();
-
- public void RegisterAssembly (string assemblyLocation, string addinId, string addinLocation, string domain)
- {
- assemblyLocation = NormalizeFileName (assemblyLocation);
- index [Util.GetFullPath (assemblyLocation)] = addinId + " " + addinLocation + " " + domain;
- }
-
- public bool GetAddinForAssembly (string assemblyLocation, out string addinId, out string addinLocation, out string domain)
- {
- assemblyLocation = NormalizeFileName (assemblyLocation);
- string s = index [Util.GetFullPath (assemblyLocation)] as string;
- if (s == null) {
- addinId = null;
- addinLocation = null;
- domain = null;
- return false;
- }
- else {
- int i = s.IndexOf (' ');
- int j = s.LastIndexOf (' ');
- addinId = s.Substring (0, i);
- addinLocation = s.Substring (i+1, j-i-1);
- domain = s.Substring (j+1);
- return true;
- }
- }
-
- public void RemoveHostData (string addinId, string addinLocation)
- {
- string loc = addinId + " " + Util.GetFullPath (addinLocation) + " ";
- ArrayList todelete = new ArrayList ();
- foreach (DictionaryEntry e in index) {
- if (((string)e.Value).StartsWith (loc))
- todelete.Add (e.Key);
- }
- foreach (string s in todelete)
- index.Remove (s);
- }
-
- public static AddinHostIndex Read (FileDatabase fileDatabase, string file)
- {
- return (AddinHostIndex) fileDatabase.ReadObject (file, typeMap);
- }
-
- public void Write (FileDatabase fileDatabase, string file)
- {
- fileDatabase.WriteObject (file, this, typeMap);
- }
-
- void IBinaryXmlElement.Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("index", index);
- }
-
- void IBinaryXmlElement.Read (BinaryXmlReader reader)
- {
- reader.ReadValue ("index", index);
- }
-
- string NormalizeFileName (string name)
- {
- if (Util.IsWindows)
- return name.ToLower ();
- else
- return name;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs
deleted file mode 100644
index cac7d66..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-//
-// AddinScanFolderInfo.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-using System.Collections;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Database
-{
- class AddinScanFolderInfo: IBinaryXmlElement
- {
- Hashtable files = new Hashtable ();
- string folder;
- string fileName;
- string domain;
- bool sharedFolder = true;
-
- static BinaryXmlTypeMap typeMap = new BinaryXmlTypeMap (
- typeof(AddinScanFolderInfo),
- typeof(AddinFileInfo)
- );
-
- internal AddinScanFolderInfo ()
- {
- }
-
- public AddinScanFolderInfo (string folder)
- {
- this.folder = folder;
- }
-
- public string FileName {
- get { return fileName; }
- }
-
- public static AddinScanFolderInfo Read (FileDatabase filedb, string file)
- {
- AddinScanFolderInfo finfo = (AddinScanFolderInfo) filedb.ReadSharedObject (file, typeMap);
- if (finfo != null)
- finfo.fileName = file;
- return finfo;
- }
-
- public static AddinScanFolderInfo Read (FileDatabase filedb, string basePath, string folderPath)
- {
- string fileName;
- AddinScanFolderInfo finfo = (AddinScanFolderInfo) filedb.ReadSharedObject (basePath, GetDomain (folderPath), ".data", Util.GetFullPath (folderPath), typeMap, out fileName);
- if (finfo != null)
- finfo.fileName = fileName;
- return finfo;
- }
-
- static string GetDomain (string path)
- {
- path = Util.GetFullPath (path);
- string s = path.Replace (Path.DirectorySeparatorChar, '_');
- s = s.Replace (Path.AltDirectorySeparatorChar, '_');
- s = s.Replace (Path.VolumeSeparatorChar, '_');
- s = s.Trim ('_');
- if (s.Length > 200)
- s = s.Substring (s.Length - 200);
- return s;
- }
-
- public void Write (FileDatabase filedb, string basePath)
- {
- filedb.WriteSharedObject (basePath, GetDomain (folder), ".data", Util.GetFullPath (folder), fileName, typeMap, this);
- }
-
- public string GetExistingLocalDomain ()
- {
- foreach (AddinFileInfo info in files.Values) {
- if (info.Domain != null && info.Domain != AddinDatabase.GlobalDomain)
- return info.Domain;
- }
- return AddinDatabase.GlobalDomain;
- }
-
- public string Folder {
- get { return folder; }
- }
-
- public string Domain {
- get {
- if (sharedFolder)
- return AddinDatabase.GlobalDomain;
- else
- return domain;
- }
- set {
- domain = value;
- sharedFolder = true;
- }
- }
-
- public string RootsDomain {
- get {
- return domain;
- }
- set {
- domain = value;
- }
- }
-
- public string GetDomain (bool isRoot)
- {
- if (isRoot)
- return RootsDomain;
- else
- return Domain;
- }
-
- public bool SharedFolder {
- get {
- return sharedFolder;
- }
- set {
- sharedFolder = value;
- }
- }
-
- public DateTime GetLastScanTime (string file)
- {
- AddinFileInfo info = (AddinFileInfo) files [file];
- if (info == null)
- return DateTime.MinValue;
- else
- return info.LastScan;
- }
-
- public AddinFileInfo GetAddinFileInfo (string file)
- {
- return (AddinFileInfo) files [file];
- }
-
- public void SetLastScanTime (string file, string addinId, bool isRoot, DateTime time, bool scanError)
- {
- AddinFileInfo info = (AddinFileInfo) files [file];
- if (info == null) {
- info = new AddinFileInfo ();
- info.File = file;
- files [file] = info;
- }
- info.LastScan = time;
- info.AddinId = addinId;
- info.IsRoot = isRoot;
- info.ScanError = scanError;
- if (addinId != null)
- info.Domain = GetDomain (isRoot);
- else
- info.Domain = null;
- }
-
- public ArrayList GetMissingAddins ()
- {
- ArrayList missing = new ArrayList ();
-
- if (!Directory.Exists (folder)) {
- // All deleted
- foreach (AddinFileInfo info in files.Values) {
- if (info.IsAddin)
- missing.Add (info);
- }
- files.Clear ();
- return missing;
- }
- ArrayList toDelete = new ArrayList ();
- foreach (AddinFileInfo info in files.Values) {
- if (!File.Exists (info.File)) {
- if (info.IsAddin)
- missing.Add (info);
- toDelete.Add (info.File);
- }
- else if (info.IsAddin && info.Domain != GetDomain (info.IsRoot)) {
- missing.Add (info);
- }
- }
- foreach (string file in toDelete)
- files.Remove (file);
-
- return missing;
- }
-
- void IBinaryXmlElement.Write (BinaryXmlWriter writer)
- {
- if (files.Count == 0) {
- domain = null;
- sharedFolder = true;
- }
- writer.WriteValue ("folder", folder);
- writer.WriteValue ("files", files);
- writer.WriteValue ("domain", domain);
- writer.WriteValue ("sharedFolder", sharedFolder);
- }
-
- void IBinaryXmlElement.Read (BinaryXmlReader reader)
- {
- folder = reader.ReadStringValue ("folder");
- reader.ReadValue ("files", files);
- domain = reader.ReadStringValue ("domain");
- sharedFolder = reader.ReadBooleanValue ("sharedFolder");
- }
- }
-
-
- class AddinFileInfo: IBinaryXmlElement
- {
- public string File;
- public DateTime LastScan;
- public string AddinId;
- public bool IsRoot;
- public bool ScanError;
- public string Domain;
-
- public bool IsAddin {
- get { return AddinId != null && AddinId.Length != 0; }
- }
-
- void IBinaryXmlElement.Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("File", File);
- writer.WriteValue ("LastScan", LastScan);
- writer.WriteValue ("AddinId", AddinId);
- writer.WriteValue ("IsRoot", IsRoot);
- writer.WriteValue ("ScanError", ScanError);
- writer.WriteValue ("Domain", Domain);
- }
-
- void IBinaryXmlElement.Read (BinaryXmlReader reader)
- {
- File = reader.ReadStringValue ("File");
- LastScan = reader.ReadDateTimeValue ("LastScan");
- AddinId = reader.ReadStringValue ("AddinId");
- IsRoot = reader.ReadBooleanValue ("IsRoot");
- ScanError = reader.ReadBooleanValue ("ScanError");
- Domain = reader.ReadStringValue ("Domain");
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanResult.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanResult.cs
deleted file mode 100644
index ea03531..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanResult.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// AddinScanResult.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Reflection;
-using System.IO;
-using System.Collections;
-using System.Collections.Specialized;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Database
-{
- internal class AddinScanResult: MarshalByRefObject
- {
- internal ArrayList AddinsToScan = new ArrayList ();
- internal ArrayList AddinsToUpdateRelations = new ArrayList ();
- internal ArrayList FilesToScan = new ArrayList ();
- internal ArrayList ModifiedFolderInfos = new ArrayList ();
- internal ArrayList FilesWithScanFailure = new ArrayList ();
- internal AddinHostIndex HostIndex;
- internal ArrayList RemovedAddins = new ArrayList ();
- Hashtable visitedFolders = new Hashtable ();
-
- Hashtable assemblyLocations = new Hashtable ();
- Hashtable assemblyLocationsByFullName = new Hashtable ();
-
- public bool RegenerateAllData;
- public bool RegenerateRelationData;
- public bool changesFound;
- public bool CheckOnly;
- public bool LocateAssembliesOnly;
- public StringCollection FilesToIgnore;
-
- public bool ChangesFound {
- get { return changesFound; }
- set { changesFound = value; }
- }
-
- public bool VisitFolder (string folder)
- {
- if (visitedFolders.Contains (folder))
- return false;
- else {
- visitedFolders.Add (folder, folder);
- return true;
- }
- }
-
- public bool IgnoreFile (string file)
- {
- return FilesToIgnore != null && FilesToIgnore.Contains (file);
- }
-
- public void AddFileToIgnore (string fileName)
- {
- if (FilesToIgnore == null)
- FilesToIgnore = new StringCollection ();
- FilesToIgnore.Add (fileName);
- }
-
- public void AddAddinToScan (string addinId)
- {
- if (!AddinsToScan.Contains (addinId))
- AddinsToScan.Add (addinId);
- }
-
- public void AddRemovedAddin (string addinId)
- {
- if (!RemovedAddins.Contains (addinId))
- RemovedAddins.Add (addinId);
- }
-
- public void AddFileToWithFailure (string file)
- {
- if (!FilesWithScanFailure.Contains (file))
- FilesWithScanFailure.Add (file);
- }
-
- public void AddFileToScan (string file, AddinScanFolderInfo folderInfo)
- {
- FileToScan di = new FileToScan ();
- di.File = file;
- di.AddinScanFolderInfo = folderInfo;
- FilesToScan.Add (di);
- if (!ModifiedFolderInfos.Contains (folderInfo))
- ModifiedFolderInfos.Add (folderInfo);
- }
-
- public void AddAddinToUpdateRelations (string addinId)
- {
- if (!AddinsToUpdateRelations.Contains (addinId))
- AddinsToUpdateRelations.Add (addinId);
- }
-
- public void AddAssemblyLocation (string file)
- {
- string name = Path.GetFileNameWithoutExtension (file);
- ArrayList list = assemblyLocations [name] as ArrayList;
- if (list == null) {
- list = new ArrayList ();
- assemblyLocations [name] = list;
- }
- list.Add (file);
- }
-
- public string GetAssemblyLocation (string fullName)
- {
- string loc = assemblyLocationsByFullName [fullName] as String;
- if (loc != null)
- return loc;
-
- int i = fullName.IndexOf (',');
- string name = fullName.Substring (0,i);
- ArrayList list = assemblyLocations [name] as ArrayList;
- if (list == null)
- return null;
-
- string lastAsm = null;
- foreach (string file in list.ToArray ()) {
- AssemblyName aname = AssemblyName.GetAssemblyName (file);
- list.Remove (file);
- lastAsm = file;
- assemblyLocationsByFullName [aname.FullName] = file;
- if (aname.FullName == fullName)
- return file;
- }
-
- if (lastAsm != null) {
- // If an exact version is not found, just take any of them
- return lastAsm;
- }
- return null;
- }
- }
-
- class FileToScan
- {
- public string File;
- public AddinScanFolderInfo AddinScanFolderInfo;
- }
-
- class ObjectTypeExtenderData
- {
- public DependencyCollection Deps;
- public string TypeName;
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs
deleted file mode 100644
index 026b0b2..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs
+++ /dev/null
@@ -1,898 +0,0 @@
-//
-// AddinScanner.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Text;
-using System.Reflection;
-using System.Collections.Specialized;
-using System.Xml;
-using System.ComponentModel;
-
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Database
-{
- class AddinScanner: MarshalByRefObject
- {
- AddinDatabase database;
-
- public AddinScanner (AddinDatabase database)
- {
- this.database = database;
- }
-
- public void ScanFolder (IProgressStatus monitor, string path, string domain, AddinScanResult scanResult)
- {
- path = Util.GetFullPath (path);
-
- // Avoid folders including each other
- if (!scanResult.VisitFolder (path))
- return;
-
- if (monitor.LogLevel > 1 && !scanResult.LocateAssembliesOnly)
- monitor.Log ("Checking: " + path);
-
- AddinScanFolderInfo folderInfo;
- if (!database.GetFolderInfoForPath (monitor, path, out folderInfo)) {
- // folderInfo file was corrupt.
- // Just in case, we are going to regenerate all relation data.
- if (!Directory.Exists (path))
- scanResult.RegenerateRelationData = true;
- } else {
- if (folderInfo == null && !Directory.Exists (path))
- return;
- }
-
- // if domain is null it means that a new domain has to be created.
-
- bool sharedFolder = domain == AddinDatabase.GlobalDomain;
-
- if (folderInfo == null)
- folderInfo = new AddinScanFolderInfo (path);
-
- if (!sharedFolder && (folderInfo.SharedFolder || folderInfo.Domain != domain)) {
- // If the folder already has a domain, reuse it
- if (domain == null && folderInfo.RootsDomain != null && folderInfo.RootsDomain != AddinDatabase.GlobalDomain)
- domain = folderInfo.RootsDomain;
- else if (domain == null) {
- folderInfo.Domain = domain = database.GetUniqueDomainId ();
- scanResult.RegenerateRelationData = true;
- }
- else {
- folderInfo.Domain = domain;
- scanResult.RegenerateRelationData = true;
- }
- }
- else if (!folderInfo.SharedFolder && sharedFolder) {
- scanResult.RegenerateRelationData = true;
- }
-
- folderInfo.SharedFolder = sharedFolder;
-
- if (Directory.Exists (path))
- {
- string[] files = Directory.GetFiles (path);
-
- // First of all, look for .addin files. Addin files must be processed before
- // assemblies, because they may add files to the ignore list (i.e., assemblies
- // included in .addin files won't be scanned twice).
- foreach (string file in files) {
- if (file.EndsWith (".addin.xml") || file.EndsWith (".addin")) {
- RegisterFileToScan (monitor, file, scanResult, folderInfo);
- }
- }
-
- foreach (string file in files) {
- switch (Path.GetExtension (file)) {
- case ".dll":
- case ".exe":
- RegisterFileToScan (monitor, file, scanResult, folderInfo);
- scanResult.AddAssemblyLocation (file);
- break;
- case ".addins":
- ScanAddinsFile (monitor, file, domain, scanResult);
- break;
- }
- }
- }
- else if (!scanResult.LocateAssembliesOnly) {
- // The folder has been deleted. All add-ins defined in that folder should also be deleted.
- scanResult.RegenerateRelationData = true;
- scanResult.ChangesFound = true;
- if (scanResult.CheckOnly)
- return;
- database.DeleteFolderInfo (monitor, folderInfo);
- }
-
- if (scanResult.LocateAssembliesOnly)
- return;
-
- // Look for deleted add-ins.
-
- UpdateDeletedAddins (monitor, folderInfo, scanResult);
- }
-
- public void UpdateDeletedAddins (IProgressStatus monitor, AddinScanFolderInfo folderInfo, AddinScanResult scanResult)
- {
- ArrayList missing = folderInfo.GetMissingAddins ();
- if (missing.Count > 0) {
- if (Directory.Exists (folderInfo.Folder))
- scanResult.ModifiedFolderInfos.Add (folderInfo);
- scanResult.ChangesFound = true;
- if (scanResult.CheckOnly)
- return;
-
- foreach (AddinFileInfo info in missing) {
- database.UninstallAddin (monitor, info.Domain, info.AddinId, scanResult);
- }
- }
- }
-
- void RegisterFileToScan (IProgressStatus monitor, string file, AddinScanResult scanResult, AddinScanFolderInfo folderInfo)
- {
- if (scanResult.LocateAssembliesOnly)
- return;
-
- AddinFileInfo finfo = folderInfo.GetAddinFileInfo (file);
- bool added = false;
-
- if (finfo != null && (!finfo.IsAddin || finfo.Domain == folderInfo.GetDomain (finfo.IsRoot)) && File.GetLastWriteTime (file) == finfo.LastScan && !scanResult.RegenerateAllData) {
- if (finfo.ScanError) {
- // Always schedule the file for scan if there was an error in a previous scan.
- // However, don't set ChangesFound=true, in this way if there isn't any other
- // change in the registry, the file won't be scanned again.
- scanResult.AddFileToScan (file, folderInfo);
- added = true;
- }
-
- if (!finfo.IsAddin)
- return;
- if (database.AddinDescriptionExists (finfo.Domain, finfo.AddinId))
- return;
- }
-
- scanResult.ChangesFound = true;
-
- if (!scanResult.CheckOnly && !added)
- scanResult.AddFileToScan (file, folderInfo);
- }
-
- public void ScanFile (IProgressStatus monitor, string file, AddinScanFolderInfo folderInfo, AddinScanResult scanResult)
- {
- if (scanResult.IgnoreFile (file)) {
- // The file must be ignored. Maybe it caused a crash in a previous scan, or it
- // might be included by a .addin file (in which case it will be scanned when processing
- // the .addin file).
- folderInfo.SetLastScanTime (file, null, false, File.GetLastWriteTime (file), true);
- return;
- }
-
- if (monitor.LogLevel > 1)
- monitor.Log ("Scanning file: " + file);
-
- // Log the file to be scanned, so in case of a process crash the main process
- // will know what crashed
- monitor.Log ("plog:scan:" + file);
-
- string scannedAddinId = null;
- bool scannedIsRoot = false;
- bool scanSuccessful = false;
-
- try {
- string ext = Path.GetExtension (file);
- AddinDescription config = null;
-
- if (ext == ".dll" || ext == ".exe")
- scanSuccessful = ScanAssembly (monitor, file, scanResult, out config);
- else
- scanSuccessful = ScanConfigAssemblies (monitor, file, scanResult, out config);
-
- if (config != null) {
-
- AddinFileInfo fi = folderInfo.GetAddinFileInfo (file);
-
- // If version is not specified, make up one
- if (config.Version.Length == 0) {
- config.Version = "0.0.0.0";
- }
-
- if (config.LocalId.Length == 0) {
- // Generate an internal id for this add-in
- config.LocalId = database.GetUniqueAddinId (file, (fi != null ? fi.AddinId : null), config.Namespace, config.Version);
- config.HasUserId = false;
- }
-
- // Check errors in the description
- StringCollection errors = config.Verify ();
-
- if (database.IsGlobalRegistry && config.AddinId.IndexOf ('.') == -1) {
- errors.Add ("Add-ins registered in the global registry must have a namespace.");
- }
-
- if (errors.Count > 0) {
- scanSuccessful = false;
- monitor.ReportError ("Errors found in add-in '" + file + ":", null);
- foreach (string err in errors)
- monitor.ReportError (err, null);
- }
-
- // Make sure all extensions sets are initialized with the correct add-in id
-
- config.SetExtensionsAddinId (config.AddinId);
-
- scanResult.ChangesFound = true;
-
- // If the add-in already existed, try to reuse the relation data it had.
- // Also, the dependencies of the old add-in need to be re-analized
-
- AddinDescription existingDescription = null;
- bool res = database.GetAddinDescription (monitor, folderInfo.Domain, config.AddinId, out existingDescription);
-
- // If we can't get information about the old assembly, just regenerate all relation data
- if (!res)
- scanResult.RegenerateRelationData = true;
-
- string replaceFileName = null;
-
- if (existingDescription != null) {
- // Reuse old relation data
- config.MergeExternalData (existingDescription);
- Util.AddDependencies (existingDescription, scanResult);
- replaceFileName = existingDescription.FileName;
- }
-
- // If the scanned file results in an add-in version different from the one obtained from
- // previous scans, the old add-in needs to be uninstalled.
- if (fi != null && fi.IsAddin && fi.AddinId != config.AddinId) {
- database.UninstallAddin (monitor, folderInfo.Domain, fi.AddinId, scanResult);
-
- // If the add-in version has changed, regenerate everything again since old data can't be reused
- if (Addin.GetIdName (fi.AddinId) == Addin.GetIdName (config.AddinId))
- scanResult.RegenerateRelationData = true;
- }
-
- // If a description could be generated, save it now (if the scan was successful)
- if (scanSuccessful) {
-
- // Assign the domain
- if (config.IsRoot) {
- if (folderInfo.RootsDomain == null)
- folderInfo.RootsDomain = database.GetUniqueDomainId ();
- config.Domain = folderInfo.RootsDomain;
- } else
- config.Domain = folderInfo.Domain;
-
- if (config.IsRoot && scanResult.HostIndex != null) {
- // If the add-in is a root, register its assemblies
- foreach (string f in config.MainModule.Assemblies) {
- string asmFile = Path.Combine (config.BasePath, f);
- scanResult.HostIndex.RegisterAssembly (asmFile, config.AddinId, config.AddinFile, config.Domain);
- }
- }
-
- if (database.SaveDescription (monitor, config, replaceFileName)) {
- // The new dependencies also have to be updated
- Util.AddDependencies (config, scanResult);
- scanResult.AddAddinToUpdateRelations (config.AddinId);
- scannedAddinId = config.AddinId;
- scannedIsRoot = config.IsRoot;
- return;
- }
- }
- }
- }
- catch (Exception ex) {
- monitor.ReportError ("Unexpected error while scanning file: " + file, ex);
- }
- finally {
- folderInfo.SetLastScanTime (file, scannedAddinId, scannedIsRoot, File.GetLastWriteTime (file), !scanSuccessful);
- monitor.Log ("plog:endscan");
- }
- }
-
- public AddinDescription ScanSingleFile (IProgressStatus monitor, string file, AddinScanResult scanResult)
- {
- AddinDescription config = null;
-
- if (monitor.LogLevel > 1)
- monitor.Log ("Scanning file: " + file);
-
- monitor.Log ("plog:scan:" + file);
-
- try {
- string ext = Path.GetExtension (file);
- bool scanSuccessful;
-
- if (ext == ".dll" || ext == ".exe")
- scanSuccessful = ScanAssembly (monitor, file, scanResult, out config);
- else
- scanSuccessful = ScanConfigAssemblies (monitor, file, scanResult, out config);
-
- if (scanSuccessful && config != null) {
-
- if (config.Version.Length == 0)
- config.Version = "0.0.0.0";
-
- if (config.LocalId.Length == 0) {
- // Generate an internal id for this add-in
- config.LocalId = database.GetUniqueAddinId (file, "", config.Namespace, config.Version);
- }
- }
- }
- catch (Exception ex) {
- monitor.ReportError ("Unexpected error while scanning file: " + file, ex);
- } finally {
- monitor.Log ("plog:endscan");
- }
- return config;
- }
-
- public void ScanAddinsFile (IProgressStatus monitor, string file, string domain, AddinScanResult scanResult)
- {
- XmlTextReader r = null;
- ArrayList directories = new ArrayList ();
- ArrayList directoriesWithSubdirs = new ArrayList ();
- try {
- r = new XmlTextReader (new StreamReader (file));
- r.MoveToContent ();
- if (r.IsEmptyElement)
- return;
- r.ReadStartElement ();
- r.MoveToContent ();
- while (r.NodeType != XmlNodeType.EndElement) {
- if (r.NodeType == XmlNodeType.Element && r.LocalName == "Directory") {
- string subs = r.GetAttribute ("include-subdirs");
- string sdom;
- string share = r.GetAttribute ("shared");
- if (share == "true")
- sdom = AddinDatabase.GlobalDomain;
- else if (share == "false")
- sdom = null;
- else
- sdom = domain; // Inherit the domain
-
- string path = r.ReadElementString ().Trim ();
- if (path.Length > 0) {
- if (subs == "true")
- directoriesWithSubdirs.Add (new string[] {path, sdom});
- else
- directories.Add (new string[] {path, sdom});
- }
- }
- else if (r.NodeType == XmlNodeType.Element && r.LocalName == "GacAssembly") {
- string aname = r.ReadElementString ().Trim ();
- if (aname.Length > 0) {
- aname = Util.GetGacPath (aname);
- if (aname != null) {
- // Gac assemblies always use the global domain
- directories.Add (new string[] {aname, AddinDatabase.GlobalDomain});
- }
- }
- }
- else
- r.Skip ();
- r.MoveToContent ();
- }
- } catch (Exception ex) {
- monitor.ReportError ("Could not process addins file: " + file, ex);
- return;
- } finally {
- if (r != null)
- r.Close ();
- }
- foreach (string[] d in directories) {
- string dir = d[0];
- if (!Path.IsPathRooted (dir))
- dir = Path.Combine (Path.GetDirectoryName (file), dir);
- ScanFolder (monitor, dir, d[1], scanResult);
- }
- foreach (string[] d in directoriesWithSubdirs) {
- string dir = d[0];
- if (!Path.IsPathRooted (dir))
- dir = Path.Combine (Path.GetDirectoryName (file), dir);
- ScanFolderRec (monitor, dir, d[1], scanResult);
- }
- }
-
- public void ScanFolderRec (IProgressStatus monitor, string dir, string domain, AddinScanResult scanResult)
- {
- ScanFolder (monitor, dir, domain, scanResult);
-
- if (!Directory.Exists (dir))
- return;
-
- foreach (string sd in Directory.GetDirectories (dir))
- ScanFolderRec (monitor, sd, domain, scanResult);
- }
-
- bool ScanConfigAssemblies (IProgressStatus monitor, string filePath, AddinScanResult scanResult, out AddinDescription config)
- {
- config = null;
-
- try {
- string basePath = Path.GetDirectoryName (filePath);
-
- config = AddinDescription.Read (filePath);
- config.BasePath = basePath;
- config.AddinFile = filePath;
-
- return ScanDescription (monitor, config, null, scanResult);
- }
- catch (Exception ex) {
- // Something went wrong while scanning the assembly. We'll ignore it for now.
- monitor.ReportError ("There was an error while scanning add-in: " + filePath, ex);
- return false;
- }
- }
-
- bool ScanAssembly (IProgressStatus monitor, string filePath, AddinScanResult scanResult, out AddinDescription config)
- {
- config = null;
-
- try {
- Assembly asm = Util.LoadAssemblyForReflection (filePath);
-
- // Get the config file from the resources, if there is one
-
- string configFile = null;
- foreach (string res in asm.GetManifestResourceNames ()) {
- if (res.EndsWith (".addin") || res.EndsWith (".addin.xml")) {
- configFile = res;
- break;
- }
- }
-
- if (configFile != null) {
- using (Stream s = asm.GetManifestResourceStream (configFile)) {
- string asmFile = new Uri (asm.CodeBase).LocalPath;
- config = AddinDescription.Read (s, Path.GetDirectoryName (asmFile));
- }
- }
- else {
- // On this case, only scan the assembly if it has the Addin attribute.
- AddinAttribute att = (AddinAttribute) Attribute.GetCustomAttribute (asm, typeof(AddinAttribute), false);
- if (att == null) {
- config = null;
- return true;
- }
- config = new AddinDescription ();
- }
-
- config.BasePath = Path.GetDirectoryName (filePath);
- config.AddinFile = filePath;
-
- string rasmFile = Path.GetFileName (filePath);
- if (!config.MainModule.Assemblies.Contains (rasmFile))
- config.MainModule.Assemblies.Add (rasmFile);
-
- return ScanDescription (monitor, config, asm, scanResult);
- }
- catch (Exception ex) {
- // Something went wrong while scanning the assembly. We'll ignore it for now.
- monitor.ReportError ("There was an error while scanning assembly: " + filePath, ex);
- return false;
- }
- }
-
- bool ScanDescription (IProgressStatus monitor, AddinDescription config, Assembly rootAssembly, AddinScanResult scanResult)
- {
- // First of all scan the main module
-
- ArrayList assemblies = new ArrayList ();
- ArrayList asmFiles = new ArrayList ();
- ArrayList hostExtensionClasses = new ArrayList ();
-
- try {
- // Add all data files to the ignore file list. It avoids scanning assemblies
- // which are included as 'data' in an add-in.
- foreach (string df in config.AllFiles) {
- string file = Path.Combine (config.BasePath, df);
- scanResult.AddFileToIgnore (Util.GetFullPath (file));
- }
-
- foreach (string s in config.MainModule.Assemblies) {
- string asmFile = Path.Combine (config.BasePath, s);
- asmFiles.Add (asmFile);
- Assembly asm = Util.LoadAssemblyForReflection (asmFile);
- assemblies.Add (asm);
- scanResult.AddFileToIgnore (Util.GetFullPath (asmFile));
- }
-
- foreach (Assembly asm in assemblies)
- ScanAssemblyAddinHeaders (config, asm, scanResult);
-
- // The add-in id and version must be already assigned at this point
-
- // Clean host data from the index. New data will be added.
- if (scanResult.HostIndex != null)
- scanResult.HostIndex.RemoveHostData (config.AddinId, config.AddinFile);
-
- foreach (Assembly asm in assemblies)
- ScanAssemblyContents (config, asm, hostExtensionClasses, scanResult);
-
- } catch (Exception ex) {
- ReportReflectionException (monitor, ex, config, scanResult);
- return false;
- }
-
- foreach (Type t in hostExtensionClasses) {
- RegisterHostTypeNode (config, t, assemblies);
- }
-
- // Extension node types may have child nodes declared as attributes. Find them.
-
- Hashtable internalNodeSets = new Hashtable ();
-
- ArrayList setsCopy = new ArrayList ();
- setsCopy.AddRange (config.ExtensionNodeSets);
- foreach (ExtensionNodeSet eset in setsCopy)
- ScanNodeSet (config, eset, assemblies, internalNodeSets);
-
- foreach (ExtensionPoint ep in config.ExtensionPoints) {
- ScanNodeSet (config, ep.NodeSet, assemblies, internalNodeSets);
- }
-
- // Now scan all modules
-
- if (!config.IsRoot) {
- foreach (ModuleDescription mod in config.OptionalModules) {
- try {
- assemblies.Clear ();
- asmFiles.Clear ();
- foreach (string s in mod.Assemblies) {
- string asmFile = Path.Combine (config.BasePath, s);
- asmFiles.Add (asmFile);
- Assembly asm = Util.LoadAssemblyForReflection (asmFile);
- assemblies.Add (asm);
- scanResult.AddFileToIgnore (Util.GetFullPath (asmFile));
- }
- foreach (Assembly asm in assemblies)
- ScanAssemblyContents (config, asm, null, scanResult);
-
- } catch (Exception ex) {
- ReportReflectionException (monitor, ex, config, scanResult);
- }
- }
- }
-
- config.StoreFileInfo ();
- return true;
- }
-
- void ReportReflectionException (IProgressStatus monitor, Exception ex, AddinDescription config, AddinScanResult scanResult)
- {
- scanResult.AddFileToWithFailure (config.AddinFile);
- if (monitor.LogLevel <= 1)
- return;
-
- monitor.Log ("Could not load some add-in assemblies: " + ex.Message);
-
- ReflectionTypeLoadException rex = ex as ReflectionTypeLoadException;
- if (rex != null) {
- foreach (Exception e in rex.LoaderExceptions)
- monitor.Log ("Load exception: " + e);
- }
- }
-
- void ScanAssemblyAddinHeaders (AddinDescription config, Assembly asm, AddinScanResult scanResult)
- {
- // Get basic add-in information
- AddinAttribute att = (AddinAttribute) Attribute.GetCustomAttribute (asm, typeof(AddinAttribute), false);
- if (att != null) {
- if (att.Id.Length > 0)
- config.LocalId = att.Id;
- if (att.Version.Length > 0)
- config.Version = att.Version;
- if (att.Namespace.Length > 0)
- config.Namespace = att.Namespace;
- if (att.Category.Length > 0)
- config.Category = att.Category;
- config.IsRoot = att is AddinRootAttribute;
- }
- }
-
- void ScanAssemblyContents (AddinDescription config, Assembly asm, ArrayList hostExtensionClasses, AddinScanResult scanResult)
- {
- // Get dependencies
-
- object[] deps = asm.GetCustomAttributes (typeof(AddinDependencyAttribute), false);
- foreach (AddinDependencyAttribute dep in deps) {
- AddinDependency adep = new AddinDependency ();
- adep.AddinId = dep.Id;
- adep.Version = dep.Version;
- config.MainModule.Dependencies.Add (adep);
- }
-
- // Get extension points
-
- object[] extPoints = asm.GetCustomAttributes (typeof(ExtensionPointAttribute), false);
- foreach (ExtensionPointAttribute ext in extPoints) {
- ExtensionPoint ep = config.AddExtensionPoint (ext.Path);
- ep.Description = ext.Description;
- ep.Name = ext.Name;
- ep.AddExtensionNode (ext.NodeName, ext.NodeType.FullName);
- }
-
- foreach (Type t in asm.GetTypes ()) {
-
- if (Attribute.IsDefined (t, typeof(ExtensionAttribute))) {
- foreach (ExtensionAttribute eatt in t.GetCustomAttributes (typeof(ExtensionAttribute), false)) {
- string path;
- string nodeName;
-
- if (eatt.Path.Length == 0) {
- if (config.IsRoot) {
- // The extension point must be one of the defined by the assembly
- // Look for it later, when the assembly has been fully scanned.
- hostExtensionClasses.Add (t);
- continue;
- }
- else {
- path = GetBaseTypeNameList (t);
- if (path == "$") {
- // The type does not implement any interface and has no superclass.
- // Will be reported later as an error.
- path = "$" + t.FullName;
- }
- nodeName = "Type";
- }
- } else {
- path = eatt.Path;
- nodeName = eatt.NodeName;
- }
-
- ExtensionNodeDescription elem = config.MainModule.AddExtensionNode (path, nodeName);
- if (eatt.Id.Length > 0) {
- elem.SetAttribute ("id", eatt.Id);
- elem.SetAttribute ("type", t.FullName);
- } else {
- elem.SetAttribute ("id", t.FullName);
- }
- if (eatt.InsertAfter.Length > 0)
- elem.SetAttribute ("insertafter", eatt.InsertAfter);
- if (eatt.InsertBefore.Length > 0)
- elem.SetAttribute ("insertbefore", eatt.InsertAfter);
- }
- }
- else if (Attribute.IsDefined (t, typeof(TypeExtensionPointAttribute))) {
- foreach (TypeExtensionPointAttribute epa in t.GetCustomAttributes (typeof(TypeExtensionPointAttribute), false)) {
- ExtensionPoint ep;
-
- ExtensionNodeType nt = new ExtensionNodeType ();
-
- if (epa.Path.Length > 0) {
- ep = config.AddExtensionPoint (epa.Path);
- }
- else {
- ep = config.AddExtensionPoint (GetDefaultTypeExtensionPath (config, t));
- nt.ObjectTypeName = t.FullName;
- }
- nt.Id = epa.NodeName;
- nt.TypeName = epa.NodeType.FullName;
- ep.NodeSet.NodeTypes.Add (nt);
- ep.Description = epa.Description;
- ep.Name = epa.Name;
- ep.RootAddin = config.AddinId;
- ep.SetExtensionsAddinId (config.AddinId);
- }
- }
- }
- }
-
- void ScanNodeSet (AddinDescription config, ExtensionNodeSet nset, ArrayList assemblies, Hashtable internalNodeSets)
- {
- foreach (ExtensionNodeType nt in nset.NodeTypes)
- ScanNodeType (config, nt, assemblies, internalNodeSets);
- }
-
- void ScanNodeType (AddinDescription config, ExtensionNodeType nt, ArrayList assemblies, Hashtable internalNodeSets)
- {
- if (nt.TypeName.Length == 0)
- nt.TypeName = "Mono.Addins.TypeExtensionNode";
-
- Type ntype = FindAddinType (nt.TypeName, assemblies);
- if (ntype == null)
- return;
-
- // Add type information declared with attributes in the code
- ExtensionNodeAttribute nodeAtt = (ExtensionNodeAttribute) Attribute.GetCustomAttribute (ntype, typeof(ExtensionNodeAttribute), true);
- if (nodeAtt != null) {
- if (nt.Id.Length == 0 && nodeAtt.NodeName.Length > 0)
- nt.Id = nodeAtt.NodeName;
- if (nt.Description.Length == 0 && nodeAtt.Description.Length > 0)
- nt.Description = nodeAtt.Description;
- } else {
- // Use the node type name as default name
- if (nt.Id.Length == 0)
- nt.Id = ntype.Name;
- }
-
- // Add information about attributes
- object[] fieldAtts = ntype.GetCustomAttributes (typeof(NodeAttributeAttribute), true);
- foreach (NodeAttributeAttribute fatt in fieldAtts) {
- NodeTypeAttribute natt = new NodeTypeAttribute ();
- natt.Name = fatt.Name;
- natt.Required = fatt.Required;
- if (fatt.Type != null)
- natt.Type = fatt.Type.FullName;
- if (fatt.Description.Length > 0)
- natt.Description = fatt.Description;
- nt.Attributes.Add (natt);
- }
-
- // Check if the type has NodeAttribute attributes applied to fields.
- foreach (FieldInfo field in ntype.GetFields (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) {
- NodeAttributeAttribute fatt = (NodeAttributeAttribute) Attribute.GetCustomAttribute (field, typeof(NodeAttributeAttribute));
- if (fatt != null) {
- NodeTypeAttribute natt = new NodeTypeAttribute ();
- if (fatt.Name.Length > 0)
- natt.Name = fatt.Name;
- else
- natt.Name = field.Name;
- if (fatt.Description.Length > 0)
- natt.Description = fatt.Description;
- natt.Type = field.FieldType.FullName;
- natt.Required = fatt.Required;
- nt.Attributes.Add (natt);
- }
- }
-
- // Check if the extension type allows children by looking for [ExtensionNodeChild] attributes.
- // First of all, look in the internalNodeSets hashtable, which is being used as cache
-
- string childSet = (string) internalNodeSets [nt.TypeName];
-
- if (childSet == null) {
- object[] ats = ntype.GetCustomAttributes (typeof(ExtensionNodeChildAttribute), true);
- if (ats.Length > 0) {
- // Create a new node set for this type. It is necessary to create a new node set
- // instead of just adding child ExtensionNodeType objects to the this node type
- // because child types references can be recursive.
- ExtensionNodeSet internalSet = new ExtensionNodeSet ();
- internalSet.Id = ntype.Name + "_" + Guid.NewGuid().ToString ();
- foreach (ExtensionNodeChildAttribute at in ats) {
- ExtensionNodeType internalType = new ExtensionNodeType ();
- internalType.Id = at.NodeName;
- internalType.TypeName = at.ExtensionNodeType.FullName;
- internalSet.NodeTypes.Add (internalType);
- }
- config.ExtensionNodeSets.Add (internalSet);
- nt.NodeSets.Add (internalSet.Id);
-
- // Register the new set in a hashtable, to allow recursive references to the
- // same internal set.
- internalNodeSets [nt.TypeName] = internalSet.Id;
- internalNodeSets [ntype.AssemblyQualifiedName] = internalSet.Id;
- ScanNodeSet (config, internalSet, assemblies, internalNodeSets);
- }
- }
- else {
- if (childSet.Length == 0) {
- // The extension type does not declare children.
- return;
- }
- // The extension type can have children. The allowed children are
- // defined in this extension set.
- nt.NodeSets.Add (childSet);
- return;
- }
-
- ScanNodeSet (config, nt, assemblies, internalNodeSets);
- }
-
- string GetBaseTypeNameList (Type type)
- {
- StringBuilder sb = new StringBuilder ("$");
- Type btype = type.BaseType;
- while (btype != typeof(object)) {
- sb.Append (btype.FullName).Append (',');
- btype = btype.BaseType;
- }
- foreach (Type iterf in type.GetInterfaces ()) {
- sb.Append (iterf.FullName).Append (',');
- }
- if (sb.Length > 0)
- sb.Remove (sb.Length - 1, 1);
- return sb.ToString ();
- }
-
- void RegisterHostTypeNode (AddinDescription config, Type t, ArrayList assemblies)
- {
- foreach (ExtensionAttribute eatt in t.GetCustomAttributes (typeof(ExtensionAttribute), false)) {
- if (eatt.Path.Length > 0)
- continue;
-
- foreach (ExtensionPoint ep in config.ExtensionPoints) {
- foreach (ExtensionNodeType nt in ep.NodeSet.NodeTypes) {
- if (nt.ObjectTypeName.Length == 0)
- continue;
- Type etype = FindAddinType (nt.ObjectTypeName, assemblies);
- if (etype != null && etype.IsAssignableFrom (t)) {
- RegisterTypeNode (config, eatt, ep.Path, nt.Id, t);
- return;
- }
- }
- }
- }
- }
-
- Type FindAddinType (string typeName, ArrayList assemblies)
- {
- // Look in the current assembly
- Type etype = Type.GetType (typeName, false);
- if (etype != null)
- return etype;
-
- // Look in referenced assemblies
- foreach (Assembly asm in assemblies) {
- etype = asm.GetType (typeName);
- if (etype != null)
- return etype;
- }
-
- Hashtable visited = new Hashtable ();
-
- // Look in indirectly referenced assemblies
- foreach (Assembly asm in assemblies) {
- foreach (AssemblyName aref in asm.GetReferencedAssemblies ()) {
- if (visited.Contains (aref))
- continue;
- visited.Add (aref, aref);
- Assembly rasm = Assembly.Load (aref);
- etype = rasm.GetType (typeName);
- if (etype != null)
- return etype;
- }
- }
- return null;
- }
-
- void RegisterTypeNode (AddinDescription config, ExtensionAttribute eatt, string path, string nodeName, Type t)
- {
- ExtensionNodeDescription elem = config.MainModule.AddExtensionNode (path, nodeName);
- if (eatt.Id.Length > 0) {
- elem.SetAttribute ("id", eatt.Id);
- elem.SetAttribute ("type", t.FullName);
- } else {
- elem.SetAttribute ("id", t.FullName);
- }
- if (eatt.InsertAfter.Length > 0)
- elem.SetAttribute ("insertafter", eatt.InsertAfter);
- if (eatt.InsertBefore.Length > 0)
- elem.SetAttribute ("insertbefore", eatt.InsertAfter);
- }
-
- internal string GetDefaultTypeExtensionPath (AddinDescription desc, Type type)
- {
- return "/" + Addin.GetIdName (desc.AddinId) + "/TypeExtensions/" + type.FullName;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs
deleted file mode 100644
index e0b0eb2..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-//
-// AddinUpdateData.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Database
-{
- class AddinUpdateData
- {
- // This table collects information about extensions. For each path (key)
- // has a ExtensionInfo object with information about the addin that
- // defines the extension point and the addins which extend it
- Hashtable pathHash = new Hashtable ();
-
- // Collects globally defined node sets. Key is node set name. Value is
- // a ExtensionInfo
- Hashtable nodeSetHash = new Hashtable ();
-
- Hashtable objectTypeExtensions = new Hashtable ();
-
- internal int RelExtensionPoints;
- internal int RelExtensions;
- internal int RelNodeSetTypes;
- internal int RelExtensionNodes;
-
- class RootExtensionPoint
- {
- public AddinDescription Description;
- public ExtensionPoint ExtensionPoint;
- }
-
- IProgressStatus monitor;
-
- public AddinUpdateData (AddinDatabase database, IProgressStatus monitor)
- {
- this.monitor = monitor;
- }
-
- public void RegisterNodeSet (AddinDescription description, ExtensionNodeSet nset)
- {
- ArrayList extensions = (ArrayList) nodeSetHash [nset.Id];
- if (extensions != null) {
- // Extension point already registered
- ArrayList compatExtensions = GetCompatibleExtensionPoints (nset.Id, description, description.MainModule, extensions);
- if (compatExtensions.Count > 0) {
- foreach (ExtensionPoint einfo in compatExtensions)
- einfo.NodeSet.MergeWith (null, nset);
- return;
- }
- }
- // Create a new extension set
- RootExtensionPoint rep = new RootExtensionPoint ();
- rep.ExtensionPoint = new ExtensionPoint ();
- rep.ExtensionPoint.SetNodeSet (nset);
- rep.ExtensionPoint.RootAddin = description.AddinId;
- rep.ExtensionPoint.Path = nset.Id;
- rep.Description = description;
- if (extensions == null) {
- extensions = new ArrayList ();
- nodeSetHash [nset.Id] = extensions;
- }
- extensions.Add (rep);
- }
-
- public void RegisterExtensionPoint (AddinDescription description, ExtensionPoint ep)
- {
- ArrayList extensions = (ArrayList) pathHash [ep.Path];
- if (extensions != null) {
- // Extension point already registered
- ArrayList compatExtensions = GetCompatibleExtensionPoints (ep.Path, description, description.MainModule, extensions);
- if (compatExtensions.Count > 0) {
- foreach (ExtensionPoint einfo in compatExtensions)
- einfo.MergeWith (null, ep);
- RegisterObjectTypes (ep);
- return;
- }
- }
- // Create a new extension
- RootExtensionPoint rep = new RootExtensionPoint ();
- rep.ExtensionPoint = ep;
- rep.ExtensionPoint.RootAddin = description.AddinId;
- rep.Description = description;
- if (extensions == null) {
- extensions = new ArrayList ();
- pathHash [ep.Path] = extensions;
- }
- extensions.Add (rep);
- RegisterObjectTypes (ep);
- }
-
- void RegisterObjectTypes (ExtensionPoint ep)
- {
- // Register extension points bound to a node type
-
- foreach (ExtensionNodeType nt in ep.NodeSet.NodeTypes) {
- if (nt.ObjectTypeName.Length > 0) {
- ArrayList list = (ArrayList) objectTypeExtensions [nt.ObjectTypeName];
- if (list == null) {
- list = new ArrayList ();
- objectTypeExtensions [nt.ObjectTypeName] = list;
- }
- list.Add (ep);
- }
- }
- }
-
- public void RegisterExtension (AddinDescription description, ModuleDescription module, Extension extension)
- {
- if (extension.Path.StartsWith ("$")) {
- string[] objectTypes = extension.Path.Substring (1).Split (',');
- bool found = false;
- foreach (string s in objectTypes) {
- ArrayList list = (ArrayList) objectTypeExtensions [s];
- if (list != null) {
- found = true;
- foreach (ExtensionPoint ep in list) {
- if (IsAddinCompatible (ep.ParentAddinDescription, description, module)) {
- extension.Path = ep.Path;
- RegisterExtension (description, module, ep.Path);
- }
- }
- }
- }
- if (!found)
- monitor.ReportWarning ("The add-in '" + description.AddinId + "' is trying to register the class '" + extension.Path.Substring (1) + "', but there isn't any add-in defining a suitable extension point");
- }
- }
-
- public void RegisterExtension (AddinDescription description, ModuleDescription module, string path)
- {
- ArrayList extensions = (ArrayList) pathHash [path];
- if (extensions == null) {
- // Root add-in extension points are registered before any other kind of extension,
- // so we should find it now.
- extensions = GetParentExtensionInfo (path);
- }
- if (extensions == null) {
- monitor.ReportWarning ("The add-in '" + description.AddinId + "' is trying to extend '" + path + "', but there isn't any add-in defining this extension point");
- return;
- }
-
- bool found = false;
- foreach (RootExtensionPoint einfo in extensions) {
- if (IsAddinCompatible (einfo.Description, description, module)) {
- if (!einfo.ExtensionPoint.Addins.Contains (description.AddinId))
- einfo.ExtensionPoint.Addins.Add (description.AddinId);
- found = true;
- }
- }
- if (!found)
- monitor.ReportWarning ("The add-in '" + description.AddinId + "' is trying to extend '" + path + "', but there isn't any compatible add-in defining this extension point");
- }
-
- ArrayList GetCompatibleExtensionPoints (string path, AddinDescription description, ModuleDescription module, ArrayList rootExtensionPoints)
- {
- ArrayList list = new ArrayList ();
- foreach (RootExtensionPoint rep in rootExtensionPoints) {
-
- // Find an extension point defined in a root add-in which is compatible with the version of the extender dependency
- if (IsAddinCompatible (rep.Description, description, module))
- list.Add (rep.ExtensionPoint);
- }
- return list;
- }
-
- ArrayList GetParentExtensionInfo (string path)
- {
- int i = path.LastIndexOf ('/');
- if (i == -1)
- return null;
- string np = path.Substring (0, i);
- ArrayList ep = (ArrayList) pathHash [np];
- if (ep != null)
- return ep;
- else
- return GetParentExtensionInfo (np);
- }
-
- bool IsAddinCompatible (AddinDescription installedDescription, AddinDescription description, ModuleDescription module)
- {
- if (installedDescription == description)
- return true;
- if (installedDescription.Domain != AddinDatabase.GlobalDomain) {
- if (description.Domain != AddinDatabase.GlobalDomain && description.Domain != installedDescription.Domain)
- return false;
- } else if (description.Domain != AddinDatabase.GlobalDomain)
- return false;
-
- string addinId = Addin.GetFullId (installedDescription.Namespace, installedDescription.LocalId, null);
- string requiredVersion = null;
-
- for (int n = module.Dependencies.Count - 1; n >= 0; n--) {
- AddinDependency adep = module.Dependencies [n] as AddinDependency;
- if (adep != null && Addin.GetFullId (description.Namespace, adep.AddinId, null) == addinId) {
- requiredVersion = adep.Version;
- break;
- }
- }
- if (requiredVersion == null)
- return false;
-
- // Check if the required version is between rep.Description.CompatVersion and rep.Description.Version
- if (Addin.CompareVersions (installedDescription.Version, requiredVersion) > 0)
- return false;
- if (installedDescription.CompatVersion.Length > 0 && Addin.CompareVersions (installedDescription.CompatVersion, requiredVersion) < 0)
- return false;
-
- return true;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/DatabaseConfiguration.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/DatabaseConfiguration.cs
deleted file mode 100644
index 21323d2..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/DatabaseConfiguration.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// DatabaseConfiguration.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Xml;
-
-namespace Mono.Addins.Database
-{
- internal class DatabaseConfiguration
- {
- Hashtable addinStatus = new Hashtable ();
-
- public bool IsEnabled (string addinId, bool defaultValue)
- {
- if (addinStatus.Contains (addinId))
- return addinStatus [addinId] != null;
- else
- return defaultValue;
- }
-
- public void SetStatus (string addinId, bool enabled, bool defaultValue)
- {
- if (enabled == defaultValue)
- addinStatus.Remove (addinId);
- else if (enabled)
- addinStatus [addinId] = this;
- else
- addinStatus [addinId] = null;
- }
-
- public static DatabaseConfiguration Read (string file)
- {
- DatabaseConfiguration config = new DatabaseConfiguration ();
-
- StreamReader s = new StreamReader (file);
- using (s) {
- XmlTextReader tr = new XmlTextReader (s);
- tr.MoveToContent ();
- if (tr.IsEmptyElement)
- return config;
-
- tr.ReadStartElement ("Configuration");
- tr.MoveToContent ();
-
- while (tr.NodeType != XmlNodeType.EndElement) {
-
- if (tr.NodeType != XmlNodeType.Element || tr.IsEmptyElement) {
- tr.Skip ();
- }
- else if (tr.LocalName == "DisabledAddins") {
- // For back compatibility
- tr.ReadStartElement ();
- tr.MoveToContent ();
- while (tr.NodeType != XmlNodeType.EndElement) {
- if (tr.NodeType == XmlNodeType.Element && tr.LocalName == "Addin")
- config.addinStatus [tr.ReadElementString ()] = null;
- else
- tr.Skip ();
- tr.MoveToContent ();
- }
- tr.ReadEndElement ();
- }
- else if (tr.LocalName == "AddinStatus") {
- tr.ReadStartElement ();
- tr.MoveToContent ();
- while (tr.NodeType != XmlNodeType.EndElement) {
- if (tr.NodeType == XmlNodeType.Element && tr.LocalName == "Addin") {
- string aid = tr.GetAttribute ("id");
- string senabled = tr.GetAttribute ("enabled");
- if (senabled.Length == 0 || senabled == "True")
- config.addinStatus [aid] = config;
- else
- config.addinStatus [aid] = null;
- }
- tr.Skip ();
- tr.MoveToContent ();
- }
- tr.ReadEndElement ();
- }
- tr.MoveToContent ();
- }
- }
- return config;
- }
-
- public void Write (string file)
- {
- StreamWriter s = new StreamWriter (file);
- using (s) {
- XmlTextWriter tw = new XmlTextWriter (s);
- tw.Formatting = Formatting.Indented;
- tw.WriteStartElement ("Configuration");
- tw.WriteStartElement ("AddinStatus");
- foreach (DictionaryEntry e in addinStatus) {
- tw.WriteStartElement ("Addin");
- tw.WriteAttributeString ("id", (string)e.Key);
- tw.WriteAttributeString ("enabled", (e.Value != null).ToString ());
- tw.WriteEndElement ();
- }
- tw.WriteEndElement ();
- tw.WriteEndElement ();
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/FileDatabase.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/FileDatabase.cs
deleted file mode 100644
index 1f78f2b..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/FileDatabase.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-//
-// FileDatabase.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.IO;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Database
-{
- internal class FileDatabase
- {
- Stream updatingLock;
-
- bool inTransaction;
- string rootDirectory;
- Hashtable foldersToUpdate;
- Hashtable deletedFiles;
- Hashtable deletedDirs;
- IDisposable transactionLock;
- bool ignoreDesc;
-
- public FileDatabase (string rootDirectory)
- {
- this.rootDirectory = rootDirectory;
- }
-
- string DatabaseLockFile {
- get { return Path.Combine (rootDirectory, "fdb-lock"); }
- }
-
- string UpdateDatabaseLockFile {
- get { return Path.Combine (rootDirectory, "fdb-update-lock"); }
- }
-
- // Returns 'true' if description data must be ignored when reading the contents of a file
- public bool IgnoreDescriptionData {
- get { return ignoreDesc; }
- set { ignoreDesc = value; }
- }
-
- public bool BeginTransaction ()
- {
- if (inTransaction)
- throw new InvalidOperationException ("Already in a transaction");
-
- transactionLock = LockWrite ();
- try {
- updatingLock = new FileStream (UpdateDatabaseLockFile, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
- } catch (IOException) {
- // The database is already being updated. Can't do anything for now.
- return false;
- } finally {
- transactionLock.Dispose ();
- }
-
- // Delete .new files that could have been left by an aborted database update
-
- transactionLock = LockRead ();
- CleanDirectory (rootDirectory);
-
- inTransaction = true;
- foldersToUpdate = new Hashtable ();
- deletedFiles = new Hashtable ();
- deletedDirs = new Hashtable ();
- return true;
- }
-
- void CleanDirectory (string dir)
- {
- foreach (string file in Directory.GetFiles (dir, "*.new"))
- File.Delete (file);
-
- foreach (string sdir in Directory.GetDirectories (dir))
- CleanDirectory (sdir);
- }
-
- public IDisposable LockRead ()
- {
- return FileLock (FileAccess.Read, -1);
- }
-
- public IDisposable LockWrite ()
- {
- return FileLock (FileAccess.Write, -1);
- }
-
- IDisposable FileLock (FileAccess access, int timeout)
- {
- DateTime tim = DateTime.Now;
- DateTime wt = tim;
-
- FileShare share = access == FileAccess.Read ? FileShare.Read : FileShare.None;
- string path = Path.GetDirectoryName (DatabaseLockFile);
-
- if (!Directory.Exists (path))
- Directory.CreateDirectory (path);
-
- do {
- try {
- return new FileStream (DatabaseLockFile, FileMode.OpenOrCreate, access, share);
- }
- catch (IOException) {
- // Wait and try again
- if ((DateTime.Now - wt).TotalSeconds >= 4) {
- Console.WriteLine ("Waiting for " + access + " add-in database lock");
- wt = DateTime.Now;
- }
-
- }
- System.Threading.Thread.Sleep (100);
- }
- while (timeout <= 0 || (DateTime.Now - tim).TotalMilliseconds < timeout);
-
- throw new Exception ("Lock timed out");
- }
-
- public Stream Create (string fileName)
- {
- if (inTransaction) {
- deletedFiles.Remove (fileName);
- foldersToUpdate [Path.GetDirectoryName (fileName)] = null;
- return File.Create (fileName + ".new");
- }
- else
- return File.Create (fileName);
- }
-
- public Stream OpenRead (string fileName)
- {
- if (inTransaction) {
- if (deletedFiles.Contains (fileName))
- throw new FileNotFoundException ();
- if (File.Exists (fileName + ".new"))
- return File.OpenRead (fileName + ".new");
- }
- return File.OpenRead (fileName);
- }
-
- public void Delete (string fileName)
- {
- if (inTransaction) {
- if (deletedFiles.Contains (fileName))
- return;
- if (File.Exists (fileName + ".new"))
- File.Delete (fileName + ".new");
- if (File.Exists (fileName))
- deletedFiles [fileName] = null;
- }
- else {
- File.Delete (fileName);
- }
- }
-
- public void DeleteDir (string dirName)
- {
- if (inTransaction) {
- if (deletedDirs.Contains (dirName))
- return;
- if (Directory.Exists (dirName + ".new"))
- Directory.Delete (dirName + ".new", true);
- if (Directory.Exists (dirName))
- deletedDirs [dirName] = null;
- }
- else {
- Directory.Delete (dirName, true);
- }
- }
-
-
- public bool Exists (string fileName)
- {
- if (inTransaction) {
- if (deletedFiles.Contains (fileName))
- return false;
- if (File.Exists (fileName + ".new"))
- return true;
- }
- return File.Exists (fileName);
- }
-
- public bool DirExists (string dir)
- {
- return Directory.Exists (dir);
- }
-
- public void CreateDir (string dir)
- {
- Directory.CreateDirectory (dir);
- }
-
- public string[] GetDirectories (string dir)
- {
- return Directory.GetDirectories (dir);
- }
-
- public bool DirectoryIsEmpty (string dir)
- {
- foreach (string f in Directory.GetFiles (dir)) {
- if (!inTransaction || !deletedFiles.Contains (f))
- return false;
- }
- return true;
- }
-
- public string[] GetDirectoryFiles (string dir, string pattern)
- {
- if (pattern == null || pattern.Length == 0 || pattern.EndsWith ("*"))
- throw new NotSupportedException ();
-
- if (inTransaction) {
- Hashtable files = new Hashtable ();
- foreach (string f in Directory.GetFiles (dir, pattern)) {
- if (!deletedFiles.Contains (f))
- files [f] = f;
- }
- foreach (string f in Directory.GetFiles (dir, pattern + ".new")) {
- string ofile = f.Substring (0, f.Length - 4);
- files [ofile] = ofile;
- }
- string[] res = new string [files.Count];
- int n = 0;
- foreach (string s in files.Keys)
- res [n++] = s;
- return res;
- }
- else
- return Directory.GetFiles (dir, pattern);
- }
-
- public void CommitTransaction ()
- {
- if (!inTransaction)
- return;
-
- try {
- transactionLock.Dispose ();
- transactionLock = LockWrite ();
- foreach (string dir in foldersToUpdate.Keys) {
- foreach (string file in Directory.GetFiles (dir, "*.new")) {
- string dst = file.Substring (0, file.Length - 4);
- File.Delete (dst);
- File.Move (file, dst);
- }
- }
- foreach (string file in deletedFiles.Keys)
- File.Delete (file);
- foreach (string dir in deletedDirs.Keys)
- Directory.Delete (dir, true);
- }
- finally {
- transactionLock.Dispose ();
- EndTransaction ();
- }
- }
-
- public void RollbackTransaction ()
- {
- if (!inTransaction)
- return;
-
- try {
- // There is no need for write lock since existing files won't be updated.
-
- foreach (string dir in foldersToUpdate.Keys) {
- foreach (string file in Directory.GetFiles (dir, "*.new"))
- File.Delete (file);
- }
- }
- finally {
- transactionLock.Dispose ();
- EndTransaction ();
- }
- }
-
- void EndTransaction ()
- {
- inTransaction = false;
- deletedFiles = null;
- foldersToUpdate = null;
- updatingLock.Close ();
- updatingLock = null;
- transactionLock = null;
- }
-
-
-
- // The ReadSharedObject and WriteSharedObject methods can be used to read/write objects from/to files.
- // What's special about those methods is that they handle file name colisions.
-
- public string[] GetObjectSharedFiles (string directory, string sharedFileName, string extension)
- {
- return GetDirectoryFiles (directory, sharedFileName + "*" + extension);
- }
-
- public object ReadSharedObject (string fullFileName, BinaryXmlTypeMap typeMap)
- {
- object result;
- OpenFileForPath (fullFileName, null, typeMap, false, out result);
- return result;
- }
-
- public bool SharedObjectExists (string directory, string sharedFileName, string extension, string objectId)
- {
- return null != GetSharedObjectFile (directory, sharedFileName, extension, objectId);
- }
-
- public string GetSharedObjectFile (string directory, string sharedFileName, string extension, string objectId)
- {
- string fileName;
- ReadSharedObject (directory, sharedFileName, extension, objectId, null, true, out fileName);
- return fileName;
- }
-
- public object ReadSharedObject (string directory, string sharedFileName, string extension, string objectId, BinaryXmlTypeMap typeMap, out string fileName)
- {
- return ReadSharedObject (directory, sharedFileName, extension, objectId, typeMap, false, out fileName);
- }
-
- object ReadSharedObject (string directory, string sharedFileName, string extension, string objectId, BinaryXmlTypeMap typeMap, bool checkOnly, out string fileName)
- {
- string name = sharedFileName + "_" + Util.GetStringHashCode (objectId).ToString ("x");
- string file = Path.Combine (directory, name + extension);
-
- object result;
- if (OpenFileForPath (file, objectId, typeMap, checkOnly, out result)) {
- fileName = file;
- return result;
- }
-
- // The file is not the one we expected. There has been a name colision
-
- foreach (string f in GetDirectoryFiles (directory, name + "*" + extension)) {
- if (f != file && OpenFileForPath (f, objectId, typeMap, checkOnly, out result)) {
- fileName = f;
- return result;
- }
- }
-
- // File not found
- fileName = null;
- return null;
- }
-
- bool OpenFileForPath (string f, string objectId, BinaryXmlTypeMap typeMap, bool checkOnly, out object result)
- {
- result = null;
-
- if (!Exists (f)) {
- return false;
- }
- using (Stream s = OpenRead (f)) {
- BinaryXmlReader reader = new BinaryXmlReader (s, typeMap);
- reader.ReadBeginElement ();
- string id = reader.ReadStringValue ("id");
- if (objectId == null || objectId == id) {
- if (!checkOnly)
- result = reader.ReadValue ("data");
- return true;
- }
- }
- return false;
- }
-
- public void WriteSharedObject (string objectId, string targetFile, BinaryXmlTypeMap typeMap, IBinaryXmlElement obj)
- {
- WriteSharedObject (null, null, null, objectId, targetFile, typeMap, obj);
- }
-
- public string WriteSharedObject (string directory, string sharedFileName, string extension, string objectId, string readFileName, BinaryXmlTypeMap typeMap, IBinaryXmlElement obj)
- {
- string file = readFileName;
-
- if (file == null) {
- int count = 1;
- string name = sharedFileName + "_" + Util.GetStringHashCode (objectId).ToString ("x");
- file = Path.Combine (directory, name + extension);
-
- while (Exists (file)) {
- count++;
- file = Path.Combine (directory, name + "_" + count + extension);
- }
- }
-
- using (Stream s = Create (file)) {
- BinaryXmlWriter writer = new BinaryXmlWriter (s, typeMap);
- writer.WriteBeginElement ("File");
- writer.WriteValue ("id", objectId);
- writer.WriteValue ("data", obj);
- writer.WriteEndElement ();
- }
- return file;
- }
-
- public object ReadObject (string file, BinaryXmlTypeMap typeMap)
- {
- using (Stream s = OpenRead (file)) {
- BinaryXmlReader reader = new BinaryXmlReader (s, typeMap);
- return reader.ReadValue ("data");
- }
- }
-
- public void WriteObject (string file, object obj, BinaryXmlTypeMap typeMap)
- {
- using (Stream s = Create (file)) {
- BinaryXmlWriter writer = new BinaryXmlWriter (s, typeMap);
- writer.WriteValue ("data", obj);
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/ProcessProgressStatus.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/ProcessProgressStatus.cs
deleted file mode 100644
index 3af2982..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/ProcessProgressStatus.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// ProcessProgressStatus.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections.Specialized;
-using System.IO;
-
-namespace Mono.Addins.Database
-{
- internal class ProcessProgressStatus: MarshalByRefObject, IProgressStatus
- {
- bool canceled;
- int logLevel;
-
- public ProcessProgressStatus (int logLevel)
- {
- this.logLevel = logLevel;
- }
-
- public void SetMessage (string msg)
- {
- Console.WriteLine ("process-ps-msg:" + Encode (msg));
- }
-
- public void SetProgress (double progress)
- {
- Console.WriteLine ("process-ps-progress:" + progress.ToString ());
- }
-
- public void Log (string msg)
- {
- if (msg.StartsWith ("plog:"))
- // This is an special type of log that will be provided to the
- // main process in case of a crash in the setup process
- Console.WriteLine ("process-ps-plog:" + Encode (msg.Substring (5)));
- else
- Console.WriteLine ("process-ps-log:" + Encode (msg));
- }
-
- public void ReportWarning (string message)
- {
- Console.WriteLine ("process-ps-warning:" + Encode (message));
- }
-
- public void ReportError (string message, Exception exception)
- {
- if (message == null) message = string.Empty;
- string et;
- if (logLevel > 1)
- et = exception != null ? exception.ToString () : string.Empty;
- else
- et = exception != null ? exception.Message : string.Empty;
-
- Console.WriteLine ("process-ps-exception:" + Encode (et));
- Console.WriteLine ("process-ps-error:" + Encode (message));
- }
-
- public bool IsCanceled {
- get { return canceled; }
- }
-
- public int LogLevel {
- get { return logLevel; }
- }
-
- public void Cancel ()
- {
- canceled = true;
- Console.WriteLine ("process-ps-cancel:");
- }
-
- static string Encode (string msg)
- {
- msg = msg.Replace ("&", "&a");
- return msg.Replace ("\n", "&n");
- }
-
- static string Decode (string msg)
- {
- msg = msg.Replace ("&n", "\n");
- return msg.Replace ("&a", "&");
- }
-
- public static void MonitorProcessStatus (IProgressStatus monitor, TextReader reader, StringCollection progessLog)
- {
- string line;
- string exceptionText = null;
- while ((line = reader.ReadLine ()) != null) {
- int i = line.IndexOf (':');
- if (i != -1) {
- string tag = line.Substring (0, i);
- string txt = line.Substring (i+1);
- bool wasTag = true;
-
- switch (tag) {
- case "process-ps-msg":
- monitor.SetMessage (Decode (txt));
- break;
- case "process-ps-progress":
- monitor.SetProgress (double.Parse (txt));
- break;
- case "process-ps-log":
- monitor.Log (Decode (txt));
- break;
- case "process-ps-warning":
- monitor.ReportWarning (Decode (txt));
- break;
- case "process-ps-exception":
- exceptionText = Decode (txt);
- if (exceptionText == string.Empty)
- exceptionText = null;
- break;
- case "process-ps-error":
- string err = Decode (txt);
- if (err == string.Empty) err = null;
- monitor.ReportError (err, exceptionText != null ? new Exception (exceptionText) : null);
- break;
- case "process-ps-cancel":
- monitor.Cancel ();
- break;
- case "process-ps-plog":
- progessLog.Add (Decode (txt));
- break;
- default:
- wasTag = false;
- break;
- }
- if (wasTag)
- continue;
- }
- Console.WriteLine (line);
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/SetupProcess.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
deleted file mode 100644
index 1562d4a..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// SetupProcess.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections.Specialized;
-using System.IO;
-using System.Text;
-using System.Diagnostics;
-using System.Runtime.Serialization.Formatters.Binary;
-
-namespace Mono.Addins.Database
-{
- internal class SetupProcess
- {
- internal static void ExecuteCommand (IProgressStatus monitor, string registryPath, string startupDir, string name, params string[] args)
- {
- string asm = new Uri (typeof(SetupProcess).Assembly.CodeBase).LocalPath;
- string verboseParam = monitor.LogLevel.ToString ();
-
- // Arguments string
- StringBuilder sb = new StringBuilder ();
- sb.Append (verboseParam).Append (' ').Append (name);
- foreach (string arg in args)
- sb.Append (" \"").Append (arg).Append ("\"");
-
- Process process = new Process ();
- if (Util.IsWindows)
- process.StartInfo = new ProcessStartInfo (asm, sb.ToString ());
- else {
- asm = asm.Replace(" ", @"\ ");
- process.StartInfo = new ProcessStartInfo ("mono", "--debug " + asm + " " + sb.ToString ());
- }
- process.StartInfo.WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory;
- process.StartInfo.UseShellExecute = false;
- process.StartInfo.RedirectStandardInput = true;
- process.StartInfo.RedirectStandardOutput = true;
- process.StartInfo.RedirectStandardError = true;
- process.EnableRaisingEvents = true;
- try {
- process.Start ();
- } catch (Exception ex) {
- Console.WriteLine (ex);
- throw;
- }
-
- process.StandardInput.WriteLine (registryPath);
- process.StandardInput.WriteLine (startupDir);
- process.StandardInput.Flush ();
-
-// string rr = process.StandardOutput.ReadToEnd ();
-// Console.WriteLine (rr);
-
- StringCollection progessLog = new StringCollection ();
- ProcessProgressStatus.MonitorProcessStatus (monitor, process.StandardOutput, progessLog);
- process.WaitForExit ();
- if (process.ExitCode != 0)
- throw new ProcessFailedException (progessLog);
- }
-
- public static int Main (string[] args)
- {
- ProcessProgressStatus monitor = new ProcessProgressStatus (int.Parse (args[0]));
-
- try {
- string registryPath = Console.In.ReadLine ();
- string startupDir = Console.In.ReadLine ();
-
- AddinDatabase.RunningSetupProcess = true;
- AddinRegistry reg = new AddinRegistry (registryPath, startupDir);
-
- switch (args [1]) {
- case "scan":
- string folder = args.Length > 2 ? args [2] : null;
- if (folder.Length == 0) folder = null;
- StringCollection filesToIgnore = new StringCollection ();
- for (int n=3; n<args.Length; n++)
- filesToIgnore.Add (args[n]);
- reg.ScanFolders (monitor, folder, filesToIgnore);
- break;
- case "get-desc":
- reg.ParseAddin (monitor, args[2], args[3]);
- break;
- }
- } catch (Exception ex) {
- monitor.ReportError ("Unexpected error in setup process", ex);
- return 1;
- }
- return 0;
- }
- }
-
- class ProcessFailedException: Exception
- {
- StringCollection progessLog;
-
- public ProcessFailedException (StringCollection progessLog)
- {
- this.progessLog = progessLog;
- }
-
- public StringCollection ProgessLog {
- get { return progessLog; }
- }
-
- public string LastLog {
- get { return progessLog.Count > 0 ? progessLog [progessLog.Count - 1] : ""; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs
deleted file mode 100644
index 23c27ac..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// Util.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-using Mono.Addins.Description;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Database
-{
- internal class Util
- {
- public static bool IsWindows {
- get { return Path.DirectorySeparatorChar == '\\'; }
- }
-
- public static void CheckWrittableFloder (string path)
- {
- string testFile = null;
- int n = 0;
- do {
- testFile = Path.Combine (path, new Random ().Next ().ToString ());
- n++;
- } while (File.Exists (testFile) && n < 100);
- if (n == 100)
- throw new InvalidOperationException ("Could not create file in directory: " + path);
-
- StreamWriter w = new StreamWriter (testFile);
- w.Close ();
- File.Delete (testFile);
- }
-
- public static void AddDependencies (AddinDescription desc, AddinScanResult scanResult)
- {
- // Not implemented in AddinScanResult to avoid making AddinDescription remotable
- foreach (ModuleDescription mod in desc.AllModules) {
- foreach (Dependency dep in mod.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null) continue;
- string depid = Addin.GetFullId (desc.Namespace, adep.AddinId, adep.Version);
- scanResult.AddAddinToUpdateRelations (depid);
- }
- }
- }
-
- public static Assembly LoadAssemblyForReflection (string fileName)
- {
-/* if (!gotLoadMethod) {
- reflectionOnlyLoadFrom = typeof(Assembly).GetMethod ("ReflectionOnlyLoadFrom");
- gotLoadMethod = true;
- LoadAssemblyForReflection (typeof(Util).Assembly.Location);
- }
-
- if (reflectionOnlyLoadFrom != null)
- return (Assembly) reflectionOnlyLoadFrom.Invoke (null, new string [] { fileName });
- else
-*/ return Assembly.LoadFile (fileName);
- }
-
- // Works like Path.GetFullPath, but it does not require the path to exist
- public static string GetFullPath (string path)
- {
- if (path == null)
- throw new ArgumentNullException ("path");
-
- if (!Path.IsPathRooted (path))
- path = Path.Combine (Environment.CurrentDirectory, path);
-
- string root = Path.GetPathRoot (path);
- path = path.Substring (root.Length);
-
- string[] parts = path.Split (Path.DirectorySeparatorChar);
- string[] newParts = new string [parts.Length];
- int i = 0;
- for (int n=0; n<parts.Length; n++) {
- string p = parts [n];
- if (p == null || p.Length == 0 || p == ".")
- continue;
- if (p == "..") {
- if (i > 0)
- i--;
- } else {
- newParts [i++] = p;
- }
- }
- return root + string.Join (new string (Path.DirectorySeparatorChar, 1), newParts, 0, i);
- }
-
- public static int GetStringHashCode (string s)
- {
- int h = 0;
- int n = 0;
- for (; n < s.Length - 1; n+=2) {
- h = (h << 5) - h + s[n];
- h = (h << 5) - h + s[n+1];
- }
- if (n < s.Length)
- h = (h << 5) - h + s[n];
- return h;
- }
-
- public static string GetGacPath (string fullName)
- {
- string gacDir = typeof(Uri).Assembly.Location;
- gacDir = Path.GetDirectoryName (gacDir);
- gacDir = Path.GetDirectoryName (gacDir);
- gacDir = Path.GetDirectoryName (gacDir);
-
- string[] parts = fullName.Split (',');
- if (parts.Length != 4) return null;
- string name = parts[0].Trim ();
-
- int i = parts[1].IndexOf ('=');
- string version = i != -1 ? parts[1].Substring (i+1).Trim () : parts[1].Trim ();
-
- i = parts[2].IndexOf ('=');
- string culture = i != -1 ? parts[2].Substring (i+1).Trim () : parts[2].Trim ();
- if (culture == "neutral") culture = "";
-
- i = parts[3].IndexOf ('=');
- string token = i != -1 ? parts[3].Substring (i+1).Trim () : parts[3].Trim ();
-
- string file = Path.Combine (gacDir, name);
- file = Path.Combine (file, version + "_" + culture + "_" + token);
- return file;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AddinDependency.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AddinDependency.cs
deleted file mode 100644
index 3507f09..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AddinDependency.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// AddinDependency.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml;
-using System.Xml.Serialization;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- [XmlType ("AddinReference")]
- public class AddinDependency: Dependency
- {
- string id;
- string version;
-
- public AddinDependency ()
- {
- }
-
- public AddinDependency (string fullId)
- {
- Addin.GetIdParts (fullId, out id, out version);
- id = "::" + id;
- }
-
- public AddinDependency (string id, string version)
- {
- this.id = id;
- this.version = version;
- }
-
- internal AddinDependency (XmlElement elem): base (elem)
- {
- id = elem.GetAttribute ("id");
- version = elem.GetAttribute ("version");
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- VerifyNotEmpty (location + "Dependencies/Addin/", errors, "id", AddinId);
- VerifyNotEmpty (location + "Dependencies/Addin/", errors, "version", Version);
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- CreateElement (parent, "Addin");
- Element.SetAttribute ("id", AddinId);
- Element.SetAttribute ("version", Version);
- }
-
- public string FullAddinId {
- get {
- AddinDescription desc = ParentAddinDescription;
- if (desc == null)
- return Addin.GetFullId (null, AddinId, Version);
- else
- return Addin.GetFullId (desc.Namespace, AddinId, Version);
- }
- }
-
- public string AddinId {
- get { return id != null ? id : string.Empty; }
- set { id = value; }
- }
-
- public string Version {
- get { return version != null ? version : string.Empty; }
- set { version = value; }
- }
-
- public override string Name {
- get { return AddinId + " v" + version; }
- }
-
- internal override bool CheckInstalled ()
- {
- Addin[] addins = AddinManager.Registry.GetAddins ();
- foreach (Addin addin in addins) {
- if (addin.Id == id && addin.SupportsVersion (version)) {
- return true;
- }
- }
- return false;
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- base.Write (writer);
- writer.WriteValue ("id", id);
- writer.WriteValue ("version", version);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- base.Read (reader);
- id = reader.ReadStringValue ("id");
- version = reader.ReadStringValue ("version");
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AddinDescription.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AddinDescription.cs
deleted file mode 100644
index 2ffc008..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AddinDescription.cs
+++ /dev/null
@@ -1,754 +0,0 @@
-//
-// AddinDescription.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Collections.Specialized;
-using Mono.Addins.Serialization;
-using Mono.Addins.Database;
-
-namespace Mono.Addins.Description
-{
- // This class represent an add-in configuration file. It has properties for getting
- // all information, and methods for loading and saving files.
- public class AddinDescription: IBinaryXmlElement
- {
- XmlDocument configDoc;
- string configFile;
- AddinDatabase ownerDatabase;
-
- string id;
- string name;
- string ns;
- string version;
- string compatVersion;
- string author;
- string url;
- string copyright;
- string description;
- string category;
- string basePath;
- string sourceAddinFile;
- bool isroot;
- bool hasUserId;
- bool canWrite = true;
- bool defaultEnabled = true;
- string domain;
-
- ModuleDescription mainModule;
- ModuleCollection optionalModules;
- ExtensionNodeSetCollection nodeSets;
- ConditionTypeDescriptionCollection conditionTypes;
- ExtensionPointCollection extensionPoints;
- ExtensionNodeDescription localizer;
- object[] fileInfo;
-
- internal static BinaryXmlTypeMap typeMap;
-
- static AddinDescription ()
- {
- typeMap = new BinaryXmlTypeMap ();
- typeMap.RegisterType (typeof(AddinDescription), "AddinDescription");
- typeMap.RegisterType (typeof(Extension), "Extension");
- typeMap.RegisterType (typeof(ExtensionNodeDescription), "Node");
- typeMap.RegisterType (typeof(ExtensionNodeSet), "NodeSet");
- typeMap.RegisterType (typeof(ExtensionNodeType), "NodeType");
- typeMap.RegisterType (typeof(ExtensionPoint), "ExtensionPoint");
- typeMap.RegisterType (typeof(ModuleDescription), "ModuleDescription");
- typeMap.RegisterType (typeof(ConditionTypeDescription), "ConditionType");
- typeMap.RegisterType (typeof(Condition), "Condition");
- typeMap.RegisterType (typeof(AddinDependency), "AddinDependency");
- typeMap.RegisterType (typeof(AssemblyDependency), "AssemblyDependency");
- typeMap.RegisterType (typeof(NodeTypeAttribute), "NodeTypeAttribute");
- typeMap.RegisterType (typeof(AddinFileInfo), "FileInfo");
- }
-
- internal AddinDatabase OwnerDatabase {
- get { return ownerDatabase; }
- set { ownerDatabase = value; }
- }
-
- public string AddinFile {
- get { return sourceAddinFile; }
- set { sourceAddinFile = value; }
- }
-
- public string AddinId {
- get { return Addin.GetFullId (Namespace, LocalId, Version); }
- }
-
- public string LocalId {
- get { return id != null ? id : string.Empty; }
- set { id = value; hasUserId = true; }
- }
-
- public string Namespace {
- get { return ns != null ? ns : string.Empty; }
- set { ns = value; }
- }
-
- public string Name {
- get {
- if (name != null && name.Length > 0)
- return name;
- if (HasUserId)
- return AddinId;
- else if (sourceAddinFile != null)
- return Path.GetFileNameWithoutExtension (sourceAddinFile);
- else
- return string.Empty;
- }
- set { name = value; }
- }
-
- public string Version {
- get { return version != null ? version : string.Empty; }
- set { version = value; }
- }
-
- public string CompatVersion {
- get { return compatVersion != null ? compatVersion : string.Empty; }
- set { compatVersion = value; }
- }
-
- public string Author {
- get { return author != null ? author : string.Empty; }
- set { author = value; }
- }
-
- public string Url {
- get { return url != null ? url : string.Empty; }
- set { url = value; }
- }
-
- public string Copyright {
- get { return copyright != null ? copyright : string.Empty; }
- set { copyright = value; }
- }
-
- public string Description {
- get { return description != null ? description : string.Empty; }
- set { description = value; }
- }
-
- public string Category {
- get { return category != null ? category : string.Empty; }
- set { category = value; }
- }
-
- internal string BasePath {
- get { return basePath != null ? basePath : string.Empty; }
- set { basePath = value; }
- }
-
- public bool IsRoot {
- get { return isroot; }
- set { isroot = value; }
- }
-
- public bool EnabledByDefault {
- get { return defaultEnabled; }
- set { defaultEnabled = value; }
- }
-
- internal bool HasUserId {
- get { return hasUserId; }
- set { hasUserId = value; }
- }
-
- internal bool SupportsVersion (string ver)
- {
- return Addin.CompareVersions (ver, Version) >= 0 &&
- (CompatVersion.Length == 0 || Addin.CompareVersions (ver, CompatVersion) <= 0);
- }
-
- public StringCollection AllFiles {
- get {
- StringCollection col = new StringCollection ();
- foreach (string s in MainModule.AllFiles)
- col.Add (s);
-
- foreach (ModuleDescription mod in OptionalModules) {
- foreach (string s in mod.AllFiles)
- col.Add (s);
- }
- return col;
- }
- }
-
- public ModuleDescription MainModule {
- get {
- if (mainModule == null) {
- if (RootElement == null)
- mainModule = new ModuleDescription ();
- else
- mainModule = new ModuleDescription (RootElement);
- mainModule.SetParent (this);
- }
- return mainModule;
- }
- }
-
- public ModuleCollection OptionalModules {
- get {
- if (optionalModules == null) {
- optionalModules = new ModuleCollection (this);
- if (RootElement != null) {
- foreach (XmlElement mod in RootElement.SelectNodes ("Module"))
- optionalModules.Add (new ModuleDescription (mod));
- }
- }
- return optionalModules;
- }
- }
-
- public ModuleCollection AllModules {
- get {
- ModuleCollection col = new ModuleCollection (this);
- col.Add (MainModule);
- foreach (ModuleDescription mod in OptionalModules)
- col.Add (mod);
- return col;
- }
- }
-
- public ExtensionNodeSetCollection ExtensionNodeSets {
- get {
- if (nodeSets == null) {
- nodeSets = new ExtensionNodeSetCollection (this);
- if (RootElement != null) {
- foreach (XmlElement elem in RootElement.SelectNodes ("ExtensionNodeSet"))
- nodeSets.Add (new ExtensionNodeSet (elem));
- }
- }
- return nodeSets;
- }
- }
-
- public ExtensionPointCollection ExtensionPoints {
- get {
- if (extensionPoints == null) {
- extensionPoints = new ExtensionPointCollection (this);
- if (RootElement != null) {
- foreach (XmlElement elem in RootElement.SelectNodes ("ExtensionPoint"))
- extensionPoints.Add (new ExtensionPoint (elem));
- }
- }
- return extensionPoints;
- }
- }
-
- public ConditionTypeDescriptionCollection ConditionTypes {
- get {
- if (conditionTypes == null) {
- conditionTypes = new ConditionTypeDescriptionCollection (this);
- if (RootElement != null) {
- foreach (XmlElement elem in RootElement.SelectNodes ("ConditionType"))
- conditionTypes.Add (new ConditionTypeDescription (elem));
- }
- }
- return conditionTypes;
- }
- }
-
- public ExtensionNodeDescription Localizer {
- get { return localizer; }
- set { localizer = value; }
- }
-
- public ExtensionPoint AddExtensionPoint (string path)
- {
- ExtensionPoint ep = new ExtensionPoint ();
- ep.Path = path;
- ExtensionPoints.Add (ep);
- return ep;
- }
-
- internal ExtensionNodeDescription FindExtensionNode (string path, bool lookInDeps)
- {
- // Look in the extensions of this add-in
-
- foreach (Extension ext in MainModule.Extensions) {
- if (path.StartsWith (ext.Path + "/")) {
- string subp = path.Substring (ext.Path.Length).Trim ('/');
- ExtensionNodeDescriptionCollection nodes = ext.ExtensionNodes;
- ExtensionNodeDescription node = null;
- foreach (string p in subp.Split ('/')) {
- if (p.Length == 0) continue;
- node = nodes [p];
- if (node == null)
- break;
- nodes = node.ChildNodes;
- }
- if (node != null)
- return node;
- }
- }
-
- if (!lookInDeps || OwnerDatabase == null)
- return null;
-
- // Look in dependencies
-
- foreach (Dependency dep in MainModule.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null) continue;
- Addin ad = OwnerDatabase.GetInstalledAddin (Domain, adep.FullAddinId);
- if (ad != null && ad.Description != null) {
- ExtensionNodeDescription node = ad.Description.FindExtensionNode (path, false);
- if (node != null)
- return node;
- }
- }
- return null;
- }
-
- XmlElement RootElement {
- get {
- if (configDoc != null)
- return configDoc.DocumentElement;
- else
- return null;
- }
- }
-
- public string FileName {
- get { return configFile; }
- set { configFile = value; }
- }
-
- internal string Domain {
- get { return domain; }
- set { domain = value; }
- }
-
- internal void StoreFileInfo ()
- {
- ArrayList list = new ArrayList ();
- foreach (string f in AllFiles) {
- string file = Path.Combine (this.BasePath, f);
- AddinFileInfo fi = new AddinFileInfo ();
- fi.FileName = f;
- fi.Timestamp = File.GetLastWriteTime (file);
- list.Add (fi);
- }
- fileInfo = list.ToArray ();
- }
-
- internal bool FilesChanged ()
- {
- // Checks if the files of the add-in have changed.
- if (fileInfo == null)
- return true;
-
- foreach (AddinFileInfo f in fileInfo) {
- string file = Path.Combine (this.BasePath, f.FileName);
- if (!File.Exists (file))
- return true;
- if (f.Timestamp != File.GetLastWriteTime (file))
- return true;
- }
-
- return false;
- }
-
- public void Save (string fileName)
- {
- configFile = fileName;
- Save ();
- }
-
- public void Save ()
- {
- if (configFile == null)
- throw new InvalidOperationException ("File name not specified.");
-
- SaveXml ();
-
- using (StreamWriter sw = new StreamWriter (configFile)) {
- XmlTextWriter tw = new XmlTextWriter (sw);
- tw.Formatting = Formatting.Indented;
- configDoc.Save (tw);
- }
- }
-
- public XmlDocument SaveToXml ()
- {
- SaveXml ();
- return configDoc;
- }
-
- void SaveXml ()
- {
- if (!canWrite)
- throw new InvalidOperationException ("Can't write incomplete description.");
-
- XmlElement elem;
-
- if (configDoc == null) {
- configDoc = new XmlDocument ();
- configDoc.AppendChild (configDoc.CreateElement ("Addin"));
- }
-
- elem = configDoc.DocumentElement;
-
- if (HasUserId)
- elem.SetAttribute ("id", id);
- else
- elem.RemoveAttribute ("id");
-
- elem.SetAttribute ("version", version);
- elem.SetAttribute ("namespace", ns);
-
- if (isroot)
- elem.SetAttribute ("isroot", "true");
- else
- elem.RemoveAttribute ("isroot");
-
- // Name will return the file name when HasUserId=false
- if (Name.Length > 0)
- elem.SetAttribute ("name", Name);
- else
- elem.RemoveAttribute ("name");
-
- if (compatVersion != null && compatVersion.Length > 0)
- elem.SetAttribute ("compatVersion", compatVersion);
- else
- elem.RemoveAttribute ("compatVersion");
-
- if (defaultEnabled)
- elem.RemoveAttribute ("defaultEnabled");
- else
- elem.SetAttribute ("defaultEnabled", "false");
-
- if (author != null && author.Length > 0)
- elem.SetAttribute ("author", author);
- else
- elem.RemoveAttribute ("author");
-
- if (url != null && url.Length > 0)
- elem.SetAttribute ("url", url);
- else
- elem.RemoveAttribute ("url");
-
- if (copyright != null && copyright.Length > 0)
- elem.SetAttribute ("copyright", copyright);
- else
- elem.RemoveAttribute ("copyright");
-
- if (description != null && description.Length > 0)
- elem.SetAttribute ("description", description);
- else
- elem.RemoveAttribute ("description");
-
- if (category != null && category.Length > 0)
- elem.SetAttribute ("category", category);
- else
- elem.RemoveAttribute ("category");
-
- if (localizer == null || localizer.Element == null) {
- // Remove old element if it exists
- XmlElement oldLoc = (XmlElement) elem.SelectSingleNode ("Localizer");
- if (oldLoc != null)
- elem.RemoveChild (oldLoc);
- }
- if (localizer != null)
- localizer.SaveXml (elem);
-
- if (mainModule != null) {
- mainModule.Element = elem;
- mainModule.SaveXml (elem);
- }
-
- if (optionalModules != null)
- optionalModules.SaveXml (elem);
-
- if (nodeSets != null)
- nodeSets.SaveXml (elem);
-
- if (extensionPoints != null)
- extensionPoints.SaveXml (elem);
- }
-
-
- public static AddinDescription Read (string configFile)
- {
- AddinDescription config;
- using (Stream s = File.OpenRead (configFile)) {
- config = Read (s, Path.GetDirectoryName (configFile));
- }
- config.configFile = configFile;
- return config;
- }
-
- public static AddinDescription Read (Stream stream, string basePath)
- {
- AddinDescription config = new AddinDescription ();
-
- try {
- config.configDoc = new XmlDocument ();
- config.configDoc.Load (stream);
- } catch (Exception ex) {
- throw new InvalidOperationException ("The add-in configuration file is invalid: " + ex.Message, ex);
- }
-
- XmlElement elem = config.configDoc.DocumentElement;
- config.id = elem.GetAttribute ("id");
- config.ns = elem.GetAttribute ("namespace");
- config.name = elem.GetAttribute ("name");
- config.version = elem.GetAttribute ("version");
- config.compatVersion = elem.GetAttribute ("compatVersion");
- config.author = elem.GetAttribute ("author");
- config.url = elem.GetAttribute ("url");
- config.copyright = elem.GetAttribute ("copyright");
- config.description = elem.GetAttribute ("description");
- config.category = elem.GetAttribute ("category");
- config.basePath = elem.GetAttribute ("basePath");
-
- string s = elem.GetAttribute ("isRoot");
- if (s.Length == 0) s = elem.GetAttribute ("isroot");
- config.isroot = s == "true" || s == "yes";
-
- s = elem.GetAttribute ("defaultEnabled");
- config.defaultEnabled = s.Length == 0 || s == "true" || s == "yes";
-
- XmlElement localizerElem = (XmlElement) elem.SelectSingleNode ("Localizer");
- if (localizerElem != null)
- config.localizer = new ExtensionNodeDescription (localizerElem);
-
- if (config.id.Length > 0)
- config.hasUserId = true;
-
- return config;
- }
-
- internal static AddinDescription ReadBinary (FileDatabase fdb, string configFile)
- {
- AddinDescription description = (AddinDescription) fdb.ReadSharedObject (configFile, typeMap);
- if (description != null) {
- description.FileName = configFile;
- description.canWrite = !fdb.IgnoreDescriptionData;
- }
- return description;
- }
-
- internal void SaveBinary (FileDatabase fdb, string file)
- {
- configFile = file;
- SaveBinary (fdb);
- }
-
- internal void SaveBinary (FileDatabase fdb)
- {
- if (!canWrite)
- throw new InvalidOperationException ("Can't write incomplete description.");
- fdb.WriteSharedObject (AddinFile, FileName, typeMap, this);
-// BinaryXmlReader.DumpFile (configFile);
- }
-
- public StringCollection Verify ()
- {
- StringCollection errors = new StringCollection ();
-
- if (IsRoot) {
- if (OptionalModules.Count > 0)
- errors.Add ("Root add-in hosts can't have optional modules.");
- }
-
- if (AddinId.Length == 0 || Version.Length == 0) {
- if (ExtensionPoints.Count > 0)
- errors.Add ("Add-ins which define new extension points must have an Id and Version.");
- }
-
- MainModule.Verify ("", errors);
- OptionalModules.Verify ("", errors);
- ExtensionNodeSets.Verify ("", errors);
- ExtensionPoints.Verify ("", errors);
- ConditionTypes.Verify ("", errors);
-
- foreach (ExtensionNodeSet nset in ExtensionNodeSets) {
- if (nset.Id.Length == 0)
- errors.Add ("Attribute 'id' can't be empty for global node sets.");
- }
-
- string bp = null;
- if (BasePath.Length > 0)
- bp = BasePath;
- else if (sourceAddinFile != null && sourceAddinFile.Length > 0)
- bp = Path.GetDirectoryName (AddinFile);
- else if (configFile != null && configFile.Length > 0)
- bp = Path.GetDirectoryName (configFile);
-
- if (bp != null) {
- foreach (string file in AllFiles) {
- string asmFile = Path.Combine (BasePath, file);
- if (!File.Exists (asmFile))
- errors.Add ("The file '" + file + "' referenced in the manifest could not be found.");
- }
- }
-
- if (localizer != null && localizer.GetAttribute ("type").Length == 0) {
- errors.Add ("The attribute 'type' in the Location element is required.");
- }
-
- return errors;
- }
-
- internal void SetExtensionsAddinId (string addinId)
- {
- foreach (ExtensionPoint ep in ExtensionPoints)
- ep.SetExtensionsAddinId (addinId);
-
- foreach (ExtensionNodeSet ns in ExtensionNodeSets)
- ns.SetExtensionsAddinId (addinId);
- }
-
- internal void UnmergeExternalData (Hashtable addins)
- {
- // Removes extension types and extension sets coming from other add-ins.
- foreach (ExtensionPoint ep in ExtensionPoints)
- ep.UnmergeExternalData (AddinId, addins);
-
- foreach (ExtensionNodeSet ns in ExtensionNodeSets)
- ns.UnmergeExternalData (AddinId, addins);
- }
-
- internal void MergeExternalData (AddinDescription other)
- {
- // Removes extension types and extension sets coming from other add-ins.
- foreach (ExtensionPoint ep in other.ExtensionPoints) {
- ExtensionPoint tep = ExtensionPoints [ep.Path];
- if (tep != null)
- tep.MergeWith (AddinId, ep);
- }
-
- foreach (ExtensionNodeSet ns in other.ExtensionNodeSets) {
- ExtensionNodeSet tns = ExtensionNodeSets [ns.Id];
- if (tns != null)
- tns.MergeWith (AddinId, ns);
- }
- }
-
- void IBinaryXmlElement.Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("id", id);
- writer.WriteValue ("ns", ns);
- writer.WriteValue ("isroot", isroot);
- writer.WriteValue ("name", name);
- writer.WriteValue ("version", version);
- writer.WriteValue ("compatVersion", compatVersion);
- writer.WriteValue ("hasUserId", hasUserId);
- writer.WriteValue ("author", author);
- writer.WriteValue ("url", url);
- writer.WriteValue ("copyright", copyright);
- writer.WriteValue ("description", description);
- writer.WriteValue ("category", category);
- writer.WriteValue ("basePath", basePath);
- writer.WriteValue ("sourceAddinFile", sourceAddinFile);
- writer.WriteValue ("defaultEnabled", defaultEnabled);
- writer.WriteValue ("domain", domain);
- writer.WriteValue ("MainModule", MainModule);
- writer.WriteValue ("OptionalModules", OptionalModules);
- writer.WriteValue ("NodeSets", ExtensionNodeSets);
- writer.WriteValue ("ExtensionPoints", ExtensionPoints);
- writer.WriteValue ("ConditionTypes", ConditionTypes);
- writer.WriteValue ("FilesInfo", fileInfo);
- writer.WriteValue ("Localizer", localizer);
- }
-
- void IBinaryXmlElement.Read (BinaryXmlReader reader)
- {
- id = reader.ReadStringValue ("id");
- ns = reader.ReadStringValue ("ns");
- isroot = reader.ReadBooleanValue ("isroot");
- name = reader.ReadStringValue ("name");
- version = reader.ReadStringValue ("version");
- compatVersion = reader.ReadStringValue ("compatVersion");
- hasUserId = reader.ReadBooleanValue ("hasUserId");
- author = reader.ReadStringValue ("author");
- url = reader.ReadStringValue ("url");
- copyright = reader.ReadStringValue ("copyright");
- description = reader.ReadStringValue ("description");
- category = reader.ReadStringValue ("category");
- basePath = reader.ReadStringValue ("basePath");
- sourceAddinFile = reader.ReadStringValue ("sourceAddinFile");
- defaultEnabled = reader.ReadBooleanValue ("defaultEnabled");
- domain = reader.ReadStringValue ("domain");
- mainModule = (ModuleDescription) reader.ReadValue ("MainModule");
- optionalModules = (ModuleCollection) reader.ReadValue ("OptionalModules", new ModuleCollection (this));
- nodeSets = (ExtensionNodeSetCollection) reader.ReadValue ("NodeSets", new ExtensionNodeSetCollection (this));
- extensionPoints = (ExtensionPointCollection) reader.ReadValue ("ExtensionPoints", new ExtensionPointCollection (this));
- conditionTypes = (ConditionTypeDescriptionCollection) reader.ReadValue ("ConditionTypes", new ConditionTypeDescriptionCollection (this));
- fileInfo = (object[]) reader.ReadValue ("FilesInfo", null);
- localizer = (ExtensionNodeDescription) reader.ReadValue ("Localizer");
-
- if (mainModule != null)
- mainModule.SetParent (this);
- }
- }
-
- class AddinFileInfo: IBinaryXmlElement
- {
- string fileName;
- DateTime timestamp;
-
- public string FileName {
- get {
- return fileName;
- }
- set {
- fileName = value;
- }
- }
-
- public System.DateTime Timestamp {
- get {
- return timestamp;
- }
- set {
- timestamp = value;
- }
- }
-
- public void Read (BinaryXmlReader reader)
- {
- fileName = reader.ReadStringValue ("fileName");
- timestamp = reader.ReadDateTimeValue ("timestamp");
- }
-
- public void Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("fileName", fileName);
- writer.WriteValue ("timestamp", timestamp);
- }
-
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs
deleted file mode 100644
index 7248ada..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// AssemblyDependency.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml;
-using System.Xml.Serialization;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- [XmlType ("AssemblyDependency")]
- public class AssemblyDependency: Dependency
- {
- string fullName;
- string package;
-
- public AssemblyDependency ()
- {
- }
-
- internal AssemblyDependency (XmlElement elem): base (elem)
- {
- fullName = elem.GetAttribute ("name");
- package = elem.GetAttribute ("package");
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- VerifyNotEmpty (location + "Dependencies/Assembly/", errors, "name", FullName);
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- CreateElement (parent, "Assembly");
- Element.SetAttribute ("name", FullName);
- Element.SetAttribute ("package", Package);
- }
-
- public string FullName {
- get { return fullName != null ? fullName : string.Empty; }
- set { fullName = value; }
- }
-
- public string Package {
- get { return package != null ? package : string.Empty; }
- set { package = value; }
- }
-
- public override string Name {
- get {
- if (Package.Length > 0)
- return FullName + " " + GettextCatalog.GetString ("(provided by {0})", Package);
- else
- return FullName;
- }
- }
-
- internal override bool CheckInstalled ()
- {
- // TODO
- return true;
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- base.Write (writer);
- writer.WriteValue ("fullName", fullName);
- writer.WriteValue ("package", package);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- base.Read (reader);
- fullName = reader.ReadStringValue ("fullName");
- package = reader.ReadStringValue ("package");
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ConditionTypeDescription.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ConditionTypeDescription.cs
deleted file mode 100644
index 84039f8..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ConditionTypeDescription.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// ConditionTypeDescription.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Collections.Specialized;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- public class ConditionTypeDescription: ObjectDescription
- {
- string id;
- string typeName;
- string addinId;
- string description;
-
- public ConditionTypeDescription ()
- {
- }
-
- internal ConditionTypeDescription (XmlElement elem): base (elem)
- {
- id = elem.GetAttribute ("id");
- typeName = elem.GetAttribute ("type");
- description = ReadXmlDescription ();
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- VerifyNotEmpty (location + "ConditionType", errors, Id, "id");
- VerifyNotEmpty (location + "ConditionType (" + Id + ")", errors, TypeName, "type");
- }
-
- public string Id {
- get { return id != null ? id : string.Empty; }
- set { id = value; }
- }
-
- public string TypeName {
- get { return typeName != null ? typeName : string.Empty; }
- set { typeName = value; }
- }
-
- public string Description {
- get { return description != null ? description : string.Empty; }
- set { description = value; }
- }
-
- internal string AddinId {
- get { return addinId; }
- set { addinId = value; }
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- CreateElement (parent, "ConditionType");
- Element.SetAttribute ("id", id);
- Element.SetAttribute ("type", typeName);
- SaveXmlDescription (description);
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("Id", Id);
- writer.WriteValue ("TypeName", TypeName);
- writer.WriteValue ("Description", Description);
- writer.WriteValue ("AddinId", AddinId);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- Id = reader.ReadStringValue ("Id");
- TypeName = reader.ReadStringValue ("TypeName");
- if (!reader.IgnoreDescriptionData)
- Description = reader.ReadStringValue ("Description");
- AddinId = reader.ReadStringValue ("AddinId");
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ConditionTypeDescriptionCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ConditionTypeDescriptionCollection.cs
deleted file mode 100644
index 8d60f9e..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ConditionTypeDescriptionCollection.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// ConditionTypeDescriptionCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins.Description
-{
- public class ConditionTypeDescriptionCollection: ObjectDescriptionCollection
- {
- public ConditionTypeDescriptionCollection ()
- {
- }
-
- internal ConditionTypeDescriptionCollection (object owner): base (owner)
- {
- }
-
- public ConditionTypeDescription this [int n] {
- get { return (ConditionTypeDescription) List [n]; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/Dependency.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/Dependency.cs
deleted file mode 100644
index eb51852..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/Dependency.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Dependency.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Xml.Serialization;
-using Mono.Addins.Serialization;
-using System.Xml;
-
-namespace Mono.Addins.Description
-{
- [XmlInclude (typeof(AddinDependency))]
- public abstract class Dependency: ObjectDescription
- {
- internal Dependency (XmlElement elem): base (elem)
- {
- }
-
- internal Dependency ()
- {
- }
-
- public abstract string Name { get; }
- internal abstract bool CheckInstalled ();
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/DependencyCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/DependencyCollection.cs
deleted file mode 100644
index 9a385f5..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/DependencyCollection.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// DependencyCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Description
-{
- public class DependencyCollection: ObjectDescriptionCollection
- {
- public DependencyCollection ()
- {
- }
-
- internal DependencyCollection (object owner): base (owner)
- {
- }
-
- public Dependency this [int n] {
- get { return (Dependency) List [n]; }
- }
-
- public void Add (Dependency dep)
- {
- List.Add (dep);
- }
-
- public void Remove (Dependency dep)
- {
- List.Remove (dep);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/Extension.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/Extension.cs
deleted file mode 100644
index b145a18..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/Extension.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Extension.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Collections.Specialized;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- public class Extension: ObjectDescription, IComparable
- {
- string path;
- ExtensionNodeDescriptionCollection nodes;
-
- public Extension ()
- {
- }
-
- public Extension (string path)
- {
- this.path = path;
- }
-
- // Returns the object extended by this Extension. It can be an ExtensionPoint or
- // an ExtensionNodeDescription.
- public ObjectDescription GetExtendedObject ()
- {
- AddinDescription desc = ParentAddinDescription;
- if (desc == null)
- return null;
- ExtensionPoint ep = FindExtensionPoint (desc, path);
- if (ep == null && desc.OwnerDatabase != null) {
- foreach (Dependency dep in desc.MainModule.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null) continue;
- Addin ad = desc.OwnerDatabase.GetInstalledAddin (ParentAddinDescription.Domain, adep.FullAddinId);
- if (ad != null && ad.Description != null) {
- ep = FindExtensionPoint (ad.Description, path);
- if (ep != null)
- break;
- }
- }
- }
- if (ep != null) {
- string subp = path.Substring (ep.Path.Length).Trim ('/');
- if (subp.Length == 0)
- return ep; // The extension is directly extending the extension point
-
- // The extension is extending a node of the extension point
-
- return desc.FindExtensionNode (path, true);
- }
- return null;
- }
-
- public ExtensionNodeTypeCollection GetAllowedNodeTypes ()
- {
- ObjectDescription ob = GetExtendedObject ();
- ExtensionPoint ep = ob as ExtensionPoint;
- if (ep != null)
- return ep.NodeSet.GetAllowedNodeTypes ();
-
- ExtensionNodeDescription node = ob as ExtensionNodeDescription;
- if (node != null) {
- ExtensionNodeType nt = node.GetNodeType ();
- if (nt != null)
- return nt.GetAllowedNodeTypes ();
- }
- return new ExtensionNodeTypeCollection ();
- }
-
- ExtensionPoint FindExtensionPoint (AddinDescription desc, string path)
- {
- foreach (ExtensionPoint ep in desc.ExtensionPoints) {
- if (ep.Path == path || path.StartsWith (ep.Path + "/"))
- return ep;
- }
- return null;
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- VerifyNotEmpty (location + "Extension", errors, path, "path");
- ExtensionNodes.Verify (location + "Extension (" + path + ")/", errors);
-
- foreach (ExtensionNodeDescription cnode in ExtensionNodes)
- VerifyNode (location, cnode, errors);
- }
-
- void VerifyNode (string location, ExtensionNodeDescription node, StringCollection errors)
- {
- string id = node.GetAttribute ("id");
- if (id.Length > 0)
- id = "(" + id + ")";
- if (node.NodeName == "Condition" && node.GetAttribute ("id").Length == 0) {
- errors.Add (location + node.NodeName + id + ": Missing 'id' attribute in Condition element.");
- }
- if (node.NodeName == "ComplexCondition") {
- if (node.ChildNodes.Count > 0) {
- VerifyConditionNode (location, node.ChildNodes[0], errors);
- for (int n=1; n<node.ChildNodes.Count; n++)
- VerifyNode (location + node.NodeName + id + "/", node.ChildNodes[n], errors);
- }
- else
- errors.Add (location + "ComplexCondition: Missing child condition in ComplexCondition element.");
- }
- foreach (ExtensionNodeDescription cnode in node.ChildNodes)
- VerifyNode (location + node.NodeName + id + "/", cnode, errors);
- }
-
- void VerifyConditionNode (string location, ExtensionNodeDescription node, StringCollection errors)
- {
- string nodeName = node.NodeName;
- if (nodeName != "Or" && nodeName != "And" && nodeName != "Condition") {
- errors.Add (location + "ComplexCondition: Invalid condition element: " + nodeName);
- return;
- }
- foreach (ExtensionNodeDescription cnode in node.ChildNodes)
- VerifyConditionNode (location, cnode, errors);
- }
-
- public Extension (XmlElement element)
- {
- Element = element;
- path = element.GetAttribute ("path");
- }
-
- public string Path {
- get { return path; }
- set { path = value; }
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- if (Element == null) {
- Element = parent.OwnerDocument.CreateElement ("Extension");
- parent.AppendChild (Element);
- }
- Element.SetAttribute ("path", path);
- if (nodes != null)
- nodes.SaveXml (Element);
- }
-
- public ExtensionNodeDescriptionCollection ExtensionNodes {
- get {
- if (nodes == null) {
- nodes = new ExtensionNodeDescriptionCollection (this);
- if (Element != null) {
- foreach (XmlNode node in Element.ChildNodes) {
- XmlElement e = node as XmlElement;
- if (e != null)
- nodes.Add (new ExtensionNodeDescription (e));
- }
- }
- }
- return nodes;
- }
- }
-
- int IComparable.CompareTo (object obj)
- {
- Extension other = (Extension) obj;
- return Path.CompareTo (other.Path);
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("path", path);
- writer.WriteValue ("Nodes", ExtensionNodes);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- path = reader.ReadStringValue ("path");
- nodes = (ExtensionNodeDescriptionCollection) reader.ReadValue ("Nodes", new ExtensionNodeDescriptionCollection (this));
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionCollection.cs
deleted file mode 100644
index 55dc16a..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionCollection.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// ExtensionCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionCollection: ObjectDescriptionCollection
- {
- public ExtensionCollection ()
- {
- }
-
- internal ExtensionCollection (object owner): base (owner)
- {
- }
-
- public Extension this [int n] {
- get { return (Extension) List [n]; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeDescription.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeDescription.cs
deleted file mode 100644
index f2ddbc4..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeDescription.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-//
-// ExtensionNodeDescription.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Collections.Specialized;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionNodeDescription: ObjectDescription, NodeElement
- {
- ExtensionNodeDescriptionCollection childNodes;
- string[] attributes;
- string nodeName;
-
- public ExtensionNodeDescription (string nodeName)
- {
- this.nodeName = nodeName;
- }
-
- internal ExtensionNodeDescription (XmlElement elem)
- {
- Element = elem;
- nodeName = elem.LocalName;
- }
-
- internal ExtensionNodeDescription ()
- {
- }
-
- public ExtensionNodeType GetNodeType ()
- {
- if (Parent is Extension) {
- Extension ext = (Extension) Parent;
- object ob = ext.GetExtendedObject ();
- if (ob is ExtensionPoint) {
- ExtensionPoint ep = (ExtensionPoint) ob;
- return ep.NodeSet.GetAllowedNodeTypes () [NodeName];
- } else if (ob is ExtensionNodeDescription) {
- ExtensionNodeDescription pn = (ExtensionNodeDescription) ob;
- ExtensionNodeType pt = ((ExtensionNodeDescription) pn).GetNodeType ();
- if (pt != null)
- return pt.GetAllowedNodeTypes () [NodeName];
- }
- }
- else if (Parent is ExtensionNodeDescription) {
- ExtensionNodeType pt = ((ExtensionNodeDescription) Parent).GetNodeType ();
- if (pt != null)
- return pt.GetAllowedNodeTypes () [NodeName];
- }
- return null;
- }
-
- public string GetParentPath ()
- {
- if (Parent is Extension)
- return ((Extension)Parent).Path;
- else if (Parent is ExtensionNodeDescription) {
- ExtensionNodeDescription pn = (ExtensionNodeDescription) Parent;
- return pn.GetParentPath () + "/" + pn.Id;
- }
- else
- return string.Empty;
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- if (nodeName == null || nodeName.Length == 0)
- errors.Add (location + "Node: NodeName can't be empty.");
- ChildNodes.Verify (location + NodeName + "/", errors);
- }
-
- public string NodeName {
- get { return nodeName; }
- }
-
- public string Id {
- get { return GetAttribute ("id"); }
- set { SetAttribute ("id", value); }
- }
-
- public string InsertAfter {
- get { return GetAttribute ("insertafter"); }
- set { SetAttribute ("insertafter", value); }
- }
-
- public string InsertBefore {
- get { return GetAttribute ("insertbefore"); }
- set { SetAttribute ("insertbefore", value); }
- }
-
- public bool IsCondition {
- get { return nodeName == "Condition" || nodeName == "ComplexCondition"; }
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- if (Element == null) {
- Element = parent.OwnerDocument.CreateElement (nodeName);
- parent.AppendChild (Element);
- if (attributes != null) {
- for (int n=0; n<attributes.Length; n+=2)
- Element.SetAttribute (attributes[n], attributes[n+1]);
- }
- ChildNodes.SaveXml (Element);
- }
- }
-
- public string GetAttribute (string key)
- {
- if (Element != null)
- return Element.GetAttribute (key);
-
- if (attributes == null)
- return string.Empty;
- for (int n=0; n<attributes.Length; n+=2) {
- if (attributes [n] == key)
- return attributes [n+1];
- }
- return string.Empty;
- }
-
- public void SetAttribute (string key, string value)
- {
- if (Element != null) {
- Element.SetAttribute (key, value);
- return;
- }
-
- if (value == null)
- value = string.Empty;
-
- if (attributes == null) {
- attributes = new string [2];
- attributes [0] = key;
- attributes [1] = value;
- return;
- }
-
- for (int n=0; n<attributes.Length; n+=2) {
- if (attributes [n] == key) {
- attributes [n+1] = value;
- return;
- }
- }
- string[] newList = new string [attributes.Length + 2];
- attributes.CopyTo (newList, 0);
- attributes = newList;
- attributes [attributes.Length - 2] = key;
- attributes [attributes.Length - 1] = value;
- }
-
- public NodeAttribute[] Attributes {
- get {
- if (Element != null)
- SaveXmlAttributes ();
- if (attributes == null)
- return new NodeAttribute [0];
- NodeAttribute[] ats = new NodeAttribute [attributes.Length / 2];
- for (int n=0; n<ats.Length; n++) {
- NodeAttribute at = new NodeAttribute ();
- at.name = attributes [n*2];
- at.value = attributes [n*2 + 1];
- ats [n] = at;
- }
- return ats;
- }
- }
-
- public ExtensionNodeDescriptionCollection ChildNodes {
- get {
- if (childNodes == null) {
- childNodes = new ExtensionNodeDescriptionCollection (this);
- if (Element != null) {
- foreach (XmlNode nod in Element.ChildNodes) {
- if (nod is XmlElement)
- childNodes.Add (new ExtensionNodeDescription ((XmlElement)nod));
- }
- }
- }
- return childNodes;
- }
- }
-
- NodeElementCollection NodeElement.ChildNodes {
- get { return ChildNodes; }
- }
-
- void SaveXmlAttributes ()
- {
- attributes = new string [Element.Attributes.Count * 2];
- for (int n=0; n<attributes.Length; n+=2) {
- XmlAttribute at = Element.Attributes [n/2];
- attributes [n] = at.LocalName;
- attributes [n+1] = at.Value;
- }
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- if (Element != null)
- SaveXmlAttributes ();
-
- writer.WriteValue ("nodeName", nodeName);
- writer.WriteValue ("attributes", attributes);
- writer.WriteValue ("ChildNodes", ChildNodes);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- nodeName = reader.ReadStringValue ("nodeName");
- attributes = (string[]) reader.ReadValue ("attributes");
- childNodes = (ExtensionNodeDescriptionCollection) reader.ReadValue ("ChildNodes", new ExtensionNodeDescriptionCollection (this));
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeDescriptionCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeDescriptionCollection.cs
deleted file mode 100644
index 1f81051..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeDescriptionCollection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// ExtensionNodeDescriptionCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionNodeDescriptionCollection: ObjectDescriptionCollection, NodeElementCollection
- {
- public ExtensionNodeDescriptionCollection ()
- {
- }
-
- internal ExtensionNodeDescriptionCollection (object owner): base (owner)
- {
- }
-
- public ExtensionNodeDescription this [int n] {
- get { return (ExtensionNodeDescription) List [n]; }
- }
-
- public ExtensionNodeDescription this [string id] {
- get {
- foreach (ExtensionNodeDescription node in List)
- if (node.Id == id)
- return node;
- return null;
- }
- }
-
- NodeElement NodeElementCollection.this [int n] {
- get { return (NodeElement) List [n]; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSet.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSet.cs
deleted file mode 100644
index 2d85188..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSet.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-//
-// ExtensionNodeSet.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.Xml;
-using Mono.Addins.Serialization;
-using System.Collections.Specialized;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionNodeSet: ObjectDescription
- {
- string id;
- ExtensionNodeTypeCollection nodeTypes;
- NodeSetIdCollection nodeSets;
- bool missingNodeSetId;
- ExtensionNodeTypeCollection cachedAllowedTypes;
-
- internal ExtensionNodeSet (XmlElement element)
- {
- Element = element;
- id = element.GetAttribute (IdAttribute);
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- if (missingNodeSetId)
- errors.Add (location + "Missing id attribute in extension set reference");
-
- NodeTypes.Verify (location + "ExtensionNodeSet (" + Id + ")/", errors);
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- SaveXml (parent, "ExtensionNodeSet");
- }
-
- internal virtual void SaveXml (XmlElement parent, string nodeName)
- {
- if (Element == null) {
- Element = parent.OwnerDocument.CreateElement (nodeName);
- parent.AppendChild (Element);
- }
- if (Id.Length > 0)
- Element.SetAttribute (IdAttribute, Id);
- if (nodeTypes != null)
- nodeTypes.SaveXml (Element);
- if (nodeSets != null) {
- foreach (string s in nodeSets) {
- if (Element.SelectSingleNode ("ExtensionNodeSet[@id='" + s + "']") == null) {
- XmlElement e = Element.OwnerDocument.CreateElement ("ExtensionNodeSet");
- e.SetAttribute ("id", s);
- Element.AppendChild (e);
- }
- }
- ArrayList list = new ArrayList ();
- foreach (XmlElement e in Element.SelectNodes ("ExtensionNodeSet")) {
- if (!nodeSets.Contains (e.GetAttribute ("id")))
- list.Add (e);
- }
- foreach (XmlElement e in list)
- Element.RemoveChild (e);
- }
- }
-
- public ExtensionNodeSet ()
- {
- }
-
- public string Id {
- get { return id != null ? id : string.Empty; }
- set { id = value; }
- }
-
- internal virtual string IdAttribute {
- get { return "id"; }
- }
-
- public ExtensionNodeTypeCollection NodeTypes {
- get {
- if (nodeTypes == null) {
- if (Element != null)
- InitCollections ();
- else
- nodeTypes = new ExtensionNodeTypeCollection (this);
- }
- return nodeTypes;
- }
- }
-
- public NodeSetIdCollection NodeSets {
- get {
- if (nodeSets == null) {
- if (Element != null)
- InitCollections ();
- else
- nodeSets = new NodeSetIdCollection ();
- }
- return nodeSets;
- }
- }
-
- public ExtensionNodeTypeCollection GetAllowedNodeTypes ()
- {
- // Gets all allowed node types, including those defined in node sets
- // It only works for descriptions generated from a registry
-
- if (cachedAllowedTypes == null) {
- cachedAllowedTypes = new ExtensionNodeTypeCollection ();
- GetAllowedNodeTypes (new Hashtable (), cachedAllowedTypes);
- }
- return cachedAllowedTypes;
- }
-
- void GetAllowedNodeTypes (Hashtable visitedSets, ExtensionNodeTypeCollection col)
- {
- if (Id.Length > 0) {
- if (visitedSets.Contains (Id))
- return;
- visitedSets [Id] = Id;
- }
-
- // Gets all allowed node types, including those defined in node sets
- // It only works for descriptions generated from a registry
-
- foreach (ExtensionNodeType nt in NodeTypes)
- col.Add (nt);
-
- AddinDescription desc = ParentAddinDescription;
- if (desc == null || desc.OwnerDatabase == null)
- return;
-
- foreach (string[] ns in NodeSets.InternalList) {
- string startAddin = ns [1];
- if (startAddin == null || startAddin.Length == 0)
- startAddin = desc.AddinId;
- ExtensionNodeSet nset = desc.OwnerDatabase.FindNodeSet (ParentAddinDescription.Domain, startAddin, ns[0]);
- if (nset != null)
- nset.GetAllowedNodeTypes (visitedSets, col);
- }
- }
-
- internal void Clear ()
- {
- Element = null;
- nodeSets = null;
- nodeTypes = null;
- }
-
- internal void SetExtensionsAddinId (string addinId)
- {
- foreach (ExtensionNodeType nt in NodeTypes) {
- nt.AddinId = addinId;
- nt.SetExtensionsAddinId (addinId);
- }
- NodeSets.SetExtensionsAddinId (addinId);
- }
-
- internal void MergeWith (string thisAddinId, ExtensionNodeSet other)
- {
- foreach (ExtensionNodeType nt in other.NodeTypes) {
- if (nt.AddinId != thisAddinId && !NodeTypes.Contains (nt))
- NodeTypes.Add (nt);
- }
- NodeSets.MergeWith (thisAddinId, other.NodeSets);
- }
-
- internal void UnmergeExternalData (string thisAddinId, Hashtable addinsToUnmerge)
- {
- // Removes extension types and extension sets coming from other add-ins.
-
- ArrayList todelete = new ArrayList ();
- foreach (ExtensionNodeType nt in NodeTypes) {
- if (nt.AddinId != thisAddinId && (addinsToUnmerge == null || addinsToUnmerge.Contains (nt.AddinId)))
- todelete.Add (nt);
- }
- foreach (ExtensionNodeType nt in todelete)
- NodeTypes.Remove (nt);
-
- NodeSets.UnmergeExternalData (thisAddinId, addinsToUnmerge);
- }
-
- void InitCollections ()
- {
- nodeTypes = new ExtensionNodeTypeCollection (this);
- nodeSets = new NodeSetIdCollection ();
-
- foreach (XmlNode n in Element.ChildNodes) {
- XmlElement nt = n as XmlElement;
- if (nt == null)
- continue;
- if (nt.LocalName == "ExtensionNode") {
- ExtensionNodeType etype = new ExtensionNodeType (nt);
- nodeTypes.Add (etype);
- }
- else if (nt.LocalName == "ExtensionNodeSet") {
- string id = nt.GetAttribute ("id");
- if (id.Length > 0)
- nodeSets.Add (id);
- else
- missingNodeSetId = true;
- }
- }
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("Id", id);
- writer.WriteValue ("NodeTypes", NodeTypes);
- writer.WriteValue ("NodeSets", NodeSets.InternalList);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- id = reader.ReadStringValue ("Id");
- nodeTypes = (ExtensionNodeTypeCollection) reader.ReadValue ("NodeTypes", new ExtensionNodeTypeCollection (this));
- reader.ReadValue ("NodeSets", NodeSets.InternalList);
- }
- }
-
- public class NodeSetIdCollection: IEnumerable
- {
- // A list of string[2]. Item 0 is the node set id, item 1 is the addin that defines it.
-
- ArrayList list = new ArrayList ();
-
- public string this [int n] {
- get { return (string) list [n]; }
- }
-
- public int Count {
- get { return list.Count; }
- }
-
- public IEnumerator GetEnumerator ()
- {
- ArrayList ll = new ArrayList (list.Count);
- foreach (string[] ns in list)
- ll.Add (ns [0]);
- return ll.GetEnumerator ();
- }
-
- public void Add (string nodeSetId)
- {
- if (!Contains (nodeSetId))
- list.Add (new string [] { nodeSetId, null });
- }
-
- public void Remove (string nodeSetId)
- {
- int i = IndexOf (nodeSetId);
- if (i != -1)
- list.RemoveAt (i);
- }
-
- public bool Contains (string nodeSetId)
- {
- return IndexOf (nodeSetId) != -1;
- }
-
- public int IndexOf (string nodeSetId)
- {
- for (int n=0; n<list.Count; n++)
- if (((string[])list [n])[0] == nodeSetId)
- return n;
- return -1;
- }
-
- internal void SetExtensionsAddinId (string id)
- {
- foreach (string[] ns in list)
- ns [1] = id;
- }
-
- internal ArrayList InternalList {
- get { return list; }
- set { list = value; }
- }
-
- internal void MergeWith (string thisAddinId, NodeSetIdCollection other)
- {
- foreach (string[] ns in other.list) {
- if (ns [1] != thisAddinId && !list.Contains (ns))
- list.Add (ns);
- }
- }
-
- internal void UnmergeExternalData (string thisAddinId, Hashtable addinsToUnmerge)
- {
- ArrayList newList = new ArrayList ();
- foreach (string[] ns in list) {
- if (ns[1] == thisAddinId || (addinsToUnmerge != null && !addinsToUnmerge.Contains (ns[1])))
- newList.Add (ns);
- }
- list = newList;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSetCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSetCollection.cs
deleted file mode 100644
index c8875ed..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSetCollection.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// ExtensionNodeSetCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionNodeSetCollection: ObjectDescriptionCollection
- {
- public ExtensionNodeSetCollection ()
- {
- }
-
- internal ExtensionNodeSetCollection (object owner): base (owner)
- {
- }
-
- public ExtensionNodeSet this [int n] {
- get { return (ExtensionNodeSet) List [n]; }
- }
-
- public ExtensionNodeSet this [string id] {
- get {
- for (int n=0; n<List.Count; n++)
- if (((ExtensionNodeSet) List [n]).Id == id)
- return (ExtensionNodeSet) List [n];
- return null;
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeType.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeType.cs
deleted file mode 100644
index cb2ffa4..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeType.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// ExtensionNodeType.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Reflection;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionNodeType: ExtensionNodeSet
- {
- string typeName;
- string objectTypeName;
- string description;
- string addinId;
- NodeTypeAttributeCollection attributes;
-
- // Cached clr type
- [NonSerialized]
- internal Type Type;
-
- // Cached serializable fields
- [NonSerialized]
- internal Hashtable Fields;
-
- internal class FieldData {
- public FieldInfo Field;
- public bool Required;
- public bool Localizable;
- }
-
- // Addin where this extension type is implemented
- internal string AddinId {
- get { return addinId; }
- set { addinId = value; }
- }
-
- // Type of the extension node
- public string TypeName {
- get { return typeName != null ? typeName : string.Empty; }
- set { typeName = value; }
- }
-
- public string NodeName {
- get { return Id; }
- set { Id = value; }
- }
-
- // Type of the object that the extension creates (only valid for TypeNodeExtension).
- public string ObjectTypeName {
- get { return objectTypeName != null ? objectTypeName : string.Empty; }
- set { objectTypeName = value; }
- }
-
- // The description
- public string Description {
- get { return description != null ? description : string.Empty; }
- set { description = value; }
- }
-
- public NodeTypeAttributeCollection Attributes {
- get {
- if (attributes == null) {
- attributes = new NodeTypeAttributeCollection (this);
- if (Element != null) {
- XmlElement atts = Element ["Attributes"];
- if (atts != null) {
- foreach (XmlNode node in atts.ChildNodes) {
- XmlElement e = node as XmlElement;
- if (e != null)
- attributes.Add (new NodeTypeAttribute (e));
- }
- }
- }
- }
- return attributes;
- }
- }
-
- internal ExtensionNodeType (XmlElement element): base (element)
- {
- XmlAttribute at = element.Attributes ["type"];
- if (at != null)
- typeName = at.Value;
- at = element.Attributes ["objectType"];
- if (at != null)
- objectTypeName = at.Value;
- XmlElement de = element ["Description"];
- if (de != null)
- description = de.InnerText;
- }
-
- internal ExtensionNodeType ()
- {
- }
-
- internal override string IdAttribute {
- get { return "name"; }
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- base.Verify (location, errors);
- }
-
- internal override void SaveXml (XmlElement parent, string nodeName)
- {
- base.SaveXml (parent, "ExtensionNode");
-
- XmlElement atts = Element ["Attributes"];
- if (Attributes.Count > 0) {
- if (atts == null) {
- atts = parent.OwnerDocument.CreateElement ("Attributes");
- Element.AppendChild (atts);
- }
- Attributes.SaveXml (atts);
- } else {
- if (atts != null)
- Element.RemoveChild (atts);
- }
-
- if (TypeName.Length > 0)
- Element.SetAttribute ("type", TypeName);
- else
- Element.RemoveAttribute ("type");
-
- if (ObjectTypeName.Length > 0)
- Element.SetAttribute ("objectType", ObjectTypeName);
- else
- Element.RemoveAttribute ("objectType");
-
- SaveXmlDescription (Description);
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- base.Write (writer);
- if (Id.Length == 0)
- Id = "Type";
- if (TypeName.Length == 0)
- typeName = "Mono.Addins.TypeExtensionNode";
- writer.WriteValue ("typeName", typeName);
- writer.WriteValue ("objectTypeName", objectTypeName);
- writer.WriteValue ("description", description);
- writer.WriteValue ("addinId", addinId);
- writer.WriteValue ("Attributes", attributes);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- base.Read (reader);
- typeName = reader.ReadStringValue ("typeName");
- objectTypeName = reader.ReadStringValue ("objectTypeName");
- if (!reader.IgnoreDescriptionData)
- description = reader.ReadStringValue ("description");
- addinId = reader.ReadStringValue ("addinId");
- if (!reader.IgnoreDescriptionData)
- attributes = (NodeTypeAttributeCollection) reader.ReadValue ("Attributes", new NodeTypeAttributeCollection (this));
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeTypeCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeTypeCollection.cs
deleted file mode 100644
index 5f0bd4c..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeTypeCollection.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// ExtensionNodeTypeCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionNodeTypeCollection: ObjectDescriptionCollection
- {
- public ExtensionNodeTypeCollection ()
- {
- }
-
- internal ExtensionNodeTypeCollection (object owner): base (owner)
- {
- }
-
- public ExtensionNodeType this [int n] {
- get { return (ExtensionNodeType) List [n]; }
- }
-
- public ExtensionNodeType this [string id] {
- get {
- for (int n=0; n<List.Count; n++)
- if (((ExtensionNodeType) List [n]).Id == id)
- return (ExtensionNodeType) List [n];
- return null;
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionPoint.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionPoint.cs
deleted file mode 100644
index a80072e..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionPoint.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-// ExtensionPoint.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.Xml;
-using Mono.Addins.Serialization;
-using System.Collections.Specialized;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionPoint: ObjectDescription
- {
- string path;
- string name;
- string description;
- ExtensionNodeSet nodeSet;
- ConditionTypeDescriptionCollection conditions;
-
- // Information gathered from others addins:
-
- StringCollection addins; // Add-ins which extend this extension point
- string rootAddin; // Add-in which defines this extension point
-
- internal ExtensionPoint (XmlElement elem): base (elem)
- {
- path = elem.GetAttribute ("path");
- name = elem.GetAttribute ("name");
- description = ReadXmlDescription ();
- }
-
- public ExtensionPoint ()
- {
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- VerifyNotEmpty (location + "ExtensionPoint", errors, Path, "path");
- NodeSet.Verify (location + "ExtensionPoint (" + Path + ")/", errors);
- Conditions.Verify (location + "ExtensionPoint (" + Path + ")/", errors);
- }
-
- internal void SetExtensionsAddinId (string addinId)
- {
- NodeSet.SetExtensionsAddinId (addinId);
- foreach (ConditionTypeDescription cond in Conditions)
- cond.AddinId = addinId;
- Addins.Add (addinId);
- }
-
- internal void MergeWith (string thisAddinId, ExtensionPoint ep)
- {
- NodeSet.MergeWith (thisAddinId, ep.NodeSet);
-
- foreach (ConditionTypeDescription cond in ep.Conditions) {
- if (cond.AddinId != thisAddinId && !Conditions.Contains (cond))
- Conditions.Add (cond);
- }
- foreach (string s in ep.Addins) {
- if (!Addins.Contains (s))
- Addins.Add (s);
- }
- }
-
- internal void UnmergeExternalData (string thisAddinId, Hashtable addinsToUnmerge)
- {
- NodeSet.UnmergeExternalData (thisAddinId, addinsToUnmerge);
-
- ArrayList todel = new ArrayList ();
- foreach (ConditionTypeDescription cond in Conditions) {
- if (cond.AddinId != thisAddinId && (addinsToUnmerge == null || addinsToUnmerge.Contains (cond.AddinId)))
- todel.Add (cond);
- }
- foreach (ConditionTypeDescription cond in todel)
- Conditions.Remove (cond);
-
- if (addinsToUnmerge == null)
- Addins.Clear ();
- else {
- foreach (string s in addinsToUnmerge.Keys)
- Addins.Remove (s);
- }
- if (thisAddinId != null && !Addins.Contains (thisAddinId))
- Addins.Add (thisAddinId);
- }
-
- internal void Clear ()
- {
- NodeSet.Clear ();
- Conditions.Clear ();
- Addins.Clear ();
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- CreateElement (parent, "ExtensionPoint");
-
- Element.SetAttribute ("path", Path);
-
- if (Name.Length > 0)
- Element.SetAttribute ("name", Name);
- else
- Element.RemoveAttribute ("name");
-
- SaveXmlDescription (Description);
-
- if (nodeSet != null) {
- nodeSet.Element = Element;
- nodeSet.SaveXml (parent);
- }
- }
-
- public string Path {
- get { return path != null ? path : string.Empty; }
- set { path = value; }
- }
-
- public string Name {
- get { return name != null ? name : string.Empty; }
- set { name = value; }
- }
-
- public string Description {
- get { return description != null ? description : string.Empty; }
- set { description = value; }
- }
-
- internal StringCollection Addins {
- get {
- if (addins == null)
- addins = new StringCollection ();
- return addins;
- }
- }
-
- internal string RootAddin {
- get { return rootAddin; }
- set { rootAddin = value; }
- }
-
- public ExtensionNodeSet NodeSet {
- get {
- if (nodeSet == null) {
- if (Element != null)
- nodeSet = new ExtensionNodeSet (Element);
- else
- nodeSet = new ExtensionNodeSet ();
- nodeSet.SetParent (this);
- }
- return nodeSet;
- }
- }
-
- internal void SetNodeSet (ExtensionNodeSet nset)
- {
- // Used only by the addin updater
- nodeSet = nset;
- nodeSet.SetParent (this);
- }
-
- public ConditionTypeDescriptionCollection Conditions {
- get {
- if (conditions == null) {
- conditions = new ConditionTypeDescriptionCollection (this);
- if (Element != null) {
- foreach (XmlElement elem in Element.SelectNodes ("ConditionType"))
- conditions.Add (new ConditionTypeDescription (elem));
- }
- }
- return conditions;
- }
- }
-
- public ExtensionNodeType AddExtensionNode (string name, string typeName)
- {
- ExtensionNodeType ntype = new ExtensionNodeType ();
- ntype.Id = name;
- ntype.TypeName = typeName;
- NodeSet.NodeTypes.Add (ntype);
- return ntype;
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("path", path);
- writer.WriteValue ("name", name);
- writer.WriteValue ("description", Description);
- writer.WriteValue ("rootAddin", rootAddin);
- writer.WriteValue ("addins", Addins);
- writer.WriteValue ("NodeSet", NodeSet);
- writer.WriteValue ("Conditions", Conditions);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- path = reader.ReadStringValue ("path");
- name = reader.ReadStringValue ("name");
- if (!reader.IgnoreDescriptionData)
- description = reader.ReadStringValue ("description");
- rootAddin = reader.ReadStringValue ("rootAddin");
- addins = (StringCollection) reader.ReadValue ("addins", new StringCollection ());
- nodeSet = (ExtensionNodeSet) reader.ReadValue ("NodeSet");
- conditions = (ConditionTypeDescriptionCollection) reader.ReadValue ("Conditions", new ConditionTypeDescriptionCollection (this));
- if (nodeSet != null)
- nodeSet.SetParent (this);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionPointCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionPointCollection.cs
deleted file mode 100644
index 6b4423d..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionPointCollection.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// ExtensionPointCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Description
-{
- public class ExtensionPointCollection: ObjectDescriptionCollection
- {
- public ExtensionPointCollection ()
- {
- }
-
- internal ExtensionPointCollection (object owner): base (owner)
- {
- }
-
- public ExtensionPoint this [int n] {
- get { return (ExtensionPoint) List [n]; }
- }
-
- public ExtensionPoint this [string path] {
- get {
- for (int n=0; n<List.Count; n++)
- if (((ExtensionPoint) List [n]).Path == path)
- return (ExtensionPoint) List [n];
- return null;
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
deleted file mode 100644
index fc8cd7c..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-//
-// ModuleDescription.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Collections.Specialized;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- public class ModuleDescription: ObjectDescription
- {
- StringCollection assemblies;
- StringCollection dataFiles;
- DependencyCollection dependencies;
- ExtensionCollection extensions;
-
- internal ModuleDescription (XmlElement element)
- {
- Element = element;
- }
-
- public ModuleDescription ()
- {
- }
-
- public bool DependsOnAddin (string addinId)
- {
- AddinDescription desc = Parent as AddinDescription;
- if (desc == null)
- throw new InvalidOperationException ();
-
- foreach (Dependency dep in Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep == null) continue;
- if (Addin.GetFullId (desc.Namespace, adep.AddinId, adep.Version) == addinId)
- return true;
- }
- return false;
- }
-
- public StringCollection AllFiles {
- get {
- StringCollection col = new StringCollection ();
- foreach (string s in Assemblies)
- col.Add (s);
-
- foreach (string d in DataFiles)
- col.Add (d);
-
- return col;
- }
- }
-
- public StringCollection Assemblies {
- get {
- if (assemblies == null) {
- if (Element != null)
- InitCollections ();
- else
- assemblies = new StringCollection ();
- }
- return assemblies;
- }
- }
-
- public StringCollection DataFiles {
- get {
- if (dataFiles == null) {
- if (Element != null)
- InitCollections ();
- else
- dataFiles = new StringCollection ();
- }
- return dataFiles;
- }
- }
-
- public DependencyCollection Dependencies {
- get {
- if (dependencies == null) {
- dependencies = new DependencyCollection (this);
- if (Element != null) {
- XmlNodeList elems = Element.SelectNodes ("Dependencies/*");
-
- foreach (XmlNode node in elems) {
- XmlElement elem = node as XmlElement;
- if (elem == null) continue;
-
- if (elem.Name == "Addin") {
- AddinDependency dep = new AddinDependency (elem);
- dependencies.Add (dep);
- } else if (elem.Name == "Assembly") {
- AssemblyDependency dep = new AssemblyDependency (elem);
- dependencies.Add (dep);
- }
- }
- }
- }
- return dependencies;
- }
- }
-
- public ExtensionCollection Extensions {
- get {
- if (extensions == null) {
- extensions = new ExtensionCollection (this);
- if (Element != null) {
- foreach (XmlElement elem in Element.SelectNodes ("Extension"))
- extensions.Add (new Extension (elem));
- }
- }
- return extensions;
- }
- }
-
- public ExtensionNodeDescription AddExtensionNode (string path, string nodeName)
- {
- ExtensionNodeDescription node = new ExtensionNodeDescription (nodeName);
- GetExtension (path).ExtensionNodes.Add (node);
- return node;
- }
-
- public Extension GetExtension (string path)
- {
- foreach (Extension e in Extensions) {
- if (e.Path == path)
- return e;
- }
- Extension ex = new Extension (path);
- Extensions.Add (ex);
- return ex;
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- CreateElement (parent, "Module");
-
- if (assemblies != null || dataFiles != null) {
- XmlElement runtime = GetRuntimeElement ();
-
- while (runtime.FirstChild != null)
- runtime.RemoveChild (runtime.FirstChild);
-
- foreach (string s in assemblies) {
- XmlElement asm = Element.OwnerDocument.CreateElement ("Import");
- asm.SetAttribute ("assembly", s);
- runtime.AppendChild (asm);
- }
- foreach (string s in dataFiles) {
- XmlElement asm = Element.OwnerDocument.CreateElement ("Import");
- asm.SetAttribute ("file", s);
- runtime.AppendChild (asm);
- }
- runtime.AppendChild (Element.OwnerDocument.CreateTextNode ("\n"));
- }
-
- // Save dependency information
-
- if (dependencies != null) {
- XmlElement deps = GetDependenciesElement ();
- dependencies.SaveXml (deps);
- deps.AppendChild (Element.OwnerDocument.CreateTextNode ("\n"));
-
- if (extensions != null)
- extensions.SaveXml (Element);
- }
- }
-
- public void AddAssemblyReference (string id, string version)
- {
- XmlElement deps = GetDependenciesElement ();
- if (deps.SelectSingleNode ("Addin[@id='" + id + "']") != null)
- return;
-
- XmlElement dep = Element.OwnerDocument.CreateElement ("Addin");
- dep.SetAttribute ("id", id);
- dep.SetAttribute ("version", version);
- deps.AppendChild (dep);
- }
-
- XmlElement GetDependenciesElement ()
- {
- XmlElement de = Element ["Dependencies"];
- if (de != null)
- return de;
-
- de = Element.OwnerDocument.CreateElement ("Dependencies");
- Element.AppendChild (de);
- return de;
- }
-
- XmlElement GetRuntimeElement ()
- {
- XmlElement de = Element ["Runtime"];
- if (de != null)
- return de;
-
- de = Element.OwnerDocument.CreateElement ("Runtime");
- Element.AppendChild (de);
- return de;
- }
-
- void InitCollections ()
- {
- dataFiles = new StringCollection ();
- assemblies = new StringCollection ();
-
- XmlNodeList elems = Element.SelectNodes ("Runtime/Import");
- foreach (XmlElement elem in elems) {
- string asm = elem.GetAttribute ("assembly");
- if (asm != "") {
- assemblies.Add (asm);
- } else {
- string file = elem.GetAttribute ("file");
- if (file != "") {
- dataFiles.Add (file);
- }
- }
- }
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- Dependencies.Verify (location + "Module/", errors);
- Extensions.Verify (location + "Module/", errors);
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("Assemblies", Assemblies);
- writer.WriteValue ("DataFiles", DataFiles);
- writer.WriteValue ("Dependencies", Dependencies);
- writer.WriteValue ("Extensions", Extensions);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- assemblies = (StringCollection) reader.ReadValue ("Assemblies", new StringCollection ());
- dataFiles = (StringCollection) reader.ReadValue ("DataFiles", new StringCollection ());
- dependencies = (DependencyCollection) reader.ReadValue ("Dependencies", new DependencyCollection (this));
- extensions = (ExtensionCollection) reader.ReadValue ("Extensions", new ExtensionCollection (this));
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ModuleDescriptionCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ModuleDescriptionCollection.cs
deleted file mode 100644
index dd521c3..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ModuleDescriptionCollection.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// ModuleCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Description
-{
- public class ModuleCollection: ObjectDescriptionCollection
- {
- public ModuleCollection ()
- {
- }
-
- internal ModuleCollection (object owner): base (owner)
- {
- }
-
- public ModuleDescription this [int n] {
- get { return (ModuleDescription) List [n]; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NativeDependency.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NativeDependency.cs
deleted file mode 100644
index d192206..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NativeDependency.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// NativeDependency.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Xml;
-using System.Xml.Serialization;
-using Mono.Addins.Description;
-
-namespace Mono.Addins.Description
-{
- [XmlType ("NativeReference")]
- public class NativeDependency: Dependency
- {
- public override string Name {
- get { return "Native dependency"; }
- }
-
- internal override bool CheckInstalled ()
- {
- return false;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NodeTypeAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NodeTypeAttribute.cs
deleted file mode 100644
index 52a0a6b..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NodeTypeAttribute.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// NodeTypeAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Collections.Specialized;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- public class NodeTypeAttribute: ObjectDescription
- {
- string name;
- string type;
- bool required;
- bool localizable;
- string description;
-
- public NodeTypeAttribute()
- {
- }
-
- public string Name {
- get { return name != null ? name : string.Empty; }
- set { name = value; }
- }
-
- public bool Required {
- get { return required; }
- set { required = value; }
- }
-
- public bool Localizable {
- get { return localizable; }
- set { localizable = value; }
- }
-
- public string Type {
- get { return type != null ? type : string.Empty; }
- set { type = value; }
- }
-
- public string Description {
- get { return description != null ? description : string.Empty; }
- set { description = value; }
- }
-
- internal override void Verify (string location, StringCollection errors)
- {
- VerifyNotEmpty (location + "Attribute", errors, Name, "name");
- }
-
- internal NodeTypeAttribute (XmlElement elem): base (elem)
- {
- name = elem.GetAttribute ("name");
- type = elem.GetAttribute ("type");
- required = elem.GetAttribute ("required").ToLower () == "true";
- localizable = elem.GetAttribute ("localizable").ToLower () == "true";
- description = ReadXmlDescription ();
- }
-
- internal override void SaveXml (XmlElement parent)
- {
- CreateElement (parent, "Attribute");
- Element.SetAttribute ("name", name);
-
- if (Type.Length > 0)
- Element.SetAttribute ("type", Type);
- else
- Element.RemoveAttribute ("type");
-
- if (required)
- Element.SetAttribute ("required", "True");
- else
- Element.RemoveAttribute ("required");
-
- if (localizable)
- Element.SetAttribute ("localizable", "True");
- else
- Element.RemoveAttribute ("localizable");
-
- SaveXmlDescription (description);
- }
-
- internal override void Write (BinaryXmlWriter writer)
- {
- writer.WriteValue ("name", name);
- writer.WriteValue ("type", type);
- writer.WriteValue ("required", required);
- writer.WriteValue ("description", description);
- writer.WriteValue ("localizable", localizable);
- }
-
- internal override void Read (BinaryXmlReader reader)
- {
- name = reader.ReadStringValue ("name");
- type = reader.ReadStringValue ("type");
- required = reader.ReadBooleanValue ("required");
- if (!reader.IgnoreDescriptionData)
- description = reader.ReadStringValue ("description");
- localizable = reader.ReadBooleanValue ("localizable");
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NodeTypeAttributeCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NodeTypeAttributeCollection.cs
deleted file mode 100644
index 276cb8c..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/NodeTypeAttributeCollection.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// NodeTypeAttributeCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins.Description
-{
- public class NodeTypeAttributeCollection: ObjectDescriptionCollection
- {
- public NodeTypeAttributeCollection ()
- {
- }
-
- internal NodeTypeAttributeCollection (object owner): base (owner)
- {
- }
-
- public NodeTypeAttribute this [int n] {
- get { return (NodeTypeAttribute) List [n]; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ObjectDescription.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ObjectDescription.cs
deleted file mode 100644
index 756823c..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ObjectDescription.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// ObjectDescription.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections.Specialized;
-using System.Xml;
-using Mono.Addins.Serialization;
-
-namespace Mono.Addins.Description
-{
- public class ObjectDescription: IBinaryXmlElement
- {
- internal XmlElement Element;
- object parent;
-
- internal ObjectDescription (XmlElement elem)
- {
- Element = elem;
- }
-
- internal ObjectDescription ()
- {
- }
-
- public object Parent {
- get { return parent; }
- }
-
- public AddinDescription ParentAddinDescription {
- get {
- if (parent is AddinDescription)
- return (AddinDescription) parent;
- else if (parent is ObjectDescription)
- return ((ObjectDescription)parent).ParentAddinDescription;
- else
- return null;
- }
- }
-
- internal void SetParent (object ob)
- {
- parent = ob;
- }
-
- void IBinaryXmlElement.Write (BinaryXmlWriter writer)
- {
- Write (writer);
- }
-
- void IBinaryXmlElement.Read (BinaryXmlReader reader)
- {
- Read (reader);
- }
-
- internal virtual void Write (BinaryXmlWriter writer)
- {
- }
-
- internal virtual void Read (BinaryXmlReader reader)
- {
- }
-
- internal virtual void SaveXml (XmlElement parent)
- {
- }
-
- internal void CreateElement (XmlElement parent, string nodeName)
- {
- if (Element == null) {
- Element = parent.OwnerDocument.CreateElement (nodeName);
- parent.AppendChild (Element);
- }
- }
-
- internal string ReadXmlDescription ()
- {
- XmlElement de = Element ["Description"];
- if (de != null)
- return de.InnerText;
- else
- return null;
- }
-
- internal void SaveXmlDescription (string desc)
- {
- XmlElement de = Element ["Description"];
- if (desc != null && desc.Length > 0) {
- if (de == null) {
- de = Element.OwnerDocument.CreateElement ("Description");
- Element.AppendChild (de);
- }
- de.InnerText = desc;
- } else {
- if (de != null)
- Element.RemoveChild (de);
- }
- }
-
- internal virtual void Verify (string location, StringCollection errors)
- {
- }
-
- internal void VerifyNotEmpty (string location, StringCollection errors, string attr, string val)
- {
- if (val == null || val.Length == 0)
- errors.Add (location + ": attribute '" + attr + "' can't be empty.");
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ObjectDescriptionCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ObjectDescriptionCollection.cs
deleted file mode 100644
index faac4f3..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Description/ObjectDescriptionCollection.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// ObjectDescriptionCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Collections;
-using System.Collections.Specialized;
-
-namespace Mono.Addins.Description
-{
- public class ObjectDescriptionCollection: CollectionBase
- {
- object owner;
-
- internal ObjectDescriptionCollection (object owner)
- {
- this.owner = owner;
- }
-
- public ObjectDescriptionCollection ()
- {
- }
-
- public void Add (ObjectDescription ep)
- {
- List.Add (ep);
- }
-
- public void AddRange (ObjectDescriptionCollection collection)
- {
- foreach (ObjectDescription ob in collection)
- Add (ob);
- }
-
- public void Remove (ObjectDescription ep)
- {
- List.Remove (ep);
- }
-
- public bool Contains (ObjectDescription ob)
- {
- return List.Contains (ob);
- }
-
- protected override void OnRemove (int index, object value)
- {
- ObjectDescription ep = (ObjectDescription) value;
- if (ep.Element != null) {
- ep.Element.ParentNode.RemoveChild (ep.Element);
- ep.Element = null;
- }
- if (owner != null)
- ep.SetParent (null);
- }
-
- protected override void OnInsertComplete (int index, object value)
- {
- if (owner != null)
- ((ObjectDescription)value).SetParent (owner);
- }
-
- protected override void OnSetComplete (int index, object oldValue, object newValue)
- {
- if (owner != null) {
- ((ObjectDescription)newValue).SetParent (owner);
- ((ObjectDescription)oldValue).SetParent (null);
- }
- }
-
- protected override void OnClear ()
- {
- if (owner != null) {
- foreach (ObjectDescription ob in List)
- ob.SetParent (null);
- }
- }
-
-
- internal void SaveXml (XmlElement parent)
- {
- foreach (ObjectDescription ob in this)
- ob.SaveXml (parent);
- }
-
- internal void Verify (string location, StringCollection errors)
- {
- int n=0;
- foreach (ObjectDescription ob in this) {
- ob.Verify (location + "[" + n + "]/", errors);
- n++;
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextDomain.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextDomain.cs
deleted file mode 100644
index 9247edf..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextDomain.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// GettextDomain.cs: Wrappers for the libintl library.
-//
-// Authors:
-// Edd Dumbill (edd at usefulinc.com)
-// Jonathan Pryor (jonpryor at vt.edu)
-// Lluis Sanchez Gual (lluis at novell.com)
-//
-// (C) 2004 Edd Dumbill
-// (C) 2005-2006 Jonathan Pryor
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.InteropServices;
-using System.IO;
-using System.Text;
-
-namespace Mono.Addins.Localization
-{
- class GettextDomain
- {
- [DllImport("intl")]
- static extern IntPtr bindtextdomain (IntPtr domainname, IntPtr dirname);
- [DllImport("intl")]
- static extern IntPtr bind_textdomain_codeset (IntPtr domainname, IntPtr codeset);
- [DllImport("intl")]
- static extern IntPtr dgettext (IntPtr domainname, IntPtr instring);
- [DllImport("intl")]
- static extern IntPtr dngettext (IntPtr domainname, IntPtr instring, IntPtr plural, int n);
-
- IntPtr ipackage;
-
- public void Init (String package, string localedir)
- {
- if (localedir == null) {
- localedir = System.Reflection.Assembly.GetEntryAssembly ().CodeBase;
- FileInfo f = new FileInfo (localedir);
- string prefix = f.Directory.Parent.Parent.Parent.ToString ();
- prefix = Path.Combine (Path.Combine (prefix, "share"), "locale");
- }
-
- ipackage = StringToPtr (package);
- IntPtr ilocaledir = StringToPtr (localedir);
- IntPtr iutf8 = StringToPtr ("UTF-8");
-
- try {
- if (bindtextdomain (ipackage, ilocaledir) == IntPtr.Zero)
- throw new InvalidOperationException ("Gettext localizer: bindtextdomain failed");
- if (bind_textdomain_codeset (ipackage, iutf8) == IntPtr.Zero)
- throw new InvalidOperationException ("Gettext localizer: bind_textdomain_codeset failed");
- }
- finally {
- Marshal.FreeHGlobal (ilocaledir);
- Marshal.FreeHGlobal (iutf8);
- }
- }
-
- ~GettextDomain ()
- {
- Marshal.FreeHGlobal (ipackage);
- }
-
- public String GetString (String s)
- {
- IntPtr ints = StringToPtr (s);
- try {
- // gettext(3) returns the input pointer if no translation is found
- IntPtr r = dgettext (ipackage, ints);
- if (r != ints)
- return PtrToString (r);
- return s;
- }
- finally {
- Marshal.FreeHGlobal (ints);
- }
- }
-
- public String GetPluralString (String singular, String defaultPlural, int n)
- {
- IntPtr ints = StringToPtr (singular);
- IntPtr intp = StringToPtr (defaultPlural);
- try {
- // gettext(3) returns the input pointer if no translation is found
- IntPtr r = dngettext (ipackage, ints, intp, n);
- if (r == ints)
- return singular;
- if (r == intp)
- return defaultPlural;
- return PtrToString (r);
- }
- finally {
- Marshal.FreeHGlobal (ints);
- Marshal.FreeHGlobal (intp);
- }
- }
-
- static IntPtr StringToPtr (string s)
- {
- if (s == null)
- return IntPtr.Zero;
- byte[] marshal = Encoding.UTF8.GetBytes (s);
- IntPtr mem = Marshal.AllocHGlobal (marshal.Length + 1);
- Marshal.Copy (marshal, 0, mem, marshal.Length);
- Marshal.WriteByte (mem, marshal.Length, 0);
- return mem;
- }
-
- static string PtrToString (IntPtr ptr)
- {
- if (ptr == IntPtr.Zero)
- return null;
- int sz = 0;
- while (Marshal.ReadByte (ptr, sz) != 0)
- sz++;
- byte[] bytes = new byte [sz];
- Marshal.Copy (ptr, bytes, 0, sz);
- return Encoding.UTF8.GetString (bytes);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextLocalizer.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextLocalizer.cs
deleted file mode 100644
index 56a2774..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextLocalizer.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// GettextLocalizer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using Mono.Addins;
-
-namespace Mono.Addins.Localization
-{
- class GettextLocalizer: IAddinLocalizerFactory, IAddinLocalizer, IPluralAddinLocalizer
- {
- GettextDomain domain;
-
- public IAddinLocalizer CreateLocalizer (RuntimeAddin addin, NodeElement element)
- {
- string pkg = element.GetAttribute ("catalog");
- if (pkg.Length == 0)
- pkg = addin.Id;
- string dir = element.GetAttribute ("location");
- if (dir.Length == 0)
- dir = "locale";
- dir = addin.GetFilePath (dir);
- domain = new GettextDomain ();
- domain.Init (pkg, dir);
- return this;
- }
-
- public string GetString (string msgid)
- {
- return domain.GetString (msgid);
- }
-
- public string GetPluralString (string singular, string defaultPlural, int n)
- {
- return domain.GetPluralString (singular, defaultPlural, n);
- }
-
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IAddinLocalizer.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IAddinLocalizer.cs
deleted file mode 100644
index eb38adc..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IAddinLocalizer.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// IAddinLocalizer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace Mono.Addins.Localization
-{
- public interface IAddinLocalizer
- {
- string GetString (string msgid);
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IAddinLocalizerFactory.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IAddinLocalizerFactory.cs
deleted file mode 100644
index c54583f..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IAddinLocalizerFactory.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// IAddinLocalizerFactory.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace Mono.Addins.Localization
-{
- public interface IAddinLocalizerFactory
- {
- IAddinLocalizer CreateLocalizer (RuntimeAddin addin, NodeElement element);
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IPluralAddinLocalizer.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IPluralAddinLocalizer.cs
deleted file mode 100644
index 57a7494..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/IPluralAddinLocalizer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// IPluralAddinLocalizer.cs
-//
-// Author:
-// Lluis Sanchez Gual <lluis at novell.com>
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-
-namespace Mono.Addins.Localization
-{
- public interface IPluralAddinLocalizer
- {
- string GetPluralString (string singular, String defaultPlural, int n);
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/NullLocalizer.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/NullLocalizer.cs
deleted file mode 100644
index d412c8e..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/NullLocalizer.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// NullLocalizer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-
-namespace Mono.Addins.Localization
-{
- class NullLocalizer: IAddinLocalizer
- {
- public static AddinLocalizer Instance = new AddinLocalizer (new NullLocalizer ());
-
- public string GetString (string msgid)
- {
- return msgid;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/StringResourceLocalizer.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/StringResourceLocalizer.cs
deleted file mode 100644
index 9fe0544..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/StringResourceLocalizer.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// StringResourceLocalizer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using Mono.Addins;
-
-namespace Mono.Addins.Localization
-{
- class StringResourceLocalizer: IAddinLocalizerFactory, IAddinLocalizer
- {
- RuntimeAddin addin;
-
- public IAddinLocalizer CreateLocalizer (RuntimeAddin addin, NodeElement element)
- {
- this.addin = addin;
- return this;
- }
-
- public string GetString (string msgid)
- {
- string s = addin.GetResourceString (msgid, false, System.Threading.Thread.CurrentThread.CurrentCulture);
- if (s == null)
- return msgid;
- else
- return s;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/StringTableLocalizer.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/StringTableLocalizer.cs
deleted file mode 100644
index 613ae51..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Localization/StringTableLocalizer.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// StringTableLocalizer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.Collections;
-using Mono.Addins;
-
-namespace Mono.Addins.Localization
-{
- class StringTableLocalizer: IAddinLocalizerFactory, IAddinLocalizer
- {
- Hashtable locales = new Hashtable ();
- static Hashtable nullLocale = new Hashtable ();
-
- public IAddinLocalizer CreateLocalizer (RuntimeAddin addin, NodeElement element)
- {
- foreach (NodeElement nloc in element.ChildNodes) {
- if (nloc.NodeName != "Locale")
- throw new InvalidOperationException ("Invalid element found: '" + nloc.NodeName + "'. Expected: 'Locale'");
- string ln = nloc.GetAttribute ("id");
- if (ln.Length == 0)
- throw new InvalidOperationException ("Locale id not specified");
- ln = ln.Replace ('_','-');
- Hashtable messages = new Hashtable ();
- foreach (NodeElement nmsg in nloc.ChildNodes) {
- if (nmsg.NodeName != "Msg")
- throw new InvalidOperationException ("Locale '" + ln + "': Invalid element found: '" + nmsg.NodeName + "'. Expected: 'Msg'");
- string id = nmsg.GetAttribute ("id");
- if (id.Length == 0)
- throw new InvalidOperationException ("Locale '" + ln + "': Message id not specified");
- messages [id] = nmsg.GetAttribute ("str");
- }
- locales [ln] = messages;
- }
- return this;
- }
-
- public string GetString (string id)
- {
- string cname = System.Threading.Thread.CurrentThread.CurrentCulture.Name;
- Hashtable loc = (Hashtable) locales [cname];
- if (loc == null) {
- string sn = cname.Substring (0, 2);
- loc = (Hashtable) locales [sn];
- if (loc != null)
- locales [cname] = loc;
- else {
- locales [cname] = nullLocale;
- return id;
- }
- }
- string msg = (string) loc [id];
- if (msg == null) {
- if (cname.Length > 2) {
- // Try again without the country
- cname = cname.Substring (0, 2);
- loc = (Hashtable) locales [cname];
- if (loc != null) {
- msg = (string) loc [id];
- if (msg != null)
- return msg;
- }
- }
- return id;
- }
- else
- return msg;
- }
- }
-}
-
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlReader.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlReader.cs
deleted file mode 100644
index 7fd5650..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlReader.cs
+++ /dev/null
@@ -1,548 +0,0 @@
-//
-// BinaryXmlReader.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.Text;
-using System.IO;
-
-namespace Mono.Addins.Serialization
-{
- internal class BinaryXmlReader
- {
- BinaryReader reader;
-
- internal const byte TagBeginElement = 1;
- internal const byte TagEndElement = 2;
- internal const byte TagValue = 4;
-
- internal const byte TagObject = 5;
- internal const byte TagObjectArray = 6;
- internal const byte TagObjectDictionary = 7;
- internal const byte TagObjectNull = 8;
-
- byte currentType;
- string currentName;
- ArrayList stringTable = new ArrayList ();
- BinaryXmlTypeMap typeMap;
- object contextData;
- bool ignoreDesc;
-
- public BinaryXmlReader (Stream stream, BinaryXmlTypeMap typeMap)
- {
- reader = new BinaryReader (stream);
- this.typeMap = typeMap;
- ReadNext ();
- }
-
- public BinaryXmlTypeMap TypeMap {
- get { return typeMap; }
- set { typeMap = value; }
- }
-
- public object ContextData {
- get { return contextData; }
- set { contextData = value; }
- }
-
- // Returns 'true' if description data must be ignored when reading the contents of a file
- public bool IgnoreDescriptionData {
- get { return ignoreDesc; }
- set { ignoreDesc = value; }
- }
-
- void ReadNext ()
- {
- int b = reader.BaseStream.ReadByte ();
- if (b == -1) {
- currentType = TagBeginElement;
- return;
- }
- currentType = (byte) b;
- if (currentType == TagBeginElement || currentType == TagValue)
- currentName = ReadString ();
- }
-
- string ReadString ()
- {
- // The first integer means:
- // >=0: string of the specified length
- // -1: null string
- // <-1: a string from the string table
-
- int len = reader.ReadInt32 ();
- if (len == -1)
- return null;
- if (len < -1)
- return (string) stringTable [-(len + 2)];
-
- byte[] bytes = new byte [len];
- int n = 0;
- while (n < len)
- n += reader.Read (bytes, n, len - n);
- string s = Encoding.UTF8.GetString (bytes);
- stringTable.Add (s);
- return s;
- }
-
- public string LocalName {
- get { return currentName; }
- }
-
- public bool IsElement {
- get { return currentType == TagBeginElement; }
- }
-
- public bool IsValue {
- get { return currentType == TagValue; }
- }
-
- TypeCode ReadValueType (TypeCode type)
- {
- if (currentType != TagValue)
- throw new InvalidOperationException ("Reader not positioned on a value.");
- TypeCode t = (TypeCode) reader.ReadByte ();
- if (t != type && type != TypeCode.Empty)
- throw new InvalidOperationException ("Invalid value type. Expected " + type + ", found " + t);
- return t;
- }
-
- public string ReadStringValue (string name)
- {
- if (!SkipToValue (name))
- return null;
- return ReadStringValue ();
- }
-
- public string ReadStringValue ()
- {
- if (currentType != TagValue)
- throw new InvalidOperationException ("Reader not positioned on a value.");
-
- TypeCode t = (TypeCode) reader.ReadByte ();
- if (t == TypeCode.Empty) {
- ReadNext ();
- return null;
- }
- if (t != TypeCode.String)
- throw new InvalidOperationException ("Invalid value type. Expected String, found " + t);
-
- string s = ReadString ();
- ReadNext ();
- return s;
- }
-
- public bool ReadBooleanValue (string name)
- {
- if (!SkipToValue (name))
- return false;
- return ReadBooleanValue ();
- }
-
- public bool ReadBooleanValue ()
- {
- ReadValueType (TypeCode.Boolean);
- bool value = reader.ReadBoolean ();
- ReadNext ();
- return value;
- }
-
- public char ReadCharValue (string name)
- {
- if (!SkipToValue (name))
- return (char)0;
- return ReadCharValue ();
- }
-
- public char ReadCharValue ()
- {
- ReadValueType (TypeCode.Char);
- char value = reader.ReadChar ();
- ReadNext ();
- return value;
- }
-
- public byte ReadByteValue (string name)
- {
- if (!SkipToValue (name))
- return (byte)0;
- return ReadByteValue ();
- }
-
- public byte ReadByteValue ()
- {
- ReadValueType (TypeCode.Byte);
- byte value = reader.ReadByte ();
- ReadNext ();
- return value;
- }
-
- public short ReadInt16Value (string name)
- {
- if (!SkipToValue (name))
- return (short)0;
- return ReadInt16Value ();
- }
-
- public short ReadInt16Value ()
- {
- ReadValueType (TypeCode.Int16);
- short value = reader.ReadInt16 ();
- ReadNext ();
- return value;
- }
-
- public int ReadInt32Value (string name)
- {
- if (!SkipToValue (name))
- return 0;
- return ReadInt32Value ();
- }
-
- public int ReadInt32Value ()
- {
- ReadValueType (TypeCode.Int32);
- int value = reader.ReadInt32 ();
- ReadNext ();
- return value;
- }
-
- public long ReadInt64Value (string name)
- {
- if (!SkipToValue (name))
- return (long)0;
- return ReadInt64Value ();
- }
-
- public long ReadInt64Value ()
- {
- ReadValueType (TypeCode.Int64);
- long value = reader.ReadInt64 ();
- ReadNext ();
- return value;
- }
-
- public DateTime ReadDateTimeValue (string name)
- {
- if (!SkipToValue (name))
- return DateTime.MinValue;
- return ReadDateTimeValue ();
- }
-
- public DateTime ReadDateTimeValue ()
- {
- ReadValueType (TypeCode.DateTime);
- DateTime value = new DateTime (reader.ReadInt64 ());
- ReadNext ();
- return value;
- }
-
- public object ReadValue (string name)
- {
- if (!SkipToValue (name))
- return null;
- return ReadValue ();
- }
-
- public object ReadValue ()
- {
- object res = ReadValueInternal ();
- ReadNext ();
- return res;
- }
-
- public object ReadValue (string name, object targetInstance)
- {
- if (!SkipToValue (name))
- return null;
- return ReadValue (targetInstance);
- }
-
- public object ReadValue (object targetInstance)
- {
- TypeCode t = (TypeCode) reader.ReadByte ();
- if (t == TypeCode.Empty) {
- ReadNext ();
- return null;
- }
- if (t != TypeCode.Object)
- throw new InvalidOperationException ("Invalid value type. Expected Object, found " + t);
-
- object res = ReadObject (targetInstance);
- ReadNext ();
- return res;
- }
-
- object ReadValueInternal ()
- {
- TypeCode t = (TypeCode) reader.ReadByte ();
- if (t == TypeCode.Empty)
- return null;
- return ReadValueInternal (t);
- }
-
- object ReadValueInternal (TypeCode t)
- {
- object res;
- switch (t) {
- case TypeCode.Boolean: res = reader.ReadBoolean (); break;
- case TypeCode.Char: res = reader.ReadChar (); break;
- case TypeCode.SByte: res = reader.ReadSByte (); break;
- case TypeCode.Byte: res = reader.ReadByte (); break;
- case TypeCode.Int16: res = reader.ReadInt16 (); break;
- case TypeCode.UInt16: res = reader.ReadUInt16 (); break;
- case TypeCode.Int32: res = reader.ReadInt32 (); break;
- case TypeCode.UInt32: res = reader.ReadUInt32 (); break;
- case TypeCode.Int64: res = reader.ReadInt64 (); break;
- case TypeCode.UInt64: res = reader.ReadUInt64 (); break;
- case TypeCode.Single: res = reader.ReadSingle (); break;
- case TypeCode.Double: res = reader.ReadDouble (); break;
- case TypeCode.DateTime: res = new DateTime (reader.ReadInt64 ()); break;
- case TypeCode.String: res = ReadString (); break;
- case TypeCode.Object: res = ReadObject (null); break;
- case TypeCode.Empty: res = null; break;
- default:
- throw new InvalidOperationException ("Unexpected value type: " + t);
- }
- return res;
- }
-
- bool SkipToValue (string name)
- {
- do {
- if ((currentType == TagBeginElement || currentType == TagValue) && currentName == name)
- return true;
- if (EndOfElement)
- return false;
- Skip ();
- } while (true);
- }
-
- public void ReadBeginElement ()
- {
- if (currentType != TagBeginElement)
- throw new InvalidOperationException ("Reader not positioned on an element.");
- ReadNext ();
- }
-
- public void ReadEndElement ()
- {
- if (currentType != TagEndElement)
- throw new InvalidOperationException ("Reader not positioned on an element.");
- ReadNext ();
- }
-
- public bool EndOfElement {
- get { return currentType == TagEndElement; }
- }
-
- public void Skip ()
- {
- if (currentType == TagValue)
- ReadValue ();
- else if (currentType == TagEndElement)
- ReadNext ();
- else if (currentType == TagBeginElement) {
- ReadNext ();
- while (!EndOfElement)
- Skip ();
- ReadNext ();
- }
- }
-
- object ReadObject (object targetInstance)
- {
- byte ot = reader.ReadByte ();
- if (ot == TagObjectNull) {
- return null;
- }
- else if (ot == TagObject) {
- string tname = ReadString ();
- IBinaryXmlElement ob;
- if (targetInstance != null) {
- ob = targetInstance as IBinaryXmlElement;
- if (ob == null)
- throw new InvalidOperationException ("Target instance has an invalid type. Expected an IBinaryXmlElement implementation.");
- } else {
- ob = typeMap.CreateObject (tname);
- }
- ReadNext ();
- ob.Read (this);
- while (currentType != TagEndElement)
- Skip ();
- return ob;
- }
- else if (ot == TagObjectArray) {
- TypeCode tc = (TypeCode) reader.ReadByte ();
- int len = reader.ReadInt32 ();
- if (targetInstance != null) {
- IList list = targetInstance as IList;
- if (list == null)
- throw new InvalidOperationException ("Target instance has an invalid type. Expected an IList implementation.");
- for (int n=0; n<len; n++)
- list.Add (ReadValueInternal ());
- return list;
- }
- else {
- Array obs = CreateArray (tc, len);
- for (int n=0; n<len; n++)
- obs.SetValue (ReadValueInternal (), n);
- return obs;
- }
- }
- else if (ot == TagObjectDictionary) {
- int len = reader.ReadInt32 ();
- IDictionary table;
- if (targetInstance != null) {
- table = targetInstance as IDictionary;
- if (table == null)
- throw new InvalidOperationException ("Target instance has an invalid type. Expected an IDictionary implementation.");
- } else {
- table = new Hashtable ();
- }
- for (int n=0; n<len; n++) {
- object key = ReadValueInternal ();
- object val = ReadValueInternal ();
- table [key] = val;
- }
- return table;
- }
- else
- throw new InvalidOperationException ("Unknown object type tag: " + ot);
- }
-
- Array CreateArray (TypeCode t, int len)
- {
- switch (t) {
- case TypeCode.Boolean: return new bool [len];
- case TypeCode.Char: return new Char [len];
- case TypeCode.SByte: return new SByte [len];
- case TypeCode.Byte: return new Byte [len];
- case TypeCode.Int16: return new Int16 [len];
- case TypeCode.UInt16: return new UInt16 [len];
- case TypeCode.Int32: return new Int32 [len];
- case TypeCode.UInt32: return new UInt32 [len];
- case TypeCode.Int64: return new Int64 [len];
- case TypeCode.UInt64: return new UInt64 [len];
- case TypeCode.Single: return new Single [len];
- case TypeCode.Double: return new Double [len];
- case TypeCode.DateTime: return new DateTime [len];
- case TypeCode.String: return new String [len];
- case TypeCode.Object: return new Object [len];
- default:
- throw new InvalidOperationException ("Unexpected value type: " + t);
- }
- }
-
- const int IndSize = 2;
-
- public static void DumpFile (string file)
- {
- Console.WriteLine ("FILE: " + file);
- using (Stream s = File.OpenRead (file)) {
- BinaryXmlReader r = new BinaryXmlReader (s, new BinaryXmlTypeMap ());
- r.Dump (0);
- }
- }
-
- public void Dump (int ind)
- {
- if (currentType == TagValue) {
- Console.Write (new string (' ', ind) + LocalName + ": ");
- DumpValue (ind);
- Console.WriteLine ();
- }
- else if (currentType == TagBeginElement) {
- string name = LocalName;
- Console.WriteLine (new string (' ', ind) + "<" + name + ">");
- DumpElement (ind + IndSize);
- Console.WriteLine (new string (' ', ind) + "</" + name + ">");
- }
- }
-
- public void DumpElement (int ind)
- {
- ReadNext ();
- while (currentType != TagEndElement) {
- Dump (ind + IndSize);
- ReadNext ();
- }
- }
-
- void DumpValue (int ind)
- {
- TypeCode t = (TypeCode) reader.ReadByte ();
- if (t != TypeCode.Object) {
- object ob = ReadValueInternal (t);
- if (ob == null) ob = "(null)";
- Console.Write (ob);
- } else {
- byte ot = reader.ReadByte ();
- switch (ot) {
- case TagObjectNull: {
- Console.Write ("(null)");
- break;
- }
- case TagObject: {
- string tname = ReadString ();
- Console.WriteLine ("(" + tname + ")");
- DumpElement (ind + IndSize);
- break;
- }
- case TagObjectArray: {
- TypeCode tc = (TypeCode) reader.ReadByte ();
- int len = reader.ReadInt32 ();
- Console.WriteLine ("(" + tc + "[" + len + "])");
- for (int n=0; n<len; n++) {
- Console.Write (new string (' ', ind + IndSize) + n + ": ");
- DumpValue (ind + IndSize*2);
- Console.WriteLine ();
- }
- break;
- }
- case TagObjectDictionary: {
- int len = reader.ReadInt32 ();
- Console.WriteLine ("(IDictionary)");
- for (int n=0; n<len; n++) {
- Console.Write (new string (' ', ind + IndSize) + "key: ");
- DumpValue (ind + IndSize*2);
- Console.WriteLine ();
- Console.Write (new string (' ', ind + IndSize) + "val: ");
- DumpValue (ind + IndSize*2);
- Console.WriteLine ();
- }
- break;
- }
- default:
- throw new InvalidOperationException ("Invalid object tag: " + ot);
- }
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlTypeMap.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlTypeMap.cs
deleted file mode 100644
index fff2fd4..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlTypeMap.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// BinaryXmlTypeMap.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins.Serialization
-{
- internal class BinaryXmlTypeMap
- {
- Hashtable types = new Hashtable ();
- Hashtable names = new Hashtable ();
-
- public BinaryXmlTypeMap ()
- {
- }
-
- public BinaryXmlTypeMap (params Type[] types)
- {
- foreach (Type t in types)
- RegisterType (t);
- }
-
- public void RegisterType (Type type)
- {
- RegisterType (type, type.Name);
- }
-
- public void RegisterType (Type type, string name)
- {
- names [type] = name;
- types [name] = type;
- }
-
- public string GetTypeName (object ob)
- {
- string s = (string) names [ob.GetType ()];
- if (s == null)
- throw new InvalidOperationException ("Type not registered: " + ob.GetType ());
- return s;
- }
-
- public IBinaryXmlElement CreateObject (string typeName)
- {
- Type t = (Type) types [typeName];
- if (t == null)
- return null;
- return (IBinaryXmlElement) Activator.CreateInstance (t,true);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlWriter.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlWriter.cs
deleted file mode 100644
index 00a14eb..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/BinaryXmlWriter.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-//
-// BinaryXmlWriter.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.Text;
-using System.IO;
-
-namespace Mono.Addins.Serialization
-{
- internal class BinaryXmlWriter
- {
- BinaryWriter writer;
- BinaryXmlTypeMap typeMap;
- Hashtable stringTable = new Hashtable ();
-
- public BinaryXmlWriter (Stream stream, BinaryXmlTypeMap typeMap)
- {
- this.typeMap = typeMap;
- writer = new BinaryWriter (stream);
- }
-
- public void WriteBeginElement (string name)
- {
- writer.Write (BinaryXmlReader.TagBeginElement);
- WriteString (name);
- }
-
- public void WriteEndElement ()
- {
- writer.Write (BinaryXmlReader.TagEndElement);
- }
-
- void WriteValueHeader (string name, TypeCode type)
- {
- writer.Write (BinaryXmlReader.TagValue);
- WriteString (name);
- writer.Write ((byte) type);
- }
-
- public void WriteValue (string name, bool b)
- {
- WriteValueHeader (name, TypeCode.Boolean);
- writer.Write (b);
- }
-
- public void WriteValue (string name, string s)
- {
- WriteValueHeader (name, TypeCode.String);
- WriteString (s);
- }
-
- public void WriteValue (string name, char value)
- {
- WriteValueHeader (name, TypeCode.Char);
- writer.Write (value);
- }
-
- public void WriteValue (string name, byte value)
- {
- WriteValueHeader (name, TypeCode.Byte);
- writer.Write (value);
- }
-
- public void WriteValue (string name, short value)
- {
- WriteValueHeader (name, TypeCode.Int16);
- writer.Write (value);
- }
-
- public void WriteValue (string name, int value)
- {
- WriteValueHeader (name, TypeCode.Int32);
- writer.Write (value);
- }
-
- public void WriteValue (string name, long value)
- {
- WriteValueHeader (name, TypeCode.Int64);
- writer.Write (value);
- }
-
- public void WriteValue (string name, DateTime value)
- {
- WriteValueHeader (name, TypeCode.DateTime);
- writer.Write (value.Ticks);
- }
-
- public void WriteValue (string name, object ob)
- {
- TypeCode t = ob != null ? Type.GetTypeCode (ob.GetType ()) : TypeCode.Empty;
- WriteValueHeader (name, t);
- if (t != TypeCode.Empty)
- WriteValue (ob, t);
- }
-
- public void WriteValue (string name, IBinaryXmlElement ob)
- {
- if (ob == null)
- WriteValueHeader (name, TypeCode.Empty);
- else {
- WriteValueHeader (name, TypeCode.Object);
- WriteObject (ob);
- }
- }
-
- void WriteValue (object ob)
- {
- if (ob == null)
- writer.Write ((byte) TypeCode.Empty);
- else {
- TypeCode t = Type.GetTypeCode (ob.GetType ());
- writer.Write ((byte) t);
- WriteValue (ob, t);
- }
- }
-
- void WriteValue (object ob, TypeCode t)
- {
- switch (t) {
- case TypeCode.Boolean: writer.Write ((bool)ob); break;
- case TypeCode.Char: writer.Write ((char)ob); break;
- case TypeCode.SByte: writer.Write ((sbyte)ob); break;
- case TypeCode.Byte: writer.Write ((byte)ob); break;
- case TypeCode.Int16: writer.Write ((short)ob); break;
- case TypeCode.UInt16: writer.Write ((ushort)ob); break;
- case TypeCode.Int32: writer.Write ((int)ob); break;
- case TypeCode.UInt32: writer.Write ((uint)ob); break;
- case TypeCode.Int64: writer.Write ((long)ob); break;
- case TypeCode.UInt64: writer.Write ((ulong)ob); break;
- case TypeCode.Single: writer.Write ((float)ob); break;
- case TypeCode.Double: writer.Write ((double)ob); break;
- case TypeCode.DateTime: writer.Write (((DateTime)ob).Ticks); break;
- case TypeCode.String: WriteString ((string)ob); break;
- case TypeCode.Object: WriteObject (ob); break;
- default:
- throw new InvalidOperationException ("Unexpected value type: " + t);
- }
- }
-
- void WriteObject (object ob)
- {
- if (ob == null)
- writer.Write (BinaryXmlReader.TagObjectNull);
- else {
- IBinaryXmlElement elem = ob as IBinaryXmlElement;
- if (elem != null) {
- writer.Write (BinaryXmlReader.TagObject);
- WriteString (typeMap.GetTypeName (elem));
- elem.Write (this);
- WriteEndElement ();
- }
- else if (ob is IDictionary) {
- IDictionary dict = (IDictionary) ob;
- writer.Write (BinaryXmlReader.TagObjectDictionary);
- writer.Write (dict.Count);
- foreach (DictionaryEntry e in dict) {
- WriteValue (e.Key);
- WriteValue (e.Value);
- }
- }
- else if (ob is ICollection) {
- ICollection col = (ICollection) ob;
- writer.Write (BinaryXmlReader.TagObjectArray);
- if (ob is Array)
- writer.Write ((byte) Type.GetTypeCode (ob.GetType().GetElementType ()));
- else
- writer.Write ((byte) TypeCode.Object);
- writer.Write (col.Count);
- foreach (object e in col) {
- WriteValue (e);
- }
- }
- else
- throw new InvalidOperationException ("Invalid object type: " + ob.GetType ());
- }
- }
-
- void WriteString (string s)
- {
- if (s == null)
- writer.Write (-1);
- else {
- object ind = stringTable [s];
- if (ind == null) {
- stringTable.Add (s, stringTable.Count);
- byte[] bytes = Encoding.UTF8.GetBytes (s);
- writer.Write (bytes.Length);
- writer.Write (bytes);
- } else {
- // +2 because -1 is reserved for null, and 0 is considered positive
- writer.Write (-((int)ind + 2));
- }
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/IBinaryXmlElement.cs b/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/IBinaryXmlElement.cs
deleted file mode 100644
index f5b49e4..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.Serialization/IBinaryXmlElement.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// IBinaryXmlElement.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins.Serialization
-{
- internal interface IBinaryXmlElement
- {
- void Read (BinaryXmlReader reader);
- void Write (BinaryXmlWriter writer);
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins.dll.config b/lib/mono-addins/Mono.Addins/Mono.Addins.dll.config
deleted file mode 100644
index 39e8a66..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins.dll.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
- <startup>
- <supportedRuntime version="v2.0.50727" />
- </startup>
-</configuration>
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/Addin.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/Addin.cs
deleted file mode 100644
index 687347c..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/Addin.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-//
-// Addin.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Collections.Specialized;
-using Mono.Addins.Description;
-using Mono.Addins.Database;
-
-namespace Mono.Addins
-{
- public class Addin
- {
- AddinInfo addin;
- string configFile;
- string sourceFile;
- WeakReference desc;
- AddinDatabase database;
-
- internal Addin (AddinDatabase database, string file)
- {
- this.database = database;
- configFile = file;
- }
-
- public string Id {
- get {
- if (configFile != null)
- return Path.GetFileNameWithoutExtension (configFile);
- return this.AddinInfo.Id;
- }
- }
-
- public string Namespace {
- get { return this.AddinInfo.Namespace; }
- }
-
- public string LocalId {
- get { return this.AddinInfo.LocalId; }
- }
-
- public string Version {
- get { return this.AddinInfo.Version; }
- }
-
- public string Name {
- get { return this.AddinInfo.Name; }
- }
-
- internal string PrivateDataPath {
- get { return Path.Combine (database.AddinPrivateDataPath, Path.GetFileNameWithoutExtension (Description.FileName)); }
- }
-
- public bool SupportsVersion (string version)
- {
- return AddinInfo.SupportsVersion (version);
- }
-
- public override string ToString ()
- {
- return Id;
- }
-
- internal AddinInfo AddinInfo {
- get {
- if (addin == null) {
- try {
- addin = AddinInfo.ReadFromDescription (Description);
- } catch (Exception ex) {
- throw new InvalidOperationException ("Could not read add-in file: " + configFile, ex);
- }
- }
- return addin;
- }
- }
-
- public bool Enabled {
- get { return AddinInfo.IsRoot ? true : database.IsAddinEnabled (Description.Domain, AddinInfo.Id, true); }
- set {
- if (value)
- database.EnableAddin (Description.Domain, AddinInfo.Id, true);
- else
- database.DisableAddin (Description.Domain, AddinInfo.Id);
- }
- }
-
- public bool IsUserAddin {
- get { return configFile.StartsWith (Environment.GetFolderPath (Environment.SpecialFolder.Personal)); }
- }
-
- public string AddinFile {
- get {
- if (sourceFile == null && addin == null)
- LoadAddinInfo ();
- return sourceFile;
- }
- }
-
- void LoadAddinInfo ()
- {
- if (addin == null) {
- try {
- AddinDescription m = Description;
- sourceFile = m.AddinFile;
- addin = AddinInfo.ReadFromDescription (m);
- } catch (Exception ex) {
- throw new InvalidOperationException ("Could not read add-in file: " + configFile, ex);
- }
- }
- }
-
- public AddinDescription Description {
- get {
- if (desc != null) {
- AddinDescription d = desc.Target as AddinDescription;
- if (d != null)
- return d;
- }
-
- AddinDescription m;
- database.ReadAddinDescription (null, configFile, out m);
-
- if (m == null)
- throw new InvalidOperationException ("Could not read add-in description");
- if (addin == null) {
- addin = AddinInfo.ReadFromDescription (m);
- sourceFile = m.AddinFile;
- }
- desc = new WeakReference (m);
- return m;
- }
- }
-
- // returns -1 if v1 > v2
- public static int CompareVersions (string v1, string v2)
- {
- string[] a1 = v1.Split ('.');
- string[] a2 = v2.Split ('.');
-
- for (int n=0; n<a1.Length; n++) {
- if (n >= a2.Length)
- return -1;
- if (a1[n].Length == 0) {
- if (a2[n].Length != 0)
- return 1;
- continue;
- }
- try {
- int n1 = int.Parse (a1[n]);
- int n2 = int.Parse (a2[n]);
- if (n1 < n2)
- return 1;
- else if (n1 > n2)
- return -1;
- } catch {
- return 1;
- }
- }
- if (a2.Length > a1.Length)
- return 1;
- return 0;
- }
-
- public static string GetFullId (string ns, string id, string version)
- {
- string res;
- if (id.StartsWith ("::"))
- res = id.Substring (2);
- else if (ns != null && ns.Length > 0)
- res = ns + "." + id;
- else
- res = id;
-
- if (version != null && version.Length > 0)
- return res + "," + version;
- else
- return res;
- }
-
- public static string GetIdName (string addinId)
- {
- int i = addinId.IndexOf (',');
- if (i != -1)
- return addinId.Substring (0, i);
- else
- return addinId;
- }
-
- public static string GetIdVersion (string addinId)
- {
- int i = addinId.IndexOf (',');
- if (i != -1)
- return addinId.Substring (i + 1).Trim ();
- else
- return string.Empty;
- }
-
- public static void GetIdParts (string addinId, out string name, out string version)
- {
- int i = addinId.IndexOf (',');
- if (i != -1) {
- name = addinId.Substring (0, i);
- version = addinId.Substring (i+1).Trim ();
- } else {
- name = addinId;
- version = string.Empty;
- }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinAttribute.cs
deleted file mode 100644
index 17f075c..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinAttribute.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// AddinAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Assembly)]
- public class AddinAttribute: Attribute
- {
- string id;
- string version;
- string ns;
- string category;
-
- public AddinAttribute ()
- {
- }
-
- public AddinAttribute (string id)
- {
- this.id = id;
- }
-
- public AddinAttribute (string id, string version)
- {
- this.id = id;
- this.version = version;
- }
-
- public string Id {
- get { return id != null ? id : string.Empty; }
- set { id = value; }
- }
-
- public string Version {
- get { return version != null ? version : string.Empty; }
- set { version = value; }
- }
-
- public string Namespace {
- get { return ns != null ? ns : string.Empty; }
- set { ns = value; }
- }
-
- public string Category {
- get { return category != null ? category : string.Empty; }
- set { category = value; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinDependencyAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinDependencyAttribute.cs
deleted file mode 100644
index 703053d..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinDependencyAttribute.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// AddinDependencyAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=true)]
- public class AddinDependencyAttribute: Attribute
- {
- string id;
- string version;
-
- public AddinDependencyAttribute (string id, string version)
- {
- this.id = id;
- this.version = version;
- }
-
- public string Id {
- get { return id; }
- }
-
- public string Version {
- get { return version; }
- }
-
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinErrorEventArgs.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinErrorEventArgs.cs
deleted file mode 100644
index 697f531..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinErrorEventArgs.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// AddinErrorEventArgs.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- public delegate void AddinErrorEventHandler (object sender, AddinErrorEventArgs args);
-
- public class AddinErrorEventArgs: AddinEventArgs
- {
- Exception exception;
- string message;
-
- public AddinErrorEventArgs (string message, string addinId, Exception exception): base (addinId)
- {
- this.message = message;
- this.exception = exception;
- }
-
- public Exception Exception {
- get { return exception; }
- }
-
- public string Message {
- get { return message; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinEventArgs.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinEventArgs.cs
deleted file mode 100644
index dc5aefb..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinEventArgs.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// AddinEventArgs.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- public delegate void AddinEventHandler (object sender, AddinEventArgs args);
-
- public class AddinEventArgs: EventArgs
- {
- string addinId;
-
- public AddinEventArgs (string addinId)
- {
- this.addinId = addinId;
- }
-
- public string AddinId {
- get { return addinId; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinInfo.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinInfo.cs
deleted file mode 100644
index 41f7bf5..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinInfo.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-//
-// AddinInfo.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Xml;
-using System.Xml.Serialization;
-using Mono.Addins.Description;
-
-namespace Mono.Addins
-{
- internal class AddinInfo
- {
- string id = "";
- string namspace = "";
- string name = "";
- string version = "";
- string baseVersion = "";
- string author = "";
- string copyright = "";
- string url = "";
- string description = "";
- string category = "";
- bool defaultEnabled = true;
- bool isroot;
- DependencyCollection dependencies;
- DependencyCollection optionalDependencies;
-
- public AddinInfo ()
- {
- dependencies = new DependencyCollection ();
- optionalDependencies = new DependencyCollection ();
- }
-
- public string Id {
- get { return Addin.GetFullId (namspace, id, version); }
- }
-
- [XmlElement ("Id")]
- public string LocalId {
- get { return id; }
- set { id = value; }
- }
-
- public string Namespace {
- get { return namspace; }
- set { namspace = value; }
- }
-
- public bool IsRoot {
- get { return isroot; }
- set { isroot = value; }
- }
-
- public string Name {
- get {
- if (name != null && name.Length > 0)
- return name;
- string sid = id;
- if (sid.StartsWith ("__"))
- sid = sid.Substring (2);
- return Addin.GetFullId (namspace, sid, null);
- }
- set { name = value; }
- }
-
- public string Version {
- get { return version; }
- set { version = value; }
- }
-
- public string BaseVersion {
- get { return baseVersion; }
- set { baseVersion = value; }
- }
-
- public string Author {
- get { return author; }
- set { author = value; }
- }
-
- public string Copyright {
- get { return copyright; }
- set { copyright = value; }
- }
-
- public string Url {
- get { return url; }
- set { url = value; }
- }
-
- public string Description {
- get { return description; }
- set { description = value; }
- }
-
- public string Category {
- get { return category; }
- set { category = value; }
- }
-
- public bool EnabledByDefault {
- get { return defaultEnabled; }
- set { defaultEnabled = value; }
- }
-
- [XmlArrayItem ("AddinDependency", typeof(AddinDependency))]
- [XmlArrayItem ("AssemblyDependency", typeof(AssemblyDependency))]
- public DependencyCollection Dependencies {
- get { return dependencies; }
- }
-
- [XmlArrayItem ("AddinDependency", typeof(AddinDependency))]
- [XmlArrayItem ("AssemblyDependency", typeof(AssemblyDependency))]
- public DependencyCollection OptionalDependencies {
- get { return optionalDependencies; }
- }
-
- public static AddinInfo ReadFromAddinFile (StreamReader r)
- {
- XmlDocument doc = new XmlDocument ();
- doc.Load (r);
- r.Close ();
-
- AddinInfo info = new AddinInfo ();
- info.id = doc.DocumentElement.GetAttribute ("id");
- info.namspace = doc.DocumentElement.GetAttribute ("namespace");
- info.name = doc.DocumentElement.GetAttribute ("name");
- if (info.id == "") info.id = info.name;
- info.version = doc.DocumentElement.GetAttribute ("version");
- info.author = doc.DocumentElement.GetAttribute ("author");
- info.copyright = doc.DocumentElement.GetAttribute ("copyright");
- info.url = doc.DocumentElement.GetAttribute ("url");
- info.description = doc.DocumentElement.GetAttribute ("description");
- info.category = doc.DocumentElement.GetAttribute ("category");
- info.baseVersion = doc.DocumentElement.GetAttribute ("compatVersion");
-
- string s = doc.DocumentElement.GetAttribute ("defaultEnabled");
- info.defaultEnabled = s.Length == 0 || s == "true" || s == "yes";
-
- s = doc.DocumentElement.GetAttribute ("isRoot");
- if (s.Length == 0) s = doc.DocumentElement.GetAttribute ("isroot");
- info.isroot = s == "true" || s == "yes";
-
- ReadDependencies (info.Dependencies, info.OptionalDependencies, doc.DocumentElement);
-
- return info;
- }
-
- static void ReadDependencies (DependencyCollection deps, DependencyCollection opDeps, XmlElement elem)
- {
- foreach (XmlElement dep in elem.SelectNodes ("Dependencies/Addin")) {
- AddinDependency adep = new AddinDependency ();
- adep.AddinId = dep.GetAttribute ("id");
- string v = dep.GetAttribute ("version");
- if (v.Length != 0)
- adep.Version = v;
- deps.Add (adep);
- }
-
- foreach (XmlElement dep in elem.SelectNodes ("Dependencies/Assembly")) {
- AssemblyDependency adep = new AssemblyDependency ();
- adep.FullName = dep.GetAttribute ("name");
- adep.Package = dep.GetAttribute ("package");
- deps.Add (adep);
- }
-
- foreach (XmlElement mod in elem.SelectNodes ("Module"))
- ReadDependencies (opDeps, opDeps, mod);
- }
-
- internal static AddinInfo ReadFromDescription (AddinDescription description)
- {
- AddinInfo info = new AddinInfo ();
- info.id = description.LocalId;
- info.namspace = description.Namespace;
- info.name = description.Name;
- info.version = description.Version;
- info.author = description.Author;
- info.copyright = description.Copyright;
- info.url = description.Url;
- info.description = description.Description;
- info.category = description.Category;
- info.baseVersion = description.CompatVersion;
- info.isroot = description.IsRoot;
- info.defaultEnabled = description.EnabledByDefault;
-
- foreach (Dependency dep in description.MainModule.Dependencies)
- info.Dependencies.Add (dep);
-
- foreach (ModuleDescription mod in description.OptionalModules) {
- foreach (Dependency dep in mod.Dependencies)
- info.OptionalDependencies.Add (dep);
- }
- return info;
- }
-
- public bool SupportsVersion (string version)
- {
- if (Addin.CompareVersions (Version, version) > 0)
- return false;
- if (baseVersion == "")
- return true;
- return Addin.CompareVersions (BaseVersion, version) >= 0;
- }
-
- public int CompareVersionTo (AddinInfo other)
- {
- return Addin.CompareVersions (this.version, other.Version);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinLocalizer.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinLocalizer.cs
deleted file mode 100644
index 6b8b1a9..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinLocalizer.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// AddinLocalizer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Mono.Addins.Localization;
-
-namespace Mono.Addins
-{
- public class AddinLocalizer
- {
- IAddinLocalizer localizer;
- IPluralAddinLocalizer pluralLocalizer;
-
- internal AddinLocalizer (IAddinLocalizer localizer)
- {
- this.localizer = localizer;
- pluralLocalizer = localizer as IPluralAddinLocalizer;
- }
-
- public string GetString (string msgid)
- {
- return localizer.GetString (msgid);
- }
-
- public string GetString (string msgid, params string[] args)
- {
- return string.Format (localizer.GetString (msgid), args);
- }
-
- public string GetPluralString (string msgid, string defaultPlural, int n)
- {
- // If the localizer does not support plural forms, just use GetString to
- // get a translation. It is not correct to check 'n' in this case because
- // there is no guarantee that 'defaultPlural' will be translated.
-
- if (pluralLocalizer != null)
- return pluralLocalizer.GetPluralString (msgid, defaultPlural, n);
- else
- return GetString (msgid);
- }
-
- public string GetPluralString (string singular, string defaultPlural, int n, params string[] args)
- {
- return string.Format (GetPluralString (singular, defaultPlural, n), args);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs
deleted file mode 100644
index a61d4df..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-//
-// AddinManager.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Reflection;
-using System.Collections;
-
-using Mono.Addins.Localization;
-
-namespace Mono.Addins
-{
- public class AddinManager
- {
- static AddinSessionService sessionService;
- static AddinRegistry registry;
-
- static string startupDirectory;
- static bool initialized;
- static IAddinInstaller installer;
-
- public static event AddinErrorEventHandler AddinLoadError;
- public static event AddinEventHandler AddinLoaded;
- public static event AddinEventHandler AddinUnloaded;
-
- private AddinManager ()
- {
- }
-
- public static void Initialize ()
- {
- Initialize (null);
- }
-
- public static void Initialize (string configDir)
- {
- if (initialized)
- return;
-
- Assembly asm = Assembly.GetEntryAssembly ();
- if (asm == null) asm = Assembly.GetCallingAssembly ();
- string asmFile = new Uri (asm.CodeBase).LocalPath;
-
- startupDirectory = Path.GetDirectoryName (asmFile);
-
- string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY");
- if (customDir != null && customDir.Length > 0)
- configDir = customDir;
-
- if (configDir == null || configDir.Length == 0)
- registry = AddinRegistry.GetGlobalRegistry (startupDirectory);
- else
- registry = new AddinRegistry (configDir, startupDirectory);
-
- if (registry.CreateHostAddinsFile (asmFile))
- registry.Update (new ConsoleProgressStatus (false));
-
- initialized = true;
-
- SessionService.Initialize ();
- }
-
- public static void Shutdown ()
- {
- SessionService.Shutdown ();
- registry.Dispose ();
- registry = null;
- startupDirectory = null;
- initialized = false;
- }
-
- public static void InitializeDefaultLocalizer (IAddinLocalizer localizer)
- {
- CheckInitialized ();
- SessionService.InitializeDefaultLocalizer (localizer);
- }
-
- internal static string StartupDirectory {
- get { return startupDirectory; }
- }
-
- public static bool IsInitialized {
- get { return initialized; }
- }
-
- public static IAddinInstaller DefaultInstaller {
- get { return installer; }
- set { installer = value; }
- }
-
- public static AddinLocalizer DefaultLocalizer {
- get {
- CheckInitialized ();
- return SessionService.DefaultLocalizer;
- }
- }
-
- public static AddinLocalizer CurrentLocalizer {
- get {
- CheckInitialized ();
- RuntimeAddin addin = SessionService.GetAddinForAssembly (Assembly.GetCallingAssembly ());
- if (addin != null)
- return addin.Localizer;
- else
- return SessionService.DefaultLocalizer;
- }
- }
-
- public static RuntimeAddin CurrentAddin {
- get {
- CheckInitialized ();
- return SessionService.GetAddinForAssembly (Assembly.GetCallingAssembly ());
- }
- }
-
- internal static AddinSessionService SessionService {
- get {
- if (sessionService == null)
- sessionService = new AddinSessionService();
-
- return sessionService;
- }
- }
-
- public static AddinRegistry Registry {
- get {
- CheckInitialized ();
- return registry;
- }
- }
-
- // This method checks if the specified add-ins are installed.
- // If some of the add-ins are not installed, it will use
- // the installer assigned to the DefaultAddinInstaller property
- // to install them. If the installation fails, or if DefaultAddinInstaller
- // is not set, an exception will be thrown.
- public static void CheckInstalled (string message, params string[] addinIds)
- {
- ArrayList notInstalled = new ArrayList ();
- foreach (string id in addinIds) {
- Addin addin = Registry.GetAddin (id, false);
- if (addin != null) {
- // The add-in is already installed
- // If the add-in is disabled, enable it now
- if (!addin.Enabled)
- addin.Enabled = true;
- } else {
- notInstalled.Add (id);
- }
- }
- if (notInstalled.Count == 0)
- return;
- if (installer == null)
- throw new InvalidOperationException ("Add-in installer not set");
-
- // Install the add-ins
- installer.InstallAddins (Registry, message, (string[]) notInstalled.ToArray (typeof(string)));
- }
-
- public static bool IsAddinLoaded (string id)
- {
- CheckInitialized ();
- return SessionService.IsAddinLoaded (id);
- }
-
- public static void LoadAddin (IProgressStatus statusMonitor, string id)
- {
- CheckInitialized ();
- SessionService.LoadAddin (statusMonitor, id, true);
- }
-
- public static ExtensionContext CreateExtensionContext ()
- {
- CheckInitialized ();
- return SessionService.DefaultContext.CreateChildContext ();
- }
-
- public static ExtensionNode GetExtensionNode (string path)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionNode (path);
- }
-
- public static ExtensionNodeList GetExtensionNodes (string path)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionNodes (path);
- }
-
- public static ExtensionNodeList GetExtensionNodes (string path, Type type)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionNodes (path, type);
- }
-
- public static object[] GetExtensionObjects (Type instanceType)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionObjects (instanceType);
- }
-
- public static object[] GetExtensionObjects (Type instanceType, bool reuseCachedInstance)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionObjects (instanceType, reuseCachedInstance);
- }
-
- public static object[] GetExtensionObjects (string path)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionObjects (path);
- }
-
- public static object[] GetExtensionObjects (string path, bool reuseCachedInstance)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionObjects (path, reuseCachedInstance);
- }
-
- public static object[] GetExtensionObjects (string path, Type arrayElementType)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionObjects (path, arrayElementType);
- }
-
- public static object[] GetExtensionObjects (string path, Type arrayElementType, bool reuseCachedInstance)
- {
- CheckInitialized ();
- return SessionService.DefaultContext.GetExtensionObjects (path, arrayElementType, reuseCachedInstance);
- }
-
- public static event ExtensionEventHandler ExtensionChanged {
- add { CheckInitialized(); SessionService.DefaultContext.ExtensionChanged += value; }
- remove { CheckInitialized(); SessionService.DefaultContext.ExtensionChanged -= value; }
- }
-
- public static void AddExtensionNodeHandler (string path, ExtensionNodeEventHandler handler)
- {
- CheckInitialized ();
- SessionService.DefaultContext.AddExtensionNodeHandler (path, handler);
- }
-
- public static void RemoveExtensionNodeHandler (string path, ExtensionNodeEventHandler handler)
- {
- CheckInitialized ();
- SessionService.DefaultContext.RemoveExtensionNodeHandler (path, handler);
- }
-
- static void CheckInitialized ()
- {
- if (!initialized)
- throw new InvalidOperationException ("Add-in manager not initialized.");
- }
-
- internal static void ReportError (string message, string addinId, Exception exception, bool fatal)
- {
- if (AddinLoadError != null)
- AddinLoadError (null, new AddinErrorEventArgs (message, addinId, exception));
- else {
- Console.WriteLine (message);
- if (exception != null)
- Console.WriteLine (exception);
- }
- }
-
- internal static void ReportAddinLoad (string id)
- {
- if (AddinLoaded != null) {
- try {
- AddinLoaded (null, new AddinEventArgs (id));
- } catch {
- // Ignore subscriber exceptions
- }
- }
- }
-
- internal static void ReportAddinUnload (string id)
- {
- if (AddinUnloaded != null) {
- try {
- AddinUnloaded (null, new AddinEventArgs (id));
- } catch {
- // Ignore subscriber exceptions
- }
- }
- }
- }
-
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
deleted file mode 100644
index 02800ee..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-//
-// AddinRegistry.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-using System.Xml;
-using System.Collections;
-using System.Collections.Specialized;
-using Mono.Addins.Database;
-using Mono.Addins.Description;
-
-namespace Mono.Addins
-{
- public class AddinRegistry: IDisposable
- {
- AddinDatabase database;
- StringCollection addinDirs;
- string basePath;
- string currentDomain;
- string startupDirectory;
-
- public AddinRegistry (string registryPath): this (registryPath, null)
- {
- }
-
- public AddinRegistry (string registryPath, string startupDirectory)
- {
- basePath = Util.GetFullPath (registryPath);
- database = new AddinDatabase (this);
-
- // Look for add-ins in the hosts directory and in the default
- // addins directory
- addinDirs = new StringCollection ();
- addinDirs.Add (database.HostsPath);
- addinDirs.Add (DefaultAddinsFolder);
-
- // Get the domain corresponding to the startup folder
- if (startupDirectory != null) {
- this.startupDirectory = startupDirectory;
- currentDomain = database.GetFolderDomain (null, startupDirectory);
- } else
- currentDomain = AddinDatabase.GlobalDomain;
- }
-
- public static AddinRegistry GetGlobalRegistry ()
- {
- return GetGlobalRegistry (null);
- }
-
- internal static AddinRegistry GetGlobalRegistry (string startupDirectory)
- {
- AddinRegistry reg = new AddinRegistry (GlobalRegistryPath, startupDirectory);
- string baseDir;
- if (Util.IsWindows)
- baseDir = Environment.GetFolderPath (Environment.SpecialFolder.CommonProgramFiles);
- else
- baseDir = "/etc";
-
- reg.AddinDirectories.Add (Path.Combine (baseDir, "mono.addins"));
- return reg;
- }
-
- internal static string GlobalRegistryPath {
- get {
- string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_GLOBAL_REGISTRY");
- if (customDir != null && customDir.Length > 0)
- return Util.GetFullPath (customDir);
-
- string path = Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData);
- path = Path.Combine (path, "mono.addins");
- return Util.GetFullPath (path);
- }
- }
-
- public string RegistryPath {
- get { return basePath; }
- }
-
- public void Dispose ()
- {
- database.Shutdown ();
- }
-
- public Addin GetAddin (string id)
- {
- return database.GetInstalledAddin (currentDomain, id);
- }
-
- public Addin GetAddin (string id, bool exactVersionMatch)
- {
- return database.GetInstalledAddin (currentDomain, id, exactVersionMatch);
- }
-
- public Addin[] GetAddins ()
- {
- ArrayList list = database.GetInstalledAddins (currentDomain, AddinType.Addin);
- return (Addin[]) list.ToArray (typeof(Addin));
- }
-
- public Addin[] GetAddinRoots ()
- {
- ArrayList list = database.GetInstalledAddins (currentDomain, AddinType.Root);
- return (Addin[]) list.ToArray (typeof(Addin));
- }
-
- public AddinDescription GetAddinDescription (IProgressStatus progressStatus, string file)
- {
- string outFile = Path.GetTempFileName ();
- try {
- database.ParseAddin (progressStatus, file, outFile, false);
- }
- catch {
- File.Delete (outFile);
- throw;
- }
-
- try {
- AddinDescription desc = AddinDescription.Read (outFile);
- if (desc != null) {
- desc.AddinFile = file;
- desc.OwnerDatabase = database;
- }
- return desc;
- }
- catch {
- // Errors are already reported using the progress status object
- return null;
- }
- finally {
- File.Delete (outFile);
- }
- }
-
- public AddinDescription ReadAddinManifestFile (string file)
- {
- AddinDescription desc = AddinDescription.Read (file);
- desc.OwnerDatabase = database;
- return desc;
- }
-
- public bool IsAddinEnabled (string id)
- {
- return database.IsAddinEnabled (currentDomain, id);
- }
-
- public void EnableAddin (string id)
- {
- database.EnableAddin (currentDomain, id, true);
- }
-
- public void DisableAddin (string id)
- {
- database.DisableAddin (currentDomain, id);
- }
-
- public void DumpFile (string file)
- {
- Mono.Addins.Serialization.BinaryXmlReader.DumpFile (file);
- }
-
- public void ResetConfiguration ()
- {
- database.ResetConfiguration ();
- }
-
- internal void NotifyDatabaseUpdated ()
- {
- if (startupDirectory != null)
- currentDomain = database.GetFolderDomain (null, startupDirectory);
- }
-
- public void Update (IProgressStatus monitor)
- {
- database.Update (monitor, currentDomain);
- }
-
- public void Rebuild (IProgressStatus monitor)
- {
- database.Repair (monitor, currentDomain);
- }
-
- internal Addin GetAddinForHostAssembly (string filePath)
- {
- return database.GetAddinForHostAssembly (currentDomain, filePath);
- }
-
- internal bool AddinDependsOn (string id1, string id2)
- {
- return database.AddinDependsOn (currentDomain, id1, id2);
- }
-
- internal void ScanFolders (IProgressStatus monitor, string folderToScan, StringCollection filesToIgnore)
- {
- database.ScanFolders (monitor, folderToScan, filesToIgnore);
- }
-
- internal void ParseAddin (IProgressStatus progressStatus, string file, string outFile)
- {
- database.ParseAddin (progressStatus, file, outFile, true);
- }
-
- public string DefaultAddinsFolder {
- get { return Path.Combine (basePath, "addins"); }
- }
-
- internal StringCollection AddinDirectories {
- get { return addinDirs; }
- }
-
- internal bool CreateHostAddinsFile (string hostFile)
- {
- hostFile = Util.GetFullPath (hostFile);
- string baseName = Path.GetFileNameWithoutExtension (hostFile);
- if (!Directory.Exists (database.HostsPath))
- Directory.CreateDirectory (database.HostsPath);
-
- foreach (string s in Directory.GetFiles (database.HostsPath, baseName + "*.addins")) {
- try {
- using (StreamReader sr = new StreamReader (s)) {
- XmlTextReader tr = new XmlTextReader (sr);
- tr.MoveToContent ();
- string host = tr.GetAttribute ("host-reference");
- if (host == hostFile)
- return false;
- }
- }
- catch {
- // Ignore this file
- }
- }
-
- string file = Path.Combine (database.HostsPath, baseName) + ".addins";
- int n=1;
- while (File.Exists (file)) {
- file = Path.Combine (database.HostsPath, baseName) + "_" + n + ".addins";
- n++;
- }
-
- using (StreamWriter sw = new StreamWriter (file)) {
- XmlTextWriter tw = new XmlTextWriter (sw);
- tw.Formatting = Formatting.Indented;
- tw.WriteStartElement ("Addins");
- tw.WriteAttributeString ("host-reference", hostFile);
- tw.WriteStartElement ("Directory");
- tw.WriteAttributeString ("shared", "false");
- tw.WriteString (Path.GetDirectoryName (hostFile));
- tw.WriteEndElement ();
- tw.Close ();
- }
- return true;
- }
-
- internal static string[] GetRegisteredStartupFolders (string registryPath)
- {
- string dbDir = Path.Combine (registryPath, "addin-db-" + AddinDatabase.VersionTag);
- dbDir = Path.Combine (dbDir, "hosts");
-
- if (!Directory.Exists (dbDir))
- return new string [0];
-
- ArrayList dirs = new ArrayList ();
-
- foreach (string s in Directory.GetFiles (dbDir, "*.addins")) {
- try {
- using (StreamReader sr = new StreamReader (s)) {
- XmlTextReader tr = new XmlTextReader (sr);
- tr.MoveToContent ();
- string host = tr.GetAttribute ("host-reference");
- dirs.Add (Path.GetDirectoryName (host));
- }
- }
- catch {
- // Ignore this file
- }
- }
- return (string[]) dirs.ToArray (typeof(string));
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinRootAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinRootAttribute.cs
deleted file mode 100644
index 4725742..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinRootAttribute.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// AddinRootAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Assembly)]
- public class AddinRootAttribute: AddinAttribute
- {
- public AddinRootAttribute ()
- {
- }
-
- public AddinRootAttribute (string id): base (id)
- {
- }
-
- public AddinRootAttribute (string id, string version): base (id, version)
- {
- }
-
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
deleted file mode 100644
index 15d69ed..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
+++ /dev/null
@@ -1,394 +0,0 @@
-//
-// AddinService.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Collections;
-using System.Reflection;
-
-using Mono.Addins.Description;
-using Mono.Addins.Database;
-using Mono.Addins.Localization;
-
-namespace Mono.Addins
-{
- internal class AddinSessionService
- {
- bool checkAssemblyLoadConflicts;
- Hashtable loadedAddins = new Hashtable ();
- ExtensionContext defaultContext;
- Hashtable nodeSets = new Hashtable ();
- Hashtable autoExtensionTypes = new Hashtable ();
- Hashtable loadedAssemblies = new Hashtable ();
- AddinLocalizer defaultLocalizer;
-
- internal void Initialize ()
- {
- defaultContext = new ExtensionContext ();
- ActivateRoots ();
- AppDomain.CurrentDomain.AssemblyLoad += new AssemblyLoadEventHandler (OnAssemblyLoaded);
- }
-
- internal void Shutdown ()
- {
- AppDomain.CurrentDomain.AssemblyLoad -= new AssemblyLoadEventHandler (OnAssemblyLoaded);
- defaultContext = null;
- loadedAddins.Clear ();
- loadedAssemblies.Clear ();
- defaultContext = null;
- }
-
- public void InitializeDefaultLocalizer (IAddinLocalizer localizer)
- {
- if (localizer != null)
- defaultLocalizer = new AddinLocalizer (localizer);
- else
- defaultLocalizer = null;
- }
-
- public AddinLocalizer DefaultLocalizer {
- get {
- if (defaultLocalizer != null)
- return defaultLocalizer;
- else
- return NullLocalizer.Instance;
- }
- }
-
- internal ExtensionContext DefaultContext {
- get { return defaultContext; }
- }
-
- public AddinLocalizer CurrentLocalizer {
- get {
- Assembly asm = Assembly.GetCallingAssembly ();
- RuntimeAddin addin = GetAddinForAssembly (asm);
- if (addin != null)
- return addin.Localizer;
- else
- return DefaultLocalizer;
- }
- }
-
- public RuntimeAddin CurrentAddin {
- get {
- Assembly asm = Assembly.GetCallingAssembly ();
- return GetAddinForAssembly (asm);
- }
- }
-
- internal RuntimeAddin GetAddinForAssembly (Assembly asm)
- {
- return (RuntimeAddin) loadedAssemblies [asm];
- }
-
- // Enables or disables conflict checking while loading assemblies.
- // Disabling makes loading faster, but less safe.
- public bool CheckAssemblyLoadConflicts {
- get { return checkAssemblyLoadConflicts; }
- set { checkAssemblyLoadConflicts = value; }
- }
-
- public bool IsAddinLoaded (string id)
- {
- return loadedAddins.Contains (Addin.GetIdName (id));
- }
-
- internal RuntimeAddin GetAddin (string id)
- {
- return (RuntimeAddin) loadedAddins [Addin.GetIdName (id)];
- }
-
- internal void ActivateAddin (string id)
- {
- defaultContext.ActivateAddinExtensions (id);
- }
-
- internal void UnloadAddin (string id)
- {
- defaultContext.RemoveAddinExtensions (id);
-
- RuntimeAddin addin = GetAddin (id);
- if (addin != null) {
- addin.UnloadExtensions ();
- loadedAddins.Remove (Addin.GetIdName (id));
- foreach (Assembly asm in addin.Assemblies)
- loadedAssemblies.Remove (asm);
- AddinManager.ReportAddinUnload (id);
- }
- }
-
- internal bool LoadAddin (IProgressStatus statusMonitor, string id, bool throwExceptions)
- {
- try {
- if (IsAddinLoaded (id))
- return true;
-
- if (!AddinManager.Registry.IsAddinEnabled (id)) {
- string msg = GettextCatalog.GetString ("Disabled extensions can't be loaded.");
- AddinManager.ReportError (msg, id, null, false);
- if (throwExceptions)
- throw new InvalidOperationException (msg);
- return false;
- }
-
- ArrayList addins = new ArrayList ();
- Stack depCheck = new Stack ();
- ResolveLoadDependencies (addins, depCheck, id, false);
- addins.Reverse ();
-
- if (statusMonitor != null)
- statusMonitor.SetMessage ("Loading Addins");
-
- for (int n=0; n<addins.Count; n++) {
-
- if (statusMonitor != null)
- statusMonitor.SetProgress ((double) n / (double)addins.Count);
-
- Addin iad = (Addin) addins [n];
- if (IsAddinLoaded (iad.Id))
- continue;
-
- if (statusMonitor != null)
- statusMonitor.SetMessage (string.Format(GettextCatalog.GetString("Loading {0} extension"), iad.Id));
-
- if (!InsertAddin (statusMonitor, iad))
- return false;
- }
- return true;
- }
- catch (Exception ex) {
- AddinManager.ReportError ("Extension could not be loaded: " + ex.Message, id, ex, false);
- if (statusMonitor != null)
- statusMonitor.ReportError ("Extension '" + id + "' could not be loaded.", ex);
- if (throwExceptions)
- throw;
- return false;
- }
- }
-
- bool InsertAddin (IProgressStatus statusMonitor, Addin iad)
- {
- try {
- RuntimeAddin p = new RuntimeAddin ();
-
- // Read the config file and load the add-in assemblies
- AddinDescription description = p.Load (iad);
-
- // Register the add-in
- loadedAddins [Addin.GetIdName (p.Id)] = p;
-
- if (!AddinDatabase.RunningSetupProcess) {
- // Load the extension points and other addin data
-
- foreach (ExtensionNodeSet rel in description.ExtensionNodeSets) {
- RegisterNodeSet (rel);
- }
-
- foreach (ConditionTypeDescription cond in description.ConditionTypes) {
- Type ctype = p.GetType (cond.TypeName, true);
- defaultContext.RegisterCondition (cond.Id, ctype);
- }
- }
-
- foreach (ExtensionPoint ep in description.ExtensionPoints)
- InsertExtensionPoint (p, ep);
-
- foreach (Assembly asm in p.Assemblies)
- loadedAssemblies [asm] = p;
-
- // Fire loaded event
- defaultContext.NotifyAddinLoaded (p);
- AddinManager.ReportAddinLoad (p.Id);
- return true;
- }
- catch (Exception ex) {
- AddinManager.ReportError ("Extension could not be loaded", iad.Id, ex, false);
- if (statusMonitor != null)
- statusMonitor.ReportError ("Extension '" + iad.Id + "' could not be loaded.", ex);
- return false;
- }
- }
-
- internal void InsertExtensionPoint (RuntimeAddin addin, ExtensionPoint ep)
- {
- defaultContext.CreateExtensionPoint (ep);
- foreach (ExtensionNodeType nt in ep.NodeSet.NodeTypes) {
- if (nt.ObjectTypeName.Length > 0) {
- Type ntype = addin.GetType (nt.ObjectTypeName, true);
- RegisterAutoTypeExtensionPoint (ntype, ep.Path);
- }
- }
- }
-
- bool ResolveLoadDependencies (ArrayList addins, Stack depCheck, string id, bool optional)
- {
- if (IsAddinLoaded (id))
- return true;
-
- if (depCheck.Contains (id))
- throw new InvalidOperationException ("A cyclic addin dependency has been detected.");
-
- depCheck.Push (id);
-
- Addin iad = AddinManager.Registry.GetAddin (id);
- if (iad == null || !iad.Enabled) {
- if (optional)
- return false;
- else if (iad != null && !iad.Enabled)
- throw new MissingDependencyException (GettextCatalog.GetString ("The required extension '{0}' is disabled.", id));
- else
- throw new MissingDependencyException (GettextCatalog.GetString ("The required extension '{0}' is not installed.", id));
- }
-
- // If this addin has already been requested, bring it to the head
- // of the list, so it is loaded earlier than before.
- addins.Remove (iad);
- addins.Add (iad);
-
- foreach (Dependency dep in iad.AddinInfo.Dependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep != null) {
- try {
- string adepid = Addin.GetFullId (iad.AddinInfo.Namespace, adep.AddinId, adep.Version);
- ResolveLoadDependencies (addins, depCheck, adepid, false);
- } catch (MissingDependencyException) {
- if (optional)
- return false;
- else
- throw;
- }
- }
- }
-
- if (iad.AddinInfo.OptionalDependencies != null) {
- foreach (Dependency dep in iad.AddinInfo.OptionalDependencies) {
- AddinDependency adep = dep as AddinDependency;
- if (adep != null) {
- string adepid = Addin.GetFullId (iad.Namespace, adep.AddinId, adep.Version);
- if (!ResolveLoadDependencies (addins, depCheck, adepid, true))
- return false;
- }
- }
- }
-
- depCheck.Pop ();
- return true;
- }
-
- public void RegisterNodeSet (ExtensionNodeSet nset)
- {
- nodeSets [nset.Id] = nset;
- }
-
- public void UnregisterNodeSet (ExtensionNodeSet nset)
- {
- nodeSets.Remove (nset.Id);
- }
-
- public string GetNodeTypeAddin (ExtensionNodeSet nset, string type, string callingAddinId)
- {
- ExtensionNodeType nt = FindType (nset, type, callingAddinId);
- if (nt != null)
- return nt.AddinId;
- else
- return null;
- }
-
- internal ExtensionNodeType FindType (ExtensionNodeSet nset, string name, string callingAddinId)
- {
- if (nset == null)
- return null;
-
- foreach (ExtensionNodeType nt in nset.NodeTypes) {
- if (nt.Id == name)
- return nt;
- }
-
- foreach (string ns in nset.NodeSets) {
- ExtensionNodeSet regSet = (ExtensionNodeSet) nodeSets [ns];
- if (regSet == null) {
- AddinManager.ReportError ("Unknown node set: " + ns, callingAddinId, null, false);
- return null;
- }
- ExtensionNodeType nt = FindType (regSet, name, callingAddinId);
- if (nt != null)
- return nt;
- }
- return null;
- }
-
- public void RegisterAutoTypeExtensionPoint (Type type, string path)
- {
- autoExtensionTypes [type] = path;
- }
-
- public void UnregisterAutoTypeExtensionPoint (Type type, string path)
- {
- autoExtensionTypes.Remove (type);
- }
-
- public string GetAutoTypeExtensionPoint (Type type)
- {
- return autoExtensionTypes [type] as string;
- }
-
- void OnAssemblyLoaded (object s, AssemblyLoadEventArgs a)
- {
- CheckHostAssembly (a.LoadedAssembly);
- }
-
- internal void ActivateRoots ()
- {
- foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies ())
- CheckHostAssembly (asm);
- }
-
- void CheckHostAssembly (Assembly asm)
- {
- if (AddinDatabase.RunningSetupProcess || asm is System.Reflection.Emit.AssemblyBuilder)
- return;
- string asmFile = new Uri (asm.CodeBase).LocalPath;
- Addin ainfo = AddinManager.Registry.GetAddinForHostAssembly (asmFile);
- if (ainfo != null && !IsAddinLoaded (ainfo.Id)) {
- if (ainfo.Description.FilesChanged ()) {
- // If the add-in has changed, update the add-in database.
- // We do it here because once loaded, add-in roots can't be
- // reloaded like regular add-ins.
- AddinManager.Registry.Update (null);
- ainfo = AddinManager.Registry.GetAddinForHostAssembly (asmFile);
- if (ainfo == null)
- return;
- }
- LoadAddin (null, ainfo.Id, false);
- }
- }
- }
-
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ConditionType.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ConditionType.cs
deleted file mode 100644
index 2b8f2fc..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ConditionType.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// ConditionType.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using Mono.Addins.Description;
-using System.Collections;
-
-namespace Mono.Addins
-{
- public abstract class ConditionType
- {
- internal event EventHandler Changed;
- string id;
-
- public abstract bool Evaluate (NodeElement conditionNode);
-
- public void NotifyChanged ()
- {
- if (Changed != null)
- Changed (this, EventArgs.Empty);
- }
-
- internal string Id {
- get { return id; }
- set { id = value; }
- }
- }
-
- internal class BaseCondition
- {
- BaseCondition parent;
-
- internal BaseCondition (BaseCondition parent)
- {
- this.parent = parent;
- }
-
- public virtual bool Evaluate (ExtensionContext ctx)
- {
- return parent == null || parent.Evaluate (ctx);
- }
-
- internal virtual void GetConditionTypes (ArrayList listToFill)
- {
- }
- }
-
- internal class NullCondition: BaseCondition
- {
- public NullCondition (): base (null)
- {
- }
-
- public override bool Evaluate (ExtensionContext ctx)
- {
- return false;
- }
- }
-
- class OrCondition: BaseCondition
- {
- BaseCondition[] conditions;
-
- public OrCondition (BaseCondition[] conditions, BaseCondition parent): base (parent)
- {
- this.conditions = conditions;
- }
-
- public override bool Evaluate (ExtensionContext ctx)
- {
- if (!base.Evaluate (ctx))
- return false;
- foreach (BaseCondition cond in conditions)
- if (cond.Evaluate (ctx))
- return true;
- return false;
- }
-
- internal override void GetConditionTypes (ArrayList listToFill)
- {
- foreach (BaseCondition cond in conditions)
- cond.GetConditionTypes (listToFill);
- }
- }
-
- class AndCondition: BaseCondition
- {
- BaseCondition[] conditions;
-
- public AndCondition (BaseCondition[] conditions, BaseCondition parent): base (parent)
- {
- this.conditions = conditions;
- }
-
- public override bool Evaluate (ExtensionContext ctx)
- {
- if (!base.Evaluate (ctx))
- return false;
- foreach (BaseCondition cond in conditions)
- if (!cond.Evaluate (ctx))
- return false;
- return true;
- }
-
- internal override void GetConditionTypes (ArrayList listToFill)
- {
- foreach (BaseCondition cond in conditions)
- cond.GetConditionTypes (listToFill);
- }
- }
-
-
- internal sealed class Condition: BaseCondition
- {
- ExtensionNodeDescription node;
- string typeId;
-
- internal Condition (ExtensionNodeDescription element, BaseCondition parent): base (parent)
- {
- typeId = element.GetAttribute ("id");
- node = element;
- }
-
- public override bool Evaluate (ExtensionContext ctx)
- {
- if (!base.Evaluate (ctx))
- return false;
-
- ConditionType type = ctx.GetCondition (typeId);
- if (type == null) {
- AddinManager.ReportError ("Condition '" + typeId + "' not found in current extension context.", null, null, false);
- return false;
- }
-
- try {
- return type.Evaluate (node);
- }
- catch (Exception ex) {
- AddinManager.ReportError ("Error while evaluating condition '" + typeId + "'", null, ex, false);
- return false;
- }
- }
-
- internal override void GetConditionTypes (ArrayList listToFill)
- {
- listToFill.Add (typeId);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ConsoleProgressStatus.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ConsoleProgressStatus.cs
deleted file mode 100644
index d6ab9f0..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ConsoleProgressStatus.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// ConsoleProgressStatus.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- public class ConsoleProgressStatus: MarshalByRefObject, IProgressStatus
- {
- bool canceled;
- int logLevel;
-
- public ConsoleProgressStatus (bool verboseLog)
- {
- if (verboseLog)
- logLevel = 2;
- else
- logLevel = 1;
- }
-
- public ConsoleProgressStatus (int logLevel)
- {
- this.logLevel = logLevel;
- }
-
- public void SetMessage (string msg)
- {
- }
-
- public void SetProgress (double progress)
- {
- }
-
- public void Log (string msg)
- {
- Console.WriteLine (msg);
- }
-
- public void ReportWarning (string message)
- {
- if (logLevel > 0)
- Console.WriteLine ("WARNING: " + message);
- }
-
- public void ReportError (string message, Exception exception)
- {
- if (logLevel == 0)
- return;
- Console.Write ("ERROR: ");
- if (logLevel > 1) {
- if (message != null)
- Console.WriteLine (message);
- if (exception != null)
- Console.WriteLine (exception);
- } else {
- if (message != null && exception != null)
- Console.WriteLine (message + " (" + exception.Message + ")");
- else {
- if (message != null)
- Console.WriteLine (message);
- if (exception != null)
- Console.WriteLine (exception.Message);
- }
- }
- }
-
- public bool IsCanceled {
- get { return canceled; }
- }
-
- public int LogLevel {
- get { return logLevel; }
- }
-
- public void Cancel ()
- {
- canceled = true;
- }
- }
-}
-
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionAttribute.cs
deleted file mode 100644
index 1e52416..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionAttribute.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// ExtensionAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Class, AllowMultiple=true)]
- public class ExtensionAttribute: Attribute
- {
- string path;
- string nodeName;
- string id;
- string insertBefore;
- string insertAfter;
-
- public ExtensionAttribute ()
- {
- }
-
- public ExtensionAttribute (string path)
- {
- this.path = path;
- }
-
- public string Path {
- get { return path != null ? path : string.Empty; }
- set { path = value; }
- }
-
- public string NodeName {
- get { return nodeName != null && nodeName.Length > 0 ? nodeName : "Type"; }
- set { nodeName = value; }
- }
-
- public string Id {
- get { return id != null ? id : string.Empty; }
- set { id = value; }
- }
-
- public string InsertBefore {
- get { return insertBefore != null ? insertBefore : string.Empty; }
- set { insertBefore = value; }
- }
-
- public string InsertAfter {
- get { return insertAfter != null ? insertAfter : string.Empty; }
- set { insertAfter = value; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionContext.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionContext.cs
deleted file mode 100644
index cea44eb..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionContext.cs
+++ /dev/null
@@ -1,799 +0,0 @@
-//
-// ExtensionContext.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using Mono.Addins.Description;
-
-namespace Mono.Addins
-{
- public class ExtensionContext
- {
- Hashtable conditionTypes = new Hashtable ();
- Hashtable conditionsToNodes = new Hashtable ();
- ArrayList childContexts;
- ExtensionContext parentContext;
- ExtensionTree tree;
- bool fireEvents = false;
-
- ArrayList runTimeEnabledAddins;
- ArrayList runTimeDisabledAddins;
-
- public event ExtensionEventHandler ExtensionChanged;
-
- ~ExtensionContext ()
- {
- if (parentContext != null)
- parentContext.DisposeChildContext (this);
- }
-
- internal ExtensionContext ()
- {
- tree = new ExtensionTree (this);
- }
-
- internal ExtensionContext CreateChildContext ()
- {
- lock (conditionTypes) {
- if (childContexts == null)
- childContexts = new ArrayList ();
- ExtensionContext ctx = new ExtensionContext ();
- ctx.parentContext = this;
- WeakReference wref = new WeakReference (ctx);
- childContexts.Add (wref);
- return ctx;
- }
- }
-
- internal void DisposeChildContext (ExtensionContext ctx)
- {
- lock (conditionTypes) {
- foreach (WeakReference wref in childContexts) {
- if (wref.Target == ctx) {
- childContexts.Remove (wref);
- return;
- }
- }
- }
- }
-
- public void RegisterCondition (string id, ConditionType type)
- {
- type.Id = id;
- ConditionInfo info = CreateConditionInfo (id);
- ConditionType ot = info.CondType as ConditionType;
- if (ot != null)
- ot.Changed -= new EventHandler (OnConditionChanged);
- info.CondType = type;
- type.Changed += new EventHandler (OnConditionChanged);
- }
-
- public void RegisterCondition (string id, Type type)
- {
- // Allows delayed creation of condition types
- ConditionInfo info = CreateConditionInfo (id);
- ConditionType ot = info.CondType as ConditionType;
- if (ot != null)
- ot.Changed -= new EventHandler (OnConditionChanged);
- info.CondType = type;
- }
-
- ConditionInfo CreateConditionInfo (string id)
- {
- ConditionInfo info = conditionTypes [id] as ConditionInfo;
- if (info == null) {
- info = new ConditionInfo ();
- conditionTypes [id] = info;
- }
- return info;
- }
-
- internal bool FireEvents {
- get { return fireEvents; }
- }
-
- internal ConditionType GetCondition (string id)
- {
- ConditionType ct;
- ConditionInfo info = (ConditionInfo) conditionTypes [id];
-
- if (info != null) {
- if (info.CondType is Type) {
- // The condition was registered as a type, create an instance now
- ct = (ConditionType) Activator.CreateInstance ((Type)info.CondType);
- ct.Id = id;
- ct.Changed += new EventHandler (OnConditionChanged);
- info.CondType = ct;
- }
- else
- ct = info.CondType as ConditionType;
-
- if (ct != null)
- return ct;
- }
-
- if (parentContext != null)
- return parentContext.GetCondition (id);
- else
- return null;
- }
-
- internal void RegisterNodeCondition (TreeNode node, BaseCondition cond)
- {
- ArrayList list = (ArrayList) conditionsToNodes [cond];
- if (list == null) {
- list = new ArrayList ();
- conditionsToNodes [cond] = list;
- ArrayList conditionTypeIds = new ArrayList ();
- cond.GetConditionTypes (conditionTypeIds);
-
- foreach (string cid in conditionTypeIds) {
-
- // Make sure the condition is properly created
- GetCondition (cid);
-
- ConditionInfo info = CreateConditionInfo (cid);
- if (info.BoundConditions == null)
- info.BoundConditions = new ArrayList ();
-
- info.BoundConditions.Add (cond);
- }
- }
- list.Add (node);
- }
-
- internal void UnregisterNodeCondition (TreeNode node, BaseCondition cond)
- {
- ArrayList list = (ArrayList) conditionsToNodes [cond];
- if (list == null)
- return;
-
- list.Remove (node);
- if (list.Count == 0) {
- conditionsToNodes.Remove (cond);
- ArrayList conditionTypeIds = new ArrayList ();
- cond.GetConditionTypes (conditionTypeIds);
- foreach (string cid in conditionTypes.Keys) {
- ConditionInfo info = conditionTypes [cid] as ConditionInfo;
- if (info != null && info.BoundConditions != null)
- info.BoundConditions.Remove (cond);
- }
- }
- }
-
- public ExtensionNode GetExtensionNode (string path)
- {
- TreeNode node = GetNode (path);
- if (node == null)
- return null;
-
- if (node.Condition == null || node.Condition.Evaluate (this))
- return node.ExtensionNode;
- else
- return null;
- }
-
- public ExtensionNodeList GetExtensionNodes (string path)
- {
- return GetExtensionNodes (path, null);
- }
-
- public ExtensionNodeList GetExtensionNodes (string path, Type expectedNodeType)
- {
- TreeNode node = GetNode (path);
- if (node == null || node.ExtensionNode == null)
- return ExtensionNodeList.Empty;
-
- ExtensionNodeList list = node.ExtensionNode.ChildNodes;
-
- if (expectedNodeType != null) {
- bool foundError = false;
- foreach (ExtensionNode cnode in list) {
- if (!expectedNodeType.IsInstanceOfType (cnode)) {
- foundError = true;
- AddinManager.ReportError ("Error while getting nodes for path '" + path + "'. Expected subclass of node type '" + expectedNodeType + "'. Found '" + cnode.GetType (), null, null, false);
- }
- }
- if (foundError) {
- // Create a new list excluding the elements that failed the test
- ArrayList newList = new ArrayList ();
- foreach (ExtensionNode cnode in list) {
- if (expectedNodeType.IsInstanceOfType (cnode))
- newList.Add (cnode);
- }
- return new ExtensionNodeList (newList);
- }
- }
- return list;
- }
-
- public object[] GetExtensionObjects (Type instanceType)
- {
- return GetExtensionObjects (instanceType, true);
- }
-
- public object[] GetExtensionObjects (Type instanceType, bool reuseCachedInstance)
- {
- string path = AddinManager.SessionService.GetAutoTypeExtensionPoint (instanceType);
- if (path == null)
- return (object[]) Array.CreateInstance (instanceType, 0);
- return GetExtensionObjects (path, instanceType, reuseCachedInstance);
- }
-
- public object[] GetExtensionObjects (string path)
- {
- return GetExtensionObjects (path, typeof(object), true);
- }
-
- public object[] GetExtensionObjects (string path, bool reuseCachedInstance)
- {
- return GetExtensionObjects (path, typeof(object), reuseCachedInstance);
- }
-
- public object[] GetExtensionObjects (string path, Type arrayElementType)
- {
- return GetExtensionObjects (path, arrayElementType, true);
- }
-
- public object[] GetExtensionObjects (string path, Type arrayElementType, bool reuseCachedInstance)
- {
- ExtensionNode node = GetExtensionNode (path);
- if (node == null)
- throw new InvalidOperationException ("Extension node not found in path: " + path);
- return node.GetChildObjects (arrayElementType, reuseCachedInstance);
- }
-
- public void AddExtensionNodeHandler (string path, ExtensionNodeEventHandler handler)
- {
- ExtensionNode node = GetExtensionNode (path);
- if (node == null)
- throw new InvalidOperationException ("Extension node not found in path: " + path);
- node.ExtensionNodeChanged += handler;
- }
-
- public void RemoveExtensionNodeHandler (string path, ExtensionNodeEventHandler handler)
- {
- ExtensionNode node = GetExtensionNode (path);
- if (node == null)
- throw new InvalidOperationException ("Extension node not found in path: " + path);
- node.ExtensionNodeChanged -= handler;
- }
-
- void OnConditionChanged (object s, EventArgs a)
- {
- ConditionType cond = (ConditionType) s;
- NotifyConditionChanged (cond);
- }
-
- internal void NotifyConditionChanged (ConditionType cond)
- {
- try {
- fireEvents = true;
-
- ConditionInfo info = (ConditionInfo) conditionTypes [cond.Id];
- if (info != null && info.BoundConditions != null) {
- Hashtable parentsToNotify = new Hashtable ();
- foreach (BaseCondition c in info.BoundConditions) {
- ArrayList nodeList = (ArrayList) conditionsToNodes [c];
- if (nodeList != null) {
- foreach (TreeNode node in nodeList)
- parentsToNotify [node.Parent] = null;
- }
- }
- foreach (TreeNode node in parentsToNotify.Keys) {
- if (node.NotifyChildrenChanged ())
- NotifyExtensionsChanged (new ExtensionEventArgs (node.GetPath ()));
- }
- }
- }
- finally {
- fireEvents = false;
- }
-
- // Notify child contexts
- lock (conditionTypes) {
- if (childContexts != null) {
- foreach (WeakReference wref in childContexts) {
- ExtensionContext ctx = wref.Target as ExtensionContext;
- if (ctx != null)
- ctx.NotifyConditionChanged (cond);
- }
- }
- }
- }
-
-
- internal void NotifyExtensionsChanged (ExtensionEventArgs args)
- {
- if (!fireEvents)
- return;
-
- if (ExtensionChanged != null)
- ExtensionChanged (this, args);
- }
-
- internal void NotifyAddinLoaded (RuntimeAddin ad)
- {
- tree.NotifyAddinLoaded (ad, true);
-
- lock (conditionTypes) {
- if (childContexts != null) {
- foreach (WeakReference wref in childContexts) {
- ExtensionContext ctx = wref.Target as ExtensionContext;
- if (ctx != null)
- ctx.NotifyAddinLoaded (ad);
- }
- }
- }
- }
-
- internal void CreateExtensionPoint (ExtensionPoint ep)
- {
- TreeNode node = tree.GetNode (ep.Path, true);
- if (node.ExtensionPoint == null) {
- node.ExtensionPoint = ep;
- node.ExtensionNodeSet = ep.NodeSet;
- }
- }
-
- internal void ActivateAddinExtensions (string id)
- {
- // Looks for loaded extension points which are extended by the provided
- // add-in, and adds the new nodes
-
- try {
- fireEvents = true;
-
- Addin addin = AddinManager.Registry.GetAddin (id);
- if (addin == null) {
- AddinManager.ReportError ("Required add-in not found", id, null, false);
- return;
- }
- // Take note that his add-in has been enabled at run-time
- // Needed because loaded add-in descriptions may not include this add-in.
- RegisterRuntimeEnabledAddin (id);
-
- // Look for loaded extension points
- Hashtable eps = new Hashtable ();
- foreach (ModuleDescription mod in addin.Description.AllModules) {
- foreach (Extension ext in mod.Extensions) {
- ExtensionPoint ep = tree.FindLoadedExtensionPoint (ext.Path);
- if (ep != null && !eps.Contains (ep))
- eps.Add (ep, ep);
- }
- }
-
- // Add the new nodes
- ArrayList loadedNodes = new ArrayList ();
- foreach (ExtensionPoint ep in eps.Keys) {
- ExtensionLoadData data = GetAddinExtensions (id, ep);
- if (data != null) {
- foreach (Extension ext in data.Extensions) {
- TreeNode node = GetNode (ext.Path);
- if (node != null && node.ExtensionNodeSet != null) {
- if (node.ChildrenLoaded)
- LoadModuleExtensionNodes (ext, data.AddinId, node.ExtensionNodeSet, loadedNodes);
- }
- else
- AddinManager.ReportError ("Extension node not found or not extensible: " + ext.Path, id, null, false);
- }
-
- // Global extension change event. Other events are fired by LoadModuleExtensionNodes.
- NotifyExtensionsChanged (new ExtensionEventArgs (ep.Path));
- }
- }
-
- // Call the OnAddinLoaded method on nodes, if the add-in is already loaded
- foreach (TreeNode nod in loadedNodes)
- nod.ExtensionNode.OnAddinLoaded ();
- }
- finally {
- fireEvents = false;
- }
- // Do the same in child contexts
-
- lock (conditionTypes) {
- if (childContexts != null) {
- foreach (WeakReference wref in childContexts) {
- ExtensionContext ctx = wref.Target as ExtensionContext;
- if (ctx != null)
- ctx.ActivateAddinExtensions (id);
- }
- }
- }
- }
-
- internal void RemoveAddinExtensions (string id)
- {
- try {
- // Registers this add-in as disabled, so from now on extension from this
- // add-in will be ignored
- RegisterRuntimeDisabledAddin (id);
-
- fireEvents = true;
-
- // This method removes all extension nodes added by the add-in
- // Get all nodes created by the addin
- ArrayList list = new ArrayList ();
- tree.FindAddinNodes (id, list);
-
- // Remove each node and notify the change
- ArrayList paths = new ArrayList ();
- foreach (TreeNode node in list) {
- if (node.ExtensionNode == null) {
- // It's an extension point. Just remove it, no notifications are needed
- node.Remove ();
- }
- else {
- string path = node.Parent.GetPath ();
- if (!paths.Contains (path))
- paths.Add (path);
- node.ExtensionNode.OnAddinUnloaded ();
- node.Remove ();
- }
- }
-
- // Notify global extension point changes
- foreach (string path in paths)
- NotifyExtensionsChanged (new ExtensionEventArgs (path));
- } finally {
- fireEvents = false;
- }
- }
-
- void RegisterRuntimeDisabledAddin (string addinId)
- {
- if (runTimeDisabledAddins == null)
- runTimeDisabledAddins = new ArrayList ();
- if (!runTimeDisabledAddins.Contains (addinId))
- runTimeDisabledAddins.Add (addinId);
-
- if (runTimeEnabledAddins != null)
- runTimeEnabledAddins.Remove (addinId);
- }
-
- void RegisterRuntimeEnabledAddin (string addinId)
- {
- if (runTimeEnabledAddins == null)
- runTimeEnabledAddins = new ArrayList ();
- if (!runTimeEnabledAddins.Contains (addinId))
- runTimeEnabledAddins.Add (addinId);
-
- if (runTimeDisabledAddins != null)
- runTimeDisabledAddins.Remove (addinId);
- }
-
- internal ICollection GetAddinsForPath (string path, StringCollection col)
- {
- ArrayList newlist = null;
-
- // Always consider add-ins which have been enabled at runtime since
- // they may contain extensioin for this path.
- // Ignore addins disabled at run-time.
-
- if (runTimeEnabledAddins != null && runTimeEnabledAddins.Count > 0) {
- newlist = new ArrayList ();
- newlist.AddRange (col);
- foreach (string s in runTimeEnabledAddins)
- if (!newlist.Contains (s))
- newlist.Add (s);
- }
-
- if (runTimeDisabledAddins != null && runTimeDisabledAddins.Count > 0) {
- if (newlist == null) {
- newlist = new ArrayList ();
- newlist.AddRange (col);
- }
- foreach (string s in runTimeDisabledAddins)
- newlist.Remove (s);
- }
-
- return newlist != null ? (ICollection)newlist : (ICollection)col;
- }
-
- // Load the extension nodes at the specified path. If the path
- // contains extension nodes implemented in an add-in which is
- // not loaded, the add-in will be automatically loaded
-
- internal void LoadExtensions (string requestedExtensionPath)
- {
- TreeNode node = GetNode (requestedExtensionPath);
- if (node == null)
- throw new InvalidOperationException ("Extension point not defined: " + requestedExtensionPath);
-
- ExtensionPoint ep = node.ExtensionPoint;
-
- if (ep != null) {
-
- // Collect extensions to be loaded from add-ins. Before loading the extensions,
- // they must be sorted, that's why loading is split in two steps (collecting + loading).
-
- ArrayList loadData = new ArrayList ();
-
- foreach (string addin in GetAddinsForPath (ep.Path, ep.Addins)) {
- ExtensionLoadData ed = GetAddinExtensions (addin, ep);
- if (ed != null) {
- // Insert the addin data taking into account dependencies.
- // An add-in must be processed after all its dependencies.
- bool added = false;
- for (int n=0; n<loadData.Count; n++) {
- ExtensionLoadData other = (ExtensionLoadData) loadData [n];
- if (AddinManager.Registry.AddinDependsOn (other.AddinId, ed.AddinId)) {
- loadData.Insert (n, ed);
- added = true;
- break;
- }
- }
- if (!added)
- loadData.Add (ed);
- }
- }
-
- // Now load the extensions
-
- ArrayList loadedNodes = new ArrayList ();
- foreach (ExtensionLoadData data in loadData) {
- foreach (Extension ext in data.Extensions) {
- TreeNode cnode = GetNode (ext.Path);
- if (cnode != null && cnode.ExtensionNodeSet != null)
- LoadModuleExtensionNodes (ext, data.AddinId, cnode.ExtensionNodeSet, loadedNodes);
- else
- AddinManager.ReportError ("Extension node not found or not extensible: " + ext.Path, data.AddinId, null, false);
- }
- }
- // Call the OnAddinLoaded method on nodes, if the add-in is already loaded
- foreach (TreeNode nod in loadedNodes)
- nod.ExtensionNode.OnAddinLoaded ();
-
- NotifyExtensionsChanged (new ExtensionEventArgs (requestedExtensionPath));
- }
- }
-
- ExtensionLoadData GetAddinExtensions (string id, ExtensionPoint ep)
- {
- Addin pinfo = null;
-
- // Root add-ins are not returned by GetInstalledAddin.
- RuntimeAddin addin = AddinManager.SessionService.GetAddin (id);
- if (addin != null)
- pinfo = addin.Addin;
- else
- pinfo = AddinManager.Registry.GetAddin (id);
-
- if (pinfo == null) {
- AddinManager.ReportError ("Required add-in not found", id, null, false);
- return null;
- }
- if (!pinfo.Enabled)
- return null;
-
- // Loads extensions defined in each module
-
- ExtensionLoadData data = null;
- AddinDescription conf = pinfo.Description;
- GetAddinExtensions (conf.MainModule, id, ep, ref data);
-
- foreach (ModuleDescription module in conf.OptionalModules) {
- if (CheckOptionalAddinDependencies (conf, module))
- GetAddinExtensions (module, id, ep, ref data);
- }
- if (data != null)
- data.Extensions.Sort ();
-
- return data;
- }
-
- void GetAddinExtensions (ModuleDescription module, string addinId, ExtensionPoint ep, ref ExtensionLoadData data)
- {
- string basePath = ep.Path + "/";
-
- foreach (Extension extension in module.Extensions) {
- if (extension.Path == ep.Path || extension.Path.StartsWith (basePath)) {
- if (data == null) {
- data = new ExtensionLoadData ();
- data.AddinId = addinId;
- data.Extensions = new ArrayList ();
- }
- data.Extensions.Add (extension);
- }
- }
- }
-
- void LoadModuleExtensionNodes (Extension extension, string addinId, ExtensionNodeSet nset, ArrayList loadedNodes)
- {
- // Now load the extensions
- ArrayList addedNodes = new ArrayList ();
- tree.LoadExtension (addinId, extension, addedNodes);
-
- RuntimeAddin ad = AddinManager.SessionService.GetAddin (addinId);
- if (ad != null) {
- foreach (TreeNode nod in addedNodes) {
- // Don't call OnAddinLoaded here. Do it when the entire extension point has been loaded.
- if (nod.ExtensionNode != null)
- loadedNodes.Add (nod);
- }
- }
- }
-
- bool CheckOptionalAddinDependencies (AddinDescription conf, ModuleDescription module)
- {
- foreach (Dependency dep in module.Dependencies) {
- AddinDependency pdep = dep as AddinDependency;
- if (pdep != null) {
- Addin pinfo = AddinManager.Registry.GetAddin (Addin.GetFullId (conf.Namespace, pdep.AddinId, pdep.Version));
- if (pinfo == null || !pinfo.Enabled)
- return false;
- }
- }
- return true;
- }
-
-
- TreeNode GetNode (string path)
- {
- TreeNode node = tree.GetNode (path);
- if (node != null || parentContext == null)
- return node;
-
- TreeNode supNode = parentContext.tree.GetNode (path);
- if (supNode == null)
- return null;
-
- if (path.StartsWith ("/"))
- path = path.Substring (1);
-
- string[] parts = path.Split ('/');
- TreeNode srcNode = parentContext.tree;
- TreeNode dstNode = tree;
-
- foreach (string part in parts) {
-
- // Look for the node in the source tree
-
- int i = srcNode.Children.IndexOfNode (part);
- if (i != -1)
- srcNode = srcNode.Children [i];
- else
- return null;
-
- // Now get the node in the target tree
-
- int j = dstNode.Children.IndexOfNode (part);
- if (j != -1) {
- dstNode = dstNode.Children [j];
- }
- else {
- // Create if not found
- TreeNode newNode = new TreeNode (part);
- dstNode.AddChildNode (newNode);
- dstNode = newNode;
-
- // Copy extension data
- dstNode.ExtensionNodeSet = srcNode.ExtensionNodeSet;
- dstNode.ExtensionPoint = srcNode.ExtensionPoint;
- dstNode.Condition = srcNode.Condition;
-
- if (dstNode.Condition != null)
- RegisterNodeCondition (dstNode, dstNode.Condition);
- }
- }
-
- return dstNode;
- }
-
- internal bool FindExtensionPathByType (IProgressStatus monitor, Type type, string nodeName, out string path, out string pathNodeName)
- {
- return tree.FindExtensionPathByType (monitor, type, nodeName, out path, out pathNodeName);
- }
- }
-
- class ConditionInfo
- {
- public object CondType;
- public ArrayList BoundConditions;
- }
-
-
-
- public delegate void ExtensionEventHandler (object sender, ExtensionEventArgs args);
- public delegate void ExtensionNodeEventHandler (object sender, ExtensionNodeEventArgs args);
-
- public class ExtensionEventArgs: EventArgs
- {
- string path;
-
- internal ExtensionEventArgs ()
- {
- }
-
- public ExtensionEventArgs (string path)
- {
- this.path = path;
- }
-
- public virtual string Path {
- get { return path; }
- }
-
- public bool PathChanged (string pathToCheck)
- {
- if (pathToCheck.EndsWith ("/"))
- return path.StartsWith (pathToCheck);
- else
- return path.StartsWith (pathToCheck) && (pathToCheck.Length == path.Length || path [pathToCheck.Length] == '/');
- }
- }
-
- public class ExtensionNodeEventArgs: ExtensionEventArgs
- {
- ExtensionNode node;
- ExtensionChange change;
-
- public ExtensionNodeEventArgs (ExtensionChange change, ExtensionNode node)
- {
- this.node = node;
- this.change = change;
- }
-
- public override string Path {
- get { return node.Path; }
- }
-
- public ExtensionChange Change {
- get { return change; }
- }
-
- public ExtensionNode ExtensionNode {
- get { return node; }
- }
-
- public object ExtensionObject {
- get {
- InstanceExtensionNode tnode = node as InstanceExtensionNode;
- if (tnode == null)
- throw new InvalidOperationException ("Node is not an InstanceExtensionNode");
- return tnode.GetInstance ();
- }
- }
- }
-
- public enum ExtensionChange
- {
- Add,
- Remove
- }
-
-
- internal class ExtensionLoadData
- {
- public string AddinId;
- public ArrayList Extensions;
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs
deleted file mode 100644
index 0b03c3a..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-//
-// ExtensionNode.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.Xml;
-using System.Reflection;
-using Mono.Addins.Description;
-
-namespace Mono.Addins
-{
- public class ExtensionNode
- {
- bool childrenLoaded;
- TreeNode treeNode;
- ExtensionNodeList childNodes;
- RuntimeAddin addin;
- string addinId;
- ExtensionNodeType nodeType;
- event ExtensionNodeEventHandler extensionNodeChanged;
-
- public string Id {
- get { return treeNode != null ? treeNode.Id : string.Empty; }
- }
-
- public string Path {
- get { return treeNode != null ? treeNode.GetPath () : string.Empty; }
- }
-
- public ExtensionNode Parent {
- get {
- if (treeNode != null && treeNode.Parent != null)
- return treeNode.Parent.ExtensionNode;
- else
- return null;
- }
- }
-
- public ExtensionContext ExtensionContext {
- get { return treeNode.Context; }
- }
-
- public bool HasId {
- get { return !Id.StartsWith (ExtensionTree.AutoIdPrefix); }
- }
-
- internal void SetTreeNode (TreeNode node)
- {
- treeNode = node;
- }
-
- internal void SetData (string plugid, ExtensionNodeType nodeType)
- {
- this.addinId = plugid;
- this.nodeType = nodeType;
- }
-
- internal string AddinId {
- get { return addinId; }
- }
-
- internal TreeNode TreeNode {
- get { return treeNode; }
- }
-
- public RuntimeAddin Addin {
- get {
- if (addin == null && addinId != null) {
- if (!AddinManager.SessionService.IsAddinLoaded (addinId))
- AddinManager.SessionService.LoadAddin (null, addinId, true);
- addin = AddinManager.SessionService.GetAddin (addinId);
- }
- if (addin == null)
- throw new InvalidOperationException ("Add-in '" + addinId + "' could not be loaded.");
- return addin;
- }
- }
-
- public event ExtensionNodeEventHandler ExtensionNodeChanged {
- add {
- extensionNodeChanged += value;
- foreach (ExtensionNode node in ChildNodes) {
- try {
- extensionNodeChanged (this, new ExtensionNodeEventArgs (ExtensionChange.Add, node));
- } catch (Exception ex) {
- AddinManager.ReportError (null, null, ex, false);
- }
- }
- }
- remove {
- extensionNodeChanged -= value;
- }
- }
-
- public ExtensionNodeList ChildNodes {
- get {
- if (childrenLoaded)
- return childNodes;
-
- try {
- if (treeNode.Children.Count == 0) {
- childNodes = ExtensionNodeList.Empty;
- return childNodes;
- }
- }
- catch (Exception ex) {
- AddinManager.ReportError (null, null, ex, false);
- childNodes = ExtensionNodeList.Empty;
- return childNodes;
- } finally {
- childrenLoaded = true;
- }
-
- ArrayList list = new ArrayList ();
- foreach (TreeNode cn in treeNode.Children) {
-
- // For each node check if it is visible for the current context.
- // If something fails while evaluating the condition, just ignore the node.
-
- try {
- if (cn.ExtensionNode != null && cn.IsEnabled)
- list.Add (cn.ExtensionNode);
- } catch (Exception ex) {
- AddinManager.ReportError (null, null, ex, false);
- }
- }
- if (list.Count > 0)
- childNodes = new ExtensionNodeList (list);
- else
- childNodes = ExtensionNodeList.Empty;
-
- return childNodes;
- }
- }
-
- public object[] GetChildObjects ()
- {
- return GetChildObjects (typeof(object), true);
- }
-
- public object[] GetChildObjects (bool reuseCachedInstance)
- {
- return GetChildObjects (typeof(object), reuseCachedInstance);
- }
-
- public object[] GetChildObjects (Type arrayElementType)
- {
- return GetChildObjects (arrayElementType, true);
- }
-
- public object[] GetChildObjects (Type arrayElementType, bool reuseCachedInstance)
- {
- ArrayList list = new ArrayList (ChildNodes.Count);
-
- for (int n=0; n<ChildNodes.Count; n++) {
- InstanceExtensionNode node = ChildNodes [n] as InstanceExtensionNode;
- if (node == null) {
- AddinManager.ReportError ("Error while getting object for node in path '" + Path + "'. Extension node is not a subclass of InstanceExtensionNode.", null, null, false);
- continue;
- }
-
- try {
- if (reuseCachedInstance)
- list.Add (node.GetInstance (arrayElementType));
- else
- list.Add (node.CreateInstance (arrayElementType));
- }
- catch (Exception ex) {
- AddinManager.ReportError ("Error while getting object for node in path '" + Path + "'.", null, ex, false);
- }
- }
- return (object[]) list.ToArray (arrayElementType);
- }
-
- internal protected virtual void Read (NodeElement elem)
- {
- if (nodeType == null || nodeType.Fields == null)
- return;
-
- NodeAttribute[] attributes = elem.Attributes;
- Hashtable fields = (Hashtable) nodeType.Fields.Clone ();
-
- foreach (NodeAttribute at in attributes) {
-
- ExtensionNodeType.FieldData f = (ExtensionNodeType.FieldData) fields [at.name];
- if (f == null)
- continue;
-
- fields.Remove (at.name);
-
- object val;
-
- if (f.Field.FieldType == typeof(string)) {
- if (f.Localizable)
- val = Addin.Localizer.GetString (at.value);
- else
- val = at.value;
- }
- else if (f.Field.FieldType == typeof(string[])) {
- string[] ss = at.value.Split (',');
- if (ss.Length == 0 && ss[0].Length == 0)
- val = new string [0];
- else {
- for (int n=0; n<ss.Length; n++)
- ss [n] = ss[n].Trim ();
- val = ss;
- }
- }
- else if (f.Field.FieldType.IsEnum) {
- val = Enum.Parse (f.Field.FieldType, at.value);
- }
- else {
- try {
- val = Convert.ChangeType (at.Value, f.Field.FieldType);
- } catch (InvalidCastException) {
- throw new InvalidOperationException ("Property type not supported by [NodeAttribute]: " + f.Field.DeclaringType + "." + f.Field.Name);
- }
- }
-
- f.Field.SetValue (this, val);
- }
-
- if (fields.Count > 0) {
- // Check if one of the remaining fields is mandatory
- foreach (DictionaryEntry e in fields) {
- ExtensionNodeType.FieldData f = (ExtensionNodeType.FieldData) e.Value;
- if (f.Required)
- throw new InvalidOperationException ("Required attribute '" + e.Key + "' not found.");
- }
- }
- }
-
- internal bool NotifyChildChanged ()
- {
- if (!childrenLoaded)
- return false;
-
- ExtensionNodeList oldList = childNodes;
- childrenLoaded = false;
-
- bool changed = false;
-
- foreach (ExtensionNode nod in oldList) {
- if (ChildNodes [nod.Id] == null) {
- changed = true;
- OnChildNodeRemoved (nod);
- }
- }
- foreach (ExtensionNode nod in ChildNodes) {
- if (oldList [nod.Id] == null) {
- changed = true;
- OnChildNodeAdded (nod);
- }
- }
- if (changed)
- OnChildrenChanged ();
- return changed;
- }
-
- // Called when the add-in that defined this extension node is actually
- // loaded in memory.
- internal protected virtual void OnAddinLoaded ()
- {
- }
-
- // Called when the add-in that defined this extension node is being
- // unloaded from memory.
- internal protected virtual void OnAddinUnloaded ()
- {
- }
-
- // Called when the children list of this node has changed. It may be due to add-ins
- // being loaded/unloaded, or to conditions being changed.
- protected virtual void OnChildrenChanged ()
- {
- }
-
- protected virtual void OnChildNodeAdded (ExtensionNode node)
- {
- if (extensionNodeChanged != null)
- extensionNodeChanged (this, new ExtensionNodeEventArgs (ExtensionChange.Add, node));
- }
-
- protected virtual void OnChildNodeRemoved (ExtensionNode node)
- {
- if (extensionNodeChanged != null)
- extensionNodeChanged (this, new ExtensionNodeEventArgs (ExtensionChange.Remove, node));
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeAttribute.cs
deleted file mode 100644
index 7dd2e76..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeAttribute.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// ExtensionNodeAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Class)]
- public class ExtensionNodeAttribute: Attribute
- {
- string nodeName;
- string description;
-
- public ExtensionNodeAttribute ()
- {
- }
-
- public ExtensionNodeAttribute (string nodeName)
- {
- this.nodeName = nodeName;
- }
-
- public ExtensionNodeAttribute (string nodeName, string description)
- {
- this.nodeName = nodeName;
- this.description = description;
- }
-
- public string NodeName {
- get { return nodeName != null ? nodeName : string.Empty; }
- set { nodeName = value; }
- }
-
- public string Description {
- get { return description != null ? description : string.Empty; }
- set { description = value; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeChildAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeChildAttribute.cs
deleted file mode 100644
index 88125e4..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeChildAttribute.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// ExtensionNodeChildAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Class, AllowMultiple=true)]
- public class ExtensionNodeChildAttribute: Attribute
- {
- string nodeName;
- Type extensionNodeType;
-
- public ExtensionNodeChildAttribute (string nodeName)
- : this (typeof(TypeExtensionNode), nodeName)
- {
- }
-
- public ExtensionNodeChildAttribute (Type extensionNodeType)
- : this (extensionNodeType, null)
- {
- }
-
- public ExtensionNodeChildAttribute (Type extensionNodeType, string nodeName)
- {
- this.extensionNodeType = extensionNodeType;
- this.nodeName = nodeName;
- }
-
- public string NodeName {
- get { return nodeName != null ? nodeName : string.Empty; }
- set { nodeName = value; }
- }
-
- public Type ExtensionNodeType {
- get { return extensionNodeType; }
- set { extensionNodeType = value; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeList.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeList.cs
deleted file mode 100644
index 0492405..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionNodeList.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// ExtensionNodeList.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins
-{
- public class ExtensionNodeList: IEnumerable
- {
- internal ArrayList list;
-
- internal static ExtensionNodeList Empty = new ExtensionNodeList (new ArrayList ());
-
- internal ExtensionNodeList (ArrayList list)
- {
- this.list = list;
- }
-
- public ExtensionNode this [int n] {
- get {
- if (list == null)
- throw new System.IndexOutOfRangeException ();
- else
- return (ExtensionNode) list [n];
- }
- }
-
- public ExtensionNode this [string id] {
- get {
- if (list == null)
- return null;
- else {
- for (int n = list.Count - 1; n >= 0; n--)
- if (((ExtensionNode) list [n]).Id == id)
- return (ExtensionNode) list [n];
- return null;
- }
- }
- }
-
- public IEnumerator GetEnumerator ()
- {
- return list.GetEnumerator ();
- }
-
- public int Count {
- get { return list == null ? 0 : list.Count; }
- }
-
- public void CopyTo (Array array, int index)
- {
- list.CopyTo (array, index);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionPointAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionPointAttribute.cs
deleted file mode 100644
index 5d8fe31..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionPointAttribute.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// ExtensionPointAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=true)]
- public class ExtensionPointAttribute: Attribute
- {
- string path;
- Type nodeType;
- string nodeName;
- string desc;
- string name;
- Type objectType;
-
- public ExtensionPointAttribute ()
- {
- }
-
- public ExtensionPointAttribute (string path)
- {
- this.path = path;
- }
-
- public ExtensionPointAttribute (string path, Type nodeType)
- {
- this.path = path;
- this.nodeType = nodeType;
- }
-
- public ExtensionPointAttribute (string path, string nodeName, Type nodeType)
- {
- this.path = path;
- this.nodeType = nodeType;
- this.nodeName = nodeName;
- }
-
- public string Path {
- get { return path != null ? path : string.Empty; }
- set { path = value; }
- }
-
- public string Description {
- get { return desc != null ? desc : string.Empty; }
- set { desc = value; }
- }
-
- public Type NodeType {
- get { return nodeType != null ? nodeType : typeof(TypeExtensionNode); }
- set { nodeType = value; }
- }
-
- public Type ObjectType {
- get { return objectType; }
- set { objectType = value; }
- }
-
- public string NodeName {
- get { return nodeName != null && nodeName.Length > 0 ? nodeName : "Type"; }
- set { nodeName = value; }
- }
-
- public string Name {
- get { return name != null ? name : string.Empty; }
- set { name = value; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionTree.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionTree.cs
deleted file mode 100644
index ef7cd0e..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/ExtensionTree.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-//
-// ExtensionTree.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Xml;
-using Mono.Addins.Description;
-
-namespace Mono.Addins
-{
- internal class ExtensionTree: TreeNode
- {
- int internalId;
- internal const string AutoIdPrefix = "__nid_";
- ExtensionContext context;
-
- public ExtensionTree (ExtensionContext context): base ("")
- {
- this.context = context;
- }
-
- public override ExtensionContext Context {
- get { return context; }
- }
-
-
- public void LoadExtension (string addin, Extension extension, ArrayList addedNodes)
- {
- TreeNode tnode = GetNode (extension.Path);
- if (tnode == null) {
- AddinManager.ReportError ("Can't load extensions for path '" + extension.Path + "'. Extension point not defined.", addin, null, false);
- return;
- }
-
- int curPos = tnode.ChildCount;
- LoadExtensionElement (tnode, addin, extension.ExtensionNodes, ref curPos, tnode.Condition, false, addedNodes);
- }
-
- void LoadExtensionElement (TreeNode tnode, string addin, ExtensionNodeDescriptionCollection extension, ref int curPos, BaseCondition parentCondition, bool inComplextCondition, ArrayList addedNodes)
- {
- foreach (ExtensionNodeDescription elem in extension) {
-
- if (inComplextCondition) {
- parentCondition = ReadComplexCondition (elem, parentCondition);
- inComplextCondition = false;
- continue;
- }
-
- if (elem.NodeName == "ComplexCondition") {
- LoadExtensionElement (tnode, addin, elem.ChildNodes, ref curPos, parentCondition, true, addedNodes);
- continue;
- }
-
- if (elem.NodeName == "Condition") {
- Condition cond = new Condition (elem, parentCondition);
- LoadExtensionElement (tnode, addin, elem.ChildNodes, ref curPos, cond, false, addedNodes);
- continue;
- }
-
- string after = elem.GetAttribute ("insertafter");
- if (after.Length > 0) {
- int i = tnode.Children.IndexOfNode (after);
- if (i != -1)
- curPos = i+1;
- }
- string before = elem.GetAttribute ("insertbefore");
- if (before.Length > 0) {
- int i = tnode.Children.IndexOfNode (before);
- if (i != -1)
- curPos = i;
- }
-
- // Find the type of the node in this extension
- ExtensionNodeType ntype = AddinManager.SessionService.FindType (tnode.ExtensionNodeSet, elem.NodeName, addin);
-
- if (ntype == null) {
- AddinManager.ReportError ("Node '" + elem.NodeName + "' not allowed in extension: " + tnode.GetPath (), addin, null, false);
- continue;
- }
-
- string id = elem.GetAttribute ("id");
- if (id.Length == 0)
- id = AutoIdPrefix + (++internalId);
-
- TreeNode cnode = new TreeNode (id);
-
- ExtensionNode enode = ReadNode (cnode, addin, ntype, elem);
- if (enode == null)
- continue;
-
- cnode.Condition = parentCondition;
- cnode.ExtensionNodeSet = ntype;
- tnode.InsertChildNode (curPos, cnode);
- addedNodes.Add (cnode);
-
- if (cnode.Condition != null)
- Context.RegisterNodeCondition (cnode, cnode.Condition);
-
- // Load children
- if (elem.ChildNodes.Count > 0) {
- int cp = 0;
- LoadExtensionElement (cnode, addin, elem.ChildNodes, ref cp, parentCondition, false, addedNodes);
- }
-
- curPos++;
- }
- if (Context.FireEvents)
- tnode.NotifyChildrenChanged ();
- }
-
- BaseCondition ReadComplexCondition (ExtensionNodeDescription elem, BaseCondition parentCondition)
- {
- if (elem.NodeName == "Or" || elem.NodeName == "And") {
- ArrayList conds = new ArrayList ();
- foreach (ExtensionNodeDescription celem in elem.ChildNodes) {
- conds.Add (ReadComplexCondition (celem, null));
- }
- if (elem.NodeName == "Or")
- return new OrCondition ((BaseCondition[]) conds.ToArray (typeof(BaseCondition)), parentCondition);
- else
- return new AndCondition ((BaseCondition[]) conds.ToArray (typeof(BaseCondition)), parentCondition);
- }
- if (elem.NodeName == "Condition") {
- return new Condition (elem, parentCondition);
- }
- AddinManager.ReportError ("Invalid complex condition element '" + elem.NodeName + "'.", null, null, false);
- return new NullCondition ();
- }
-
- public ExtensionNode ReadNode (TreeNode tnode, string addin, ExtensionNodeType ntype, ExtensionNodeDescription elem)
- {
- try {
- if (ntype.Type == null) {
- if (!InitializeNodeType (ntype))
- return null;
- }
-
- ExtensionNode node;
- node = Activator.CreateInstance (ntype.Type) as ExtensionNode;
- if (node == null) {
- AddinManager.ReportError ("Extension node type '" + ntype.Type + "' must be a subclass of ExtensionNode", addin, null, false);
- return null;
- }
-
- tnode.AttachExtensionNode (node);
- node.SetData (addin, ntype);
- node.Read (elem);
- return node;
- }
- catch (Exception ex) {
- AddinManager.ReportError ("Could not read extension node of type '" + ntype.Type + "' from extension path '" + tnode.GetPath() + "'", addin, ex, false);
- return null;
- }
- }
-
- bool InitializeNodeType (ExtensionNodeType ntype)
- {
- RuntimeAddin p = AddinManager.SessionService.GetAddin (ntype.AddinId);
- if (p == null) {
- if (!AddinManager.SessionService.IsAddinLoaded (ntype.AddinId)) {
- if (!AddinManager.SessionService.LoadAddin (null, ntype.AddinId, false))
- return false;
- p = AddinManager.SessionService.GetAddin (ntype.AddinId);
- if (p == null) {
- AddinManager.ReportError ("Add-in not found", ntype.AddinId, null, false);
- return false;
- }
- }
- }
-
- // If no type name is provided, use TypeExtensionNode by default
- if (ntype.TypeName == null || ntype.TypeName.Length == 0) {
- ntype.Type = typeof(TypeExtensionNode);
- return true;
- }
-
- ntype.Type = p.GetType (ntype.TypeName, false);
- if (ntype.Type == null) {
- AddinManager.ReportError ("Extension node type '" + ntype.TypeName + "' not found.", ntype.AddinId, null, false);
- return false;
- }
-
- Hashtable fields = new Hashtable ();
-
- // Check if the type has NodeAttribute attributes applied to fields.
- foreach (FieldInfo field in ntype.Type.GetFields (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) {
- NodeAttributeAttribute at = (NodeAttributeAttribute) Attribute.GetCustomAttribute (field, typeof(NodeAttributeAttribute), true);
- if (at != null) {
- ExtensionNodeType.FieldData fdata = new ExtensionNodeType.FieldData ();
- fdata.Field = field;
- fdata.Required = at.Required;
- fdata.Localizable = at.Localizable;
-
- string name;
- if (at.Name != null && at.Name.Length > 0)
- name = at.Name;
- else
- name = field.Name;
-
- fields [name] = fdata;
- }
- }
- if (fields.Count > 0)
- ntype.Fields = fields;
-
- return true;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/GettextCatalog.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/GettextCatalog.cs
deleted file mode 100644
index 7739e9c..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/GettextCatalog.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// GettextCatalog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace Mono.Addins
-{
- // TODO: Add real translation suport, which can work in Windows
-
- internal class GettextCatalog
- {
- public static string GetString (string str)
- {
- return str;
- }
-
- public static string GetString (string str, params object[] arguments)
- {
- return string.Format (GetString (str), arguments);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/IAddinInstaller.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/IAddinInstaller.cs
deleted file mode 100644
index 7dd3607..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/IAddinInstaller.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-using System;
-
-namespace Mono.Addins
-{
- public interface IAddinInstaller
- {
- void InstallAddins (AddinRegistry reg, string message, string[] addinIds);
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/IProgressStatus.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/IProgressStatus.cs
deleted file mode 100644
index 834c739..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/IProgressStatus.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// IProgressStatus.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- public interface IProgressStatus
- {
- void SetMessage (string msg);
- void SetProgress (double progress);
-
- void Log (string msg);
- int LogLevel { get; } // 0: no log, 1: normal log, >1 verbose log
-
- void ReportWarning (string message);
- void ReportError (string message, Exception exception);
-
- bool IsCanceled { get; }
- void Cancel ();
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/InstanceExtensionNode.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/InstanceExtensionNode.cs
deleted file mode 100644
index 5d7afc6..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/InstanceExtensionNode.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// InstanceExtensionNode.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- public abstract class InstanceExtensionNode: ExtensionNode
- {
- object cachedInstance;
-
- public object GetInstance (Type expectedType)
- {
- object ob = GetInstance ();
- if (!expectedType.IsInstanceOfType (ob))
- throw new InvalidOperationException (string.Format ("Expected subclass of type '{0}'. Found '{1}'.", expectedType, ob.GetType ()));
- return ob;
- }
-
- public object GetInstance ()
- {
- if (cachedInstance == null)
- cachedInstance = CreateInstance ();
- return cachedInstance;
- }
-
- public object CreateInstance (Type expectedType)
- {
- object ob = CreateInstance ();
- if (!expectedType.IsInstanceOfType (ob))
- throw new InvalidOperationException (string.Format ("Expected subclass of type '{0}'. Found '{1}'.", expectedType, ob.GetType ()));
- return ob;
- }
-
- public abstract object CreateInstance ();
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/MissingDependencyException.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/MissingDependencyException.cs
deleted file mode 100644
index 4680c63..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/MissingDependencyException.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// MissingDependencyException.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Mono.Addins
-{
- [Serializable]
- internal class MissingDependencyException: Exception
- {
- public MissingDependencyException (SerializationInfo inf, StreamingContext ctx) : base (inf, ctx)
- {
- }
-
- public MissingDependencyException (string message): base (message)
- {
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/NodeAttributeAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/NodeAttributeAttribute.cs
deleted file mode 100644
index 9a5fc70..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/NodeAttributeAttribute.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// NodeAttributeAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Class | AttributeTargets.Field, AllowMultiple=true)]
- public class NodeAttributeAttribute: Attribute
- {
- string name;
- bool required;
- bool localizable;
- Type type;
- string description;
-
- public NodeAttributeAttribute ()
- {
- }
-
- public NodeAttributeAttribute (string name)
- :this (name, false, null)
- {
- }
-
- public NodeAttributeAttribute (string name, string description)
- :this (name, false, description)
- {
- }
-
- public NodeAttributeAttribute (string name, bool required)
- : this (name, required, null)
- {
- }
-
- public NodeAttributeAttribute (string name, bool required, string description)
- {
- this.name = name;
- this.required = required;
- this.description = description;
- }
-
- public NodeAttributeAttribute (string name, Type type)
- : this (name, type, false, null)
- {
- }
-
- public NodeAttributeAttribute (string name, Type type, string description)
- : this (name, type, false, description)
- {
- }
-
- public NodeAttributeAttribute (string name, Type type, bool required)
- : this (name, type, false, null)
- {
- }
-
- public NodeAttributeAttribute (string name, Type type, bool required, string description)
- {
- this.name = name;
- this.type = type;
- this.required = required;
- this.description = description;
- }
-
- public string Name {
- get { return name != null ? name : string.Empty; }
- set { name = value; }
- }
-
- public bool Required {
- get { return required; }
- set { required = value; }
- }
-
- public Type Type {
- get { return type; }
- set { type = value; }
- }
-
- public string Description {
- get { return description != null ? description : string.Empty; }
- set { description = value; }
- }
-
- public bool Localizable {
- get { return localizable; }
- set { localizable = value; }
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/NodeElement.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/NodeElement.cs
deleted file mode 100644
index 4599482..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/NodeElement.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// NodeElement.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins
-{
- public interface NodeElement
- {
- string NodeName { get; }
- string GetAttribute (string key);
- NodeAttribute[] Attributes { get; }
- NodeElementCollection ChildNodes { get; }
- }
-
- public class NodeAttribute
- {
- internal string name;
- internal string value;
-
- internal NodeAttribute ()
- {
- }
-
- public string Name {
- get { return name; }
- }
-
- public string Value {
- get { return value; }
- }
- }
-
- public interface NodeElementCollection: IList, ICollection, IEnumerable
- {
- new NodeElement this [int n] { get; }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs
deleted file mode 100644
index 70da5c0..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-//
-// RuntimeAddin.cs
-//
-// Author:
-// Lluis Sanchez Gual,
-// Georg Wächter
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-using System.Xml;
-using System.Resources;
-using System.Globalization;
-
-using Mono.Addins.Description;
-using Mono.Addins.Localization;
-
-namespace Mono.Addins
-{
- public class RuntimeAddin
- {
- string id;
- string baseDirectory;
- string privatePath;
- Addin ainfo;
-
- Assembly[] assemblies;
- RuntimeAddin[] depAddins;
- ResourceManager[] resourceManagers;
- AddinLocalizer localizer;
-
- internal RuntimeAddin()
- {
- }
-
- internal Assembly[] Assemblies {
- get { return assemblies; }
- }
-
- public string Id {
- get { return Addin.GetIdName (id); }
- }
-
- public string Version {
- get { return Addin.GetIdVersion (id); }
- }
-
- internal Addin Addin {
- get { return ainfo; }
- }
-
- public override string ToString ()
- {
- return ainfo.ToString ();
- }
-
- void CreateResourceManagers ()
- {
- ArrayList managersList = new ArrayList ();
-
- // Search for embedded resource files
- foreach (Assembly asm in assemblies)
- {
- foreach (string res in asm.GetManifestResourceNames ()) {
- if (res.EndsWith (".resources"))
- managersList.Add (new ResourceManager (res.Substring (0, res.Length - ".resources".Length), asm));
- }
- }
-
- resourceManagers = (ResourceManager[]) managersList.ToArray (typeof(ResourceManager));
- }
-
- public string GetResourceString (string name)
- {
- return (string) GetResourceObject (name, true, null);
- }
-
- public string GetResourceString (string name, bool throwIfNotFound)
- {
- return (string) GetResourceObject (name, throwIfNotFound, null);
- }
-
- public string GetResourceString (string name, bool throwIfNotFound, CultureInfo culture)
- {
- return (string) GetResourceObject (name, throwIfNotFound, culture);
- }
-
- public object GetResourceObject (string name)
- {
- return GetResourceObject (name, true, null);
- }
-
- public object GetResourceObject (string name, bool throwIfNotFound)
- {
- return GetResourceObject (name, throwIfNotFound, null);
- }
-
- public object GetResourceObject (string name, bool throwIfNotFound, CultureInfo culture)
- {
- if (resourceManagers == null)
- CreateResourceManagers ();
-
- // Look in resources of this add-in
- foreach (ResourceManager manager in resourceManagers)
- {
- object t = manager.GetObject (name, culture);
- if (t != null)
- return t;
- }
-
- // Look in resources of dependent add-ins
- foreach (RuntimeAddin addin in depAddins)
- {
- object t = addin.GetResourceObject (name, false, culture);
- if (t != null)
- return t;
- }
-
- if (throwIfNotFound)
- throw new InvalidOperationException ("Resource object '" + name + "' not found in add-in '" + id + "'");
-
- return null;
- }
-
-
- public Type GetType (string typeName)
- {
- return GetType (typeName, true);
- }
-
- public Type GetType (string typeName, bool throwIfNotFound)
- {
- // Look in the addin assemblies
-
- Type at = Type.GetType (typeName, false);
- if (at != null)
- return at;
-
- foreach (Assembly asm in assemblies) {
- Type t = asm.GetType (typeName, false);
- if (t != null)
- return t;
- }
-
- // Look in the dependent add-ins
- foreach (RuntimeAddin addin in depAddins) {
- Type t = addin.GetType (typeName, false);
- if (t != null)
- return t;
- }
-
- if (throwIfNotFound)
- throw new InvalidOperationException ("Type '" + typeName + "' not found in add-in '" + id + "'");
- return null;
- }
-
- public object CreateInstance (string typeName)
- {
- return CreateInstance (typeName, true);
- }
-
- public object CreateInstance (string typeName, bool throwIfNotFound)
- {
- Type type = GetType (typeName, throwIfNotFound);
- if (type == null)
- return null;
- else
- return Activator.CreateInstance (type, true);
- }
-
- public string GetFilePath (string fileName)
- {
- return Path.Combine (baseDirectory, fileName);
- }
-
- public string PrivateDataPath {
- get {
- if (privatePath == null) {
- privatePath = ainfo.PrivateDataPath;
- if (!Directory.Exists (privatePath))
- Directory.CreateDirectory (privatePath);
- }
- return privatePath;
- }
- }
-
- public Stream GetResource (string resourceName)
- {
- return GetResource (resourceName, false);
- }
-
- public Stream GetResource (string resourceName, bool throwIfNotFound)
- {
- // Look in the addin assemblies
-
- foreach (Assembly asm in assemblies) {
- Stream res = asm.GetManifestResourceStream (resourceName);
- if (res != null)
- return res;
- }
-
- // Look in the dependent add-ins
- foreach (RuntimeAddin addin in depAddins) {
- Stream res = addin.GetResource (resourceName);
- if (res != null)
- return res;
- }
-
- if (throwIfNotFound)
- throw new InvalidOperationException ("Resource '" + resourceName + "' not found in add-in '" + id + "'");
-
- return null;
- }
-
- public AddinLocalizer Localizer {
- get {
- if (localizer != null)
- return localizer;
- else
- return AddinManager.DefaultLocalizer;
- }
- }
-
- internal AddinDescription Load (Addin iad)
- {
- ainfo = iad;
-
- ArrayList plugList = new ArrayList ();
- ArrayList asmList = new ArrayList ();
-
- AddinDescription description = iad.Description;
- id = description.AddinId;
- baseDirectory = description.BasePath;
-
- // Load the main modules
- LoadModule (description.MainModule, description.Namespace, plugList, asmList);
-
- // Load the optional modules, if the dependencies are present
- foreach (ModuleDescription module in description.OptionalModules) {
- if (CheckAddinDependencies (module))
- LoadModule (module, description.Namespace, plugList, asmList);
- }
-
- depAddins = (RuntimeAddin[]) plugList.ToArray (typeof(RuntimeAddin));
- assemblies = (Assembly[]) asmList.ToArray (typeof(Assembly));
-
- if (description.Localizer != null) {
- string cls = description.Localizer.GetAttribute ("type");
-
- // First try getting one of the stock localizers. If none of found try getting the type.
- object fob = CreateInstance ("Mono.Addins.Localization." + cls + "Localizer", false);
- if (fob == null)
- fob = CreateInstance (cls, true);
-
- IAddinLocalizerFactory factory = fob as IAddinLocalizerFactory;
- if (factory == null)
- throw new InvalidOperationException ("Localizer factory type '" + cls + "' must implement IAddinLocalizerFactory");
- localizer = new AddinLocalizer (factory.CreateLocalizer (this, description.Localizer));
- }
-
- return description;
- }
-
- void LoadModule (ModuleDescription module, string ns, ArrayList plugList, ArrayList asmList)
- {
- // Load the assemblies
- foreach (string s in module.Assemblies) {
- Assembly asm = null;
-
- // don't load the assembly if it's already loaded
- string asmPath = Path.Combine (baseDirectory, s);
- foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies ()) {
- // Sorry, you can't load addins from
- // dynamic assemblies as get_Location
- // throws a NotSupportedException
- if (a is System.Reflection.Emit.AssemblyBuilder) {
- continue;
- }
-
- if (a.Location == asmPath) {
- asm = a;
- break;
- }
- }
-
- if (asm == null) {
- asm = Assembly.LoadFrom (asmPath);
- }
-
- asmList.Add (asm);
- }
-
- // Collect dependent ids
- foreach (Dependency dep in module.Dependencies) {
- AddinDependency pdep = dep as AddinDependency;
- if (pdep != null) {
- RuntimeAddin adn = AddinManager.SessionService.GetAddin (Addin.GetFullId (ns, pdep.AddinId, pdep.Version));
- if (adn != null)
- plugList.Add (adn);
- else
- AddinManager.ReportError ("Add-in dependency not loaded: " + pdep.FullAddinId, module.ParentAddinDescription.AddinId, null, false);
- }
- }
- }
-
- internal void UnloadExtensions ()
- {
- // Create the extension points (but do not load them)
- AddinDescription emap = Addin.Description;
- if (emap == null) return;
-
- foreach (ExtensionNodeSet rel in emap.ExtensionNodeSets)
- AddinManager.SessionService.UnregisterNodeSet (rel);
- }
-
- bool CheckAddinDependencies (ModuleDescription module)
- {
- foreach (Dependency dep in module.Dependencies) {
- AddinDependency pdep = dep as AddinDependency;
- if (pdep != null && !AddinManager.SessionService.IsAddinLoaded (pdep.FullAddinId))
- return false;
- }
- return true;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/TreeNode.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/TreeNode.cs
deleted file mode 100644
index 33d1417..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/TreeNode.cs
+++ /dev/null
@@ -1,333 +0,0 @@
-//
-// TreeNode.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Text;
-using System.Collections;
-using Mono.Addins.Description;
-
-namespace Mono.Addins
-{
- class TreeNode
- {
- ArrayList childrenList;
- TreeNodeCollection children;
- ExtensionNode extensionNode;
- bool childrenLoaded;
- string id;
- TreeNode parent;
- ExtensionNodeSet nodeTypes;
- ExtensionPoint extensionPoint;
- BaseCondition condition;
-
- public TreeNode (string id)
- {
- this.id = id;
-
- // Root node
- if (id.Length == 0)
- childrenLoaded = true;
- }
-
- internal void AttachExtensionNode (ExtensionNode enode)
- {
- this.extensionNode = enode;
- if (extensionNode != null)
- extensionNode.SetTreeNode (this);
- }
-
- public string Id {
- get { return id; }
- }
-
- public ExtensionNode ExtensionNode {
- get {
- if (extensionNode == null && extensionPoint != null) {
- extensionNode = new ExtensionNode ();
- extensionNode.SetData (extensionPoint.RootAddin, null);
- AttachExtensionNode (extensionNode);
- }
- return extensionNode;
- }
- }
-
- public ExtensionPoint ExtensionPoint {
- get { return extensionPoint; }
- set { extensionPoint = value; }
- }
-
- public ExtensionNodeSet ExtensionNodeSet {
- get { return nodeTypes; }
- set { nodeTypes = value; }
- }
-
- public TreeNode Parent {
- get { return parent; }
- }
-
- public BaseCondition Condition {
- get { return condition; }
- set {
- condition = value;
- }
- }
-
- public virtual ExtensionContext Context {
- get {
- if (parent != null)
- return parent.Context;
- else
- return null;
- }
- }
-
- public bool IsEnabled {
- get {
- if (condition == null)
- return true;
- ExtensionContext ctx = Context;
- if (ctx == null)
- return true;
- else
- return condition.Evaluate (ctx);
- }
- }
-
- public bool ChildrenLoaded {
- get { return childrenLoaded; }
- }
-
- public void AddChildNode (TreeNode node)
- {
- node.parent = this;
- if (childrenList == null)
- childrenList = new ArrayList ();
- childrenList.Add (node);
- }
-
- public void InsertChildNode (int n, TreeNode node)
- {
- node.parent = this;
- if (childrenList == null)
- childrenList = new ArrayList ();
- childrenList.Insert (n, node);
-
- // Dont call NotifyChildrenChanged here. It is called by ExtensionTree,
- // after inserting all children of the node.
- }
-
- internal int ChildCount {
- get { return childrenList == null ? 0 : childrenList.Count; }
- }
-
- public ExtensionNode GetExtensionNode (string path, string childId)
- {
- TreeNode node = GetNode (path, childId);
- return node != null ? node.ExtensionNode : null;
- }
-
- public ExtensionNode GetExtensionNode (string path)
- {
- TreeNode node = GetNode (path);
- return node != null ? node.ExtensionNode : null;
- }
-
- public TreeNode GetNode (string path, string childId)
- {
- if (childId == null || childId.Length == 0)
- return GetNode (path);
- else
- return GetNode (path + "/" + childId);
- }
-
- public TreeNode GetNode (string path)
- {
- return GetNode (path, false);
- }
-
- public TreeNode GetNode (string path, bool buildPath)
- {
- if (path.StartsWith ("/"))
- path = path.Substring (1);
-
- string[] parts = path.Split ('/');
- TreeNode curNode = this;
-
- foreach (string part in parts) {
- int i = curNode.Children.IndexOfNode (part);
- if (i != -1) {
- curNode = curNode.Children [i];
- continue;
- }
-
- if (buildPath) {
- TreeNode newNode = new TreeNode (part);
- curNode.AddChildNode (newNode);
- curNode = newNode;
- } else
- return null;
- }
- return curNode;
- }
-
- public TreeNodeCollection Children {
- get {
- if (!childrenLoaded) {
- childrenLoaded = true;
- if (extensionPoint != null)
- Context.LoadExtensions (GetPath ());
- // We have to keep the relation info, since add-ins may be loaded/unloaded
- }
- if (childrenList == null)
- return TreeNodeCollection.Empty;
- if (children == null)
- children = new TreeNodeCollection (childrenList);
- return children;
- }
- }
-
- public string GetPath ()
- {
- int num=0;
- TreeNode node = this;
- while (node != null) {
- num++;
- node = node.parent;
- }
-
- string[] ids = new string [num];
-
- node = this;
- while (node != null) {
- ids [--num] = node.id;
- node = node.parent;
- }
- return string.Join ("/", ids);
- }
-
- public void NotifyAddinLoaded (RuntimeAddin ad, bool recursive)
- {
- if (extensionNode != null && extensionNode.AddinId == ad.Addin.Id)
- extensionNode.OnAddinLoaded ();
- if (recursive && childrenLoaded) {
- foreach (TreeNode node in Children.Clone ())
- node.NotifyAddinLoaded (ad, true);
- }
- }
-
- public ExtensionPoint FindLoadedExtensionPoint (string path)
- {
- if (path.StartsWith ("/"))
- path = path.Substring (1);
-
- string[] parts = path.Split ('/');
- TreeNode curNode = this;
-
- foreach (string part in parts) {
- int i = curNode.Children.IndexOfNode (part);
- if (i != -1) {
- curNode = curNode.Children [i];
- if (!curNode.ChildrenLoaded)
- return null;
- if (curNode.ExtensionPoint != null)
- return curNode.ExtensionPoint;
- continue;
- }
- return null;
- }
- return null;
- }
-
- public void FindAddinNodes (string id, ArrayList nodes)
- {
- if (id != null && extensionPoint != null && extensionPoint.RootAddin == id) {
- // It is an extension point created by the add-in. All nodes below this
- // extension point will be added to the list, even if they come from other add-ins.
- id = null;
- }
-
- if (childrenLoaded) {
- // Deep-first search, to make sure children are removed before the parent.
- foreach (TreeNode node in Children)
- node.FindAddinNodes (id, nodes);
- }
-
- if (id == null || (ExtensionNode != null && ExtensionNode.AddinId == id))
- nodes.Add (this);
- }
-
- public bool FindExtensionPathByType (IProgressStatus monitor, Type type, string nodeName, out string path, out string pathNodeName)
- {
- if (extensionPoint != null) {
- foreach (ExtensionNodeType nt in extensionPoint.NodeSet.NodeTypes) {
- if (nt.ObjectTypeName.Length > 0 && (nodeName.Length == 0 || nodeName == nt.Id)) {
- RuntimeAddin addin = AddinManager.SessionService.GetAddin (extensionPoint.RootAddin);
- Type ot = addin.GetType (nt.ObjectTypeName);
- if (ot != null) {
- if (ot.IsAssignableFrom (type)) {
- path = extensionPoint.Path;
- pathNodeName = nt.Id;
- return true;
- }
- }
- else
- monitor.ReportError ("Type '" + nt.ObjectTypeName + "' not found in add-in '" + Id + "'", null);
- }
- }
- }
- else {
- foreach (TreeNode node in Children) {
- if (node.FindExtensionPathByType (monitor, type, nodeName, out path, out pathNodeName))
- return true;
- }
- }
- path = null;
- pathNodeName = null;
- return false;
- }
-
- public void Remove ()
- {
- if (parent != null) {
- if (Condition != null)
- Context.UnregisterNodeCondition (this, Condition);
- parent.childrenList.Remove (this);
- parent.NotifyChildrenChanged ();
- }
- }
-
- public bool NotifyChildrenChanged ()
- {
- if (extensionNode != null)
- return extensionNode.NotifyChildChanged ();
- else
- return false;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/TreeNodeCollection.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/TreeNodeCollection.cs
deleted file mode 100644
index 28d499d..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/TreeNodeCollection.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// TreeNodeCollection.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mono.Addins
-{
- class TreeNodeCollection: IEnumerable
- {
- ArrayList list;
-
- internal static TreeNodeCollection Empty = new TreeNodeCollection (null);
-
- public TreeNodeCollection (ArrayList list)
- {
- this.list = list;
- }
-
- public IEnumerator GetEnumerator ()
- {
- if (list != null)
- return list.GetEnumerator ();
- else
- return Type.EmptyTypes.GetEnumerator ();
- }
-
- public TreeNode this [int n] {
- get {
- if (list != null)
- return (TreeNode) list [n];
- else
- throw new System.IndexOutOfRangeException ();
- }
- }
-
- public int IndexOfNode (string id)
- {
- for (int n=0; n<Count; n++) {
- if (this [n].Id == id)
- return n;
- }
- return -1;
- }
-
- public int Count {
- get { return list != null ? list.Count : 0; }
- }
-
- public TreeNodeCollection Clone ()
- {
- if (list != null)
- return new TreeNodeCollection ((ArrayList) list.Clone ());
- else
- return Empty;
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/TypeExtensionNode.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/TypeExtensionNode.cs
deleted file mode 100644
index 9223a94..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/TypeExtensionNode.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// TypeExtensionNode.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-
-namespace Mono.Addins
-{
- [ExtensionNode ("Type", Description="Specifies a class that will be used to create an extension object.")]
- [NodeAttribute ("class", typeof(Type), false, Description="Name of the class. If a value is not provided, the class name will be taken from the 'id' attribute")]
- public class TypeExtensionNode: InstanceExtensionNode
- {
- string typeName;
-
- internal protected override void Read (NodeElement elem)
- {
- base.Read (elem);
- typeName = elem.GetAttribute ("type");
- if (typeName.Length == 0)
- typeName = elem.GetAttribute ("class");
- if (typeName.Length == 0)
- typeName = elem.GetAttribute ("id");
- }
-
- public override object CreateInstance ()
- {
- if (typeName.Length == 0)
- throw new InvalidOperationException ("Type name not specified.");
-
- Type t = Addin.GetType (typeName, true);
- return Activator.CreateInstance (t);
- }
- }
-}
diff --git a/lib/mono-addins/Mono.Addins/Mono.Addins/TypeExtensionPointAttribute.cs b/lib/mono-addins/Mono.Addins/Mono.Addins/TypeExtensionPointAttribute.cs
deleted file mode 100644
index e858194..0000000
--- a/lib/mono-addins/Mono.Addins/Mono.Addins/TypeExtensionPointAttribute.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// TypeExtensionPointAttribute.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace Mono.Addins
-{
- [AttributeUsage (AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple=true)]
- public class TypeExtensionPointAttribute: Attribute
- {
- string path;
- string nodeName;
- Type nodeType;
- string desc;
- string name;
-
- public TypeExtensionPointAttribute ()
- {
- }
-
- public TypeExtensionPointAttribute (string path)
- {
- this.path = path;
- }
-
- public string Path {
- get { return path != null ? path : string.Empty; }
- set { path = value; }
- }
-
- public string Description {
- get { return desc != null ? desc : string.Empty; }
- set { desc = value; }
- }
-
- public string NodeName {
- get { return nodeName != null && nodeName.Length > 0 ? nodeName : "Type"; }
- set { nodeName = value; }
- }
-
- public string Name {
- get { return name != null ? name : string.Empty; }
- set { name = value; }
- }
-
- public Type NodeType {
- get { return nodeType != null ? nodeType : typeof(TypeExtensionNode); }
- set { nodeType = value; }
- }
-}
-}
diff --git a/lib/semweb/Makefile.in b/lib/semweb/Makefile.in
index f4eb2af..21b572e 100644
--- a/lib/semweb/Makefile.in
+++ b/lib/semweb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = lib/semweb
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -73,16 +76,17 @@ am__installdirs = "$(DESTDIR)$(assemblydir)"
DATA = $(assembly_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,8 +103,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -113,9 +116,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -164,16 +172,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -184,6 +194,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -194,21 +205,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -236,6 +251,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -260,18 +277,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -281,17 +295,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -350,9 +360,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/semweb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/semweb/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/semweb/Makefile
+ $(AUTOMAKE) --foreign lib/semweb/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/lib/unique-sharp/Makefile.am b/lib/unique-sharp/Makefile.am
new file mode 100644
index 0000000..8899ef1
--- /dev/null
+++ b/lib/unique-sharp/Makefile.am
@@ -0,0 +1,17 @@
+SUBDIRS = \
+ generator \
+ unique
+
+fetch:
+ rm -rf fetch
+ git clone git://gitorious.org/unique-sharp/unique-sharp.git fetch
+
+update:
+ cp fetch/generator/*.cs generator/
+ cp fetch/unique/*.custom \
+ fetch/unique/*.cs \
+ fetch/unique/unique-api.raw \
+ fetch/unique/Unique.metadata \
+ unique
+
+.PHONY: fetch update
diff --git a/lib/unique-sharp/Makefile.in b/lib/unique-sharp/Makefile.in
new file mode 100644
index 0000000..2ff0de6
--- /dev/null
+++ b/lib/unique-sharp/Makefile.in
@@ -0,0 +1,669 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = lib/unique-sharp
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = \
+ generator \
+ unique
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/unique-sharp/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign lib/unique-sharp/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
+
+
+fetch:
+ rm -rf fetch
+ git clone git://gitorious.org/unique-sharp/unique-sharp.git fetch
+
+update:
+ cp fetch/generator/*.cs generator/
+ cp fetch/unique/*.custom \
+ fetch/unique/*.cs \
+ fetch/unique/unique-api.raw \
+ fetch/unique/Unique.metadata \
+ unique
+
+.PHONY: fetch update
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/gio-sharp/generator/AliasGen.cs b/lib/unique-sharp/generator/AliasGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/AliasGen.cs
copy to lib/unique-sharp/generator/AliasGen.cs
diff --git a/lib/gio-sharp/generator/BoxedGen.cs b/lib/unique-sharp/generator/BoxedGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/BoxedGen.cs
copy to lib/unique-sharp/generator/BoxedGen.cs
diff --git a/lib/gio-sharp/generator/ByRefGen.cs b/lib/unique-sharp/generator/ByRefGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/ByRefGen.cs
copy to lib/unique-sharp/generator/ByRefGen.cs
diff --git a/lib/gio-sharp/generator/CallbackGen.cs b/lib/unique-sharp/generator/CallbackGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/CallbackGen.cs
copy to lib/unique-sharp/generator/CallbackGen.cs
diff --git a/lib/gio-sharp/generator/ChildProperty.cs b/lib/unique-sharp/generator/ChildProperty.cs
similarity index 100%
copy from lib/gio-sharp/generator/ChildProperty.cs
copy to lib/unique-sharp/generator/ChildProperty.cs
diff --git a/lib/unique-sharp/generator/ClassBase.cs b/lib/unique-sharp/generator/ClassBase.cs
new file mode 100644
index 0000000..68b16df
--- /dev/null
+++ b/lib/unique-sharp/generator/ClassBase.cs
@@ -0,0 +1,480 @@
+// GtkSharp.Generation.ClassBase.cs - Common code between object
+// and interface wrappers
+//
+// Authors: Rachel Hestilow <hestilow at ximian.com>
+// Mike Kestner <mkestner at speakeasy.net>
+//
+// Copyright (c) 2002 Rachel Hestilow
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public abstract class ClassBase : GenBase {
+ protected Hashtable props = new Hashtable();
+ protected Hashtable fields = new Hashtable();
+ protected Hashtable sigs = new Hashtable();
+ protected Hashtable methods = new Hashtable();
+ protected ArrayList interfaces = new ArrayList();
+ protected ArrayList managed_interfaces = new ArrayList();
+ protected ArrayList ctors = new ArrayList();
+
+ private bool ctors_initted = false;
+ private Hashtable clash_map;
+ private bool deprecated = false;
+ private bool isabstract = false;
+
+ public Hashtable Methods {
+ get {
+ return methods;
+ }
+ }
+
+ public Hashtable Signals {
+ get {
+ return sigs;
+ }
+ }
+
+ public ClassBase Parent {
+ get {
+ string parent = Elem.GetAttribute("parent");
+
+ if (parent == "")
+ return null;
+ else
+ return SymbolTable.Table.GetClassGen(parent);
+ }
+ }
+
+ protected ClassBase (XmlElement ns, XmlElement elem) : base (ns, elem) {
+
+ if (elem.HasAttribute ("deprecated")) {
+ string attr = elem.GetAttribute ("deprecated");
+ deprecated = attr == "1" || attr == "true";
+ }
+
+ if (elem.HasAttribute ("abstract")) {
+ string attr = elem.GetAttribute ("abstract");
+ isabstract = attr == "1" || attr == "true";
+ }
+
+ foreach (XmlNode node in elem.ChildNodes) {
+ if (!(node is XmlElement)) continue;
+ XmlElement member = (XmlElement) node;
+ if (member.HasAttribute ("hidden"))
+ continue;
+
+ string name;
+ switch (node.Name) {
+ case "method":
+ name = member.GetAttribute("name");
+ while (methods.ContainsKey(name))
+ name += "mangled";
+ methods.Add (name, new Method (member, this));
+ break;
+
+ case "property":
+ name = member.GetAttribute("name");
+ while (props.ContainsKey(name))
+ name += "mangled";
+ props.Add (name, new Property (member, this));
+ break;
+
+ case "field":
+ name = member.GetAttribute("name");
+ while (fields.ContainsKey (name))
+ name += "mangled";
+ fields.Add (name, new ObjectField (member, this));
+ break;
+
+ case "signal":
+ name = member.GetAttribute("name");
+ while (sigs.ContainsKey(name))
+ name += "mangled";
+ sigs.Add (name, new Signal (member, this));
+ break;
+
+ case "implements":
+ ParseImplements (member);
+ break;
+
+ case "constructor":
+ ctors.Add (new Ctor (member, this));
+ break;
+
+ default:
+ break;
+ }
+ }
+ }
+
+ public override bool Validate ()
+ {
+ if (Parent != null && !Parent.ValidateForSubclass ())
+ return false;
+ foreach (string iface in interfaces) {
+ InterfaceGen igen = SymbolTable.Table[iface] as InterfaceGen;
+ if (igen == null) {
+ Console.WriteLine (QualifiedName + " implements unknown GInterface " + iface);
+ return false;
+ }
+ if (!igen.ValidateForSubclass ()) {
+ Console.WriteLine (QualifiedName + " implements invalid GInterface " + iface);
+ return false;
+ }
+ }
+
+ ArrayList invalids = new ArrayList ();
+
+ foreach (Property prop in props.Values) {
+ if (!prop.Validate ()) {
+ Console.WriteLine ("in type " + QualifiedName);
+ invalids.Add (prop);
+ }
+ }
+ foreach (Property prop in invalids)
+ props.Remove (prop.Name);
+ invalids.Clear ();
+
+ foreach (Signal sig in sigs.Values) {
+ if (!sig.Validate ()) {
+ Console.WriteLine ("in type " + QualifiedName);
+ invalids.Add (sig);
+ }
+ }
+ foreach (Signal sig in invalids)
+ sigs.Remove (sig.Name);
+ invalids.Clear ();
+
+ foreach (ObjectField field in fields.Values) {
+ if (!field.Validate ()) {
+ Console.WriteLine ("in type " + QualifiedName);
+ invalids.Add (field);
+ }
+ }
+ foreach (ObjectField field in invalids)
+ fields.Remove (field.Name);
+ invalids.Clear ();
+
+ foreach (Method method in methods.Values) {
+ if (!method.Validate ()) {
+ Console.WriteLine ("in type " + QualifiedName);
+ invalids.Add (method);
+ }
+ }
+ foreach (Method method in invalids)
+ methods.Remove (method.Name);
+ invalids.Clear ();
+
+ foreach (Ctor ctor in ctors) {
+ if (!ctor.Validate ()) {
+ Console.WriteLine ("in type " + QualifiedName);
+ invalids.Add (ctor);
+ }
+ }
+ foreach (Ctor ctor in invalids)
+ ctors.Remove (ctor);
+ invalids.Clear ();
+
+ return true;
+ }
+
+ public virtual bool ValidateForSubclass ()
+ {
+ ArrayList invalids = new ArrayList ();
+
+ foreach (Signal sig in sigs.Values) {
+ if (!sig.Validate ()) {
+ Console.WriteLine ("in type " + QualifiedName);
+ invalids.Add (sig);
+ }
+ }
+ foreach (Signal sig in invalids)
+ sigs.Remove (sig.Name);
+ invalids.Clear ();
+
+ return true;
+ }
+
+ public bool IsDeprecated {
+ get {
+ return deprecated;
+ }
+ }
+
+ public bool IsAbstract {
+ get {
+ return isabstract;
+ }
+ }
+
+ public abstract string AssignToName { get; }
+
+ public abstract string CallByName ();
+
+ public override string DefaultValue {
+ get {
+ return "null";
+ }
+ }
+
+ protected bool IsNodeNameHandled (string name)
+ {
+ switch (name) {
+ case "method":
+ case "property":
+ case "field":
+ case "signal":
+ case "implements":
+ case "constructor":
+ case "disabledefaultconstructor":
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ public void GenProperties (GenerationInfo gen_info, ClassBase implementor)
+ {
+ if (props.Count == 0)
+ return;
+
+ foreach (Property prop in props.Values)
+ prop.Generate (gen_info, "\t\t", implementor);
+ }
+
+ public void GenSignals (GenerationInfo gen_info, ClassBase implementor)
+ {
+ if (sigs == null)
+ return;
+
+ foreach (Signal sig in sigs.Values)
+ sig.Generate (gen_info, implementor);
+ }
+
+ protected void GenFields (GenerationInfo gen_info)
+ {
+ foreach (ObjectField field in fields.Values)
+ field.Generate (gen_info, "\t\t");
+ }
+
+ private void ParseImplements (XmlElement member)
+ {
+ foreach (XmlNode node in member.ChildNodes) {
+ if (node.Name != "interface")
+ continue;
+ XmlElement element = (XmlElement) node;
+ if (element.HasAttribute ("hidden"))
+ continue;
+ if (element.HasAttribute ("cname"))
+ interfaces.Add (element.GetAttribute ("cname"));
+ else if (element.HasAttribute ("name"))
+ managed_interfaces.Add (element.GetAttribute ("name"));
+ }
+ }
+
+ protected bool IgnoreMethod (Method method, ClassBase implementor)
+ {
+ if (implementor != null && implementor.QualifiedName != this.QualifiedName && method.IsStatic)
+ return true;
+
+ string mname = method.Name;
+ return ((method.IsSetter || (method.IsGetter && mname.StartsWith("Get"))) &&
+ ((props != null) && props.ContainsKey(mname.Substring(3)) ||
+ (fields != null) && fields.ContainsKey(mname.Substring(3))));
+ }
+
+ public void GenMethods (GenerationInfo gen_info, Hashtable collisions, ClassBase implementor)
+ {
+ if (methods == null)
+ return;
+
+ foreach (Method method in methods.Values) {
+ if (IgnoreMethod (method, implementor))
+ continue;
+
+ string oname = null, oprotection = null;
+ if (collisions != null && collisions.Contains (method.Name)) {
+ oname = method.Name;
+ oprotection = method.Protection;
+ method.Name = QualifiedName + "." + method.Name;
+ method.Protection = "";
+ }
+ method.Generate (gen_info, implementor);
+ if (oname != null) {
+ method.Name = oname;
+ method.Protection = oprotection;
+ }
+ }
+ }
+
+ public Method GetMethod (string name)
+ {
+ return (Method) methods[name];
+ }
+
+ public Property GetProperty (string name)
+ {
+ return (Property) props[name];
+ }
+
+ public Signal GetSignal (string name)
+ {
+ return (Signal) sigs[name];
+ }
+
+ public Method GetMethodRecursively (string name)
+ {
+ return GetMethodRecursively (name, false);
+ }
+
+ public virtual Method GetMethodRecursively (string name, bool check_self)
+ {
+ Method p = null;
+ if (check_self)
+ p = GetMethod (name);
+ if (p == null && Parent != null)
+ p = Parent.GetMethodRecursively (name, true);
+
+ if (check_self && p == null) {
+ foreach (string iface in interfaces) {
+ ClassBase igen = SymbolTable.Table.GetClassGen (iface);
+ if (igen == null)
+ continue;
+ p = igen.GetMethodRecursively (name, true);
+ if (p != null)
+ break;
+ }
+ }
+
+ return p;
+ }
+
+ public virtual Property GetPropertyRecursively (string name)
+ {
+ ClassBase klass = this;
+ Property p = null;
+ while (klass != null && p == null) {
+ p = (Property) klass.GetProperty (name);
+ klass = klass.Parent;
+ }
+
+ return p;
+ }
+
+ public Signal GetSignalRecursively (string name)
+ {
+ return GetSignalRecursively (name, false);
+ }
+
+ public virtual Signal GetSignalRecursively (string name, bool check_self)
+ {
+ Signal p = null;
+ if (check_self)
+ p = GetSignal (name);
+ if (p == null && Parent != null)
+ p = Parent.GetSignalRecursively (name, true);
+
+ if (check_self && p == null) {
+ foreach (string iface in interfaces) {
+ ClassBase igen = SymbolTable.Table.GetClassGen (iface);
+ if (igen == null)
+ continue;
+ p = igen.GetSignalRecursively (name, true);
+ if (p != null)
+ break;
+ }
+ }
+
+ return p;
+ }
+
+ public bool Implements (string iface)
+ {
+ if (interfaces.Contains (iface))
+ return true;
+ else if (Parent != null)
+ return Parent.Implements (iface);
+ else
+ return false;
+ }
+
+ public ArrayList Ctors { get { return ctors; } }
+
+ bool HasStaticCtor (string name)
+ {
+ if (Parent != null && Parent.HasStaticCtor (name))
+ return true;
+
+ foreach (Ctor ctor in Ctors)
+ if (ctor.StaticName == name)
+ return true;
+
+ return false;
+ }
+
+ private void InitializeCtors ()
+ {
+ if (ctors_initted)
+ return;
+
+ if (Parent != null)
+ Parent.InitializeCtors ();
+
+ ArrayList valid_ctors = new ArrayList();
+ clash_map = new Hashtable();
+
+ foreach (Ctor ctor in ctors) {
+ if (clash_map.Contains (ctor.Signature.Types)) {
+ Ctor clash = clash_map [ctor.Signature.Types] as Ctor;
+ Ctor alter = ctor.Preferred ? clash : ctor;
+ alter.IsStatic = true;
+ if (Parent != null && Parent.HasStaticCtor (alter.StaticName))
+ alter.Modifiers = "new ";
+ } else
+ clash_map [ctor.Signature.Types] = ctor;
+
+ valid_ctors.Add (ctor);
+ }
+
+ ctors = valid_ctors;
+ ctors_initted = true;
+ }
+
+ protected virtual void GenCtors (GenerationInfo gen_info)
+ {
+ InitializeCtors ();
+ foreach (Ctor ctor in ctors)
+ ctor.Generate (gen_info);
+ }
+
+ public virtual void Finish (StreamWriter sw, string indent)
+ {
+ }
+
+ public virtual void Prepare (StreamWriter sw, string indent)
+ {
+ }
+ }
+}
diff --git a/lib/gio-sharp/generator/ClassGen.cs b/lib/unique-sharp/generator/ClassGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/ClassGen.cs
copy to lib/unique-sharp/generator/ClassGen.cs
diff --git a/lib/gio-sharp/generator/CodeGenerator.cs b/lib/unique-sharp/generator/CodeGenerator.cs
similarity index 100%
copy from lib/gio-sharp/generator/CodeGenerator.cs
copy to lib/unique-sharp/generator/CodeGenerator.cs
diff --git a/lib/gio-sharp/generator/ConstFilenameGen.cs b/lib/unique-sharp/generator/ConstFilenameGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/ConstFilenameGen.cs
copy to lib/unique-sharp/generator/ConstFilenameGen.cs
diff --git a/lib/gio-sharp/generator/ConstStringGen.cs b/lib/unique-sharp/generator/ConstStringGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/ConstStringGen.cs
copy to lib/unique-sharp/generator/ConstStringGen.cs
diff --git a/lib/gio-sharp/generator/Ctor.cs b/lib/unique-sharp/generator/Ctor.cs
similarity index 100%
copy from lib/gio-sharp/generator/Ctor.cs
copy to lib/unique-sharp/generator/Ctor.cs
diff --git a/lib/gio-sharp/generator/EnumGen.cs b/lib/unique-sharp/generator/EnumGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/EnumGen.cs
copy to lib/unique-sharp/generator/EnumGen.cs
diff --git a/lib/gio-sharp/generator/FieldBase.cs b/lib/unique-sharp/generator/FieldBase.cs
similarity index 100%
copy from lib/gio-sharp/generator/FieldBase.cs
copy to lib/unique-sharp/generator/FieldBase.cs
diff --git a/lib/gio-sharp/generator/GenBase.cs b/lib/unique-sharp/generator/GenBase.cs
similarity index 100%
copy from lib/gio-sharp/generator/GenBase.cs
copy to lib/unique-sharp/generator/GenBase.cs
diff --git a/lib/gio-sharp/generator/GenerationInfo.cs b/lib/unique-sharp/generator/GenerationInfo.cs
similarity index 100%
copy from lib/gio-sharp/generator/GenerationInfo.cs
copy to lib/unique-sharp/generator/GenerationInfo.cs
diff --git a/lib/gio-sharp/generator/HandleBase.cs b/lib/unique-sharp/generator/HandleBase.cs
similarity index 100%
copy from lib/gio-sharp/generator/HandleBase.cs
copy to lib/unique-sharp/generator/HandleBase.cs
diff --git a/lib/gio-sharp/generator/IAccessor.cs b/lib/unique-sharp/generator/IAccessor.cs
similarity index 100%
copy from lib/gio-sharp/generator/IAccessor.cs
copy to lib/unique-sharp/generator/IAccessor.cs
diff --git a/lib/gio-sharp/generator/IGeneratable.cs b/lib/unique-sharp/generator/IGeneratable.cs
similarity index 100%
copy from lib/gio-sharp/generator/IGeneratable.cs
copy to lib/unique-sharp/generator/IGeneratable.cs
diff --git a/lib/gio-sharp/generator/IManualMarshaler.cs b/lib/unique-sharp/generator/IManualMarshaler.cs
similarity index 100%
copy from lib/gio-sharp/generator/IManualMarshaler.cs
copy to lib/unique-sharp/generator/IManualMarshaler.cs
diff --git a/lib/gio-sharp/generator/InterfaceGen.cs b/lib/unique-sharp/generator/InterfaceGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/InterfaceGen.cs
copy to lib/unique-sharp/generator/InterfaceGen.cs
diff --git a/lib/gio-sharp/generator/LPGen.cs b/lib/unique-sharp/generator/LPGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/LPGen.cs
copy to lib/unique-sharp/generator/LPGen.cs
diff --git a/lib/gio-sharp/generator/LPUGen.cs b/lib/unique-sharp/generator/LPUGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/LPUGen.cs
copy to lib/unique-sharp/generator/LPUGen.cs
diff --git a/lib/gio-sharp/generator/Makefile.am b/lib/unique-sharp/generator/Makefile.am
similarity index 100%
copy from lib/gio-sharp/generator/Makefile.am
copy to lib/unique-sharp/generator/Makefile.am
diff --git a/lib/unique-sharp/generator/Makefile.in b/lib/unique-sharp/generator/Makefile.in
new file mode 100644
index 0000000..394e2ae
--- /dev/null
+++ b/lib/unique-sharp/generator/Makefile.in
@@ -0,0 +1,539 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.include
+subdir = lib/unique-sharp/generator
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+CLEANFILES = \
+ gapi_codegen.exe \
+ gapi_codegen.exe.mdb
+
+sources = \
+ AliasGen.cs \
+ BoxedGen.cs \
+ ByRefGen.cs \
+ CallbackGen.cs \
+ ChildProperty.cs \
+ ClassBase.cs \
+ ClassGen.cs \
+ CodeGenerator.cs \
+ ConstFilenameGen.cs \
+ ConstStringGen.cs \
+ Ctor.cs \
+ EnumGen.cs \
+ FieldBase.cs \
+ GenBase.cs \
+ GenerationInfo.cs \
+ HandleBase.cs \
+ IAccessor.cs \
+ IGeneratable.cs \
+ IManualMarshaler.cs \
+ InterfaceGen.cs \
+ LPGen.cs \
+ LPUGen.cs \
+ ManagedCallString.cs \
+ ManualGen.cs \
+ MarshalGen.cs \
+ MethodBase.cs \
+ MethodBody.cs \
+ Method.cs \
+ ObjectField.cs \
+ ObjectBase.cs \
+ ObjectGen.cs \
+ OpaqueGen.cs \
+ Parameters.cs \
+ Parser.cs \
+ Property.cs \
+ PropertyBase.cs \
+ ReturnValue.cs \
+ Signal.cs \
+ Signature.cs \
+ SimpleBase.cs \
+ SimpleGen.cs \
+ Statistics.cs \
+ StructBase.cs \
+ StructField.cs \
+ StructGen.cs \
+ SymbolTable.cs \
+ VirtualMethod.cs \
+ VMSignature.cs
+
+build_sources = $(addprefix $(srcdir)/, $(sources))
+dist_sources = $(sources)
+EXTRA_DIST = \
+ $(dist_sources)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/unique-sharp/generator/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign lib/unique-sharp/generator/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+all: gapi_codegen.exe
+
+gapi_codegen.exe: $(build_sources)
+ @echo -e "\n*** Building the generator"
+ $(CSC) /out:gapi_codegen.exe $(build_sources)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/gio-sharp/generator/ManagedCallString.cs b/lib/unique-sharp/generator/ManagedCallString.cs
similarity index 100%
copy from lib/gio-sharp/generator/ManagedCallString.cs
copy to lib/unique-sharp/generator/ManagedCallString.cs
diff --git a/lib/gio-sharp/generator/ManualGen.cs b/lib/unique-sharp/generator/ManualGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/ManualGen.cs
copy to lib/unique-sharp/generator/ManualGen.cs
diff --git a/lib/gio-sharp/generator/MarshalGen.cs b/lib/unique-sharp/generator/MarshalGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/MarshalGen.cs
copy to lib/unique-sharp/generator/MarshalGen.cs
diff --git a/lib/gio-sharp/generator/Method.cs b/lib/unique-sharp/generator/Method.cs
similarity index 100%
copy from lib/gio-sharp/generator/Method.cs
copy to lib/unique-sharp/generator/Method.cs
diff --git a/lib/gio-sharp/generator/MethodBase.cs b/lib/unique-sharp/generator/MethodBase.cs
similarity index 100%
copy from lib/gio-sharp/generator/MethodBase.cs
copy to lib/unique-sharp/generator/MethodBase.cs
diff --git a/lib/gio-sharp/generator/MethodBody.cs b/lib/unique-sharp/generator/MethodBody.cs
similarity index 100%
copy from lib/gio-sharp/generator/MethodBody.cs
copy to lib/unique-sharp/generator/MethodBody.cs
diff --git a/lib/gio-sharp/generator/ObjectBase.cs b/lib/unique-sharp/generator/ObjectBase.cs
similarity index 100%
copy from lib/gio-sharp/generator/ObjectBase.cs
copy to lib/unique-sharp/generator/ObjectBase.cs
diff --git a/lib/gio-sharp/generator/ObjectField.cs b/lib/unique-sharp/generator/ObjectField.cs
similarity index 100%
copy from lib/gio-sharp/generator/ObjectField.cs
copy to lib/unique-sharp/generator/ObjectField.cs
diff --git a/lib/gio-sharp/generator/ObjectGen.cs b/lib/unique-sharp/generator/ObjectGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/ObjectGen.cs
copy to lib/unique-sharp/generator/ObjectGen.cs
diff --git a/lib/unique-sharp/generator/OpaqueGen.cs b/lib/unique-sharp/generator/OpaqueGen.cs
new file mode 100644
index 0000000..2f77e62
--- /dev/null
+++ b/lib/unique-sharp/generator/OpaqueGen.cs
@@ -0,0 +1,237 @@
+// GtkSharp.Generation.OpaqueGen.cs - The Opaque Generatable.
+//
+// Author: Mike Kestner <mkestner at speakeasy.net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class OpaqueGen : HandleBase {
+
+ public OpaqueGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override string FromNative(string var, bool owned)
+ {
+ return var + " == IntPtr.Zero ? null : (" + QualifiedName + ") GLib.Opaque.GetOpaque (" + var + ", typeof (" + QualifiedName + "), " + (owned ? "true" : "false") + ")";
+ }
+
+ private bool DisableRawCtor {
+ get {
+ return Elem.HasAttribute ("disable_raw_ctor");
+ }
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Collections;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ sw.WriteLine ("#region Autogenerated code");
+
+ SymbolTable table = SymbolTable.Table;
+
+ Method ref_, unref, dispose;
+ GetSpecialMethods (out ref_, out unref, out dispose);
+
+ if (IsDeprecated)
+ sw.WriteLine ("\t[Obsolete]");
+ sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
+ string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
+ if (cs_parent != "")
+ sw.Write (" : " + cs_parent);
+ else
+ sw.Write (" : GLib.Opaque");
+
+ foreach (string iface in managed_interfaces) {
+ if (Parent != null && Parent.Implements (iface))
+ continue;
+ sw.Write (", " + iface);
+ }
+
+ sw.WriteLine (" {");
+ sw.WriteLine ();
+
+ GenFields (gen_info);
+ GenMethods (gen_info, null, null);
+ GenCtors (gen_info);
+
+ if (ref_ != null) {
+ ref_.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Ref (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (!Owned) {");
+ sw.WriteLine ("\t\t\t\t" + ref_.CName + " (raw);");
+ sw.WriteLine ("\t\t\t\tOwned = true;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (ref_.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
+ if (ref_.ReturnType == "void")
+ sw.WriteLine ("\t\tpublic void Ref () {}");
+ else
+ sw.WriteLine ("\t\tpublic " + Name + " Ref () { return this; }");
+ sw.WriteLine ();
+ }
+ }
+
+ bool finalizer_needed = false;
+
+ if (unref != null) {
+ unref.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Unref (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (Owned) {");
+ sw.WriteLine ("\t\t\t\t" + unref.CName + " (raw);");
+ sw.WriteLine ("\t\t\t\tOwned = false;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (unref.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
+ sw.WriteLine ("\t\tpublic void Unref () {}");
+ sw.WriteLine ();
+ }
+ finalizer_needed = true;
+ }
+
+ if (dispose != null) {
+ dispose.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Free (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\t" + dispose.CName + " (raw);");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (dispose.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now freed automatically\")]");
+ sw.WriteLine ("\t\tpublic void " + dispose.Name + " () {}");
+ sw.WriteLine ();
+ }
+ finalizer_needed = true;
+ }
+
+ if (finalizer_needed) {
+ sw.WriteLine ("\t\tclass FinalizerInfo {");
+ sw.WriteLine ("\t\t\tIntPtr handle;");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t\tpublic FinalizerInfo (IntPtr handle)");
+ sw.WriteLine ("\t\t\t{");
+ sw.WriteLine ("\t\t\t\tthis.handle = handle;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t\tpublic bool Handler ()");
+ sw.WriteLine ("\t\t\t{");
+ if (dispose != null)
+ sw.WriteLine ("\t\t\t\t{0} (handle);", dispose.CName);
+ else if (unref != null)
+ sw.WriteLine ("\t\t\t\t{0} (handle);", unref.CName);
+ sw.WriteLine ("\t\t\t\treturn false;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t~{0} ()", Name);
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (!Owned)");
+ sw.WriteLine ("\t\t\t\treturn;");
+ sw.WriteLine ("\t\t\tFinalizerInfo info = new FinalizerInfo (Handle);");
+ sw.WriteLine ("\t\t\tGLib.Timeout.Add (50, new GLib.TimeoutHandler (info.Handler));");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+#if false
+ Method copy = Methods ["Copy"] as Method;
+ if (copy != null && copy.Parameters.Count == 0) {
+ sw.WriteLine ("\t\tprotected override GLib.Opaque Copy (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGLib.Opaque result = new " + QualifiedName + " (" + copy.CName + " (raw));");
+ sw.WriteLine ("\t\t\tresult.Owned = true;");
+ sw.WriteLine ("\t\t\treturn result;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+#endif
+ sw.WriteLine ("#endregion");
+
+ AppendCustom(sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.OpaqueCount++;
+ }
+
+ void GetSpecialMethods (out Method ref_, out Method unref, out Method dispose)
+ {
+ ref_ = CheckSpecialMethod (GetMethod ("Ref"));
+ unref = CheckSpecialMethod (GetMethod ("Unref"));
+
+ dispose = GetMethod ("Free");
+ if (dispose == null) {
+ dispose = GetMethod ("Destroy");
+ if (dispose == null)
+ dispose = GetMethod ("Dispose");
+ }
+ dispose = CheckSpecialMethod (dispose);
+ }
+
+ Method CheckSpecialMethod (Method method)
+ {
+ if (method == null)
+ return null;
+ if (method.ReturnType != "void" &&
+ method.ReturnType != QualifiedName)
+ return null;
+ if (method.Signature.ToString () != "")
+ return null;
+
+ methods.Remove (method.Name);
+ return method;
+ }
+
+ protected override void GenCtors (GenerationInfo gen_info)
+ {
+ if (!DisableRawCtor) {
+ gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
+ gen_info.Writer.WriteLine();
+ }
+
+ base.GenCtors (gen_info);
+ }
+
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Parameters.cs b/lib/unique-sharp/generator/Parameters.cs
similarity index 100%
copy from lib/gio-sharp/generator/Parameters.cs
copy to lib/unique-sharp/generator/Parameters.cs
diff --git a/lib/gio-sharp/generator/Parser.cs b/lib/unique-sharp/generator/Parser.cs
similarity index 100%
copy from lib/gio-sharp/generator/Parser.cs
copy to lib/unique-sharp/generator/Parser.cs
diff --git a/lib/gio-sharp/generator/Property.cs b/lib/unique-sharp/generator/Property.cs
similarity index 100%
copy from lib/gio-sharp/generator/Property.cs
copy to lib/unique-sharp/generator/Property.cs
diff --git a/lib/gio-sharp/generator/PropertyBase.cs b/lib/unique-sharp/generator/PropertyBase.cs
similarity index 100%
copy from lib/gio-sharp/generator/PropertyBase.cs
copy to lib/unique-sharp/generator/PropertyBase.cs
diff --git a/lib/gio-sharp/generator/ReturnValue.cs b/lib/unique-sharp/generator/ReturnValue.cs
similarity index 100%
copy from lib/gio-sharp/generator/ReturnValue.cs
copy to lib/unique-sharp/generator/ReturnValue.cs
diff --git a/lib/unique-sharp/generator/Signal.cs b/lib/unique-sharp/generator/Signal.cs
new file mode 100644
index 0000000..32901c0
--- /dev/null
+++ b/lib/unique-sharp/generator/Signal.cs
@@ -0,0 +1,587 @@
+// GtkSharp.Generation.Signal.cs - The Signal Generatable.
+//
+// Author: Mike Kestner <mkestner at speakeasy.net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2005 Novell, Inc.
+// Copyright (c) 2007 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Signal {
+
+ bool marshaled;
+ string name;
+ XmlElement elem;
+ ReturnValue retval;
+ Parameters parms;
+ ClassBase container_type;
+
+ public Signal (XmlElement elem, ClassBase container_type)
+ {
+ this.elem = elem;
+ name = elem.GetAttribute ("name");
+ marshaled = elem.GetAttribute ("manual") == "true";
+ retval = new ReturnValue (elem ["return-type"]);
+ parms = new Parameters (elem["parameters"]);
+ this.container_type = container_type;
+ }
+
+ bool Marshaled {
+ get { return marshaled; }
+ }
+
+ public string Name {
+ get {
+ return name;
+ }
+ set {
+ name = value;
+ }
+ }
+
+ public bool Validate ()
+ {
+ if (Name == "") {
+ Console.Write ("Nameless signal ");
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ if (!parms.Validate () || !retval.Validate ()) {
+ Console.Write (" in signal " + Name + " ");
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ return true;
+ }
+
+ public void GenerateDecl (StreamWriter sw)
+ {
+ if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null))
+ sw.Write("new ");
+
+ sw.WriteLine ("\t\tevent " + EventHandlerQualifiedName + " " + Name + ";");
+ }
+
+ public string CName {
+ get {
+ return "\"" + elem.GetAttribute("cname") + "\"";
+ }
+ }
+
+ string CallbackSig {
+ get {
+ string result = "";
+ for (int i = 0; i < parms.Count; i++) {
+ if (i > 0)
+ result += ", ";
+
+ Parameter p = parms [i];
+ if (p.PassAs != "" && !(p.Generatable is StructBase))
+ result += p.PassAs + " ";
+ result += (p.MarshalType + " arg" + i);
+ }
+
+ return result;
+ }
+ }
+
+ string CallbackName {
+ get { return Name + "SignalCallback"; }
+ }
+
+ string DelegateName {
+ get { return Name + "SignalDelegate"; }
+ }
+
+ private string EventArgsName {
+ get {
+ if (IsEventHandler)
+ return "EventArgs";
+ else
+ return Name + "Args";
+ }
+ }
+
+ private string EventArgsQualifiedName {
+ get {
+ if (IsEventHandler)
+ return "System.EventArgs";
+ else
+ return container_type.NS + "." + Name + "Args";
+ }
+ }
+
+ private string EventHandlerName {
+ get {
+ if (IsEventHandler)
+ return "EventHandler";
+ else if (SymbolTable.Table [container_type.NS + Name + "Handler"] != null)
+ return Name + "EventHandler";
+ else
+ return Name + "Handler";
+ }
+ }
+
+ private string EventHandlerQualifiedName {
+ get {
+ if (IsEventHandler)
+ return "System.EventHandler";
+ else
+ return container_type.NS + "." + EventHandlerName;
+ }
+ }
+
+ string ClassFieldName {
+ get {
+ return elem.HasAttribute ("field_name") ? elem.GetAttribute("field_name") : String.Empty;
+ }
+ }
+
+ private bool HasOutParams {
+ get {
+ foreach (Parameter p in parms) {
+ if (p.PassAs == "out")
+ return true;
+ }
+ return false;
+ }
+ }
+
+ private bool IsEventHandler {
+ get {
+ return retval.CSType == "void" && parms.Count == 1 && (parms [0].Generatable is ObjectGen || parms [0].Generatable is InterfaceGen);
+ }
+ }
+
+ private bool IsVoid {
+ get {
+ return retval.CSType == "void";
+ }
+ }
+
+ private string ReturnGType {
+ get {
+ IGeneratable igen = SymbolTable.Table [retval.CType];
+
+ if (igen is ObjectGen)
+ return "GLib.GType.Object";
+ if (igen is BoxedGen)
+ return retval.CSType + ".GType";
+ if (igen is EnumGen)
+ return retval.CSType + "GType.GType";
+
+ switch (retval.CSType) {
+ case "bool":
+ return "GLib.GType.Boolean";
+ case "string":
+ return "GLib.GType.String";
+ case "int":
+ return "GLib.GType.Int";
+ default:
+ throw new Exception (retval.CSType);
+ }
+ }
+ }
+
+ public string GenArgsInitialization (StreamWriter sw)
+ {
+ if (parms.Count > 1)
+ sw.WriteLine("\t\t\t\targs.Args = new object[" + (parms.Count - 1) + "];");
+ string finish = "";
+ for (int idx = 1; idx < parms.Count; idx++) {
+ Parameter p = parms [idx];
+ IGeneratable igen = p.Generatable;
+ if (p.PassAs != "out") {
+ if (igen is ManualGen) {
+ sw.WriteLine("\t\t\t\tif (arg{0} == IntPtr.Zero)", idx);
+ sw.WriteLine("\t\t\t\t\targs.Args[{0}] = null;", idx - 1);
+ sw.WriteLine("\t\t\t\telse {");
+ sw.WriteLine("\t\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
+ sw.WriteLine("\t\t\t\t}");
+ } else
+ sw.WriteLine("\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
+ }
+ if (igen is StructBase && p.PassAs == "ref")
+ finish += "\t\t\t\tif (arg" + idx + " != IntPtr.Zero) System.Runtime.InteropServices.Marshal.StructureToPtr (args.Args[" + (idx-1) + "], arg" + idx + ", false);\n";
+ else if (p.PassAs != "")
+ finish += "\t\t\t\targ" + idx + " = " + igen.ToNativeReturn ("((" + p.CSType + ")args.Args[" + (idx - 1) + "])") + ";\n";
+ }
+ return finish;
+ }
+
+ public void GenArgsCleanup (StreamWriter sw, string finish)
+ {
+ if (IsVoid && finish.Length == 0)
+ return;
+
+ sw.WriteLine("\n\t\t\ttry {");
+ sw.Write (finish);
+ if (!IsVoid) {
+ if (retval.CSType == "bool") {
+ sw.WriteLine ("\t\t\t\tif (args.RetVal == null)");
+ sw.WriteLine ("\t\t\t\t\treturn false;");
+ }
+ sw.WriteLine("\t\t\t\treturn " + SymbolTable.Table.ToNativeReturn (retval.CType, "((" + retval.CSType + ")args.RetVal)") + ";");
+ }
+ sw.WriteLine("\t\t\t} catch (Exception) {");
+ sw.WriteLine ("\t\t\t\tException ex = new Exception (\"args.RetVal or 'out' property unset or set to incorrect type in " + EventHandlerQualifiedName + " callback\");");
+ sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (ex, true);");
+
+ sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return.");
+ sw.WriteLine ("\t\t\t\tthrow ex;");
+ sw.WriteLine("\t\t\t}");
+ }
+
+ public void GenCallback (StreamWriter sw)
+ {
+ if (IsEventHandler)
+ return;
+
+ sw.WriteLine ("\t\t[GLib.CDeclCallback]");
+ sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + DelegateName + " (" + CallbackSig + ", IntPtr gch);");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + CallbackName + " (" + CallbackSig + ", IntPtr gch)");
+ sw.WriteLine("\t\t{");
+ sw.WriteLine("\t\t\t{0} args = new {0} ();", EventArgsQualifiedName);
+ sw.WriteLine("\t\t\ttry {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;");
+ sw.WriteLine("\t\t\t\tif (sig == null)");
+ sw.WriteLine("\t\t\t\t\tthrow new Exception(\"Unknown signal GC handle received \" + gch);");
+ sw.WriteLine();
+ string finish = GenArgsInitialization (sw);
+ sw.WriteLine("\t\t\t\t{0} handler = ({0}) sig.Handler;", EventHandlerQualifiedName);
+ sw.WriteLine("\t\t\t\thandler (GLib.Object.GetObject (arg0), args);");
+ sw.WriteLine("\t\t\t} catch (Exception e) {");
+ sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, false);");
+ sw.WriteLine("\t\t\t}");
+ GenArgsCleanup (sw, finish);
+ sw.WriteLine("\t\t}");
+ sw.WriteLine();
+ }
+
+ private bool NeedNew (ClassBase implementor)
+ {
+ return elem.HasAttribute ("new_flag") ||
+ (container_type != null && container_type.GetSignalRecursively (Name) != null) ||
+ (implementor != null && implementor.GetSignalRecursively (Name) != null);
+ }
+
+ public void GenEventHandler (GenerationInfo gen_info)
+ {
+ if (IsEventHandler)
+ return;
+
+ string ns = container_type.NS;
+
+ StreamWriter sw = gen_info.OpenStream (EventHandlerName);
+
+ sw.WriteLine ("namespace " + ns + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+
+ sw.WriteLine ();
+ sw.WriteLine ("\tpublic delegate void " + EventHandlerName + "(object o, " + EventArgsName + " args);");
+ sw.WriteLine ();
+ sw.WriteLine ("\tpublic class " + EventArgsName + " : GLib.SignalArgs {");
+ for (int i = 1; i < parms.Count; i++) {
+ sw.WriteLine ("\t\tpublic " + parms[i].CSType + " " + parms[i].StudlyName + "{");
+ if (parms[i].PassAs != "out") {
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn (" + parms[i].CSType + ") Args[" + (i - 1) + "];");
+ sw.WriteLine ("\t\t\t}");
+ }
+ if (parms[i].PassAs != "") {
+ sw.WriteLine ("\t\t\tset {");
+ sw.WriteLine ("\t\t\t\tArgs[" + (i - 1) + "] = (" + parms[i].CSType + ")value;");
+ sw.WriteLine ("\t\t\t}");
+ }
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ }
+
+ private void GenVMDeclaration (StreamWriter sw, ClassBase implementor)
+ {
+ VMSignature vmsig = new VMSignature (parms);
+ sw.WriteLine ("\t\t[GLib.DefaultSignalHandler(Type=typeof(" + (implementor != null ? implementor.QualifiedName : container_type.QualifiedName) + "), ConnectionMethod=\"Override" + Name +"\")]");
+ sw.Write ("\t\tprotected ");
+ if (NeedNew (implementor))
+ sw.Write ("new ");
+ sw.WriteLine ("virtual {0} {1} ({2})", retval.CSType, "On" + Name, vmsig.ToString ());
+ }
+
+ private string CastFromInt (string type)
+ {
+ return type != "int" ? "(" + type + ") " : "";
+ }
+
+ private string GlueCallString {
+ get {
+ string result = "Handle";
+
+ for (int i = 1; i < parms.Count; i++) {
+ Parameter p = parms [i];
+ IGeneratable igen = p.Generatable;
+
+ if (i > 1 && parms [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
+ string string_name = parms [i - 1].Name;
+ result += ", " + igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
+ continue;
+ }
+
+ p.CallName = p.Name;
+ string call_parm = p.CallString;
+
+ if (p.IsUserData && parms.IsHidden (p) && !parms.HideData && (i == 1 || parms [i - 1].Scope != "notified")) {
+ call_parm = "IntPtr.Zero";
+ }
+
+ result += ", " + call_parm;
+ }
+ return result;
+ }
+ }
+
+ private string GlueSignature {
+ get {
+ string result = String.Empty;
+ for (int i = 0; i < parms.Count; i++)
+ result += parms[i].CType.Replace ("const-", "const ") + " " + parms[i].Name + (i == parms.Count-1 ? "" : ", ");
+ return result;
+ }
+ }
+
+ private string DefaultGlueValue {
+ get {
+ string val = retval.DefaultValue;
+ switch (val) {
+ case "null":
+ return "NULL";
+ case "false":
+ return "FALSE";
+ case "true":
+ return "TRUE";
+ default:
+ return val;
+ }
+ }
+ }
+
+ private void GenGlueVirtualMethod (GenerationInfo gen_info)
+ {
+ StreamWriter glue = gen_info.GlueWriter;
+ string glue_name = String.Format ("{0}sharp_{1}_base_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
+ glue.WriteLine ("{0} {1} ({2});\n", retval.CType, glue_name, GlueSignature);
+ glue.WriteLine ("{0}\n{1} ({2})", retval.CType, glue_name, GlueSignature);
+ glue.WriteLine ("{");
+ glue.WriteLine ("\t{0}Class *klass = ({0}Class *) get_threshold_class (G_OBJECT ({1}));", container_type.CName, parms[0].Name);
+ glue.Write ("\tif (klass->{0})\n\t\t", ClassFieldName);
+ if (!IsVoid)
+ glue.Write ("return ");
+ glue.Write ("(* klass->{0}) (", ClassFieldName);
+ for (int i = 0; i < parms.Count; i++)
+ glue.Write (parms[i].Name + (i == parms.Count - 1 ? "" : ", "));
+ glue.WriteLine (");");
+ if (!IsVoid)
+ glue.WriteLine ("\treturn " + DefaultGlueValue + ";");
+ glue.WriteLine ("}");
+
+ StreamWriter sw = gen_info.Writer;
+ sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
+ sw.WriteLine ("\t\tstatic extern {0} {1} ({2});\n", retval.MarshalType, glue_name, parms.ImportSignature);
+ GenVMDeclaration (sw, null);
+ sw.WriteLine ("\t\t{");
+ MethodBody body = new MethodBody (parms);
+ body.Initialize (gen_info, false, false, String.Empty);
+ sw.WriteLine ("\t\t\t{0}{1} ({2});", IsVoid ? "" : retval.MarshalType + " __ret = ", glue_name, GlueCallString);
+ body.Finish (sw, "");
+ if (!IsVoid)
+ sw.WriteLine ("\t\t\treturn {0};", retval.FromNative ("__ret"));
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ private void GenChainVirtualMethod (StreamWriter sw, ClassBase implementor)
+ {
+ GenVMDeclaration (sw, implementor);
+ sw.WriteLine ("\t\t{");
+ if (IsVoid)
+ sw.WriteLine ("\t\t\tGLib.Value ret = GLib.Value.Empty;");
+ else
+ sw.WriteLine ("\t\t\tGLib.Value ret = new GLib.Value (" + ReturnGType + ");");
+
+ sw.WriteLine ("\t\t\tGLib.ValueArray inst_and_params = new GLib.ValueArray (" + parms.Count + ");");
+ sw.WriteLine ("\t\t\tGLib.Value[] vals = new GLib.Value [" + parms.Count + "];");
+ sw.WriteLine ("\t\t\tvals [0] = new GLib.Value (this);");
+ sw.WriteLine ("\t\t\tinst_and_params.Append (vals [0]);");
+ string cleanup = "";
+ for (int i = 1; i < parms.Count; i++) {
+ Parameter p = parms [i];
+ if (p.PassAs != "") {
+ if (SymbolTable.Table.IsBoxed (p.CType)) {
+ if (p.PassAs == "ref")
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
+ else
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value ((GLib.GType)typeof (" + p.CSType + "));");
+ cleanup += "\t\t\t" + p.Name + " = (" + p.CSType + ") vals [" + i + "];\n";
+ } else {
+ if (p.PassAs == "ref")
+ sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = GLib.Marshaller.StructureToPtrAlloc (" + p.Generatable.CallByName (p.Name) + ");");
+ else
+ sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + p.MarshalType + ")));");
+
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + "_ptr);");
+ cleanup += "\t\t\t" + p.Name + " = " + p.FromNative ("(" + p.MarshalType + ") Marshal.PtrToStructure (" + p.Name + "_ptr, typeof (" + p.MarshalType + "))") + ";\n";
+ cleanup += "\t\t\tMarshal.FreeHGlobal (" + p.Name + "_ptr);\n";
+ }
+ } else if (p.IsLength && parms [i - 1].IsString)
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (System.Text.Encoding.UTF8.GetByteCount (" + parms [i-1].Name + "));");
+ else
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
+
+ sw.WriteLine ("\t\t\tinst_and_params.Append (vals [" + i + "]);");
+ }
+
+ sw.WriteLine ("\t\t\tg_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);");
+ if (cleanup != "")
+ sw.WriteLine (cleanup);
+ sw.WriteLine ("\t\t\tforeach (GLib.Value v in vals)");
+ sw.WriteLine ("\t\t\t\tv.Dispose ();");
+ if (!IsVoid) {
+ IGeneratable igen = SymbolTable.Table [retval.CType];
+ sw.WriteLine ("\t\t\t" + retval.CSType + " result = (" + (igen is EnumGen ? retval.CSType + ") (Enum" : retval.CSType) + ") ret;");
+ sw.WriteLine ("\t\t\tret.Dispose ();");
+ sw.WriteLine ("\t\t\treturn result;");
+ }
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ private void GenDefaultHandlerDelegate (GenerationInfo gen_info, ClassBase implementor)
+ {
+ StreamWriter sw = gen_info.Writer;
+ StreamWriter glue;
+ bool use_glue = gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0;
+ string glue_name = String.Empty;
+ ManagedCallString call = new ManagedCallString (parms, true);
+ sw.WriteLine ("\t\t[GLib.CDeclCallback]");
+ sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + Name + "VMDelegate (" + parms.ImportSignature + ");\n");
+
+ if (use_glue) {
+ glue = gen_info.GlueWriter;
+ glue_name = String.Format ("{0}sharp_{1}_override_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
+ sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
+ sw.WriteLine ("\t\tstatic extern void {0} (IntPtr gtype, {1}VMDelegate cb);\n", glue_name, Name);
+ glue.WriteLine ("void {0} (GType gtype, gpointer cb);\n", glue_name);
+ glue.WriteLine ("void\n{0} (GType gtype, gpointer cb)", glue_name);
+ glue.WriteLine ("{");
+ glue.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
+ glue.WriteLine ("\tif (klass == NULL)");
+ glue.WriteLine ("\t\tklass = g_type_class_ref (gtype);");
+ glue.WriteLine ("\t(({0} *)klass)->{1} = cb;", container_type.CName + "Class", ClassFieldName);
+ glue.WriteLine ("}\n");
+ }
+
+ sw.WriteLine ("\t\tstatic {0} {1};\n", Name + "VMDelegate", Name + "VMCallback");
+ sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + Name.ToLower() + "_cb (" + parms.ImportSignature + ")");
+ sw.WriteLine ("\t\t{");
+ string unconditional = call.Unconditional ("\t\t\t");
+ if (unconditional.Length > 0)
+ sw.WriteLine (unconditional);
+ sw.WriteLine ("\t\t\ttry {");
+ sw.WriteLine ("\t\t\t\t{0} {1}_managed = GLib.Object.GetObject ({1}, false) as {0};", implementor != null ? implementor.Name : container_type.Name, parms[0].Name);
+ sw.Write (call.Setup ("\t\t\t\t"));
+ sw.Write ("\t\t\t\t{0}", IsVoid ? "" : retval.CSType == retval.ToNativeType ? "return " : retval.CSType + " raw_ret = ");
+ sw.WriteLine ("{2}_managed.{0} ({1});", "On" + Name, call.ToString (), parms[0].Name);
+ sw.Write (call.Finish ("\t\t\t\t"));
+ if (!IsVoid && retval.CSType != retval.ToNativeType)
+ sw.WriteLine ("\t\t\t\treturn {0};", SymbolTable.Table.ToNativeReturn (retval.CType, "raw_ret"));
+ sw.WriteLine ("\t\t\t} catch (Exception e) {");
+ bool fatal = HasOutParams || !IsVoid;
+ sw.WriteLine ("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, " + (fatal ? "true" : "false") + ");");
+ if (fatal) {
+ sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return");
+ sw.WriteLine ("\t\t\t\tthrow e;");
+ }
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}\n");
+ sw.WriteLine ("\t\tprivate static void Override" + Name + " (GLib.GType gtype)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (" + Name + "VMCallback == null)");
+ sw.WriteLine ("\t\t\t\t" + Name + "VMCallback = new " + Name + "VMDelegate (" + Name.ToLower() + "_cb);");
+ if (use_glue)
+ sw.WriteLine ("\t\t\t{0} (gtype.Val, {1}VMCallback);", glue_name, Name);
+ else
+ sw.WriteLine ("\t\t\tOverrideVirtualMethod (gtype, " + CName + ", " + Name + "VMCallback);");
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ public void GenEvent (StreamWriter sw, ClassBase implementor, string target)
+ {
+ string args_type = IsEventHandler ? "" : ", typeof (" + EventArgsQualifiedName + ")";
+
+ if (Marshaled) {
+ GenCallback (sw);
+ args_type = ", new " + DelegateName + "(" + CallbackName + ")";
+ }
+
+ sw.WriteLine("\t\t[GLib.Signal("+ CName + ")]");
+ sw.Write("\t\tpublic ");
+ if (NeedNew (implementor))
+ sw.Write("new ");
+ sw.WriteLine("event " + EventHandlerQualifiedName + " " + Name + " {");
+ sw.WriteLine("\t\t\tadd {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
+ sw.WriteLine("\t\t\t\tsig.AddDelegate (value);");
+ sw.WriteLine("\t\t\t}");
+ sw.WriteLine("\t\t\tremove {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
+ sw.WriteLine("\t\t\t\tsig.RemoveDelegate (value);");
+ sw.WriteLine("\t\t\t}");
+ sw.WriteLine("\t\t}");
+ sw.WriteLine();
+ }
+
+ public void Generate (GenerationInfo gen_info, ClassBase implementor)
+ {
+ StreamWriter sw = gen_info.Writer;
+
+ if (implementor == null)
+ GenEventHandler (gen_info);
+
+ GenDefaultHandlerDelegate (gen_info, implementor);
+ if (gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0)
+ GenGlueVirtualMethod (gen_info);
+ else
+ GenChainVirtualMethod (sw, implementor);
+ GenEvent (sw, implementor, "this");
+
+ Statistics.SignalCount++;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Signature.cs b/lib/unique-sharp/generator/Signature.cs
similarity index 100%
copy from lib/gio-sharp/generator/Signature.cs
copy to lib/unique-sharp/generator/Signature.cs
diff --git a/lib/gio-sharp/generator/SimpleBase.cs b/lib/unique-sharp/generator/SimpleBase.cs
similarity index 100%
copy from lib/gio-sharp/generator/SimpleBase.cs
copy to lib/unique-sharp/generator/SimpleBase.cs
diff --git a/lib/gio-sharp/generator/SimpleGen.cs b/lib/unique-sharp/generator/SimpleGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/SimpleGen.cs
copy to lib/unique-sharp/generator/SimpleGen.cs
diff --git a/lib/gio-sharp/generator/Statistics.cs b/lib/unique-sharp/generator/Statistics.cs
similarity index 100%
copy from lib/gio-sharp/generator/Statistics.cs
copy to lib/unique-sharp/generator/Statistics.cs
diff --git a/lib/gio-sharp/generator/StructBase.cs b/lib/unique-sharp/generator/StructBase.cs
similarity index 100%
copy from lib/gio-sharp/generator/StructBase.cs
copy to lib/unique-sharp/generator/StructBase.cs
diff --git a/lib/gio-sharp/generator/StructField.cs b/lib/unique-sharp/generator/StructField.cs
similarity index 100%
copy from lib/gio-sharp/generator/StructField.cs
copy to lib/unique-sharp/generator/StructField.cs
diff --git a/lib/gio-sharp/generator/StructGen.cs b/lib/unique-sharp/generator/StructGen.cs
similarity index 100%
copy from lib/gio-sharp/generator/StructGen.cs
copy to lib/unique-sharp/generator/StructGen.cs
diff --git a/lib/gio-sharp/generator/SymbolTable.cs b/lib/unique-sharp/generator/SymbolTable.cs
similarity index 100%
copy from lib/gio-sharp/generator/SymbolTable.cs
copy to lib/unique-sharp/generator/SymbolTable.cs
diff --git a/lib/gio-sharp/generator/VMSignature.cs b/lib/unique-sharp/generator/VMSignature.cs
similarity index 100%
copy from lib/gio-sharp/generator/VMSignature.cs
copy to lib/unique-sharp/generator/VMSignature.cs
diff --git a/lib/gio-sharp/generator/VirtualMethod.cs b/lib/unique-sharp/generator/VirtualMethod.cs
similarity index 100%
copy from lib/gio-sharp/generator/VirtualMethod.cs
copy to lib/unique-sharp/generator/VirtualMethod.cs
diff --git a/lib/unique-sharp/unique/App.custom b/lib/unique-sharp/unique/App.custom
new file mode 100644
index 0000000..1a17457
--- /dev/null
+++ b/lib/unique-sharp/unique/App.custom
@@ -0,0 +1,104 @@
+// App.custom - customization for App.cs
+//
+// Author(s):
+// Stephane Delcroix <stephane at delcroix.org>
+//
+// Copyright (c) 2009 Stephane Delcroix
+//
+// This is open source software. See COPYING for details.
+//
+
+ public App (string name, string startup_id, params object [] commands) : this (name, startup_id)
+ {
+ for (int i = 0; i < commands.Length; i+=2)
+ AddCommand (commands[i] as string, (int)commands[i+1]);
+ }
+
+ [GLib.CDeclCallback]
+ delegate int MessageReceivedVMDelegate (IntPtr app, int command, IntPtr message_data, uint time_);
+
+ static MessageReceivedVMDelegate MessageReceivedVMCallback;
+
+ static int messagereceived_cb (IntPtr app, int command, IntPtr message_data, uint time_)
+ {
+ try {
+ App app_managed = GLib.Object.GetObject (app, false) as App;
+ Unique.Response raw_ret = app_managed.OnMessageReceived (command, message_data == IntPtr.Zero ? null : (Unique.MessageData) GLib.Opaque.GetOpaque (message_data, typeof (Unique.MessageData), false), time_);
+ return (int) raw_ret;
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, true);
+ // NOTREACHED: above call doesn't return
+ throw e;
+ }
+ }
+
+ static void OverrideMessageReceived (GLib.GType gtype)
+ {
+ if (MessageReceivedVMCallback == null)
+ MessageReceivedVMCallback = new MessageReceivedVMDelegate (messagereceived_cb);
+ OverrideVirtualMethod (gtype, "message-received", MessageReceivedVMCallback);
+ }
+
+ [GLib.DefaultSignalHandler(Type=typeof(Unique.App), ConnectionMethod="OverrideMessageReceived")]
+ protected virtual Unique.Response OnMessageReceived (int command, Unique.MessageData message_data, uint time_)
+ {
+ GLib.Value ret = new GLib.Value (Unique.ResponseGType.GType);
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (4);
+ GLib.Value[] vals = new GLib.Value [4];
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ vals [1] = new GLib.Value (command);
+ inst_and_params.Append (vals [1]);
+ vals [2] = new GLib.Value (message_data);
+ inst_and_params.Append (vals [2]);
+ vals [3] = new GLib.Value (time_);
+ inst_and_params.Append (vals [3]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
+ Unique.Response result = (Unique.Response) (Enum) ret;
+ ret.Dispose ();
+ return result;
+ }
+
+ [GLib.Signal("message-received")]
+ event Unique.MessageReceivedHandler InternalMessageReceived {
+ add {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "message-received", typeof (Unique.MessageReceivedArgs));
+ sig.AddDelegate (value);
+ }
+ remove {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "message-received", typeof (Unique.MessageReceivedArgs));
+ sig.RemoveDelegate (value);
+ }
+ }
+
+ MessageReceivedHandler received_handler;
+
+ public event MessageReceivedHandler MessageReceived {
+ add {
+ if (received_handler == null)
+ InternalMessageReceived += MessageReceivedWrapper;
+ received_handler = (MessageReceivedHandler)Delegate.Combine (received_handler, value);
+ }
+ remove {
+ received_handler = (MessageReceivedHandler)Delegate.Remove (received_handler, value);
+ if (received_handler == null)
+ InternalMessageReceived -= MessageReceivedWrapper;
+ }
+ }
+
+ [GLib.ConnectBefore]
+ void MessageReceivedWrapper (object sender, MessageReceivedArgs e)
+ {
+ MessageReceivedHandler eh = received_handler;
+ if (eh == null)
+ return;
+ foreach (MessageReceivedHandler d in eh.GetInvocationList ()) {
+ if (e.RetVal != null && (Response)e.RetVal != Response.Passthrough)
+ break;
+ d (sender, e);
+ }
+ }
+
+
diff --git a/lib/unique-sharp/unique/AssemblyInfo.cs b/lib/unique-sharp/unique/AssemblyInfo.cs
new file mode 100644
index 0000000..68bf32a
--- /dev/null
+++ b/lib/unique-sharp/unique/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly:AssemblyVersion("1.0.0.0")]
+[assembly:AssemblyDelaySign(false)]
+[assembly:AssemblyKeyFile("unique-sharp.snk")]
+[assembly:GLib.IgnoreClassInitializers]
diff --git a/lib/unique-sharp/unique/Makefile.am b/lib/unique-sharp/unique/Makefile.am
new file mode 100644
index 0000000..3114d53
--- /dev/null
+++ b/lib/unique-sharp/unique/Makefile.am
@@ -0,0 +1,62 @@
+include $(top_srcdir)/Makefile.include
+
+UNSAFE = -unsafe
+DEBUG = -debug
+
+SRCS = \
+ $(srcdir)/AssemblyInfo.cs \
+ $(srcdir)/MessageReceivedHandler.cs
+
+CUSTOMS = \
+ $(srcdir)/App.custom \
+ $(srcdir)/MessageData.custom
+
+SNK = $(srcdir)/snk
+
+ASSEMBLIES = \
+ -pkg:glib-sharp-2.0
+
+all: unique-sharp.dll
+
+unique-api.xml: $(srcdir)/unique-api.raw $(srcdir)/Unique.metadata
+ @echo -e "\n*** Massaging the raw api into $@"
+ cp $(srcdir)/unique-api.raw unique-api.xml
+ chmod +w unique-api.xml
+ $(GAPI2FIXUP) --api=unique-api.xml --metadata=$(srcdir)/Unique.metadata
+
+$(top_builddir)/unique-sharp/generator/gapi_codegen.exe:
+ $(MAKE) -C $(top_builddir)/lib/unique-sharp/generator
+
+generated/App.cs: unique-api.xml $(CUSTOMS) $(builddir)/../generator/gapi_codegen.exe
+ @echo -e "\n*** Generating C# code"
+ $(MONO) $(top_builddir)/lib/unique-sharp/generator/gapi_codegen.exe $(GLIBSHARP_CFLAGS) --outdir=generated --customdir=$(srcdir) --generate unique-api.xml
+
+unique-sharp.snk: $(SNK)
+ cp $< $@
+
+unique-sharp.dll: generated/App.cs $(SRCS) unique-sharp.snk
+ @echo -e "\n*** Building $@"
+ $(CSC) -target:library -out:$@ $(UNSAFE) $(DEBUG) $(ASSEMBLIES) $(SRCS) generated/*.cs
+
+assemblydir = $(pkglibdir)
+assembly_DATA = \
+ unique-sharp.dll \
+ unique-sharp.dll.config
+
+
+CLEANFILES = \
+ unique-sharp.dll \
+ unique-sharp.dll.mdb \
+ unique-api.xml
+
+DISTCLEANFILES = \
+ generated/*.cs \
+ unique-sharp.snk
+
+EXTRA_DIST = \
+ $(SRCS) \
+ $(CUSTOMS) \
+ Unique.metadata \
+ $(SNK) \
+ unique-sharp.dll.config \
+ unique-api.raw
diff --git a/lib/unique-sharp/unique/Makefile.in b/lib/unique-sharp/unique/Makefile.in
new file mode 100644
index 0000000..e9781aa
--- /dev/null
+++ b/lib/unique-sharp/unique/Makefile.in
@@ -0,0 +1,581 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.include
+subdir = lib/unique-sharp/unique
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(assemblydir)"
+DATA = $(assembly_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSC_DEFINES = @CSC_DEFINES@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXIF_CFLAGS = @EXIF_CFLAGS@
+EXIF_LIBS = @EXIF_LIBS@
+EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+F_CFLAGS = @F_CFLAGS@
+F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCONF_SHARP_CFLAGS = @GCONF_SHARP_CFLAGS@
+GCONF_SHARP_LIBS = @GCONF_SHARP_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_ICON_THEME_PREFIX = @GNOME_ICON_THEME_PREFIX@
+GNOME_SCREENSAVER_SAVERDIR = @GNOME_SCREENSAVER_SAVERDIR@
+GNOME_SCREENSAVER_THEMESDIR = @GNOME_SCREENSAVER_THEMESDIR@
+GNOME_SHARP_CFLAGS = @GNOME_SHARP_CFLAGS@
+GNOME_SHARP_LIBS = @GNOME_SHARP_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+HELP_DIR = @HELP_DIR@
+ICONS_DIRECTORY = @ICONS_DIRECTORY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_VERSION_CHECK_CFLAGS = @LIBEXIF_VERSION_CHECK_CFLAGS@
+LIBEXIF_VERSION_CHECK_LIBS = @LIBEXIF_VERSION_CHECK_LIBS@
+LIBGPHOTO2_CFLAGS = @LIBGPHOTO2_CFLAGS@
+LIBGPHOTO2_LIBS = @LIBGPHOTO2_LIBS@
+LIBJPEG = @LIBJPEG@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_DEFINES = @NUNIT_DEFINES@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+DIR_DOCS = $(top_builddir)/docs
+DIR_EXTENSIONS = $(top_builddir)/extensions
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+DIR_ICONS = $(top_builddir)/icons
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+DIR_SEMWEB = $(top_builddir)/lib/semweb
+DIR_SRC = $(top_builddir)/src
+DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
+LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
+CSC_FLAGS = -debug
+CSC = $(MCS) $(CSC_FLAGS) -target:exe
+CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
+MONO_DEBUGFLAGS = --debug
+RUNTIME = mono $(MONO_DEBUGFLAGS)
+UNSAFE = -unsafe
+DEBUG = -debug
+SRCS = \
+ $(srcdir)/AssemblyInfo.cs \
+ $(srcdir)/MessageReceivedHandler.cs
+
+CUSTOMS = \
+ $(srcdir)/App.custom \
+ $(srcdir)/MessageData.custom
+
+SNK = $(srcdir)/snk
+ASSEMBLIES = \
+ -pkg:glib-sharp-2.0
+
+assemblydir = $(pkglibdir)
+assembly_DATA = \
+ unique-sharp.dll \
+ unique-sharp.dll.config
+
+CLEANFILES = \
+ unique-sharp.dll \
+ unique-sharp.dll.mdb \
+ unique-api.xml
+
+DISTCLEANFILES = \
+ generated/*.cs \
+ unique-sharp.snk
+
+EXTRA_DIST = \
+ $(SRCS) \
+ $(CUSTOMS) \
+ Unique.metadata \
+ $(SNK) \
+ unique-sharp.dll.config \
+ unique-api.raw
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/unique-sharp/unique/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign lib/unique-sharp/unique/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-assemblyDATA: $(assembly_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
+ @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(assemblydir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(assemblydir)" || exit $$?; \
+ done
+
+uninstall-assemblyDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(assemblydir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(assemblydir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(assemblydir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-assemblyDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-assemblyDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-assemblyDATA install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-assemblyDATA
+
+
+all: unique-sharp.dll
+
+unique-api.xml: $(srcdir)/unique-api.raw $(srcdir)/Unique.metadata
+ @echo -e "\n*** Massaging the raw api into $@"
+ cp $(srcdir)/unique-api.raw unique-api.xml
+ chmod +w unique-api.xml
+ $(GAPI2FIXUP) --api=unique-api.xml --metadata=$(srcdir)/Unique.metadata
+
+$(top_builddir)/unique-sharp/generator/gapi_codegen.exe:
+ $(MAKE) -C $(top_builddir)/lib/unique-sharp/generator
+
+generated/App.cs: unique-api.xml $(CUSTOMS) $(builddir)/../generator/gapi_codegen.exe
+ @echo -e "\n*** Generating C# code"
+ $(MONO) $(top_builddir)/lib/unique-sharp/generator/gapi_codegen.exe $(GLIBSHARP_CFLAGS) --outdir=generated --customdir=$(srcdir) --generate unique-api.xml
+
+unique-sharp.snk: $(SNK)
+ cp $< $@
+
+unique-sharp.dll: generated/App.cs $(SRCS) unique-sharp.snk
+ @echo -e "\n*** Building $@"
+ $(CSC) -target:library -out:$@ $(UNSAFE) $(DEBUG) $(ASSEMBLIES) $(SRCS) generated/*.cs
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/unique-sharp/unique/MessageData.custom b/lib/unique-sharp/unique/MessageData.custom
new file mode 100644
index 0000000..55939cf
--- /dev/null
+++ b/lib/unique-sharp/unique/MessageData.custom
@@ -0,0 +1,54 @@
+//
+// MessageData.custom
+//
+// Author(s):
+// Stephane Delcroix <stephane at delcroix.org>
+//
+// Copyright (c) 2009 Stephane Delcroix
+//
+// This is open source software.
+//
+
+ public object Clone ()
+ {
+ return (object)Copy ();
+ }
+
+ [DllImport("libunique-1.0-0.dll")]
+ static extern bool unique_message_data_set_text(IntPtr raw, IntPtr str, IntPtr length);
+
+ [DllImport("libunique-1.0-0.dll")]
+ static extern IntPtr unique_message_data_get_text(IntPtr raw);
+
+ public string Text {
+ set {
+ IntPtr native_str = GLib.Marshaller.StringToPtrGStrdup (value);
+ bool raw_ret = unique_message_data_set_text(Handle, native_str, new IntPtr ((long) System.Text.Encoding.UTF8.GetByteCount (value)));
+ bool ret = raw_ret;
+ GLib.Marshaller.Free (native_str);
+ if (!ret)
+ throw new Exception ("Failed to convert the text to UTF-8");
+ }
+ get {
+ IntPtr raw_ret = unique_message_data_get_text(Handle);
+ string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
+ return ret;
+ }
+ }
+
+ [DllImport("libunique-1.0-0.dll")]
+ static extern byte[] unique_message_data_get(IntPtr raw, out UIntPtr length);
+
+ [DllImport("libunique-1.0-0.dll")]
+ static extern void unique_message_data_set(IntPtr raw, byte[] data, UIntPtr n_data);
+
+ public byte[] Data {
+ set { unique_message_data_set(Handle, value, new UIntPtr ((ulong) (value == null ? -1 : value.Length))); }
+ get {
+ UIntPtr native_length;
+ return unique_message_data_get(Handle, out native_length);
+ }
+ }
+
+
+
diff --git a/lib/unique-sharp/unique/MessageReceivedHandler.cs b/lib/unique-sharp/unique/MessageReceivedHandler.cs
new file mode 100644
index 0000000..4bac8a9
--- /dev/null
+++ b/lib/unique-sharp/unique/MessageReceivedHandler.cs
@@ -0,0 +1,37 @@
+// MessageReceivedHandler.cs
+//
+// Author(s):
+// Stephane Delcroix <stephane at delcroix.org>
+//
+// Copyright (c) 2009 Stephane Delcroix
+//
+// This is open source software. See COPYING for details.
+//
+
+namespace Unique {
+
+ using System;
+
+ public delegate void MessageReceivedHandler(object o, MessageReceivedArgs args);
+
+ public class MessageReceivedArgs : GLib.SignalArgs {
+ public int Command{
+ get {
+ return (int) Args[0];
+ }
+ }
+
+ public Unique.MessageData MessageData{
+ get {
+ return (Unique.MessageData) Args[1];
+ }
+ }
+
+ public uint Time{
+ get {
+ return (uint) Args[2];
+ }
+ }
+
+ }
+}
diff --git a/lib/unique-sharp/unique/Unique.metadata b/lib/unique-sharp/unique/Unique.metadata
new file mode 100644
index 0000000..5cce804
--- /dev/null
+++ b/lib/unique-sharp/unique/Unique.metadata
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<metadata>
+ <attr path="/api/namespace/object[@cname='UniqueApp']/constructor[@cname='unique_app_new_with_commands']" name="hidden">1</attr>
+ <attr path="/api/namespace/object[@cname='UniqueApp']/method[@cname='unique_app_is_running']" name="name">GetIsRunning</attr>
+ <attr path="/api/namespace/object[@cname='UniqueApp']/method[@cname='unique_app_send_message']/parameters/parameter[@name='command_id']" name="type">UniqueCommand</attr>
+ <attr path="/api/namespace/object[@cname='UniqueApp']/signal[@cname='message-received']" name="hidden">1</attr>
+
+ <add-node path="/api/namespace/boxed[@cname='UniqueMessageData']"><implements><interface name="ICloneable" /></implements></add-node>
+ <attr path="/api/namespace/boxed[@cname='UniqueMessageData']/method[@cname='unique_message_data_copy']" name="accessibility">private</attr>
+ <attr path="/api/namespace/boxed[@cname='UniqueMessageData']/method[@cname='unique_message_data_get_text']" name="hidden">1</attr>
+ <attr path="/api/namespace/boxed[@cname='UniqueMessageData']/method[@cname='unique_message_data_set_text']" name="hidden">1</attr>
+ <attr path="/api/namespace/boxed[@cname='UniqueMessageData']/method[@cname='unique_message_data_get']" name="hidden">1</attr>
+ <attr path="/api/namespace/boxed[@cname='UniqueMessageData']/method[@cname='unique_message_data_set']" name="hidden">1</attr>
+ <attr path="/api/namespace/boxed[@cname='UniqueMessageData']/method[@cname='unique_message_data_set_uris']/*/*[@name='uris']" name="null_term_array">1</attr>
+ <attr path="/api/namespace/boxed[@cname='UniqueMessageData']/method[@cname='unique_message_data_set_uris']/return-type" name="type">void</attr>
+ <attr path="/api/namespace/boxed[@cname='UniqueMessageData']/method[@cname='unique_message_data_get_uris']/return-type" name="null_term_array">1</attr>
+</metadata>
+
diff --git a/lib/unique-sharp/unique/snk b/lib/unique-sharp/unique/snk
new file mode 100644
index 0000000..a651450
Binary files /dev/null and b/lib/unique-sharp/unique/snk differ
diff --git a/lib/unique-sharp/unique/unique-api.raw b/lib/unique-sharp/unique/unique-api.raw
new file mode 100644
index 0000000..8072a4f
--- /dev/null
+++ b/lib/unique-sharp/unique/unique-api.raw
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<api>
+ <!--
+
+ This file was automatically generated.
+ Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
+
+-->
+ <namespace name="Unique" library="libunique-1.0-0.dll">
+ <enum name="Command" cname="UniqueCommand" gtype="unique_command_get_type" type="enum">
+ <member cname="UNIQUE_INVALID" name="Invalid" />
+ <member cname="UNIQUE_ACTIVATE" name="Activate" value="-1" />
+ <member cname="UNIQUE_NEW" name="New" value="-2" />
+ <member cname="UNIQUE_OPEN" name="Open" value="-3" />
+ <member cname="UNIQUE_CLOSE" name="Close" value="-4" />
+ </enum>
+ <enum name="Response" cname="UniqueResponse" gtype="unique_response_get_type" type="enum">
+ <member cname="UNIQUE_RESPONSE_INVALID" name="Invalid" />
+ <member cname="UNIQUE_RESPONSE_OK" name="Ok" />
+ <member cname="UNIQUE_RESPONSE_CANCEL" name="Cancel" />
+ <member cname="UNIQUE_RESPONSE_FAIL" name="Fail" />
+ <member cname="UNIQUE_RESPONSE_PASSTHROUGH" name="Passthrough" />
+ </enum>
+ <object name="App" cname="UniqueApp" parent="GObject">
+ <field name="Priv" cname="priv" type="UniqueAppPrivate*" />
+ <property name="Name" cname="name" type="gchar*" readable="true" writeable="true" construct-only="true" />
+ <property name="StartupId" cname="startup-id" type="gchar*" readable="true" writeable="true" construct-only="true" />
+ <property name="Screen" cname="screen" type="GdkScreen" readable="true" writeable="true" construct="true" />
+ <property name="IsRunning" cname="is-running" type="gboolean" readable="true" />
+ <signal name="MessageReceived" cname="message-received" when="LAST" field_name="message_received">
+ <return-type type="UniqueResponse" />
+ <parameters>
+ <parameter type="UniqueApp*" name="app" />
+ <parameter type="gint" name="command" />
+ <parameter type="UniqueMessageData*" name="message_data" />
+ <parameter type="guint" name="time_" />
+ </parameters>
+ </signal>
+ <method name="AddCommand" cname="unique_app_add_command">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="const-gchar*" name="command_name" />
+ <parameter type="gint" name="command_id" />
+ </parameters>
+ </method>
+ <method name="GetType" cname="unique_app_get_type" shared="true">
+ <return-type type="GType" />
+ </method>
+ <method name="IsRunning" cname="unique_app_is_running">
+ <return-type type="gboolean" />
+ </method>
+ <constructor cname="unique_app_new">
+ <parameters>
+ <parameter type="const-gchar*" name="name" />
+ <parameter type="const-gchar*" name="startup_id" />
+ </parameters>
+ </constructor>
+ <constructor cname="unique_app_new_with_commands">
+ <parameters>
+ <parameter type="const-gchar*" name="name" />
+ <parameter type="const-gchar*" name="startup_id" />
+ <parameter type="const-gchar*" name="first_command_name" />
+ <parameter ellipsis="true" />
+ </parameters>
+ </constructor>
+ <method name="SendMessage" cname="unique_app_send_message">
+ <return-type type="UniqueResponse" />
+ <parameters>
+ <parameter type="gint" name="command_id" />
+ <parameter type="UniqueMessageData*" name="message_data" />
+ </parameters>
+ </method>
+ <method name="WatchWindow" cname="unique_app_watch_window">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="GtkWindow*" name="window" />
+ </parameters>
+ </method>
+ </object>
+ <boxed name="MessageData" cname="UniqueMessageData" opaque="true">
+ <method name="Copy" cname="unique_message_data_copy">
+ <return-type type="UniqueMessageData*" owned="true" />
+ </method>
+ <method name="Free" cname="unique_message_data_free">
+ <return-type type="void" />
+ </method>
+ <method name="Get" cname="unique_message_data_get">
+ <return-type type="const-guchar*" />
+ <parameters>
+ <parameter type="gsize*" name="length" />
+ </parameters>
+ </method>
+ <method name="GetFilename" cname="unique_message_data_get_filename">
+ <return-type type="gchar*" />
+ </method>
+ <method name="GetScreen" cname="unique_message_data_get_screen">
+ <return-type type="GdkScreen*" />
+ </method>
+ <method name="GetStartupId" cname="unique_message_data_get_startup_id">
+ <return-type type="const-gchar*" />
+ </method>
+ <method name="GetText" cname="unique_message_data_get_text">
+ <return-type type="gchar*" />
+ </method>
+ <method name="GetType" cname="unique_message_data_get_type" shared="true">
+ <return-type type="GType" />
+ </method>
+ <method name="GetUris" cname="unique_message_data_get_uris">
+ <return-type type="gchar**" />
+ </method>
+ <method name="GetWorkspace" cname="unique_message_data_get_workspace">
+ <return-type type="guint" />
+ </method>
+ <constructor cname="unique_message_data_new" />
+ <method name="Set" cname="unique_message_data_set">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="const-guchar*" name="data" />
+ <parameter type="gsize" name="length" />
+ </parameters>
+ </method>
+ <method name="SetFilename" cname="unique_message_data_set_filename">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="const-gchar*" name="filename" />
+ </parameters>
+ </method>
+ <method name="SetText" cname="unique_message_data_set_text">
+ <return-type type="gboolean" />
+ <parameters>
+ <parameter type="const-gchar*" name="str" />
+ <parameter type="gssize" name="length" />
+ </parameters>
+ </method>
+ <method name="SetUris" cname="unique_message_data_set_uris">
+ <return-type type="gboolean" />
+ <parameters>
+ <parameter type="gchar**" name="uris" />
+ </parameters>
+ </method>
+ </boxed>
+ </namespace>
+</api>
\ No newline at end of file
diff --git a/lib/unique-sharp/unique/unique-sharp.dll.config b/lib/unique-sharp/unique/unique-sharp.dll.config
new file mode 100644
index 0000000..02e103f
--- /dev/null
+++ b/lib/unique-sharp/unique/unique-sharp.dll.config
@@ -0,0 +1,4 @@
+<configuration>
+ <dllmap dll="libunique-1.0-0.dll" target="libunique-1.0.so.0"/>
+</configuration>
+
diff --git a/ltmain.sh b/ltmain.sh
index b36c4ad..a72f2fd 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
+# $progname: (GNU libtool) 2.2.6b
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
+VERSION=2.2.6b
TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@ $lt_unset CDPATH
: ${CP="cp -f"}
: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
+: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 4191a45..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake at gnu.org> or send patches to
-# <automake-patches at gnu.org>.
-
-nl='
-'
-IFS=" "" $nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake at gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/po/LINGUAS b/po/LINGUAS
index 586c31f..a4f0a9f 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -4,6 +4,7 @@ ar
as
be at latin
bg
+bn_IN
ca
cs
da
@@ -33,6 +34,7 @@ lv
mk
mr
nb
+nds
nl
oc
or
@@ -40,6 +42,7 @@ pa
pl
pt
pt_BR
+ro
ru
rw
sk
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c7e8302..cc8a222 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
@@ -129,7 +129,7 @@ install-data-yes: all
done
# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
# Define this as empty until I found a useful application.
install-exec installcheck:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 147ad1e..1d79f05 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,13 +27,17 @@ extensions/Exporters/SmugMugExport/SmugMugExport.glade
extensions/Exporters/TabbloExport/Tabblo/Connection.cs
extensions/Exporters/TabbloExport/TabbloExport.addin.xml
extensions/Exporters/TabbloExport/TabbloExport.cs
-extensions/Exporters/TabbloExport/TabbloExport.glade
-extensions/Exporters/TabbloExport/TrustError.glade
+[type: gettext/glade]extensions/Exporters/TabbloExport/ui/TabbloExport.ui
+[type: gettext/glade]extensions/Exporters/TabbloExport/ui/TrustError.ui
extensions/Exporters/ZipExport/ZipExport.addin.xml
extensions/Exporters/ZipExport/ZipExport.cs
extensions/Exporters/ZipExport/ZipExport.glade
extensions/Tools/HashJob/HashJob.cs
extensions/Tools/HashJob/HashJob.addin.xml
+extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs
+extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml
+[type: gettext/glade]extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui
+extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs
extensions/Tools/MergeDb/MergeDb.addin.xml
extensions/Tools/MergeDb/MergeDb.cs
extensions/Tools/MergeDb/MergeDb.glade
@@ -41,30 +45,13 @@ extensions/Tools/MergeDb/PickFolderDialog.cs
extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml
[type: gettext/glade]extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui
f-spot.desktop.in.in
+f-spot.schemas.in
f-spot-import.desktop.in.in
f-spot-view.desktop.in.in
lib/libfspot/f-jpeg-utils.c
-lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs
-lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
-lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs
-lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
-lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
-lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs
-lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs
-lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs
-lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs
-lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs
-lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs
-lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs
-lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs
-lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs
-lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
-lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
-lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs
-lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs
src/CameraFileSelectionDialog.cs
src/CameraSelectionDialog.cs
-src/Core.cs
+src/Core/App.cs
src/Core/Photo.cs
src/Editors/AutoStretchEditor.cs
src/Editors/ColorEditor.cs
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 05a09ba..a12fd96 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
-[encoding: UTF-8]
f-spot.desktop.in
f-spot-view.desktop.in
f-spot-import.desktop.in
@@ -25,6 +24,7 @@ extensions/ChangePhotoPath/ChangePhotoPath.addin.xml
extensions/ChangePhotoPath/ChangePhotoPath.glade
extensions/DevelopInUFraw/DevelopInUFRaw.cs
extensions/RetroactiveRoll/RetroactiveRoll.addin.xml
+extensions/Editors/BWEditor/BWEditor.cs
extensions/Editors/FlipEditor/FlipEditor.cs
extensions/Editors/ResizeEditor/ResizeEditor.cs
extensions/Editors/BlackoutEditor/BlackoutEditor.cs
diff --git a/po/bg.po b/po/bg.po
index ea35001..8dbdad2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,1828 +1,3990 @@
-# Bulgarian translation of f-spot.
-# Copyright (C) 2005 THE f-spot'S COPYRIGHT HOLDER
+# Bulgarian translation of f-spot po-file.
+# Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Krasimir Chonov <mk2616 at abv.bg>.
# This file is distributed under the same license as the f-spot package.
# Rostislav "zbrox" Raykov <zbrox at i-space.org>, 2005.
-#
-#
+# Krasimir Chonov <mk2616 at abv.bg>, 2009, 2010.
+# Alexander Shopov <ash at contact.bg>, 2009
+#
msgid ""
msgstr ""
-"Project-Id-Version: f-spot\n"
+"Project-Id-Version: f-spot master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-03 16:06+0300\n"
-"PO-Revision-Date: 2005-10-03 16:10+0300\n"
-"Last-Translator: Rostislav \"zbrox\" Raykov <zbrox at i-space.org>\n"
+"POT-Creation-Date: 2010-03-11 21:18+0200\n"
+"PO-Revision-Date: 2010-03-11 21:18+0200\n"
+"Last-Translator: Krasimir Chonov <mk2616 at abv.bg>\n"
"Language-Team: Bulgarian <dict at fsa-bg.org>\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"
-#: ../f-spot.desktop.in.in.h:1 ../f-spot-view.desktop.in.h:1
-#: ../src/f-spot.glade.h:67
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../f-spot.desktop.in.in.h:2 ../f-spot-view.desktop.in.h:2
-msgid "Photo Management"
-msgstr "Управление на фотографии"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD…"
-#: ../libeog/eog-file-selection.c:29 ../libeog/eog-file-selection.c:46
-msgid "By Extension"
-msgstr "По разширение"
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Прехвърляне на снимки"
-#: ../libeog/eog-file-selection.c:30
-msgid "BMP"
-msgstr "BMP"
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Пренасяне на снимка „{0}“ на CD"
-#: ../libeog/eog-file-selection.c:31
-msgid "GIF"
-msgstr "GIF"
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} от общо {1}"
-#: ../libeog/eog-file-selection.c:32
-msgid "ICO"
-msgstr "ICO"
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "Изпращането завърши"
-#: ../libeog/eog-file-selection.c:33 ../libeog/eog-file-selection.c:48
-msgid "JPEG"
-msgstr "JPEG"
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Прехвърлянето завърши"
-#: ../libeog/eog-file-selection.c:34 ../libeog/eog-file-selection.c:51
-msgid "PNG"
-msgstr "PNG"
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "Грешка при прехвърлянето"
-#: ../libeog/eog-file-selection.c:35
-msgid "PNM"
-msgstr "PNM"
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "Грешка при прехвърлянето"
-#: ../libeog/eog-file-selection.c:36
-msgid "RAS"
-msgstr "RAS"
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "копиране…"
-#: ../libeog/eog-file-selection.c:37
-msgid "SVG"
-msgstr "SVG"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>Вече има снимки планирани за запис</i></b>"
-#: ../libeog/eog-file-selection.c:38
-msgid "TGA"
-msgstr "TGA"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Снимки за запис</b>"
-#: ../libeog/eog-file-selection.c:39
-msgid "TIFF"
-msgstr "TIFF"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Автоматично завъртане"
-#: ../libeog/eog-file-selection.c:40
-msgid "XBM"
-msgstr "XBM"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Създаване на CD"
-#: ../libeog/eog-file-selection.c:41 ../libeog/eog-file-selection.c:54
-msgid "XPM"
-msgstr "XPM"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Размер"
-#: ../libeog/eog-file-selection.c:207
-msgid "Unsupported file format."
-msgstr "Неподдържан файлов формат."
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Размер на избраните снимки за изнасяне:"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Преглед на вече планираните файлове"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Изнасяне"
-#: ../libeog/eog-file-selection.c:225
-msgid "Determine File Type:"
-msgstr "Определяне вида на файла:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "_Запис само на тези снимки на CD"
-#: ../libeog/eog-file-selection.c:268
-msgid "Load Image"
-msgstr "Зареждане на изображение"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "_Facebook…"
-#: ../libeog/eog-file-selection.c:274
-msgid "Save Image"
-msgstr "Запазване на изображение"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "Изчакване за идентификация"
-#: ../libeog/eog-image.c:773
-msgid "No image loaded."
-msgstr "Няма заредено изображение."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
+msgstr ""
+"F-Spot ще стартира браузъра ви, за да позволите правата, които сте избрали.\n"
+"\n"
+"Когато Facebook ви пренасочи към тази програма, натиснете „Добре“ отдолу."
-#: ../libeog/eog-image.c:780
-msgid "Can't save non local files."
-msgstr "Не може да се запазват не-локални файлове."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "Прекалено много снимки за изнасяне"
-#: ../libeog/eog-image.c:803
-msgid "Unsupported image type for saving."
-msgstr "Неподдържан за запис вид изображение"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+"Facebook позволява само {0} снимки на албум. Изберете по-малък брой "
+"изображения и опитайте пак."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Качване на снимки"
-#: ../libeog/image-view.c:2110
-msgid "interpolation type"
-msgstr "вид на интерполацията"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "Албумът трябва да има име"
-#: ../libeog/image-view.c:2111
-msgid "the type of interpolation to use"
-msgstr "вида на интерполацията, която да се използва"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "Задайте име на албума или изберете вече съществуващ."
-#: ../libeog/image-view.c:2117 ../libeog/image-view.c:2124
-msgid "check type"
-msgstr "вид проверка"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "Неуспешно създаване на нов албум"
-#: ../libeog/image-view.c:2118
-msgid "the type of chequering to use"
-msgstr "вида на шахматния шаблон"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"Възникна грешка при създаване на нов албум.\n"
+"\n"
+"{0}"
-#: ../libeog/image-view.c:2125
-msgid "the size of chequers to use"
-msgstr "размера на шахматния шаблон, който да се използва"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Качване на снимка „{0}“ ({1} от {2})"
-#: ../libeog/image-view.c:2131
-msgid "dither"
-msgstr "дифузия"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Грешка при качване във Facebook: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Грешка"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Качването завърши"
-#: ../libeog/image-view.c:2132
-msgid "dither type"
-msgstr "вид дифузия"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Посещаване на групата на F-Spot във Facebook"
-#: ../libfspot/f-jpeg-utils.c:445
-msgid "File not found"
-msgstr "Файлът не е открит"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Изчакване за идентификация"
-#: ../libfspot/f-jpeg-utils.c:468
-#, c-format
-msgid "Unknown transform type %d"
-msgstr "Непознат вид трансформация - %d"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"F-Spot ще стартира браузъра ви, за да влезете във Facebook.\n"
+"\n"
+"След като Facebook ви върне към това приложение, натиснете „Добре“\n"
+"отдолу. По възможност F-Spot ще запази сесията ви в ключодържателя\n"
+"на GNOME и ще я използва при бъдещи изнасяния на снимки към Facebook."
-#: ../libfspot/f-jpeg-utils.c:476
-msgid "Operation failed"
-msgstr "Операцията пропадна"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Идентифициране…"
-#: ../src/CameraFileSelectionDialog.cs:65
-msgid "Preview"
-msgstr "Преглед"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Грешка при влизане във Facebook"
-#: ../src/CameraFileSelectionDialog.cs:67
-msgid "Path"
-msgstr "Път"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr ""
+"Имаше проблем при влизане във Facebook. Проверете идентификационни си данни "
+"и опитайте отново."
-#: ../src/CameraFileSelectionDialog.cs:69 ../src/f-spot.glade.h:71
-msgid "File"
-msgstr "Файл"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Упълномощаване на сесия"
-#: ../src/CameraFileSelectionDialog.cs:71 ../src/FolderExport.cs:690
-msgid "Index"
-msgstr "Индекс"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "Сесията е осъществена, получаване на информация за потребителя…"
-#: ../src/CameraFileSelectionDialog.cs:87
-msgid "Downloading Previews"
-msgstr "Сваляне на прегледи"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "Сесията е осъществена, получаване на списъка с приятели…"
-#: ../src/CameraFileSelectionDialog.cs:95
-#, csharp-format
-msgid "Downloading Preview of {0}"
-msgstr "Сваляне на преглед на {0}"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "Сесията е осъществена, получаване на детайли за приятел…"
-#: ../src/CameraFileSelectionDialog.cs:147
-msgid "Unknown destination."
-msgstr "Непозната целева папка"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "Сесията е осъществена, получаване на албумите със снимки…"
-#: ../src/CameraFileSelectionDialog.cs:148
-msgid ""
-"When copying files from a camera you must select a valid destination on the "
-"local filesystem"
-msgstr ""
-"Когато копирате файлове от фотоапарат, трябва да изберете валидна дестинация "
-"на локалната файлова система."
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} в момента е във Facebook"
-#: ../src/CameraFileSelectionDialog.cs:166
-msgid "Unable to create directory."
-msgstr "Неуспех при създаването на папка."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Грешка при свързване с Facebook"
-#: ../src/CameraFileSelectionDialog.cs:167
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
#, csharp-format
msgid ""
-"Error \"{0}\" while creating directory \"{1}\". Check that the path and "
-"permissions are correct and try again"
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
msgstr ""
-"Грешка „{0}“ при създаване на папката „{1}“. Проверете пътя и правата и "
-"опитайте отново."
+"Възникна грешка при изтегляне на информация ви от Facebook.\n"
+"\n"
+"Грешка от Facebook: {0}"
-#: ../src/CameraFileSelectionDialog.cs:188 ../src/CDExport.cs:139
-#: ../src/FolderExport.cs:251
-msgid "Transferring Pictures"
-msgstr "Прехвърляне на снимки"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Не сте влезли в регистрацията си."
-#: ../src/CameraFileSelectionDialog.cs:211
-#, csharp-format
-msgid "Copying file {0} of {1}"
-msgstr "Копиране на файл {0} от общо {1}"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Автоматично потвърждаване на снимките"
-#: ../src/CameraFileSelectionDialog.cs:221
-msgid "Done Copying Files"
-msgstr "Копирането на файловете приключи"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Заглавие"
-#: ../src/CameraFileSelectionDialog.cs:223
-msgid "Download Complete"
-msgstr "Свалянето на файловете приключи"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Създаване на нов албум"
-#: ../src/CameraFileSelectionDialog.cs:228
-msgid "Error transferring file"
-msgstr "Грешка при пренасянето на файла"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Описание"
-#: ../src/CameraFileSelectionDialog.cs:249
-#, csharp-format
-msgid "Transferring \"{0}\" from camera"
-msgstr "Пренасяне на снимка „{0}“ от камера"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Изнасяне към Facebook"
-#: ../src/CameraFileSelectionDialog.cs:275
-msgid "Select Destination"
-msgstr "Избор на целева папка"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "В тази снимка"
-#: ../src/CameraSelectionDialog.cs:27 ../src/StockIcons.cs:27
-msgid "Camera"
-msgstr "Фотоапарат"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Местоположение"
-#: ../src/CameraSelectionDialog.cs:28
-msgid "Port"
-msgstr "Порт"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Влизане"
-#: ../src/CDExport.cs:57
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "Пренасяне на снимка „{0}“ на CD"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Излизане"
-#: ../src/CDExport.cs:59 ../src/FlickrExport.cs:96 ../src/GalleryExport.cs:421
-#: ../src/ProgressDialog.cs:75
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} от общо {1}"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
+msgid "Name"
+msgstr "Име"
-#: ../src/CDExport.cs:71 ../src/FlickrExport.cs:101 ../src/FolderExport.cs:167
-#: ../src/GalleryExport.cs:436
-msgid "Done Sending Photos"
-msgstr "Изпращането приключено"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Не сте влезли"
-#: ../src/CDExport.cs:73 ../src/FolderExport.cs:169
-msgid "Transfer Complete"
-msgstr "Прехвърлянето е завършено"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Права:"
-#: ../src/CDExport.cs:79 ../src/FolderExport.cs:174
-msgid "Error While Transferring"
-msgstr "Грешка при прехвърлянето"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Останете свързани"
-#: ../src/CDExport.cs:84 ../src/FolderExport.cs:182
-msgid "Error Transferring"
-msgstr "Грешка при пренасянето"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Използване на съществуващ албум"
-#: ../src/CDExport.cs:99 ../src/FolderExport.cs:202
-msgid "Error: Error while transferring; Aborting"
-msgstr "Грешка при трансфера - спиране."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Кой е този?"
-#: ../src/CDExport.cs:102 ../src/FolderExport.cs:205
-msgid "Error: File Already Exists; Aborting"
-msgstr "Грешка: Файлът вече съществува - прекъсване"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq…"
-#: ../src/ColorDialog.cs:147 ../src/ColorDialog.cs:162
-msgid "Error saving adjusted photo"
-msgstr "Грешка при запазване ан променената снимка"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr…"
-#: ../src/ColorDialog.cs:148 ../src/MainWindow.cs:1307 ../src/PhotoView.cs:296
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save image {1}"
-msgstr "Получи се изключение „{0}“. Не може да се запази изображението {1}"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr…"
-#: ../src/ColorDialog.cs:163
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Идентификация"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "F-Spot {0} cannot yet edit images of this type"
-msgstr "F-Spot {0} все още не може да редактира изображения от този вид"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"Върнете се към този прозорец след като упълномощаването към {0} завърши и "
+"натиснете бутона „Завършване на упълномощаване“ отдолу"
-#: ../src/Exif.cs:226
-msgid "Image Directory"
-msgstr "Папка с изображения"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Завършване на упълномощаване"
-#: ../src/Exif.cs:228
-msgid "Thumbnail Directory"
-msgstr "Папка за малките изображения за преглед"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Влизане в {0}"
-#: ../src/Exif.cs:230
-msgid "Exif Directory"
-msgstr "Exif папка"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Проверка на името и паролата ви…"
-#: ../src/Exif.cs:232
-msgid "GPS Directory"
-msgstr "GPS папка"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Добре дошли {0}. Свързани сте към {1}"
-#: ../src/Exif.cs:234
-msgid "InterOperability Directory"
-msgstr "Директория за съвместимост"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Влизане като друг потребител"
-#: ../src/Exif.cs:236
-msgid "Unknown Directory"
-msgstr "Непозната папка"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "{0} от вашата позволена месечна квота — {1} са заети"
-#: ../src/FlickrExport.cs:49
-msgid "Enter Password"
-msgstr "Въведете парола"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Не може да влезете"
-#: ../src/FlickrExport.cs:58
-msgid "Enter Password for "
-msgstr "Въведете парола за "
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Изчакване на отговор {0} от {1}"
-#: ../src/FlickrExport.cs:91 ../src/GalleryExport.cs:417
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
#, csharp-format
msgid "Uploading picture \"{0}\""
msgstr "Качване на снимка „{0}“"
-#: ../src/FlickrExport.cs:103 ../src/GalleryExport.cs:438
-msgid "Upload Complete"
-msgstr "Качването е завършено"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Грешка при качване на снимка в {0}: {1}"
-#: ../src/FlickrExport.cs:108
-msgid "Error Uploading To Flickr"
-msgstr "Грешка при качването на Flickr"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "Не може да влезете."
-#: ../src/FlickrExport.cs:138 ../src/GalleryExport.cs:387
-msgid "Uploading Pictures"
-msgstr "Качване на изображения"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"F-Spot не можа да влезе в {0}. Проверете дали сте се идентифицирали през уеб "
+"браузъра {0}."
-#: ../src/FlickrExport.cs:148
-msgid "Unable to log on."
-msgstr "Не може да се влезне"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Регистрация</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Снимки</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Стил</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Права за разглеждане</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "Изнасяне"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "Изнасяне по _йерархия на етикет"
-#: ../src/FlickrExport.cs:149
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
msgid ""
-"F-Spot was unable to log on to Flickr. Make sure the settings you supplied "
-"are correct."
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
msgstr ""
-"F-Spot не успя да влезне във Flickr. Уверете се, че настройките, който сте "
-"предложили са правилни."
+"F-Spot се нуждае от идентификацията ви, за да качи снимки в регистрацията ви "
+"в {0}. Натиснете бутона „Идентификация“, за да се отвори уеб браузъра и да "
+"упълномощите F-Spot."
-#: ../src/FolderExport.cs:129
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "_Игнориране на етикети от най-горно ниво"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Лична"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Публична"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "_Премахване на метаданните"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Видими за семейството"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Видими за приятелите"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "_Изнасяне на етикети"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "_Преоразмеряване към: "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "_Показване на снимките в браузъра след приключване на качването"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "пиксела"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "_Папка…"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Избор на папка за експортиране"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
msgid "Building Gallery"
msgstr "Създаване на галерия"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "Грешка при качване на снимка „{0}“ в галерия:{2}{1}"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "Грешка при прехвърлянето — спиране"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Грешка: файлът вече съществува — спиране"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "Светло"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "Тъмно"
+
#. Abbreviation of previous
-#: ../src/FolderExport.cs:688
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Предишна"
-#: ../src/FolderExport.cs:693 ../src/f-spot.glade.h:95
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Индекс"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "Етикети"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
-msgstr "Следващо"
+msgstr "Следваща"
-#: ../src/FolderExport.cs:801
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Галерията е генерирана от"
-#: ../src/FolderExport.cs:844
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "Показване на стиловете"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "Скриване на стиловете"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Етикети: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Страница:"
-#: ../src/FullScreenView.cs:102
-msgid "Exit fullscreen"
-msgstr "Изход от пълен екран"
-
-#: ../src/f-spot.glade.h:1
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
msgid "\n"
msgstr "\n"
-#: ../src/f-spot.glade.h:3
-msgid " "
-msgstr " "
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Папка за изнасяне</b>"
-#: ../src/f-spot.glade.h:4
-msgid "..."
-msgstr "..."
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Метод на изнасяне</b>"
-#: ../src/f-spot.glade.h:5
-msgid "<b></b>"
-msgstr "<b></b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "Създаване на _галерия от „Оригинал“"
-#: ../src/f-spot.glade.h:6
-msgid "<b>Account</b>"
-msgstr "<b>Абонамент</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "Създаване на самостоятелна _уеб галерия"
-#: ../src/f-spot.glade.h:7
-msgid "<b>Album</b>"
-msgstr "<b>Албум</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "О_писание:"
-#: ../src/f-spot.glade.h:8
-msgid "<b>Color Temperature</b>"
-msgstr "<b>Температура на цвета</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "Изнасяне по _етикети"
-#: ../src/f-spot.glade.h:9
-msgid "<b>Destination</b>"
-msgstr "<b>Местонахождение</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "Изнасяне на икони на е_тикети"
-#: ../src/f-spot.glade.h:10
-msgid "<b>End Date</b>"
-msgstr "<b>Крайна дата</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Изнасяне на папка"
-#: ../src/f-spot.glade.h:11
-msgid "<b>Export Method</b>"
-msgstr "<b>Метод на изнасяне</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "Име на г_алерия:"
-#: ../src/f-spot.glade.h:12
-msgid "<b>Exposure</b>"
-msgstr "<b>Експонация</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "Отваряне на _целевата папка след изнасяне"
-#: ../src/f-spot.glade.h:13
-msgid "<b>From Image</b>"
-msgstr "<b>От изображение</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Папка:"
-#: ../src/f-spot.glade.h:14
-msgid "<b>Gallery</b>"
-msgstr "<b>Галерия</b>"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "_Съхраняване само на файловете"
-#: ../src/f-spot.glade.h:15
-msgid "<b>Histogram</b>"
-msgstr "<b>Хистограма</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "_Уеб галерия…"
-#: ../src/f-spot.glade.h:16
-msgid "<b>Items to Burn</b>"
-msgstr "<b>Изображения за запис</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Не може да се осъществи връзка с галерия, която е с неизвестна версия.\n"
+"Проверете дали имате приставката Remote — версия 1.0.8 или по-нова"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "Неправилен адрес"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "Адресът на галерията е е неправилен"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "Грешка при свързване към галерия"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "Възникна следната грешка при опит за влизане: {0}"
-#: ../src/f-spot.glade.h:17
-msgid "<b>Photograph Layout</b>"
-msgstr "<b>Изглед на фотографията</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "Вече съществува галерия с това име"
-#: ../src/f-spot.glade.h:18
-msgid "<b>Photos</b>"
-msgstr "<b>Снимки</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr "Вече сте регистрирали галерия с това име. Изберете друго."
-#: ../src/f-spot.glade.h:19
-msgid "<b>Predefined</b>"
-msgstr "<b>Предварителн определено</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(НайГорноНиво)"
-#: ../src/f-spot.glade.h:20
-msgid "<b>Preview</b>"
-msgstr "<b>Преглед</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "Неправилно име на галерия"
-#: ../src/f-spot.glade.h:21
-msgid "<b>Printer Details</b>"
-msgstr "<b>Информация за принтера</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Името на галерията съдържа непозволени знаци.\n"
+"Използвайте само букви, числа, „-“ и „_“"
-#: ../src/f-spot.glade.h:22
-msgid "<b>Start Date</b>"
-msgstr "<b>Начална дата</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Грешка при качване на снимка „{0}“ в галерия: {1}"
-#: ../src/f-spot.glade.h:23
-msgid "<b>Style</b>"
-msgstr "<b>Стил</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(няма галерия)"
-#: ../src/f-spot.glade.h:24
-msgid "<small> </small>"
-msgstr "<small> </small>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(няма връзка)"
-#: ../src/f-spot.glade.h:25
-msgid "<small></small>"
-msgstr "<small></small>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(няма албуми)"
-#: ../src/f-spot.glade.h:26
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Не е избрана регистрация"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Албум</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Галерия</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
msgstr ""
"<span weight='bold' size='larger'>Грешка при свързване с галерията</span>\n"
-#: ../src/f-spot.glade.h:28
-msgid "Ad_just Color..."
-msgstr "Настройване на цвета..."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "_Изнасяне на имена и коментари"
-#: ../src/f-spot.glade.h:29
-msgid "Adjust Color"
-msgstr "Настройване на цвета"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "Отваряне на _албума след качването"
-#: ../src/f-spot.glade.h:30
-msgid "Arranged _By"
-msgstr "Подредени по"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Проверете дали настройките за тази галерия са правилни."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "А_дрес:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "Име на _албум:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Описание:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "_Изнасяне в албум:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "_Име на галерия:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Галерия:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "_Главен албум:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "_Парола:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Име:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "_Потребител:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "Грешка при четене на отговора на сървъра"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Сървърът върна отговор без съдържание на галерията"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "Грешка при създаване на нов албум"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"При опит за извършване на поисканата операция възникна следната грешка:\n"
+"{0} ({1})"
-#: ../src/f-spot.glade.h:31
-msgid "Attach Tag:"
-msgstr "Прикачане на етикет:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb…"
-#: ../src/f-spot.glade.h:32
-msgid "Border:"
-msgstr "Граница:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "Грешка при създаване на албум"
-#: ../src/f-spot.glade.h:33
-msgid "Brightness:"
-msgstr "Яркост:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr "При опит за създаване на албум възникна следната грешка: {0}"
-#: ../src/f-spot.glade.h:34 ../src/StockIcons.cs:26
-msgid "Browse"
-msgstr "Разглеждане"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} изпратени"
-#: ../src/f-spot.glade.h:35
-msgid "Browse Previously Scheduled Files"
-msgstr "Разглеждане на предишно насрочени файлове"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} от около {1}"
-#: ../src/f-spot.glade.h:36
-msgid "CD"
-msgstr "Диск"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Грешка при качване в галерия: {0}"
-#: ../src/f-spot.glade.h:37
-msgid "Camera Selection"
-msgstr "Избор на фотоапарат"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Налично място: {0}, {1} % заето от {2}"
-#: ../src/f-spot.glade.h:38
-msgid "Caption:"
-msgstr "Текст:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"Избраният албум има ограничение от {0} снимки.\n"
+"Текущият избор от {1} изображения е по-голям от него."
-#: ../src/f-spot.glade.h:39
-msgid "Category:"
-msgstr "Категория:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>Изнасяне в PicasaWeb</b>"
-#: ../src/f-spot.glade.h:40
-msgid "Co_nfigure"
-msgstr "Настройки"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Регистрацията ви в Google е заключена</"
+"span>\n"
-#: ../src/f-spot.glade.h:41
-msgid "Contrast:"
-msgstr "Контраст:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Проверете дали настройките за тази галерия са правилни.\n"
+"Въведете знаците, които са показани в изображението в\n"
+"полето „Captcha“. <i>Регистърът на знаците е без значение</i>"
-#: ../src/f-spot.glade.h:42
-msgid "Copy Files To: "
-msgstr "Копиране на файлове в:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Публичен албум"
-#: ../src/f-spot.glade.h:43
-msgid "Create CD"
-msgstr "Създаване на CD"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "_Име на албум"
-#: ../src/f-spot.glade.h:44
-msgid "Create New _Category..."
-msgstr "Създаване на нова категория..."
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "_Автоматично завъртане"
-#: ../src/f-spot.glade.h:45
-msgid "Create New _Tag..."
-msgstr "Създаване на нов етикет..."
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
-#: ../src/f-spot.glade.h:46
-msgid "Create _new version..."
-msgstr "Създаване на нова версия..."
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug…"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>Изнасяне към SmugMug</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Регистрация:"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Качване на снимка „{0}“"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Влизане в Tabblo"
-#: ../src/f-spot.glade.h:47
-msgid "Crop Photo to Fit"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Получаване на адрес за качване"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo…"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "Изпращането завърши"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Качването завърши"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Грешка при качване в Tabblo: "
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Етикети на F-spot</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Регистрация в Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
msgstr ""
-"Изрязване на част от\n"
-"снимката, за да пасне"
+"<small><i>Етикетите на F-Spot могат да ви помогнат да проследите процеса на "
+"изнасяне на снимки. Пример: използвайте етикет за снимките, които искате да "
+"изнесете и друг за снимките, които вече са изнесени. Тук можете да укажете "
+"на F-spot автоматично да заменя тези етикети.</i></small>"
-#: ../src/f-spot.glade.h:48
-msgid "Description:"
-msgstr "Описание:"
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "Пре_махване от изнесени снимки:"
-#: ../src/f-spot.glade.h:49
-msgid "Destination Temp"
-msgstr "Временна целева директория"
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Избор…"
-#: ../src/f-spot.glade.h:50
-msgid "Directory"
-msgstr "Папка"
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Прикрепяне към изнесени снимки:"
-#: ../src/f-spot.glade.h:51
-msgid "Display Side_bar"
-msgstr "Показване на страничния панел"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
-#: ../src/f-spot.glade.h:52
-msgid "Display T_ags"
-msgstr "Показване на етикетите"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Възникна грешка в доверието при опит за достъп до"
-#: ../src/f-spot.glade.h:53
-msgid "Display _Dates"
-msgstr "Показване на датите"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Прекратяване"
-#: ../src/f-spot.glade.h:54
-msgid "Display _Timeline"
-msgstr "Показване на времевата линия"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Доверяване винаги"
-#: ../src/f-spot.glade.h:55
-msgid "E-Mail:"
-msgstr "Адрес на ел. поща:"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Искате ли:"
-#: ../src/f-spot.glade.h:56
-msgid "E_xport To CD..."
-msgstr "Изнасяне на CD..."
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Грешка в доверието"
-#: ../src/f-spot.glade.h:57
-msgid "Edit Tag Icon"
-msgstr "Редакция на иконата за етикет"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Доверяване веднъж"
-#: ../src/f-spot.glade.h:58
-msgid "Export"
-msgstr "Изнасяне"
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "_Компресиран файл…"
-#: ../src/f-spot.glade.h:59
-msgid "Export Tags and Categories"
-msgstr "Изнасяне на етикети и категории"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "Нищо не е избрано"
-#: ../src/f-spot.glade.h:60
-msgid "Export tags and categories"
-msgstr "Изнасяне на етикети и категории"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"Този инструмент изисква да сте избрали снимки. Изберете една или повече и "
+"опитайте отново"
-#: ../src/f-spot.glade.h:61
-msgid "Export titles and comments"
-msgstr "Изнасяне на заглавията и коментарите"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Избор на папка за изнасяне"
-#: ../src/f-spot.glade.h:62
-msgid "Export to Album:"
-msgstr "Изнасяне към албум:"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Изнасяне на файлове"
-#: ../src/f-spot.glade.h:63
-msgid "Export to Original"
-msgstr "Изнасяне към оригинала"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Подготовка на снимка „{0}“"
-#: ../src/f-spot.glade.h:64
-msgid "Export to _Flickr..."
-msgstr "Изнасяне към _Flickr..."
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "_Създаване"
-#: ../src/f-spot.glade.h:65
-msgid "Export to _Folder..."
-msgstr "Изнасяне към _папка..."
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "_Файл:"
-#: ../src/f-spot.glade.h:66
-msgid "Export to _Web Gallery..."
-msgstr "Изнасяне към галерия в интернет"
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Местоположение:"
-#: ../src/f-spot.glade.h:68
-msgid "F-Spot Photo Album"
-msgstr "F-Spot фото албум"
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Мащабиране:"
-#: ../src/f-spot.glade.h:69
-msgid "F-Spot Photo Viewer"
-msgstr "Преглед на снимки F-Spot"
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"За да се открият снимките-дубликати, които са внесени преди 0.5.0, F-Spot "
+"трябва да анализира колекция ви. Това не се прави автоматично, защото отнема "
+"известно време. Можете да стартирате или спрете този процес с помощта на "
+"този прозорец."
-#: ../src/f-spot.glade.h:70
-msgid "F-Spot View"
-msgstr "F-Spot преглед"
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+"В момента {0} снимки са без изчислена контролна сума по md5 и предстоят {1} "
+"задачи"
-#: ../src/f-spot.glade.h:72
-msgid "Fin_d"
-msgstr "Търсене"
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Затваряне"
-#: ../src/f-spot.glade.h:73
-msgid "Find by _Tag"
-msgstr "Търсене по етикет"
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "Обработка на снимки…"
-#: ../src/f-spot.glade.h:74
-msgid "Flickr"
-msgstr "Flickr"
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "Спрян"
-#: ../src/f-spot.glade.h:75
-msgid "Folder Export"
-msgstr "Изнасяне на папка"
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "Проверка за дубликати…"
-#: ../src/f-spot.glade.h:76
-msgid "Folder URI:"
-msgstr "URI на папка:"
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Галерия на F-Spot"
-#: ../src/f-spot.glade.h:77
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "В момента галерията не е в мрежата"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Показване на всички"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} снимка"
+msgstr[1] "{0} снимки"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Текущ изглед"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Избрани"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Уеб галерия"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
msgid ""
-"Full Page\n"
-"Standard - 4x6"
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
msgstr ""
-"Пълна страница\n"
-"Стандартна - 4x6"
+"<small><i>Галерията работи докато не я изключите или спрете F-Spot. "
+"Проверете\n"
+"дали програмите я достъпват директно, а не през сървъра-посредник за HTTP.</"
+"i></small>"
-#: ../src/f-spot.glade.h:79 ../src/StockIcons.cs:30
-msgid "Fullscreen"
-msgstr "Пълен екран"
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Докато галерията е включена можете да ползвате следния\n"
+"адрес, за да я достъпите от друг компютър.</i></small>"
-#: ../src/f-spot.glade.h:80
-msgid "Gallery"
-msgstr "Галерия"
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Включване и изключване на галерията по уеб"
-#: ../src/f-spot.glade.h:81
-msgid "Gallery Name:"
-msgstr "Име на галерията:"
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Позволяване на програмите за преглед да добавят етикети"
-#: ../src/f-spot.glade.h:82
-msgid "Gallery:"
-msgstr "Галерия:"
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Копиране на адреса в буфера за обмен"
-#: ../src/f-spot.glade.h:83
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "Галерия по уеб от F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "Адрес на галерия:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Ограничаване на броя на споделените снимки до"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Настройки:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Снимки с етикет"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Избраните снимки"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Споделяне:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Изгледи:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "Няма"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Галерия: {0}, снимки: {1}, последен клиент: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Галерията не е включена"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Сливане на базите от данни"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Грешка при отваряне на избрания файл"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
msgid ""
-"Hairline\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
msgstr ""
-"Косъм\n"
-"0.25 инча\n"
-"0.5 инча\n"
-"1 инча\n"
+"Избраният файл е неправилен или е от неподдържана база от данни.\n"
+"\n"
+"Получено изключение: „{0}“."
-#: ../src/f-spot.glade.h:88
-msgid "Hue:"
-msgstr "Отенък:"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+"<small><i>Изберете местоположението на базата от данни, от която искате да "
+"се внася</i></small>"
-#: ../src/f-spot.glade.h:89
-msgid "Icon:"
-msgstr "Икона:"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>Изберете какво да се внесе от избраната база от данни.\n"
+"„Само новите фотосесии“ е подходящ избор, който ще избегне повторното "
+"внасяне на снимки, които вече са внесени.\n"
+"„Внасяне на една фотосесия“ ви позволява да изберете коя сесия искате да се "
+"внесе.\n"
+"„Всичко“ ще внесе всичко и ще се появят дубликати, ако вече сте внасяли от "
+"тази база.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>Копирайте снимките локално или ги оставете където са. Ако изберете "
+"второто, проверете дали местоположение ще остане достъпно за F-Spot.</i></"
+"small>"
-#: ../src/f-spot.glade.h:90
-msgid "Import"
-msgstr "Внасяне"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "Внасяне на една фотосесия"
-#: ../src/f-spot.glade.h:91
-msgid "Import Source:"
-msgstr "Внасяне на източник:"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Копиране на изображенията в папката за снимки"
-#: ../src/f-spot.glade.h:92
-msgid "Import files after copy."
-msgstr "Внасяне на файловете след копиране"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Местоположение на базата от данни:"
-#: ../src/f-spot.glade.h:93
-msgid "Import from C_amera..."
-msgstr "Внасяне от _фотоапарат"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Всичко"
-#: ../src/f-spot.glade.h:94
-msgid "Include subdirectories."
-msgstr "Включително и подпапките"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Внасяне:"
-#: ../src/f-spot.glade.h:96
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "Запазване на изображенията на техните оригинални местоположения"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "Обединяване с друга колекция на F-Spot"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "Само новите фотосесии"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Пропускане"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
msgid ""
-"None\n"
-"Title\n"
-"Filename\n"
-"Date\n"
-"Photo Details"
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
msgstr ""
-"Няма\n"
-"Заглавие\n"
-"Име на файла\n"
-"Дата\n"
-"Информация за снимката"
+"<big>Базата от данни отговаря на файловете в папката <b>{0}</b>.\n"
+" Изберете я, за да се извърши съпоставяне.</big>"
-#: ../src/f-spot.glade.h:101
-msgid "Number of Copies:"
-msgstr "Брой на копията:"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "Настройки на предпазителя на екрана"
-#: ../src/f-spot.glade.h:102
-msgid "Open album in browser when done uploading"
-msgstr "Отваряне на албума в браузъра при приключване на качването"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Всички снимки"
-#: ../src/f-spot.glade.h:103
-msgid "Open destination when done exporting."
-msgstr "Отваряне на папката при приключване на изнасянето"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Закъснение:"
-#: ../src/f-spot.glade.h:104
-msgid "Page 1 of 3"
-msgstr "Страница 1 от 3"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Показване:"
-#: ../src/f-spot.glade.h:105
-msgid "Password:"
-msgstr "Парола:"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Снимки с етикет:"
-#: ../src/f-spot.glade.h:106
-msgid "Pause"
-msgstr "Пауза"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "F-Spot като предпазител на екрана"
-#: ../src/f-spot.glade.h:107
-msgid "Photo 0 of 0"
-msgstr "Снимка 0 от 0"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Настройки на предпазителя на екрана"
-#: ../src/f-spot.glade.h:108
-msgid "Photo Source:"
-msgstr "Източник на фотография:"
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
-#: ../src/f-spot.glade.h:109
-msgid "PhotoSize:"
-msgstr "Размер на снимката:"
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "Управление на снимки (F-Spot)"
-#: ../src/f-spot.glade.h:110
-msgid "Plain Files."
-msgstr "Обикновени файлове"
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Организирайте, наслаждавайте се и споделете снимките си"
-#: ../src/f-spot.glade.h:111
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "Уверете се, че настройките за тази галерия са правилни."
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Управление на снимки"
-#: ../src/f-spot.glade.h:112
-msgid "Prefix: "
-msgstr "Префикс:"
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Внасяне в F-Spot"
-#: ../src/f-spot.glade.h:113
-msgid "Previous"
-msgstr "Предишно"
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "Преглед на снимки с F-Spot"
-#: ../src/f-spot.glade.h:114
-msgid "Print Crop Marks"
-msgstr "Отпечатване на маркетите подрязване"
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Преглед на снимки"
-#: ../src/f-spot.glade.h:115
-msgid "Rem_ove Tag"
-msgstr "Премахване на етикет"
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
+msgid "File not found"
+msgstr "Файлът не е открит"
-#: ../src/f-spot.glade.h:116
-msgid "Resize to: "
-msgstr "Преоразмеряване към: "
+#: ../lib/libfspot/f-jpeg-utils.c:464
+#, c-format
+msgid "Unknown transform type %d"
+msgstr "Непознат вид трансформация — %d"
+
+#: ../lib/libfspot/f-jpeg-utils.c:472
+msgid "Operation failed"
+msgstr "Неуспешна операция"
+
+#: ../src/CameraFileSelectionDialog.cs:76
+msgid "Preview"
+msgstr "Преглед"
+
+#: ../src/CameraFileSelectionDialog.cs:78
+msgid "Path"
+msgstr "Път"
+
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
+msgid "File"
+msgstr "Файл"
+
+#: ../src/CameraFileSelectionDialog.cs:102
+msgid "Select Tag"
+msgstr "Избор на етикет"
+
+#: ../src/CameraFileSelectionDialog.cs:138
+msgid "Downloading Previews"
+msgstr "Сваляне на прегледи"
+
+#: ../src/CameraFileSelectionDialog.cs:148
+#, csharp-format
+msgid "Downloading Preview of {0}"
+msgstr "Сваляне на преглед на {0}"
+
+#: ../src/CameraFileSelectionDialog.cs:220
+#, csharp-format
+msgid "Copying file {0} of {1}"
+msgstr "Копиране на файл {0} от общо {1}"
+
+#: ../src/CameraFileSelectionDialog.cs:235
+msgid "Error transferring file"
+msgstr "Грешка при пренасянето на файла"
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Download Complete"
+msgstr "Свалянето на файловете приключи"
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Копирането на файловете приключи"
+
+#: ../src/CameraFileSelectionDialog.cs:268
+#, csharp-format
+msgid "Transferring \"{0}\" from camera"
+msgstr "Пренасяне на снимка „{0}“ от фотоапарат"
+
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
+msgid "Camera"
+msgstr "Фотоапарат"
+
+#: ../src/CameraSelectionDialog.cs:30
+msgid "Port"
+msgstr "Порт"
+
+#: ../src/Core/App.cs:278
+#, csharp-format
+msgid "No photos matching {0} found"
+msgstr "Не са открити снимки отговарящи на {0}"
+
+#: ../src/Core/App.cs:279
+#, csharp-format
+msgid ""
+"The tag \"{0}\" is not applied to any photos. Try adding\n"
+"the tag to some photos or selecting a different tag in the\n"
+"F-Spot preference dialog."
+msgstr ""
+"Етикетът „{0}“ не е зададен на никоя снимка. Добавете\n"
+"го поне към една или изберете друг етикет в прозореца\n"
+"с настройки на F-Spot."
+
+#: ../src/Core/App.cs:283
+msgid "Search returned no results"
+msgstr "Търсенето не върна никакви резултати"
+
+#: ../src/Core/App.cs:284
+msgid ""
+"The tag F-Spot is looking for does not exist. Try\n"
+"selecting a different tag in the F-Spot preference\n"
+"dialog."
+msgstr ""
+"Търсеният от F-Spot етикет не зададен на никоя снимка.\n"
+"Добавете го поне към една или изберете друг етикет в\n"
+"прозореца с настройки на F-Spot."
-#: ../src/f-spot.glade.h:117 ../src/StockIcons.cs:35
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Core/Photo.cs:473
+msgid "Reparented"
+msgstr "Версия на снимка"
+
+#: ../src/Core/Photo.cs:473
+#, csharp-format
+msgid "Reparented ({0})"
+msgstr "Версия на снимка ({0})"
+
+#: ../src/Core/Photo.cs:492
+#, csharp-format
+msgid "Modified"
+msgid_plural "Modified ({0})"
+msgstr[0] "Променена"
+msgstr[1] "Променени ({0})"
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1}"
+msgstr "Променена в {1}"
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1} ({0})"
+msgstr "Променена в {1} ({0})"
+
+#. Note that the original version is never stored in the photo_versions table in the
+#. database.
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
+msgid "Original"
+msgstr "Оригинал"
+
+#: ../src/Editors/AutoStretchEditor.cs:17
+msgid "Auto Color"
+msgstr "Автоматични цветове"
+
+#: ../src/Editors/ColorEditor.cs:38
+msgid "Adjust Colors"
+msgstr "Цветове"
+
+#: ../src/Editors/ColorEditor.cs:41
+msgid "Adjust"
+msgstr "Регулиране"
+
+#: ../src/Editors/CropEditor.cs:35
+msgid "4 x 3 (Book)"
+msgstr "4×3 (вертикално)"
+
+#: ../src/Editors/CropEditor.cs:36
+msgid "4 x 6 (Postcard)"
+msgstr "4×6 (хоризонтално)"
+
+#: ../src/Editors/CropEditor.cs:37
+msgid "5 x 7 (L, 2L)"
+msgstr "5×7 (L, 2L)"
+
+#: ../src/Editors/CropEditor.cs:38
+msgid "8 x 10"
+msgstr "8×10"
+
+#: ../src/Editors/CropEditor.cs:39
+msgid "Square"
+msgstr "Квадрат"
+
+#: ../src/Editors/CropEditor.cs:42
+msgid "Crop"
+msgstr "Изрязване"
+
+#: ../src/Editors/CropEditor.cs:73
+msgid "Select the area that needs cropping."
+msgstr "Изберете зоната, която трябва да се изреже."
+
+#: ../src/Editors/CropEditor.cs:98
+msgid "No Constraint"
+msgstr "Без ограничители"
+
+#: ../src/Editors/CropEditor.cs:99
+msgid "Same as photo"
+msgstr "Същия като снимката"
+
+#: ../src/Editors/CropEditor.cs:104
+msgid "Custom Ratios..."
+msgstr "Потребителски пропорции…"
+
+# FIXME
+#: ../src/Editors/DesaturateEditor.cs:17
+msgid "Desaturate"
+msgstr "Разводняване"
+
+#: ../src/Editors/RedEyeEditor.cs:19
+msgid "Red-eye Reduction"
+msgstr "Без червени очи"
+
+#: ../src/Editors/RedEyeEditor.cs:21
+msgid "Fix!"
+msgstr "Поправяне!"
+
+#: ../src/Editors/RedEyeEditor.cs:25
+msgid "Select the eyes you wish to fix."
+msgstr "Изберете червените очи, които искате да се поправят."
+
+#: ../src/Editors/SepiaEditor.cs:17
+msgid "Sepia Tone"
+msgstr "В сепия"
+
+#: ../src/Editors/SoftFocusEditor.cs:32
+msgid "Soft Focus"
+msgstr "Мек фокус"
+
+#: ../src/Editors/TiltEditor.cs:30
+msgid "Straighten"
+msgstr "Изправяне"
+
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "Грешка при внасянето"
+
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Грешка при внасянето на {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Файлове от вида „{0}“ не могат да бъдат запазени"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Необработено изключение"
+
+#: ../src/FSpot.addin.xml.h:1
+msgid "Copy Photo"
+msgstr "Копиране на снимка"
+
+#: ../src/FSpot.addin.xml.h:2
+msgid "Export to"
+msgstr "Изнасяне в"
+
+#: ../src/FSpot.addin.xml.h:3
+msgid "Open _With"
+msgstr "Отваряне _с"
+
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
+msgid "Rem_ove Tag"
+msgstr "Премахване на _етикет"
+
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
-msgstr "Завъртане на ляво"
+msgstr "Завъртане на_ляво"
-#: ../src/f-spot.glade.h:118 ../src/StockIcons.cs:36
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
-msgstr "Завъртане на дясно"
+msgstr "Завъртане на_дясно"
-#: ../src/f-spot.glade.h:119
-msgid "Saturation:"
-msgstr "Наситеност:"
+#: ../src/FSpot.addin.xml.h:7
+msgid "Tools"
+msgstr "Инструменти"
-#: ../src/f-spot.glade.h:120
-msgid "Scale images to no larger than: "
-msgstr ""
-"Скалиране на изображенията\n"
-"да са не по-големи от:"
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
+msgid "_Attach Tag"
+msgstr "_Добавяне на етикет"
-#: ../src/f-spot.glade.h:121
-msgid "Select Files To Copy From Camera..."
-msgstr "Избор на файлове, които да се копират от фотоапарата..."
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
+msgid "_Delete From Drive"
+msgstr "Из_триване от диска"
-#: ../src/f-spot.glade.h:122
-msgid "Select Tags..."
-msgstr "Избор на етикети..."
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
+msgid "_Remove From Catalog"
+msgstr "Према_хване от каталога"
-#: ../src/f-spot.glade.h:123
-msgid "Select _All"
-msgstr "Избор на всичко"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/f-spot.glade.h:124
-msgid "Select _None"
-msgstr "Отизбиране на всичко"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 пикс."
-#: ../src/f-spot.glade.h:125
-msgid "Select a tag..."
-msgstr "Избор на етикет..."
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 пикс."
-#: ../src/f-spot.glade.h:126
-msgid "Select the camera you want to transfer files from."
-msgstr "Изберете камерата, от която искате да копирате файлове."
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 пикс."
-#: ../src/f-spot.glade.h:127
-msgid "Selected Camera: "
-msgstr "Избран фотоапарат: "
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 пикс."
-#: ../src/f-spot.glade.h:128
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 пикс."
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>Ко_рекции</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Интерполация на снимка</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Размер</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Резюме</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Прозрачни части</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Преглед на всички внесени снимки</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>_Баланс на бялото</b>"
+
+#: ../src/f-spot.glade.h:21
msgid ""
-"Selection\n"
-"Gallery\n"
-"Viewport"
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
msgstr ""
-"Избор\n"
-"Галерия\n"
-"Изглед"
+"<small><i>Тук можете да позволите интерполиране на мащабирани изображения. "
+"Не го забранявайте за преглед на снимки. При проектиране на икони може да го "
+"изключите.</i></small>"
-#: ../src/f-spot.glade.h:131
-msgid "Send _Mail..."
-msgstr "Изпращане на поща..."
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>Можете да изберете как да се показват прозрачните части на "
+"изображенията. Тази настройка не влияе на снимките, но включването ѝ или "
+"използването на потребителски цвят, може да е полезно при преглед на икони "
+"или други изображения с прозрачни части.</i></small>"
-#: ../src/f-spot.glade.h:132
-msgid "Set _Date Range..."
-msgstr "Поставяне на времевия обхват"
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "Задаване като _фон"
-#: ../src/f-spot.glade.h:133
-msgid "Set as _Background"
-msgstr "Поставяне за фон"
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "Като _потребителски цвят: "
-#: ../src/f-spot.glade.h:134
-msgid "Show or hide the side pane"
-msgstr "Показване или скриване на страничния панел"
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "Като _шарка"
-#: ../src/f-spot.glade.h:135
-msgid "Show or hide the toolbar"
-msgstr "Показване или скриване на лентата с инструментите"
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Прикрепване на етикети:"
-#: ../src/f-spot.glade.h:136
-msgid "Side _pane"
-msgstr "Страничен _панел"
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "До_бавяне на етикет:"
-#: ../src/f-spot.glade.h:137 ../src/StockIcons.cs:31
-msgid "Slideshow"
-msgstr "Прожекция"
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
-#: ../src/f-spot.glade.h:138
-msgid "Source Temp"
-msgstr "Временна директория източник"
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "К_онтраст:"
-#: ../src/f-spot.glade.h:139
-msgid "Strip Image Metadata"
-msgstr "Махане на метаинформацията на изображението"
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Създаване"
-#: ../src/f-spot.glade.h:140
-msgid "Strip metadata"
-msgstr "Махане на метаинформацията"
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "Избор на фотоапарат"
-#: ../src/f-spot.glade.h:141 ../src/TagCommands.cs:295
-msgid "Tag name:"
-msgstr "Име на етикет:"
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "Копиране на файловете в папката за изображения и снимки"
-#: ../src/f-spot.glade.h:142
-msgid "Toolbar"
-msgstr "Лента с инструменти"
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "Създаване на писмо"
-#: ../src/f-spot.glade.h:143
-msgid "URI:"
-msgstr "URI:"
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr "При първо използване да се създаде _икона за етикет"
-#: ../src/f-spot.glade.h:144
-msgid "URL:"
-msgstr "URL:"
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr ""
+"Създаване на писмо с избраните снимки (вероятно с по-малък размер) като "
+"прикачени файлове "
-#: ../src/f-spot.glade.h:145
-msgid "Use Original."
-msgstr "Използване на оригинала"
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr "Намиране на дубликати"
-#: ../src/f-spot.glade.h:146
-msgid "Use static HTML."
-msgstr "Използване на статичен HTML код"
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "Показване на _имената на файловете"
-#: ../src/f-spot.glade.h:147
-msgid "Username:"
-msgstr "Потребителско име:"
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "Показване само на снимките от определени фотосесии."
-#: ../src/f-spot.glade.h:148
-msgid "View"
-msgstr "Преглед"
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "Да не се изпраща писмо"
-#: ../src/f-spot.glade.h:149
-msgid "View photos in browser when done uploading"
-msgstr "Показване на снимките в браузъра при приключване на качването"
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "Ад_рес на е-поща:"
-#: ../src/f-spot.glade.h:150
-msgid "Virtual Filesystem"
-msgstr "Виртуална файлова система"
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "И_знасяне на заглавията и коментарите"
-#: ../src/f-spot.glade.h:151
-msgid "Will print Using: US Letter size on Generic Postscript"
-msgstr "Ще се отпечата на: размер US писмо с Generic Postscript"
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "Предполагаем нов размер"
-#: ../src/f-spot.glade.h:152
-msgid "Write only these Items to CD"
-msgstr "Записване само на тези обекти на диска"
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "Много голям"
-#: ../src/f-spot.glade.h:153
-msgid "Zoom _In"
-msgstr "Увеличаване"
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "Преглед с F-Spot"
-#: ../src/f-spot.glade.h:154
-msgid "Zoom _Out"
-msgstr "Намаляне"
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr "Филтриране по избраните фотосесии"
-#: ../src/f-spot.glade.h:155
-msgid "_Attach Tag"
-msgstr "Прикачване на етикет"
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "_Галерия:"
-#: ../src/f-spot.glade.h:156
-msgid "_Attach Tag To Selection"
-msgstr "Прикачване на етикет към избраното"
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "Галерия"
-#: ../src/f-spot.glade.h:157
-msgid "_Clear Date Range"
-msgstr "Изчистване на времевия обхват"
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Внасяне"
-#: ../src/f-spot.glade.h:158
-msgid "_Close"
-msgstr "Затваряне"
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "Източник:"
-#: ../src/f-spot.glade.h:159
-msgid "_Delete Selected Tag"
-msgstr "Изтриване на избрания етикет"
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "Включително и подпапките"
-#: ../src/f-spot.glade.h:160
-msgid "_Delete Version"
-msgstr "Изтриване на версията"
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "Голям"
-#: ../src/f-spot.glade.h:161
-msgid "_Delete from Drive"
-msgstr "Изтриване от диска"
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr "Управление на потребителските диапазони от избори"
-#: ../src/f-spot.glade.h:162
-msgid "_Directory"
-msgstr "Папка"
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "Среден"
-#: ../src/f-spot.glade.h:163
-msgid "_Edit Selected Tag..."
-msgstr "Редакция на избрания етикет..."
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "Брой снимки в избраните фотосесии:"
-#: ../src/f-spot.glade.h:164
-msgid "_Export"
-msgstr "Изнасяне"
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "Брой снимки"
-#: ../src/f-spot.glade.h:165
-msgid "_Fullscreen"
-msgstr "Пълен екран"
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "_Отваряне на папка…"
-#: ../src/f-spot.glade.h:166
-msgid "_Import..."
-msgstr "Внасяне..."
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "Оригинален размер (възможен е много голям файл)"
-#: ../src/f-spot.glade.h:167
-msgid "_Large"
-msgstr "Голямо"
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "_Родителски етикет:"
-#: ../src/f-spot.glade.h:168
-msgid "_Medium"
-msgstr "Средно"
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "Пауза"
-#: ../src/f-spot.glade.h:169
-msgid "_Metadata Browser"
-msgstr "_Разглеждане на мета-данните"
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "Настройки"
-#: ../src/f-spot.glade.h:170
-msgid "_Month"
-msgstr "Месец"
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Предна"
-#: ../src/f-spot.glade.h:171
-msgid "_Print..."
-msgstr "Принтиране"
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "Поправка"
-#: ../src/f-spot.glade.h:172
-msgid "_Remove From Catalog"
-msgstr "Премахване от каталога"
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr "Избор на снимки, които да се копират от фотоапарат…"
-#: ../src/f-spot.glade.h:173
-msgid "_Remove Tag From Selection"
-msgstr "Премахване на етикет от избраното"
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "Избор на етикет…"
-#: ../src/f-spot.glade.h:174
-msgid "_Rename Version"
-msgstr "Преименуване на версията"
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "Изберете фотоапарата, от който искате да се прехвърлят файлове"
-#: ../src/f-spot.glade.h:175
-msgid "_Sharpen..."
-msgstr "Изостряне на изображението"
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "Избран фотоапарат: "
-#: ../src/f-spot.glade.h:176
-msgid "_Size"
-msgstr "Размер"
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "Ограничения на избора"
+
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "Задаване като _фон"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "Показване на всички снимки."
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "Показване или скриване на страничния панел"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "Показване или скриване на лентата с инструментите"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "_Страничен панел"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "Малък"
+
+#: ../src/f-spot.glade.h:82
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"Укажете дали снимките в оригинален размер да се завъртят или не. По-малките "
+"размери се завъртат автоматично."
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "_Махане на допълнителните данни от снимката"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr "Вре_менен:"
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "Много малък"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr "Общ оригинален размер"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "_Увеличаване"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "_Намаляване"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Увеличаване"
+
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Намаляване"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "_Яркост:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_Създаване на писмо"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "_Редактиране"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "_Eкспонация:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "На _цял екран"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Галерия"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "Помо_щ"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "_Отенък:"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "_Интерполиране на снимките при мащабиране"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Нов прозорец"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "_Отваряне на албума в браузъра при приключване на качването"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "_Отваряне на папката при приключване на изнасянето"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Снимка"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "_Наситеност:"
-#: ../src/f-spot.glade.h:177
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "_Мащабиране на снимките до:"
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
msgid "_Slideshow"
-msgstr "Прожекция"
+msgstr "Про_жекция"
-#: ../src/f-spot.glade.h:178
-msgid "_Small"
-msgstr "Малки"
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "_Махане на допълнителните данни"
-#: ../src/f-spot.glade.h:179
-msgid "_Tags"
-msgstr "Етикети"
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "_Име на етикет:"
-#: ../src/f-spot.glade.h:180
-msgid "_Update Thumbnail"
-msgstr "Обновяване на малкото изображение"
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "_Отенък:"
-#: ../src/f-spot.glade.h:181
-msgid "_Version"
-msgstr "Версия"
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "_Лента с инструменти"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_Адрес:"
-#: ../src/f-spot.glade.h:182
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
msgid "_View"
-msgstr "Преглед"
+msgstr "_Преглед"
-#: ../src/f-spot.glade.h:183
-msgid "dialog1"
-msgstr "прозорец1"
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "_Виртуална файлова система"
-#: ../src/f-spot.glade.h:184
-msgid "pixels"
-msgstr "пиксела"
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "и"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"на\n"
+"след\n"
+"между"
-#: ../src/f-spot.glade.h:185
+#: ../src/f-spot.glade.h:126
msgid "x"
-msgstr "x"
+msgstr "×"
-#: ../src/GalleryExport.cs:442
-msgid "Error Uploading To Gallery"
-msgstr "Грешка при качване в галерията"
+#: ../src/FullScreenView.cs:58
+msgid "Hide"
+msgstr "Скриване"
-#: ../src/GalleryExport.cs:474
-msgid "(No Gallery)"
-msgstr "(няма галерия)"
+#: ../src/FullScreenView.cs:60
+msgid "Hide Toolbar"
+msgstr "Скриване на лентата с инструменти"
-#: ../src/GalleryExport.cs:531
-msgid "(Not Connected)"
-msgstr "(Няма осъществена връзка)"
+#: ../src/FullScreenView.cs:66
+msgid "Info"
+msgstr "Информация"
-#: ../src/GalleryExport.cs:532
-msgid "(No Albums)"
-msgstr "(няма албуми)"
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
+msgid "Image Information"
+msgstr "Информация за снимката"
-#: ../src/ImportCommand.cs:27
-msgid "Select Folder"
-msgstr "Избор на папка"
+#: ../src/FullScreenView.cs:73
+msgid "Exit fullscreen"
+msgstr "Изход от цял екран"
-#: ../src/ImportCommand.cs:218
-msgid "(No Cameras Detected)"
-msgstr "Няма засечени фотоапарати."
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
+msgid "Slideshow"
+msgstr "Прожекция"
-#: ../src/ImportCommand.cs:631
-msgid "Select Tag"
-msgstr "Избор на етикет"
+#: ../src/FullScreenView.cs:82
+msgid "Start slideshow"
+msgstr "Прожекция"
-#: ../src/ImportCommand.cs:705
-msgid "Directory does not exist."
-msgstr "Папката не съществува."
+#: ../src/FullScreenView.cs:128
+msgid "Slide transition:"
+msgstr "Преход:"
-#: ../src/ImportCommand.cs:706
-#, csharp-format
-msgid ""
-"The directory you selected \"{0}\" does not exist. Please choose a "
-"different directory"
-msgstr "Папката, която сте избрали „{0}“ не съществува. Изберете друга папка."
+#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
+msgid "More dates"
+msgstr "Още дати"
-#: ../src/InfoBox.cs:70 ../src/PhotoVersionCommands.cs:55
-msgid "Name:"
-msgstr "Име:"
+#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
+msgid "More"
+msgstr "Още"
-#: ../src/InfoBox.cs:72
-msgid "Version:"
-msgstr "Версия:"
-
-#: ../src/InfoBox.cs:74
-msgid "Date:"
-msgstr "Дата:"
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
+msgid "_Clear Date Range"
+msgstr "_Изчистване на времевия обхват"
-#: ../src/InfoBox.cs:76
-msgid "Size:"
-msgstr "Размер:"
+#: ../src/Imaging/Exif.cs:228
+msgid "Image Directory"
+msgstr "Папка със снимки"
-#: ../src/InfoBox.cs:78
-msgid "Exposure:"
-msgstr "Експонация:"
+#: ../src/Imaging/Exif.cs:230
+msgid "Thumbnail Directory"
+msgstr "Папка за миниатюрите"
-#: ../src/InfoBox.cs:156
-msgid "(None)"
-msgstr "(няма)"
+#: ../src/Imaging/Exif.cs:232
+msgid "Exif Directory"
+msgstr "Папка за Exif"
-#: ../src/InfoDisplay.cs:148
-msgid "Extended Metadata"
-msgstr "Допълнителни мета-данни"
+#: ../src/Imaging/Exif.cs:234
+msgid "GPS Directory"
+msgstr "Папка за GPS"
-#: ../src/InfoDisplay.cs:187
-msgid "No active image"
-msgstr "Няма активно изображение"
+#: ../src/Imaging/Exif.cs:236
+msgid "InterOperability Directory"
+msgstr "Папка за съвместимост"
-#: ../src/InfoDisplay.cs:189
-#, csharp-format
-msgid "The image \"{0}\" does not exist"
-msgstr "Изображението \"{0}\" не съществува"
+#: ../src/Imaging/Exif.cs:238
+msgid "Unknown Directory"
+msgstr "Непозната папка"
-#: ../src/InfoDisplay.cs:195
-msgid "No metadata available"
-msgstr "Няма налични мета-данни"
+#: ../src/Imaging/ImageFile.cs:117
+msgid "Writing to this file format is not supported"
+msgstr "Запазването в този формат не се поддържа"
-#: ../src/IptcFile.cs:139
+#: ../src/Imaging/IptcFile.cs:145
msgid "IPTC Information Interchange Model (IIM) Version number"
-msgstr ""
+msgstr "Номер на версия на модела за обмяна на информация (IIM) на IPTC"
-#: ../src/IptcFile.cs:141
+#: ../src/Imaging/IptcFile.cs:147
msgid "OSI Destination routing information"
-msgstr ""
+msgstr "Информация за маршрута към целта на OSI"
-#: ../src/IptcFile.cs:143
+#: ../src/Imaging/IptcFile.cs:149
msgid "IPTC file format"
-msgstr "IPTC файлов формат"
+msgstr "Файлов формат IPTC"
-#: ../src/IptcFile.cs:145
+#: ../src/Imaging/IptcFile.cs:151
msgid "Identifies the provider and product"
-msgstr "Идентифицира доставчика и продукта"
+msgstr "Указва доставчика и продукта"
-#: ../src/IptcFile.cs:147
+#: ../src/Imaging/IptcFile.cs:153
msgid "A unique number identifying the envelope"
msgstr "Уникален номер идентифициращ плика"
-#: ../src/IptcFile.cs:149
+#: ../src/Imaging/IptcFile.cs:155
msgid "A unique number"
msgstr "Уникален номер"
-#: ../src/IptcFile.cs:151
+#: ../src/Imaging/IptcFile.cs:157
msgid ""
"The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
msgstr ""
"Приоритет на обработване на плика между 1 (най-спешно) и 9 (най-малко спешно)"
-#: ../src/IptcFile.cs:153
-msgid "The year month and day (CCYYMMDD) the service sent the material"
+#: ../src/Imaging/IptcFile.cs:159
+msgid "The year, month and day (CCYYMMDD) the service sent the material"
msgstr ""
"Годината, месецът и денят (CCYYMMDD), когато услугата е пратила материала"
-#: ../src/IptcFile.cs:155
-msgid ""
-"The hour minute and second the (HHMMSS+HHMM) the service sent the material"
+#: ../src/Imaging/IptcFile.cs:161
+msgid "The hour, minute and second (HHMMSS) the service sent the material"
msgstr ""
-"Часът, минутата и секундата (HHMMSS+HHMM), когато услугата е изпратила "
+"Часът, минутата и секундата (HHMMSS+HHMM), когато услугата е пратила "
"материала"
-#: ../src/IptcFile.cs:157
+#: ../src/Imaging/IptcFile.cs:163
msgid "The character set designation"
-msgstr ""
+msgstr "Означение на набор от знаци"
-#: ../src/IptcFile.cs:159
+#: ../src/Imaging/IptcFile.cs:165
msgid "External globally unique object identifier"
-msgstr ""
+msgstr "Външен, глобално уникален идентификатор"
-#: ../src/IptcFile.cs:164
+#: ../src/Imaging/IptcFile.cs:170
msgid "Abstract Relationship Method (ARM) identifier"
-msgstr ""
+msgstr "Идентификатор на абстрактен метод за отношения (ARM)"
-#: ../src/IptcFile.cs:166
+#: ../src/Imaging/IptcFile.cs:172
msgid "Abstract Relationship Method (ARM) version number."
-msgstr ""
+msgstr "Версия на абстрактния метод за отношения (ARM)."
-#: ../src/IptcFile.cs:169
+#: ../src/Imaging/IptcFile.cs:175
msgid "Number identifying the IIM version this application record uses"
-msgstr ""
+msgstr "Номер на версията на IIM, използвана от този запис от програма"
-#: ../src/IptcFile.cs:171
+#: ../src/Imaging/IptcFile.cs:177
msgid "Object type reference"
-msgstr ""
+msgstr "Референция към обект"
-#: ../src/IptcFile.cs:176
+#: ../src/Imaging/IptcFile.cs:182
msgid "Object attribute reference"
-msgstr ""
+msgstr "Референция към атрибут на обект"
-#: ../src/IptcFile.cs:182 ../src/IptcFile.cs:186
+#: ../src/Imaging/IptcFile.cs:188 ../src/Imaging/IptcFile.cs:192
msgid "Object name"
msgstr "Име на обект"
-#: ../src/IptcFile.cs:184
+#: ../src/Imaging/IptcFile.cs:190
msgid "Status of the objectdata according to the provider"
-msgstr ""
+msgstr "Състояние на данните на обект според доставчика"
-#: ../src/IptcFile.cs:189
+#: ../src/Imaging/IptcFile.cs:194
+msgid "Location within a city or area where the object originates"
+msgstr "Местоположение в град или зона, където е създаден обекта"
+
+#: ../src/Imaging/IptcFile.cs:197
msgid "Name of the city the content is focussing on"
-msgstr "Име на града, над който съдържанието се фокусира"
+msgstr "Име на града, който е тема на съдържанието"
-#: ../src/IptcFile.cs:192
+#: ../src/Imaging/IptcFile.cs:200
msgid "Copyright information for"
msgstr "Информация за авторските права за"
-#: ../src/IptcFile.cs:195
+#: ../src/Imaging/IptcFile.cs:203
msgid "Full name of the country of the focus of the content"
-msgstr "Пълно име на страната на фокуса на съдържанието"
+msgstr "Пълно име на държавата, в която е темата на съдържанието"
-#: ../src/IptcFile.cs:198
+#: ../src/Imaging/IptcFile.cs:206
msgid ""
"Two or three letter ISO3166 code of the country of the focus of the content"
-msgstr "Две или трибуквен код по ISO3166 на страната на фокуса на съдържанието"
+msgstr ""
+"Две- или трибуквен код по ISO3166 на държавата, в която е темата на "
+"съдържанието"
-#: ../src/IptcFile.cs:201
-msgid "bleh"
-msgstr "блях"
+#: ../src/Imaging/IptcFile.cs:209
+msgid "Creator of the content"
+msgstr "Създател"
+
+#: ../src/Imaging/IptcFile.cs:212
+msgid "Provider of the object"
+msgstr "Доставчик на обекта"
-#: ../src/IptcFile.cs:204
+#: ../src/Imaging/IptcFile.cs:215
msgid "The title of the author or creator"
msgstr "Обръщението към автора или създателя"
-#: ../src/IptcFile.cs:207
+#: ../src/Imaging/IptcFile.cs:218
msgid ""
-"The person involved in writing, editing orcorrecting the objectdata or "
+"The person involved in writing, editing or correcting the object data or "
"caption/abstract"
msgstr ""
-"Човекът замесен в писането, редактирането или поправянето на данните за "
-"обекта или краткото описание."
+"Човекът, отговорен за писането, редактирането или поправянето на данните за "
+"обекта или краткото описание"
-#: ../src/IptcFile.cs:211
+#: ../src/Imaging/IptcFile.cs:222
msgid "Headline of the content"
-msgstr ""
+msgstr "Заглавие на съдържанието"
-#: ../src/IptcFile.cs:214
+#: ../src/Imaging/IptcFile.cs:225
msgid ""
-"Intructions from the creator to the reciever not covered by other fields"
+"Instructions from the creator to the receiver not covered by other fields"
msgstr ""
"Инструкции от създателя към получателя, които не са покрити от други полета"
-#: ../src/IptcFile.cs:217
+#: ../src/Imaging/IptcFile.cs:228
msgid "Intellectual genre of the object"
msgstr "Интелектуален жанр на обекта"
-#: ../src/IptcFile.cs:230
-msgid "Unkown IIM DataSet"
-msgstr ""
+#: ../src/Imaging/IptcFile.cs:241
+msgid "Unknown IIM DataSet"
+msgstr "Непознат набор от данни на IIM"
+
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
+msgid "Select Folder"
+msgstr "Избор на папка"
+
+#: ../src/ImportCommand.cs:259
+msgid "(No Cameras Detected)"
+msgstr "(не са открити фотоапарати)"
-#: ../src/MainWindow.cs:947
+#: ../src/ImportCommand.cs:404
+#, csharp-format
+msgid "Loading {0} of {1}"
+msgstr "Зареждане на файл {0} от общо {1}"
+
+#: ../src/ImportCommand.cs:470
+msgid "Done Loading"
+msgstr "Зареждането завърши"
+
+#: ../src/ImportCommand.cs:684
+msgid "Directory does not exist."
+msgstr "Папката не съществува."
+
+#: ../src/ImportCommand.cs:685
+#, csharp-format
+msgid ""
+"The directory you selected \"{0}\" does not exist. Please choose a "
+"different directory"
+msgstr "Папката, която сте избрали — „{0}“, не съществува, изберете друга."
+
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
+#: ../src/XmpTagsImporter.cs:89
+msgid "Imported Tags"
+msgstr "Внасяне на етикети"
+
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
+msgid "Rotate Left"
+msgstr "Завъртане наляво"
+
+#: ../src/ItemAction.cs:80
+msgid "Rotate picture left"
+msgstr "Завъртане на снимката наляво"
+
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
+msgid "Rotate Right"
+msgstr "Завъртане надясно"
+
+#: ../src/ItemAction.cs:92
+msgid "Rotate picture right"
+msgstr "Завъртане на снимката надясно"
+
+#: ../src/ItemAction.cs:103
+msgid "Next picture"
+msgstr "Следваща снимка"
+
+#: ../src/ItemAction.cs:124
+msgid "Previous picture"
+msgstr "Предишна снимка"
+
+#: ../src/MainWindow.cs:303
+msgid "Import new images"
+msgstr "Внасяне на нови снимки"
+
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
+msgid "Browse"
+msgstr "Разглеждане"
+
+#: ../src/MainWindow.cs:323
+msgid "Browse many photos simultaneously"
+msgstr "Едновременно преглеждане на много снимки"
+
+#: ../src/MainWindow.cs:327
+msgid "Edit Image"
+msgstr "Редактиране"
+
+#: ../src/MainWindow.cs:331
+msgid "View and edit a photo"
+msgstr "Преглед и редактиране на снимка"
+
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
+msgid "Fullscreen"
+msgstr "На цял екран"
+
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
+msgid "View photos fullscreen"
+msgstr "Преглед на цял екран"
+
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
+msgid "View photos in a slideshow"
+msgstr "Преглед на снимки в прожекция"
+
+#: ../src/MainWindow.cs:358
+msgid "Previous photo"
+msgstr "Предишна снимка"
+
+#: ../src/MainWindow.cs:363
+msgid "Next photo"
+msgstr "Следваща снимка"
+
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
-msgstr "Няма засечени фотоапарати."
+msgstr "Не са открити фотоапарати."
-#: ../src/MainWindow.cs:948
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
msgstr ""
-"F-Spot не успя да намери фотоапарати включени към компютъра. Уверете се, че "
-"фотоапарата е свързан към компютъра и че е включен."
+"F-Spot не успя да намери фотоапарати включени към компютъра. Проверете дали "
+"фотоапаратът е свързан към компютъра и дали е включен."
-#: ../src/MainWindow.cs:988
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Грешка при свързване с фотоапарата"
-#: ../src/MainWindow.cs:989
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Получи се грешка „{0}“ при свързването с фотоапарата"
-#. Translators should localize the following string
-#. * which will give them credit in the About box.
-#. * E.g. "Martin Willemoes Hansen"
-#: ../src/MainWindow.cs:1122
-msgid "translator-credits"
-msgstr ""
-"Ростислав „zbrox“ Райков <zbrox at i-space.org>\n"
-"\n"
-"Проектът за превод на GNOME има нужда от подкрепа.\n"
-"Научете повече за нас на http://gnome.cult.bg\n"
-"Докладвайте за грешки на http://gnome.cult.bg/bugs"
+#. Translators, The singular case will never happen here.
+#: ../src/MainWindow.cs:1846
+#, csharp-format
+msgid "Merge the selected tag"
+msgid_plural "Merge the {0} selected tags?"
+msgstr[0] "Обединяване на избрания етикет?"
+msgstr[1] "Обединяване на избраните {0} етикета?"
-#: ../src/MainWindow.cs:1253
-msgid "Unsharp Mask"
-msgstr "Нерязко маркиране"
+#: ../src/MainWindow.cs:1873
+msgid ""
+"This operation will merge the selected tags and any sub-tags into a single "
+"tag."
+msgstr "Тази операция ще обедини избраните етикети с всички подетикети в един."
-#: ../src/MainWindow.cs:1262
-msgid "Amount:"
-msgstr "Количество:"
+#: ../src/MainWindow.cs:1875
+msgid "_Merge Tags"
+msgstr "_Обединяване на етикети"
-#: ../src/MainWindow.cs:1263
-msgid "Radius:"
-msgstr "Радиус:"
+#: ../src/MainWindow.cs:2080
+#, csharp-format
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] "{0} снимка от общо {1}"
+msgstr[1] "{0} снимки от общо {1}"
-#: ../src/MainWindow.cs:1264
-msgid "Threshold:"
-msgstr "Праг:"
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
+#, csharp-format
+msgid "{0} Photo"
+msgid_plural "{0} Photos"
+msgstr[0] "{0} снимка"
+msgstr[1] "{0} снимки"
-#: ../src/MainWindow.cs:1306
-msgid "Error saving sharpened photo"
-msgstr "Грешка при запазване на изостреното изображение."
+#: ../src/MainWindow.cs:2085
+#, csharp-format
+msgid " ({0} selected)"
+msgid_plural " ({0} selected)"
+msgstr[0] " ({0} избрана)"
+msgstr[1] " ({0} избрани)"
+
+#: ../src/MainWindow.cs:2166
+msgid "_Ok"
+msgstr "_Добре"
+
+#: ../src/MainWindow.cs:2167
+msgid "Error Deleting Picture"
+msgstr "Грешка при изтриване"
+
+#: ../src/MainWindow.cs:2172
+#, csharp-format
+msgid "No permission to delete the file:{1}{0}"
+msgstr "Нямате права за изтриване на файла:{1}{0}"
+
+#: ../src/MainWindow.cs:2176
+#, csharp-format
+msgid "An error of type {0} occurred while deleting the file:{2}{1}"
+msgstr "Възникна грешка от вида {0} при изтриване на файла:{2}{1}"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
-msgstr[0] "Изтриване на избраната снимка за постоянно?"
-msgstr[1] "Изтриване на {0}те избрани снимки за постоянно?"
+msgstr[0] "Да се изтрие ли избраната снимка окончателно?"
+msgstr[1] "Да се изтрият ле {0}-те избрани снимки окончателно?"
-#: ../src/MainWindow.cs:1533
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
-msgstr[0] "Това изтрива всички версии на избраната снимка от диска Ви."
-msgstr[1] "Това изтрива всички версии на избраните снимки от диска Ви."
+msgstr[0] "Това изтрива всички версии на избраната снимка от диска ви."
+msgstr[1] "Това изтрива всички версии на избраните снимки от диска ви."
-#: ../src/MainWindow.cs:1536
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
-msgstr[0] "Изтриване на снимката"
-msgstr[1] "Изтриване на снимките"
+msgstr[0] "_Изтриване на снимката"
+msgstr[1] "_Изтриване на снимките"
-#: ../src/MainWindow.cs:1554
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Премахване на избраната снимка от каталога?"
-msgstr[1] "Премахване на {0}те избрани снимки от каталога?"
+msgstr[1] "Премахване на {0}-те избрани снимки от каталога?"
-#: ../src/MainWindow.cs:1559
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
"again."
msgstr ""
-"Ако премахнете снимки от каталога всичките етикети ще бъдат загубени. Самите "
-"снимки остават на вашия компютър и могат по-късно да се внесат във F-Spot "
-"отново."
+"Ако премахнете снимки от каталога, всичките етикети ще бъдат загубени. "
+"Самите снимки остават на компютъра ви и могат по-късно да се внесат във F-"
+"Spot отново."
-#: ../src/MainWindow.cs:1560
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
-msgstr "Премахване от каталога"
+msgstr "_Премахване от каталога"
-#: ../src/MainWindow.cs:1586
+#: ../src/MainWindow.cs:2320
#, csharp-format
-msgid "Delete the selected tag?"
-msgid_plural "Delete the {0} selected tags?"
-msgstr[0] "Изтриване на избрания етикет?"
-msgstr[1] "Изтриване на избраните {0} етикети?"
+msgid "Delete tag \"{0}\"?"
+msgstr "Изтриване на етикета „{0}“?"
-#: ../src/MainWindow.cs:1591
-msgid "If you delete a tag, all associations with photos are lost."
-msgstr "Ако изтриете етикет, всички връзки със снимките ще се загубят."
+#: ../src/MainWindow.cs:2322
+#, csharp-format
+msgid "Delete the {0} selected tags?"
+msgstr "Изтриване на {0}-те избрани етикета?"
-#: ../src/MainWindow.cs:1592
+#: ../src/MainWindow.cs:2327
+msgid "photo"
+msgid_plural "photos"
+msgstr[0] "снимка"
+msgstr[1] "снимки"
+
+#: ../src/MainWindow.cs:2329
+#, csharp-format
+msgid "If you delete this tag, the association with {0} {1} will be lost."
+msgid_plural ""
+"If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] "Ако изтриете този етикет, всички връзки с {0} {1} ще се изгубят."
+msgstr[1] "Ако изтриете тези етикети, всички връзки с {0} {1} ще се изгубят."
+
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
-msgstr[0] "Изтриване на етикет"
-msgstr[1] "Изтриване на етикети"
+msgstr[0] "_Изтриване на етикет"
+msgstr[1] "_Изтриване на етикети"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:1606
-msgid "Category is not empty"
-msgstr "Категорията не е празна"
+#: ../src/MainWindow.cs:2348
+msgid "Tag is not empty"
+msgstr "Етикетът не е празен"
-#: ../src/MainWindow.cs:1607
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
-"Can not delete categorys which has tags. Please delete tags under \"{0}\" "
-"first"
+"Can not delete tags that have tags within them. Please delete tags under "
+"\"{0}\" first"
msgstr ""
-"Не може да се изтрие категория, която има етикети. Изтрийте етикетите за "
-"\"{0}\" първо."
+"Не могат да се изтриват етикети, в които има подетикети. Първо изтрийте "
+"подетикетите в „{0}“."
+
+#: ../src/MainWindow.cs:2789
+msgid "Rotate selected photo left"
+msgid_plural "Rotate selected photos left"
+msgstr[0] "Завъртане на снимката наляво"
+msgstr[1] "Завъртане на снимките наляво"
+
+#: ../src/MainWindow.cs:2802
+msgid "Rotate selected photo right"
+msgid_plural "Rotate selected photos right"
+msgstr[0] "Завъртане на снимката наляво"
+msgstr[1] "Завъртане на снимките надясно"
+
+#: ../src/MainWindow.cs:2813
+#, csharp-format
+msgid "Find _Selected Tag"
+msgid_plural "Find _Selected Tags"
+msgstr[0] "Търсене на избрания _етикет"
+msgstr[1] "Търсене на избраните _етикети"
-#: ../src/MetadataStore.cs:17
+#: ../src/MainWindow.cs:2817
+#, csharp-format
+msgid "Find Selected Tag _With"
+msgid_plural "Find Selected Tags _With"
+msgstr[0] "Търсене на избрания етикет _с"
+msgstr[1] "Търсене на избраните етикети _с"
+
+#: ../src/MainWindow.cs:2858
+msgid "Create New Version?"
+msgid_plural "Create New Versions?"
+msgstr[0] "Създаване на нова версия?"
+msgstr[1] "Създаване на нови версии?"
+
+#: ../src/MainWindow.cs:2860
+#, csharp-format
+msgid ""
+"Before launching {1}, should F-Spot create a new version of the selected "
+"photo to preserve the original?"
+msgid_plural ""
+"Before launching {1}, should F-Spot create new versions of the selected "
+"photos to preserve the originals?"
+msgstr[0] ""
+"Дали F-Spot да създаде нова версия на избраната снимка, преди да стартирате "
+"{1}, за да запазите оригинала?"
+msgstr[1] ""
+"Дали F-Spot да създаде нова версия на избраните снимки, преди да стартирате "
+"{1}, за да запазите оригиналите?"
+
+#: ../src/MainWindow.cs:2882
+msgid "XCF version"
+msgstr "Версия на XCF"
+
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "Създател"
-#: ../src/MetadataStore.cs:18
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "Заглавие"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "Авторски права"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "Тема и ключови думи"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "Компресия"
-#: ../src/MetadataStore.cs:23
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
-msgstr ""
+msgstr "Равен брой битове на отчет"
-#: ../src/MetadataStore.cs:25
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Ориентация"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Фотометрична интерпретация"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Единица за разделителна способност"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Програма на експонацията"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Режим на измерване"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Режим на експонация"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
-msgstr ""
+msgstr "Потребителски изобразен"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
-msgstr "Конфигурация на компонентите"
+msgstr "Настройки на компонентите"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Източник на светлина"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Метод на засичане"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Цветово пространство"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Баланс на бялото"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
-msgstr "Единца за разделителна способност на фокалната равнина"
+msgstr "Единица за разделителна способност на фокалната равнина"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Вид файлов източник"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
-msgstr ""
+msgstr "Вид заснемане"
-#: ../src/MetadataStore.cs:55
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
-msgstr ""
+msgstr "Усилване"
-#: ../src/MetadataStore.cs:57
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Контраст"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Наситеност"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Острота"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Вид сцена"
-#: ../src/PhotoPopup.cs:30
-msgid "Copy Image Location"
-msgstr "Копиране местоположението на снимката"
-
-#: ../src/PhotoPopup.cs:42
-msgid "Remove From Catalog"
-msgstr "Премахване от каталога"
-
-#: ../src/PhotoPopup.cs:44
-msgid "Delete From Drive"
-msgstr "Изтриване от хард диска"
-
-#.
-#. FIXME TagMenu is ugly.
-#.
-#: ../src/PhotoPopup.cs:52
-msgid "Attach Tag"
-msgstr "Прикачане на етикет"
-
-#.
-#. FIXME finish the IPhotoSelection stuff and move the activate handler into the class
-#. this current method is way too complicated.
-#.
-#: ../src/PhotoPopup.cs:62
-msgid "Remove Tag"
-msgstr "Премахване на етикет"
-
-#: ../src/PhotoStore.cs:290
-#, csharp-format
-msgid "Modified"
-msgid_plural "Modified ({0})"
-msgstr[0] "Променена"
-msgstr[1] "Променена ({0})"
-
-#. Note that the original version is never stored in the photo_versions table in the
-#. database.
-#: ../src/PhotoStore.cs:399
-msgid "Original"
-msgstr "Оригинал"
-
#. Fixme this should really set parent menu
#. items insensitve
-#: ../src/PhotoTagMenu.cs:72
+#: ../src/PhotoTagMenu.cs:74
msgid "(No Tags)"
-msgstr "(няма етикет)"
+msgstr "(без етикет)"
-#: ../src/PhotoVersionCommands.cs:54
+#: ../src/PhotoVersionCommands.cs:58
msgid "Create New Version"
msgstr "Създаване на нова версия"
#: ../src/PhotoVersionCommands.cs:59
+msgid "Name:"
+msgstr "Име:"
+
+#: ../src/PhotoVersionCommands.cs:63
msgid "Rename Version"
msgstr "Преименуване на версията"
-#: ../src/PhotoVersionCommands.cs:60
+#: ../src/PhotoVersionCommands.cs:64
msgid "New name:"
msgstr "Ново име:"
-#: ../src/PhotoVersionCommands.cs:126
+#: ../src/PhotoVersionCommands.cs:110
+msgid "Could not create a new version"
+msgstr "Не може да се създаде нова версия"
+
+#: ../src/PhotoVersionCommands.cs:111
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to create version \"{1}\""
+msgstr "Получи се изключение „{0}“. Не може да се създаде версията „{1}“"
+
+#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
msgstr "Наистина ли да се изтрие?"
-#: ../src/PhotoVersionCommands.cs:132
+#: ../src/PhotoVersionCommands.cs:139
+msgid "Cancel"
+msgstr "Отказване"
+
+#: ../src/PhotoVersionCommands.cs:140
+msgid "Delete"
+msgstr "Изтриване"
+
+#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
msgstr "Наистина ли да се изтрие версията „{0}“?"
-#: ../src/PhotoVersionMenu.cs:84
+#: ../src/PhotoVersionCommands.cs:154
+msgid "Could not delete a version"
+msgstr "Не може да се изтрие версия"
+
+#: ../src/PhotoVersionCommands.cs:155
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
+msgstr "Получи се изключение „{0}“. Не може да се изтрие версията „{1}“"
+
+#: ../src/PhotoVersionCommands.cs:196
+msgid "Could not rename a version"
+msgstr "Версията не може да се преименува"
+
+#: ../src/PhotoVersionCommands.cs:197
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
+msgstr "Получи се изключение „{0}“. Версията не може да се преименува на „{1}“"
+
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
-msgstr "(няма редакции)"
+msgstr "(без редакции)"
-#: ../src/PhotoView.cs:94
-msgid "No Constraint"
-msgstr "Няма ограничители"
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
+msgid "Error editing photo"
+msgstr "Грешка при редактиране на снимката"
-#: ../src/PhotoView.cs:95
-msgid "4 x 3 (Book)"
-msgstr "4 x 3 (Книга)"
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "Получи се изключение „{0}“. Не може да се запази снимката {1}"
-#: ../src/PhotoView.cs:96
-msgid "4 x 6 (Postcard)"
-msgstr "4 x 6 (Картичка)"
+#: ../src/PhotoView.cs:356
+msgid "Comment:"
+msgstr "Коментар:"
-#: ../src/PhotoView.cs:97
-msgid "5 x 7 (L, 2L)"
-msgstr "5 x 7 (L, 2L)"
+#: ../src/Preferences.cs:152
+msgid "Photos"
+msgstr "Снимки"
-#: ../src/PhotoView.cs:98
-msgid "8 x 10"
-msgstr "8 x 10"
+#: ../src/PrintOperation.cs:32
+msgid "Image Settings"
+msgstr "Настройки на снимка"
-#: ../src/PhotoView.cs:99
-msgid "4 x 3 Portrait (Book)"
-msgstr "4 x 3 Портрет (Книга)"
+#: ../src/QueryWidget.cs:58
+msgid "Find: "
+msgstr "Търсене:"
-#: ../src/PhotoView.cs:100
-msgid "4 x 6 Portrait (Postcard)"
-msgstr "4 x 6 Портрет (Картичка)"
+#: ../src/QueryWidget.cs:63
+msgid "Untagged photos"
+msgstr "Снимки без етикети"
-#: ../src/PhotoView.cs:101
-msgid "5 x 7 Portrait (L, 2L)"
-msgstr "5 x 7 Портрет (L, 2L)"
+#: ../src/QueryWidget.cs:71
+msgid "Rated photos"
+msgstr "Оценени снимки"
-#: ../src/PhotoView.cs:102
-msgid "8 x 10 Portrait"
-msgstr "8 x 10 Портрет"
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/QueryWidget.cs:80
+msgid "Import roll"
+msgstr "Внесена фотосесия"
-#: ../src/PhotoView.cs:103
-msgid "Square"
-msgstr "Квадрат"
+#: ../src/QueryWidget.cs:104
+msgid "Clear search"
+msgstr "Изчистване"
-#: ../src/PhotoView.cs:236
-msgid "No selection available"
-msgstr "Няма наличен избор"
+#: ../src/QueryWidget.cs:111
+msgid "Refresh search"
+msgstr "Обновяване"
-#: ../src/PhotoView.cs:237
-msgid ""
-"This tool requires an active selection. Please select a region of the image "
-"and try the operation again"
-msgstr ""
-"Този инструмент изисква активна селекция. Изберете регион от изображението и "
-"опитайте операцията отново"
+#: ../src/QueryWidget.cs:113
+msgid "No matching photos found"
+msgstr "Не са открити съвпадения"
-#: ../src/PhotoView.cs:295
-msgid "Error editing photo"
-msgstr "Грешка при редактиране на изображението"
+#: ../src/QueryWidget.cs:155
+msgid "Hide _Find Bar"
+msgstr "Скриване на лентата за _търсене"
-#: ../src/PhotoView.cs:490
-msgid "Crop image to selected area"
-msgstr "Изрязване на изображението до избрания регион"
+#: ../src/QueryWidget.cs:161
+msgid "Show _Find Bar"
+msgstr "Показване на лентата за _търсене"
-#: ../src/PhotoView.cs:491
-msgid "Remove redeye from selected area"
-msgstr "Премахване на ефекта „червени очи“ от избрания регион"
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
+msgid "Unable to rotate this type of photo"
+msgstr "Този вид снимка не може да се завърти"
-#: ../src/PhotoView.cs:492
-msgid "Adjust the image colors"
-msgstr "Настройване на цвета"
+#: ../src/RotateCommand.cs:131
+msgid "Unable to rotate readonly file"
+msgstr "Файл само за четене не може да се завърти"
-#: ../src/PhotoView.cs:493
-msgid "Constrain the aspect ratio of the selection"
-msgstr "Придържане към съотношението на селекцията"
+#: ../src/RotateCommand.cs:198
+msgid "Rotating photos"
+msgstr "Завъртане на снимки"
-#: ../src/PhotoView.cs:494
-msgid "Next image"
-msgstr "Следващо изображение"
+#: ../src/RotateCommand.cs:209
+#, csharp-format
+msgid "Rotating photo \"{0}\""
+msgstr "Завъртане на снимката „{0}“"
-#: ../src/PhotoView.cs:495
-msgid "Previous image"
-msgstr "Предишно изображение"
+#: ../src/RotateCommand.cs:222
+msgid "Directory not found"
+msgstr "Папката не е намерена"
-#: ../src/RotateCommand.cs:56
+#: ../src/RotateCommand.cs:242
+#, csharp-format
+msgid "Unable to rotate photo"
+msgid_plural "Unable to rotate {0} photos"
+msgstr[0] "Снимката не може да се завърти"
+msgstr[1] "{0} снимки не могат да се завъртят"
+
+#: ../src/RotateCommand.cs:244
+#, csharp-format
+msgid ""
+"The photo could not be rotated because it is on a read only file system or "
+"media such as a CDROM. Please check the permissions and try again."
+msgid_plural ""
+"{0} photos could not be rotated because they are on a read only file system "
+"or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] ""
+"Снимката не може да се завърти, защото е на файлова система само за четене "
+"или на носител като CD-ROM. Проверете правата и пробвайте отново."
+msgstr[1] ""
+"{0} снимки не могат да се завъртят, защото са на файлова система само за "
+"четене или са на носител като CD-ROM. Проверете правата и пробвайте отново."
+
+#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
msgstr "Получи се грешка „{0}“ при опит за завъртане на {1}"
-#: ../src/RotateCommand.cs:61
-msgid "Error while Rotating Image."
-msgstr "Грешка при завъртане на изображението."
+#: ../src/RotateCommand.cs:276
+msgid "Error while rotating photo."
+msgstr "Грешка при завъртане на снимка."
-#: ../src/RotateCommand.cs:74
-msgid "Rotating pictures"
-msgstr "Завъртане на изображения"
+#: ../src/SendEmail.cs:240
+msgid "Preparing email"
+msgstr "Подготовка на писмо"
-#: ../src/RotateCommand.cs:84
+#: ../src/SendEmail.cs:292
#, csharp-format
-msgid "Rotating picture \"{0}\""
-msgstr "Завъртане на сникмата „{0}“"
+msgid "Exporting picture \"{0}\""
+msgstr "Изнасяне на снимка „{0}“"
-#: ../src/RotateCommand.cs:115
-#, csharp-format
-msgid "Unable to rotate image"
-msgid_plural "Unable to rotate {0} images"
-msgstr[0] "Не може да се завърти изображението"
-msgstr[1] "Не може да се завъртят {0} изображения."
+#: ../src/SendEmail.cs:314
+msgid "Error processing image"
+msgstr "Грешка при обработката на снимка"
-#: ../src/RotateCommand.cs:119
+#: ../src/SendEmail.cs:315
#, csharp-format
-msgid ""
-"The image could not be rotated because it is on a read only file system or "
-"media such as a CDROM. Please check the permissions and try again"
-msgid_plural ""
-"{0} images could not be rotated because they are on a read only file system "
-"or media such as a CDROM. Please check the permissions and try again"
-msgstr[0] "Изображението не може да бъде завъртяно, защото се намира на файлова система с права само за четене или на носител като CDROM. Проверете привилегиите и опитайте пак."
-msgstr[1] "{0} изображения не може да бъдат завъртени, защото се намират на файлова система с права само за четене или на носител като CDROM. Проверете привилегиите и опитайте пак."
+msgid "An error occured while processing \"{0}\": {1}"
+msgstr "Възникна грешка при обработка на „{0}“: {1}"
-#: ../src/StockIcons.cs:28
-msgid "Crop"
-msgstr "Изрязване"
+#. Send the mail :)
+#: ../src/SendEmail.cs:330
+msgid "My Photos"
+msgstr "Моите снимки"
-#: ../src/StockIcons.cs:29
-msgid "Edit Image"
-msgstr "Редакция на изображението"
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Грешка при запазване на изострената снимка."
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Изостряне на снимката"
-#: ../src/StockIcons.cs:32
-msgid "Logo"
-msgstr "Лого"
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Количество:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Радиус:"
-#: ../src/StockIcons.cs:33
-msgid "Question"
-msgstr "Въпрос"
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Праг:"
-#: ../src/StockIcons.cs:34
-msgid "Reduce Red-Eye"
-msgstr "Премахване на ефекта „Червени очи“"
+#: ../src/SingleView.cs:73
+msgid "Rotate photo left"
+msgstr "Завъртане наляво"
-#: ../src/StockIcons.cs:37
-msgid "Loading"
-msgstr "Зареждане"
+#: ../src/SingleView.cs:78
+msgid "Rotate photo right"
+msgstr "Завъртане надясно"
-#: ../src/StockIcons.cs:38
-msgid "Near"
-msgstr "Близо"
+#: ../src/SingleView.cs:115
+msgid "Folder"
+msgstr "Папка:"
-#: ../src/StockIcons.cs:39
-msgid "Far"
-msgstr "Далече"
+#: ../src/SingleView.cs:341
+msgid "Open"
+msgstr "Отваряне"
-#: ../src/TagCommands.cs:46
-msgid "(No categories)"
-msgstr "(няма категории)"
+#: ../src/SingleView.cs:428
+msgid "Set as Background"
+msgstr "Задаване като фон"
-#: ../src/TagCommands.cs:80 ../src/TagCommands.cs:217
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
-msgstr "Това име е вече заето"
+msgstr "Това име вече е заето"
-#: ../src/TagCommands.cs:129 ../src/TagPopup.cs:20
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "Създаване на нов етикет"
-#: ../src/TagCommands.cs:130
-msgid "Name of new tag:"
+#: ../src/TagCommands.cs:145
+msgid "Name of New Tag:"
msgstr "Име за новия етикет:"
-#: ../src/TagCommands.cs:133 ../src/TagPopup.cs:22
-msgid "Create New Category"
-msgstr "Създаване на нова категория"
+#: ../src/TagPopup.cs:26
+#, csharp-format
+msgid "Find"
+msgid_plural "Find"
+msgstr[0] "Търсене"
+msgstr[1] "Търсене"
+
+#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
+msgid "Create New Tag..."
+msgstr "Създаване на нов етикет…"
+
+#: ../src/TagPopup.cs:42
+msgid "Edit Tag..."
+msgstr "Редактиране на етикет…"
-#: ../src/TagCommands.cs:134
-msgid "Name of new category:"
-msgstr "Име на новата категория:"
+#: ../src/TagPopup.cs:46
+msgid "Delete Tag"
+msgid_plural "Delete Tags"
+msgstr[0] "Изтриване на етикет"
+msgstr[1] "Изтриване на етикети"
-#: ../src/TagCommands.cs:291
-msgid "Edit Category"
-msgstr "Редакция на категорията"
+#: ../src/TagPopup.cs:52
+msgid "Attach Tag to Selection"
+msgid_plural "Attach Tags to Selection"
+msgstr[0] "Прикачване на етикет към избраното"
+msgstr[1] "Прикачване на етикети към избраното"
-#: ../src/TagCommands.cs:292
-msgid "Category name:"
-msgstr "Име на категорията:"
+#: ../src/TagPopup.cs:56
+msgid "Remove Tag From Selection"
+msgid_plural "Remove Tags From Selection"
+msgstr[0] "Премахване на етикет от избраното"
+msgstr[1] "Премахване на етикети от избраното"
-#: ../src/TagCommands.cs:294 ../src/TagPopup.cs:27
-msgid "Edit Tag"
-msgstr "Редакция на етикет"
+#: ../src/TagPopup.cs:62
+msgid "Merge Tags"
+msgstr "Обединяване на етикети"
+
+#: ../src/TagQueryWidget.cs:34
+#, csharp-format
+msgid "Include Photos Tagged \"{0}\""
+msgstr "Включване на снимки с етикет „{0}“"
+
+#: ../src/TagQueryWidget.cs:39
+#, csharp-format
+msgid "Exclude Photos Tagged \"{0}\""
+msgstr "Изключване на снимки с етикет „{0}“"
+
+#: ../src/TagQueryWidget.cs:44
+msgid "Remove From Search"
+msgstr "Премахване от резултатите"
+
+#: ../src/TagQueryWidget.cs:88
+#, csharp-format
+msgid "Find _With"
+msgid_plural "Find _With"
+msgstr[0] "Търсене _с:"
+msgstr[1] "Търсене _с:"
+
+#: ../src/TagQueryWidget.cs:114
+msgid "All"
+msgstr "Всички"
+
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
+#, csharp-format
+msgid "Not {0}"
+msgstr "Не и {0}"
+
+#: ../src/TagQueryWidget.cs:278
+msgid "Drag tags here to search for them"
+msgstr "Издърпайте етикети тук, за да търсите"
+
+#: ../src/TagSelectionWidget.cs:497
+msgid "Error renaming tag"
+msgstr "Грешка при преименуване на етикет"
+
+#: ../src/TagStore.cs:203
+msgid "Favorites"
+msgstr "Любими"
+
+#: ../src/TagStore.cs:208
+msgid "Hidden"
+msgstr "Скрити"
+
+#: ../src/TagStore.cs:216
+msgid "People"
+msgstr "Хора"
+
+#: ../src/TagStore.cs:221
+msgid "Places"
+msgstr "Места"
+
+#: ../src/TagStore.cs:226
+msgid "Events"
+msgstr "Събития"
+
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
+msgid "(None)"
+msgstr "(няма)"
+
+#: ../src/Term.cs:298
+msgid " and "
+msgstr " и "
+
+#. operators.Add (Catalog.GetString (" && "));
+#: ../src/Term.cs:300
+msgid ", "
+msgstr ", "
+
+#: ../src/Term.cs:356
+msgid " or "
+msgstr " или"
+
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
+msgid "or"
+msgstr "или"
+
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Обновяване на миниатюрите"
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "Качване на снимка „{0}“"
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
+msgid "Photo management for GNOME"
+msgstr "Организиране на снимки"
+
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Авторски права: © 2003-2009 Novell Inc."
+
+#: ../src/UI.Dialog/AboutDialog.cs:100
+msgid "translator-credits"
+msgstr ""
+"Ростислав „zbrox“ Райков <zbrox at i-space.org>\n"
+"Красимир „bfaf“ Чонов <mk2616 at abv.bg>\n"
+"Александър Шопов <ash at contact.bg>\n"
+"\n"
+"Проектът за превод на GNOME има нужда от подкрепа.\n"
+"Научете повече за нас на http://gnome.cult.bg\n"
+"Докладвайте за грешки на http://gnome.cult.bg/bugs"
+
+#: ../src/UI.Dialog/AboutDialog.cs:105
+msgid "F-Spot Website"
+msgstr "Уеб сайт на F-Spot"
+
+# FIXME
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
+#, csharp-format
+msgid "Shift all photos by {0}"
+msgstr "Изместване на всички снимки с {0}"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "Днес"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "Вчера"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "Последните 7 дни"
-#: ../src/TagCommands.cs:385
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "Последните 30 дни"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "Последните 90 дни"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "Последните 360 дни"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "Тази седмица (пн.-нд.)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "Предишната седмица (пн.-нд.)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "Потребителски обхват"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Редактиране на иконата за етикета {0}"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "Избор на снимка от файл"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>От снимка</b>\n"
+" Можете да използвате една от снимките в библиотеката ви за икона на този "
+"етикет.\n"
+" Първо трябва да имате поне една снимка с този етикет.\n"
+" Задайте етикет на снимка като „{0}“ и се върнете тук,\n"
+" за да я използвате като икона."
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Изображението не може да се зареди"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "„{0}“ не може да се зареди като икона на етикета"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
#, csharp-format
msgid "Photo {0} of {1}"
msgstr "Снимка {0} от общо {1}"
-#: ../src/TagCommands.cs:412
-#, csharp-format
-msgid "Edit icon for category {0}"
-msgstr "Редактиране на икона за категорията {0}"
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
+msgstr "F-Spot получи фатална грешка"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "Подробности за грешката"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr "Беше хвърлено необработено изключение: "
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "Няма"
-#: ../src/TagCommands.cs:414
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "Системен профил"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "Стандартна тема"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "Грешка при зареждане на базата от данни."
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
#, csharp-format
-msgid "Edit icon for tag {0}"
-msgstr "Редакция на иконата за етикет {0}"
+msgid ""
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
+msgstr ""
+"F-Spot получи грешка при зареждане на база от данни със снимки. Старата база "
+"бе преместена в {0} и беше създадена нова."
-#: ../src/TagPopup.cs:30
-msgid "Delete Tag"
-msgstr "Изтриване на етикет"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "Етикет"
-#: ../src/TagPopup.cs:35
-msgid "Attach Tag To Selection"
-msgstr "Прикачване на етикет към избраното"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "Пропорции"
-#: ../src/TagPopup.cs:38
-msgid "Remove Tag From Selection"
-msgstr "Премахване на етикет от избраните"
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "Повторен опит"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Действие</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Референта снимка</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Задаване на час"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Зададена дата: "
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Текуща дата:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Интервал между снимките"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "разлика:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "мин. Начало в {0}"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>Крайна дата</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Избор на период</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Начална дата</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Отказ, да не се променя текущата времева скала."
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Ще бъдат показани само снимки заснети между тези дати."
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Задаване на обхват от дати"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Редактиране на етикет"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Редактиране на иконата"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Икона:"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>От външна снимка</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>От снимка</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Стандартни икони</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Преглед</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Проектиране на икона от"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Редактиране на иконата за етикет"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Няма _изображение"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "Снимка 0 от 0"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Цветови профил за прегледа:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Цветови профил за печат:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "Настройки на F-Spot"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "Външен вид на F-Spot:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+"Когато е възможно вътре във файловете на снимките.\n"
+"<small>Така ще са достъпни и за другите програми за редактиране на "
+"изображения.</small>"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Избор на папка"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "Отделно от изображенията"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Запазване на етикети и описания на снимките:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "Когато се внасят снимки, да се копират в:"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>Максимална оценка</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>Минимална оценка</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Задаване на филтър по оценка"
+
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "_Задаване на час…"
+
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "Подреждане _по"
+
+#: ../src/ui/main_window.ui.h:4
+msgid "By _Date"
+msgstr "По _дата"
+
+#: ../src/ui/main_window.ui.h:5
+msgid "By _Import Roll"
+msgstr "По _внесени фотосесии"
+
+#: ../src/ui/main_window.ui.h:6
+msgid "By _Rating"
+msgstr "По _оценка"
+
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "Копиране"
+
+#: ../src/ui/main_window.ui.h:8
+msgid "Create New _Tag..."
+msgstr "_Създаване на нов етикет…"
+
+#: ../src/ui/main_window.ui.h:9
+msgid "Create _New Version..."
+msgstr "Създаване на _нова версия…"
+
+#: ../src/ui/main_window.ui.h:11
+msgid "Fin_d"
+msgstr "_Търсене"
+
+#: ../src/ui/main_window.ui.h:12
+msgid "Manage _Extensions"
+msgstr "_Разширения"
+
+#: ../src/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "_Настройки на страница…"
+
+#: ../src/ui/main_window.ui.h:14
+msgid "Re_fresh Thumbnail"
+msgstr "Обновяване на _миниатюрата"
+
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Избор на вси_чко"
+
+#: ../src/ui/main_window.ui.h:19
+msgid "Select _None"
+msgstr "_Изчистване на избора"
+
+#: ../src/ui/main_window.ui.h:20
+msgid "Send by _Mail..."
+msgstr "Изпра_щане по пощата…"
+
+#: ../src/ui/main_window.ui.h:22
+msgid "Side_bar"
+msgstr "_Странична лента"
+
+#: ../src/ui/main_window.ui.h:23
+msgid "T_ags"
+msgstr "Е_тикети"
+
+#: ../src/ui/main_window.ui.h:25
+msgid "Thumbnail _elements"
+msgstr "_Елементи на миниатюра"
+
+#: ../src/ui/main_window.ui.h:26
+msgid "Too_lbar"
+msgstr "Лента с _инструменти"
+
+#: ../src/ui/main_window.ui.h:27
+msgid "View"
+msgstr "Преглед"
+
+#: ../src/ui/main_window.ui.h:33
+msgid "_Attach Tag to Selection"
+msgstr "_Прикачване на етикет към избрания елемент"
+
+#: ../src/ui/main_window.ui.h:35
+msgid "_Clear Rating Filter"
+msgstr "Из_чистване на оценките"
+
+#: ../src/ui/main_window.ui.h:36
+msgid "_Clear Roll Filter"
+msgstr "Из_чистване на фотосесиите"
+
+#: ../src/ui/main_window.ui.h:38
+msgid "_Components"
+msgstr "_Компоненти"
+
+#: ../src/ui/main_window.ui.h:39
+msgid "_Contents"
+msgstr "_Съдържание"
+
+#: ../src/ui/main_window.ui.h:40
+msgid "_Dates"
+msgstr "_Дати"
+
+#: ../src/ui/main_window.ui.h:42
+msgid "_Delete Selected Tag"
+msgstr "_Изтриване на избрания етикет"
+
+#: ../src/ui/main_window.ui.h:43
+msgid "_Delete Version"
+msgstr "_Изтриване на версията"
+
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "_Редактиране на етикет…"
+
+#: ../src/ui/main_window.ui.h:46
+msgid "_Export to"
+msgstr "И_знасяне към"
+
+#: ../src/ui/main_window.ui.h:47
+msgid "_Filmstrip"
+msgstr "_Филмова лента"
+
+#: ../src/ui/main_window.ui.h:50
+msgid "_Hidden"
+msgstr "_Скрити"
+
+#: ../src/ui/main_window.ui.h:51
+msgid "_Import..."
+msgstr "_Внасяне…"
+
+#: ../src/ui/main_window.ui.h:52
+msgid "_Large"
+msgstr "_Големи"
+
+# FIXME continue
+#: ../src/ui/main_window.ui.h:53
+msgid "_Last Import Roll"
+msgstr "_Последно внесена фотосесия"
+
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr "_Лупа"
+
+#: ../src/ui/main_window.ui.h:55
+msgid "_Medium"
+msgstr "С_редни"
+
+#: ../src/ui/main_window.ui.h:57
+msgid "_Quit"
+msgstr "_Спиране на програмата"
+
+#: ../src/ui/main_window.ui.h:58
+msgid "_Ratings"
+msgstr "_Оценки"
+
+#: ../src/ui/main_window.ui.h:60
+msgid "_Remove Tag From Selection"
+msgstr "Премахване на _етикет от избраното"
+
+#: ../src/ui/main_window.ui.h:61
+msgid "_Rename Version"
+msgstr "П_реименуване на версията"
+
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "_Обратен ред"
+
+#: ../src/ui/main_window.ui.h:63
+msgid "_Select Import Rolls..."
+msgstr "_Избор на внесена фотосесия…"
+
+#: ../src/ui/main_window.ui.h:64
+msgid "_Set Date Range..."
+msgstr "_Избор на обхват от дати…"
+
+#: ../src/ui/main_window.ui.h:65
+msgid "_Set Rating filter..."
+msgstr "_Избор на филтър за оценки…"
+
+#: ../src/ui/main_window.ui.h:66
+msgid "_Sharpen..."
+msgstr "Из_остряне на снимката…"
+
+#: ../src/ui/main_window.ui.h:68
+msgid "_Small"
+msgstr "_Малки"
+
+#: ../src/ui/main_window.ui.h:69
+msgid "_Tag Icons"
+msgstr "_Икони на етикетите"
+
+#: ../src/ui/main_window.ui.h:70
+msgid "_Tags"
+msgstr "_Етикети"
+
+#: ../src/ui/main_window.ui.h:71
+msgid "_Timeline"
+msgstr "_Времева скала"
+
+#: ../src/ui/main_window.ui.h:72
+msgid "_Tools"
+msgstr "_Инструменти"
+
+#: ../src/ui/main_window.ui.h:73
+msgid "_Untagged Photos"
+msgstr "Снимки _без етикети"
+
+#: ../src/ui/main_window.ui.h:74
+msgid "_Version"
+msgstr "В_ерсия"
+
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "Обновяване на базата от данни на F-Spot"
+
+#: ../src/Updater.cs:623
+msgid ""
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
+msgstr ""
+"Изчакайте докато базата от данни на галерията бъде обновена. Това може да "
+"отнеме малко време."
#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Unix.cs:37
+#: ../src/Utils/Unix.cs:35
msgid "Unable to create temporary file"
msgstr "Неуспех при създаването на временен файл"
-#: ../src/Util.cs:285
-msgid "There was an error invoking the external handler"
-msgstr "Грешка при стартирането на външна програма за обработка"
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Настройки на страница"
-#: ../src/Util.cs:286
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Размер на страница: {0}×{1} mm"
+
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "Задаване на размер и ориентация на страница"
+
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Снимки на страница"
+
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Повтаряне"
+
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Отпечатване на маркерите за подрязване"
+
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "Подредба"
+
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "Запълнена страница (без полета)"
+
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Увеличаване"
+
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Запълване"
+
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Мащабиране"
+
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "Бели полета"
+
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Потребителски текст: "
+
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Информация за снимки"
+
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "Печат във файл"
+
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "Отпечатване на датата на снимката"
+
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "Отпечатване на часа на снимката"
+
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "Отпечатване на етикетите на снимките"
+
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "Отпечатване на коментара на снимката"
+
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "Редактиране"
+
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
-"Received error:\n"
-"\"{0}\"\n"
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
msgstr ""
-"Получена е грешка:\n"
-"„{0}“\n"
+"Този инструмент изисква да е избрана част от снимката. Изберете и пробвайте "
+"операцията отново"
-#: ../src/QueryDisplay.cs:29
-msgid "Find: "
+#: ../src/Widgets/EditorPage.cs:216
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Грешка при запазване на променената снимка"
+msgstr[1] "Грешка при запазване на променените снимки"
+
+#: ../src/Widgets/EditorPage.cs:218
+#, csharp-format
+msgid ""
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
+msgstr ""
+"Получено е изключение „{0}“. Трябва да преобразувате файловете от формат RAW "
+"към JPEG, преди да ги редактирате."
+
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Хоризонтално"
+
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "_Вертикално"
+
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
msgstr "Търсене:"
-#: ../src/QueryDisplay.cs:44
-msgid "No matching images found "
-msgstr "Няма открити съвпадения "
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "Папки"
+
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Файлова система"
+
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Хистограма"
+
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Версия"
+
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Дата"
+
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Експонация"
+
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "Основно фокусно разстояние"
+
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Размер"
+
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Оценка"
+
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(неправилен формат)"
+
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Неизвестно)"
+
+#: ../src/Widgets/InfoBox.cs:561
+#, csharp-format
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(1 редакция)"
+msgstr[1] "({0} редакции)"
+
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(Грешка при четене на файл)"
+
+#: ../src/Widgets/InfoBox.cs:620
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0} снимки"
+
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"На {0}, между \n"
+"{1} и {2}"
+
+#: ../src/Widgets/InfoBox.cs:645
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"Между {0} \n"
+"и {1}"
+
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(не са открити файлове)"
+
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Показване на името на снимката"
+
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Показване на датата"
+
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Показване на размера"
+
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Показване на експонацията"
+
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "Показване на основното фокусно разстояние"
+
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Показване на фотоапарата"
+
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Показване на размера"
+
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "Метаданни"
+
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "Още метаданни"
+
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "Няма допълнителни метаданни"
+
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "Няма активна снимка"
+
+#: ../src/Widgets/MetadataDisplay.cs:414
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "Снимката „{0}“ не съществува"
+
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "Няма налични метаданни"
+
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Няма налична програма"
+
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "Оценка:"
+
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Държава"
+
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "Град"
+
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Област"
+
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Показване на прожекция от F-Spot"
+
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "Фото албум от F-Spot"
diff --git a/po/bn_IN.po b/po/bn_IN.po
new file mode 100644
index 0000000..66b91b9
--- /dev/null
+++ b/po/bn_IN.po
@@ -0,0 +1,4216 @@
+# translation of bn_IN.po to Bengali INDIA
+# Bengali (India) translation for f-spot.
+# Copyright (C) 2009 f-spot's COPYRIGHT HOLDER
+# This file is distributed under the same license as the f-spot package.
+#
+# Runa Bhattacharjee <runab at redhat.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: bn_IN\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&component=General\n"
+"POT-Creation-Date: 2009-10-13 20:41+0000\n"
+"PO-Revision-Date: 2009-10-30 19:09+0530\n"
+"Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
+"Language-Team: Bengali INDIA <anubad at lists.ankur.org.in>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "CD...(_C)"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "ছবি স্থানান্তর করা হচ্ছে"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "\"{0}\" ছবিটি CD-র মধ্যে স্থানান্তর করা হচ্ছে"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0}, সর্বমোট {1}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "ছবি স্থানান্তর সমাপ্ত হয়েছে"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "স্থানান্তর সমাপ্ত"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "স্থানান্তরকালে সমস্যা"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "স্থানান্তর করতে সমস্যা"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "কপি করা হয়েছে..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>লেখঅর উদ্দেশ্যে পূর্বেই কিছু সামগ্রী নির্ধারণ করা হয়েছে</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+#| msgid "<b>Photos</b>"
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>বার্ন করার উদ্দেশ্যে ছবি</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "স্বয়ংক্রিয় আবর্তন"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+#| msgid "_Create"
+msgid "Create CD"
+msgstr "CD তৈরি করুন"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:220
+msgid "Size"
+msgstr "মাপ"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "এক্সপোর্ট করা নির্বাচিত অংশের মাপ:"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "পূর্বে নির্ধারিত ফাইলগুলি ব্রাউজ করুন (_B)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "এক্সপোর্ট করুন (_E)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "শুধুমাত্র এই ছবিগুলি CD-র মধ্যে লেখা হবে (_W)"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "Facebook...(_a)"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "অনুমোদনের অপেক্ষা করা হচ্ছে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
+msgstr ""
+"আপনার নির্বাচিত অনুমতি সক্রিয় করার উদ্দেশ্যে F-Spot দ্বারা এখন ব্রাউজার আরম্ভ করা হবে।\n"
+"\n"
+"Facebook দ্বারা এই অ্যাপ্লিকেশনে প্রত্যাবর্তন করার নির্দেশ দেওয়া হলে নীচে \"ঠিক আছে\" টিপুন।"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "এক্সপোর্ট করার উদ্দেশ্যে অত্যাধিক ছবি নির্বাচিত হয়েছে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+#| msgid ""
+#| "Facebook only permits 60 photographs per album. Please refine your "
+#| "selection and try again."
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+"Facebook-র ক্ষেত্রে একটি অ্যালবামে শুধুমাত্র{0}-টি ছবির জন্য স্থান রয়েছে। অনুগ্রহ করে "
+"আপনার নির্বাচিত তালিকা পরিশ্রুত করে পুনরায় চেষ্টা করুন।"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "ছবি আপলোড করা হচ্ছে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "অ্যালবামের নাম উল্লেখ করা আবশ্যক"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "অনুগ্রহ করে অ্যালবামের নাম নির্ধারণ করুন অথবা একটি উপস্থিত অ্যালবাম চিহ্নিত করুন।"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "নতুন অ্যালবাম নির্মাণ করতে ব্যর্থ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"নতুন অ্যালবাম নির্মাণ করতে সমস্যা দেখা দিয়েছে।\n"
+"\n"
+"{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "\"{0}\" ছবিটি আপলোড করা হচ্ছে ({1}, সর্বমোট {2})"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Facebook-এ আপলোড করতে সমস্যা: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
+msgid "Error"
+msgstr "ত্রুটি"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "আপলোড সমাপ্ত হয়েছে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "অনুমোদনের অপেক্ষা করা হচ্ছে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"Facebook-এ লগ-ইন করার উদ্দেশ্যে F-Spot দ্বারা এখন ব্রাউজার আরম্ভ করা হবে।\n"
+"\n"
+"Facebook দ্বারা এই অ্যাপ্লিকেশনে প্রত্যাবর্তন করার নির্দেশ দেওয়া হলে নীচে \"ঠিক আছে\" টিপুন। সম্ভব হলে এই সেশানটি F-Spot দ্বারা gnome-keyring-র মধ্যে ক্যাশে করা হবে ও ভবিষ্যতে Facebook-এ করা এক্সপোর্টের ক্ষেত্রে তা পুনরায় ব্যবহার করা হবে।"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "অনুমোদন করা হচ্ছে..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Facebook-এ লগ-ইন করতে সমস্যা"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr ""
+"Facebook-এ লগ-ইন করতে সমস্যা। অনুগ্রহ করে আপনার পরিচয় সংক্রান্ত তথ্য পরীক্ষা করে "
+"পুনরায় প্রচেষ্টা করুন।"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "সেশান অনুমোদন করা হচ্ছে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "সোশান আরম্ভ করা হয়েছে, ব্যবহারকারীর তথ্য প্রাপ্ত করা হচ্ছে..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "সোশান আরম্ভ করা হয়েছে, বন্ধুদের তালিকা প্রাপ্ত করা হচ্ছে..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "সোশান আরম্ভ করা হয়েছে, বন্ধুদের তথ্য প্রাপ্ত করা হচ্ছে..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "সোশান আরম্ভ করা হয়েছে, ছবির অ্যালবাম প্রাপ্ত করা হচ্ছে..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} এখন Facebook-র মধ্যে লগ-ইন করেছেন"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Facebook-র সাথে সংযোগ করতে সমস্যা"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"Facebook থেকে তথ্য ডাউনলোড করতে সমস্যা।\n"
+"\n"
+"Facebook থেকে প্রাপ্ত বার্তা: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "আপনি লগ-ইন করেননি।"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "স্বয়ংক্রিয়ভাবে ছবি নিশ্চিত করা হবে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+#| msgid "Ratio"
+msgid "Caption"
+msgstr "শীর্ষক"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+#| msgid "Creating a new album failed"
+msgid "Create a new album"
+msgstr "একটি নতুন অ্যালবাম নির্মাণ করুন"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+#| msgid "D_escription:"
+msgid "Description"
+msgstr "বিবরণ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+#| msgid "Error logging into Facebook"
+msgid "Export to Facebook"
+msgstr "Facebook-এ এক্সপোর্ট করুন"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+#| msgid "No active photo"
+msgid "In this photo"
+msgstr "এই ফটোর মধ্যে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "অবস্থান"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+#| msgid "Location"
+msgid "Login"
+msgstr "লগ-ইন করুন"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "লগ-আউট করুন"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
+#: ../src/Widgets/InfoBox.cs:211
+msgid "Name"
+msgstr "নাম"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+#| msgid "You are not logged in."
+msgid "Not logged in"
+msgstr "আপনি লগ-ইন করেননি"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+#| msgid "Version:"
+msgid "Permissions:"
+msgstr "অনুমতি:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+#| msgid "(Not Connected)"
+msgid "Stay Connected"
+msgstr "সংযুক্ত থাকুন"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "একটি উপস্থিত অ্যালবাম ব্যবহার করা হবে"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "ইনি কে?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "23hq...(_2)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "Flickr...(_F)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "Zooomr...(_Z)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "অনুমোদন"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
+#, csharp-format
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"{0}-এ অনুমোদন সমাপ্তির পরে এই উইন্ডোতে প্রত্যাবর্তন করুন ও \"অনুমোদন সম্পূর্ণ করুন\" "
+"বাটনটি ক্লিক করুন"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "অনুমোদন সম্পূর্ণ করুন"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "{0}-এ লগ-ইন করা হচ্ছে"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "পরিচয় পরীক্ষা করা হচ্ছে..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "স্বাগতম {0}, আপনি এখন {1}-র সাথে সংযুক্ত"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "ভিন্ন ব্যবহারকারী রূপে লগ-ইন করুন"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "{0} ব্যবহৃত হয়েছে, অনুমোদিত মাসিক সীমা হল {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "লগ-ইন করতে ব্যর্থ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "{0} উত্তরের প্রতীক্ষা করা হচ্ছে, সর্বমোট {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "ছবি \"{0}\" আপলোড করা হচ্ছে"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "{0}-এ আপলোড করতে সমস্যা: {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "লগ-ইন করতে ব্যর্থ।"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"F-Spot {0}-এ লগ-ইন করতে ব্যর্থ। অনুগ্রহ করে পরীক্ষা করুন {0} ওয়েব ব্রাউজার "
+"ইন্টারফেস প্রয়োগ করে অনুমোদনের তথ্য লেখা হয়ছে কি না।"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>অ্যাকাউন্ট</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>ছবি</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>বিন্যাস</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>প্রদর্শনের অনুমতি</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../src/f-spot.glade.h:43
+msgid "Export"
+msgstr "এক্সপোর্ট করুন"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "ট্যাগের অনুক্রম এক্সপোর্ট করা হবে (_h)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"আপনার {0} অ্যাকাউন্টে ফটো আপলোড করার জন্য F-Spot-কে অনুমোদন করা আবশ্যক। \"অনুমোদন"
+"\" বাটন টিপে একটি ওয়েব-ব্রাউজার খুলুন ও F-Spot-কে অনুমোদন করুন।"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "উপরের স্তরের ট্যাগ উপেক্ষা করা হবে (_t)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "ব্যক্তিগত"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "সার্বজনীন"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "মিটাডাটা বর্জন করা হবে (_m)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "পারিবারের জন্য প্রদর্শিত"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "বন্ধুদের জন্য প্রদর্শিত"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "ট্যাগ এক্সপোর্ট করুন (_E)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "চিহ্নিত মাপে পরিবর্তন করুন: (_R)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "আপলোড সমাপ্ত হলে ব্রাউজারের মধ্যে ছবি প্রদর্শন করা হবে (_V)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "পিক্সেল"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "ফোল্ডার...(_o)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "এক্সপোর্টের ফোল্ডার নির্বাচন করুন"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "গ্যালারি নির্মাণ করা হচ্ছে"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "\"{0}\" ছবিটি গ্যালারিতে আপলোড করতে ব্যর্থ:{2}{1}"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "ত্রুটি: পরিবহণকালে সমস্যা; পরিত্যাগ করা হচ্ছে"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "ত্রুটি: ফাইল বর্তমানে উপস্থিত রয়েছে; পরিত্যাগ করা হচ্ছে"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+msgid "Light"
+msgstr "আলো"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+msgid "Dark"
+msgstr "আঁধার"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+msgid "Prev"
+msgstr "পূর্ববর্তী"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "সূচি"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
+#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+msgid "Tags"
+msgstr "ট্যাগ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
+#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "পরবর্তী"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+msgid "Gallery generated by"
+msgstr "গ্যালারি নির্মাতা"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+msgid "Show Styles"
+msgstr "বিন্যাস প্রদর্শন করা হবে"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+msgid "Hide Styles"
+msgstr "বিন্যাস আড়াল করা হবে"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "ট্যাগ: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+msgid "Page:"
+msgstr "পৃষ্ঠা:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>গন্তব্য</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>এক্সপোর্টের পদ্ধতি</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "\"Original\" সহযোগে গ্যালারি নির্মাণ করা হবে (_g)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "স্বতন্ত্র ওয়েব গ্যালারি নির্মাণ করা হবে (_w)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "বিবরণ: (_e)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "ট্যাগ এক্সপোর্ট করা হবে (_t)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "ট্যাগের আইকন এক্সপোর্ট করা হবে (_i)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "ফোল্ডার এক্সপোর্ট"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "গ্যালারির নাম: (_a)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "এক্সপোর্ট সমাপ্ত হলে গন্তব্যস্থল প্রদর্শন করা হবে (_d)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "ফোল্ডার: (_F)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "ফাইলগুলি শুধুমাত্র সংরক্ষণ করা হবে (_S)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "ওয়েব গ্যালারি...(_G)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"অজানা সংস্করণ সংখ্যার Gallery-র সাথে সংযোগ করতে ব্যর্থ। \n"
+"অনুগ্রহ করে পরীক্ষা করুন Remote প্লাগ-ইনের 1.0.8 অথবা ঊর্ধ্বতন সংস্করণ উপস্থিত রয়েছে "
+"কি না"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "অবৈধ URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "গ্যালারির URL সম্ভবত বৈধ নয়"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "গ্যালারির সাথে সংযোগ স্থাপনকালে ত্রুটি"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "লগ-ইন করার সময় নিম্নলিখিত ত্রুটি উৎপন্ন হয়েছে: {0}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "এই নামের একটি গ্যালারি বর্তমানে উপস্থিত রয়েছে"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+"আপনার নিবন্ধির গ্যালারির তালিকায় এই নামের একটি গ্যালারি বর্তমানে উপস্থিত রয়েছে। "
+"অনুগ্রহ করে ভিন্ন ও স্বতন্ত্র একটি নাম নির্বাচন করুন।"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(উপরের স্তর)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "গ্যালারির নাম বৈধ নয়"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"গ্যালারির নামের মধ্যে অবৈধ অক্ষর উপস্থিত রয়েছে।\n"
+"শুধুমাত্র অক্ষর, সংখ্যা, - ও _ চিহ্নগুলির ব্যবহার অনুমোদিত"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "\"{0}\" ছবিটি গ্যালারির মধ্যে আপলোড করতে ব্যর্থ: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(গ্যালারি নেই)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(সংযুক্ত নয়)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(অ্যালবাম নেই)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "কোনো অ্যাকাউন্ট নির্বাচন করা হয়নি"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>অ্যালবাম</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>গ্যালারি</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>গ্যালারির সাথে সংযোগ স্থাপন করতে ব্যর্থ</"
+"span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "শিরোনাম ও মন্তব্য এক্সপোর্ট করা হবে (_t)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "আপলোড সমাপ্ত হলে ব্রাউজারের মধ্যে অ্যালবাম প্রদর্শন করা হবে (_a)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "অনুগ্রহ করে পরীক্ষা করুন, গ্যালারির বৈশিষ্ট্য সঠিকরূপে স্থাপিত হয়েছে কি না।"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "URL: (_R)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "অ্যালবামের নাম: (_A)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "বিবরণ: (_D)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "অ্যালবামে এক্সপোর্ট করুন: (_E)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "গ্যালারির নাম: (_G)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "গ্যালারি: (_G)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "ঊর্ধ্বতন অ্যালবাম: (_P)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+msgid "_Password:"
+msgstr "পাসওয়ার্ড: (_P)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "শিরোনাম: (_T)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+msgid "_Username:"
+msgstr "ব্যবহারকারীর নাম: (_U)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "সার্ভার থেকে প্রাপ্ত উত্তর পড়তে সমস্যা"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Gallery সামগ্রী বিনা সার্ভার থেকে উত্তর প্রাপ্ত হয়েছে"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "নতুন অ্যালবাম নির্মাণকালে সমস্যা"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"অনুরোধিত কর্ম সঞ্চালনকালে নিম্নলিখিত সমস্যা দেখা দিয়েছে :\n"
+"{0} ({1})"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "PicasaWeb...(_P)"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "অ্যালবাম নির্মাণকালে সমস্যা"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid "The following error was encountered while attempting to create an album: {0}"
+msgstr "নতুন অ্যালবাম নির্মাণকালে নিম্নলিখিত ত্রুটি উৎপন্ন হয়েছে: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} পাঠানো হয়েছে"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0}, আনুমানিক সর্বমোট {1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "গ্যালারিতে আপলোড করতে সমস্যা: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "উপলব্ধ স্থান: {0}, {1}% ব্যবহৃত, সর্বমোট {2}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"নির্বাচিত অ্যালবামের ক্ষেত্রে সর্বাধিক {0}-টি ছবি সীমা ধার্য করা হয়েছে।\n"
+"বর্তমান নির্বাচনে {1}-টি ছবির উপস্থিতির ফলে এই সীমা উলঙ্ঘন করা হবে"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>PicasaWeb এক্সপোর্ট</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>আপনার Google অ্যাকাউন্ট লক করা হয়েছে</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"অনুগ্রহ করে পরীক্ষা করুন এই গ্যালারির বৈশিষ্ট্য সঠিকরূপে ধার্য করা হয়েছে কি না।\n"
+"'ক্যাপচা' শীর্ষক ক্ষেত্রে প্রদর্শিত ছবির মধ্যে উপস্থিত\n"
+"অক্ষরগুলি লিখুন। <i>অক্ষরগুলির ক্ষেত্রে হরফের ছাঁদ মেলানো হবে না</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "সার্বজনীন অ্যালবাম"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "অ্যালবামের শিরোনাম: (_A)"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "স্বয়ংক্রিয় আবর্তন (_A)"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "ক্যাপচা: (_C)"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "SmugMug...(_S)"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>SmugMug এক্সপোর্ট</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "অ্যাকাউন্ট: (_A)"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "\"{0}\" ছবি আপলোড করা হচ্ছে"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Tabblo-তে লগ-ইন করা হচ্ছে"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "আপলোড করার উদ্দেশ্যে URL আহরণ করা হচ্ছো"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "Tabblo...(_T)"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "ছবি পাঠানো সমাপ্ত হয়েছে"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "আপলোড সমাপ্ত"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Tabblo-তে আপলোড করতে সমস্যা: "
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "কম্প্রেস করা ফাইল...(_e)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:196
+msgid "No selection available"
+msgstr "কোনো নির্বাচন করা হয়নি"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"এটি ব্যবহার করার জন্য একটি মান নির্বাচিত থাকা আবশ্যক। অনুগ্রহ করে এক অথবা অধিক ছবি "
+"নির্বাচন করুন ও পুনরায় প্রচেষ্টা করুন"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "এক্সপোর্ট ফোল্ডার নির্বাচন করুন"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "ফাইল এক্সপোর্ট করা হচ্ছে"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "\"{0}\" ছবি প্রস্তুত করা হচ্ছে"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+#: ../src/f-spot.glade.h:92
+msgid "_Create"
+msgstr "তৈরি করুন (_C)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "ফাইলের নাম: (_F)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "অবস্থান: (_L)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "মাপ: (_S)"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"0.5.0-র পূর্বে ইম্পোর্ট করা ছবির মধ্যে প্রতিলিপি অনুসন্ধানের উদ্দেশ্যে F-Spot দ্বারা "
+"ছবির সংকলন যাচাই করা আবশ্যক। সময়সাপেক্ষ হওয়ার ফলে ডিফল্টরূপে এই কাজ করা হয় না। "
+"এই ডায়লগ সহযোগে এই আপডেটের কাজ আরম্ভ অথবা স্থগিত করা যাবে।"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid "You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr "বর্তমানে {0}-টি ফটোর জন্য md5 গণনা প্রয়োজন ও {1}-টি কাজ অপেক্ষারত রয়েছে"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "বন্ধ করুন (_C)"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "ছবি বিশ্লেষণ করা হচ্ছে..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "বন্ধ করা হয়েছে"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Hash for Duplicates"
+msgstr "প্রতিলিপির ক্ষেত্রে Hash করা হবে"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+#| msgid "(No Gallery)"
+msgid "F-Spot Gallery"
+msgstr "F-Spot গ্যালারি"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "ওয়েব গ্যালারিটি সম্ভবত বর্তমানে অফ-লাইন অবস্থায় রয়েছে"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+#| msgid "Show Styles"
+msgid "Show All"
+msgstr "সমগ্র প্রদর্শন করা হবে"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+#| msgid "{0} Photo"
+#| msgid_plural "{0} Photos"
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0}-টি ফটো"
+msgstr[1] "{0}-টি ফটো"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "বর্তমান প্রদর্শন"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+#| msgid "Delete"
+msgid "Selected"
+msgstr "নির্বাচিত"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+#| msgid "Web _Gallery..."
+msgid "Live Web Gallery"
+msgstr "লাইভ ওয়েব গ্যালারি"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>গ্যালারি নিষ্ক্রিয় না করা হলে অথবা F-Spot বন্ধ না করা অবধি গ্যালারিটি সক্রিয় থাকবে।\n"
+"স্থানীয় ব্যবহারকারীদের ক্ষেত্রে HTTP প্রক্সি এড়িয়ে এটি ব্যবহারের সুবিধা উপলব্ধ করুন।</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>গ্যালারি সক্রিয় থাকলে, অন্য কোনো কম্পিউটার থেকে শেয়ার করা ফটোগুলি দেখার জন্য উপরোক্ত\n"
+"URL-টি ব্যবহার করুন।</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "ওয়েব গ্যালারি সক্রিয় অথবা নিষ্ক্রিয় করা হয়"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "দর্শকদের জন্য ট্যাগ সংযোজনের অনুমতি প্রদান করুন"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "ক্লিপ-বোর্ডের মধ্যে URL কপি করুন"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spot লাইভ ওয়েব গ্যালারি"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+#| msgid "_Gallery:"
+msgid "Gallery URL:"
+msgstr "গ্যালারির URL:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "শেয়ার করা ফটোর সংখ্যার সীমা"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "বিকল্প:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+#| msgid "Photos per page"
+msgid "Photos with a Tag"
+msgstr "ট্যাগসহ ফটো"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+#| msgid "_Delete photo"
+#| msgid_plural "_Delete photos"
+msgid "Selected Photos"
+msgstr "নির্বাচিত ফটো"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+#| msgid "_Scale:"
+msgid "Share:"
+msgstr "শেয়ার:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+#| msgid "_View"
+msgid "Views:"
+msgstr "প্রদর্শন:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+#| msgid "None"
+msgid "none"
+msgstr "শূণ্য"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " গ্যালারি: {0}, ফটো: {1}, সর্বশেষ ক্লায়েন্ট: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+#| msgid "Gallery generated by"
+msgid "Gallery is inactive"
+msgstr "গ্যালারিটি নিষ্ক্রিয়"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Merge Db"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "নির্বাচিত ফাইল খুলতে সমস্যা"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"নির্বাচিত ফাইলটি বৈধ অথবা সমর্থিত ডাটাবেস নয়।\n"
+"\n"
+"\"{0}\" এক্সেপশন প্রাপ্ত হয়েছে।"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr "<small><i>ইম্পোর্ট করার উদ্দেশ্যে ডাটাবেসের অবস্থান নির্বাচন করুন</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>নির্বাচিত ডাটাবেস থেকে কি ইম্পোর্ট করা হবে তা নির্বাচন করুন।\n"
+"\"New Rolls Only\" প্রয়োগ করা সুবিধাজনক কারণ এর ফলে পূর্ববর্তী কোনো সময়ে "
+"ইম্পোর্ট করা ফটো পুনরায় ইম্পোর্ট করা হবে না।\n"
+"\"A Single Import Roll\" বাছাই করা হলে, একত্রিত করার উদ্দেশ্যে একটি রোল নির্বাচন করা যাবে।\n"
+"\"Everything\" সহযোগে সবকিছু ইম্পোর্ট করা হবে, এবং পূর্বে ইম্পোর্ট করা হলে প্রতিলিপি নির্মিত হবে।</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>ছবিগুলি স্থানীয়ভাবে কপি করুন অথবা মূল স্থানে অপরিবর্তিত রাখুন। দ্বিতীয় "
+"বিকল্প নির্বাচন করা হলে সংশ্লিষ্ট অবস্থানটি f-spot দ্বারা ব্যবহারযোগ্য হওয়া আবশ্যক।</"
+"i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "একটি ইম্পোর্ট রোল"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "ফটোর ফোল্ডারে ছবি কপি করুন"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "ডাটাবেসের অবস্থান:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Everything"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "ইম্পোর্ট করুন:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "ছবিগুলি মূল অবস্থান থেকে সরানো হবে না"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "একটি ভিন্ন F-Spot সংকলন একত্রিত করুন"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "শুধুমাত্র নতুন রোল"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:55
+msgid "Skip"
+msgstr "উপেক্ষা করুন"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big><b>{0}</b> ফোল্ডারের মধ্যে উপস্থিত ফাইলগুলি ডাটাবেস দ্বারা নির্দেশ করা হয়।\n"
+" ম্যাপিং করার উদ্দেশ্যে অনুগ্রহ করে এই ফোল্ডারটি নির্বাচন করুন।</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "স্ক্রিন-সেভার কনফিগার করুন"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "সকল ছবি"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "বিলম্ব:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "প্রদর্শন:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "চিহ্নিত ট্যাগসহ ছবি:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "F-Spot-কে স্ক্রিন-সেভার রূপে ধার্য করা হবে"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+#| msgid "Planar Configuration"
+msgid "Screensaver Configuration"
+msgstr "স্ক্রিন-সেভার কনফিগারেশন"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+#| msgid "F-Spot View"
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-Spot ফটো পরিচালন ব্যবস্থা"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "আপনার ফটোর সংকলন সুবিন্যস্ত, উপভোগ ও বিনিময় করুন"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "ফটো পরিচালন ব্যবস্থা"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "F-Spot-এ ইম্পোর্ট করুন"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-Spot ফটো প্রদর্শন ব্যবস্থা"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "ফটো প্রদর্শন ব্যবস্থা"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
+msgid "File not found"
+msgstr "ফাইল পাওয়া যায়নি"
+
+#: ../lib/libfspot/f-jpeg-utils.c:464
+#, c-format
+msgid "Unknown transform type %d"
+msgstr "রূপান্তরের অজানা ধরন %d"
+
+#: ../lib/libfspot/f-jpeg-utils.c:472
+msgid "Operation failed"
+msgstr "কর্ম বিফল"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
+msgid "Package"
+msgstr "প্যাকেজ"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
+msgid "Extension Installation"
+msgstr "অতিরিক্ত সামগ্রীর ইনস্টলেশন"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
+msgid "<b>Select the extensions to install and click on Next</b>"
+msgstr "<b>ইনস্টলেশনের উদ্দেশ্যে অতিরিক্ত সামগ্রী নির্বাচন করুন ও পরবর্তী টিপুন</b>"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
+msgid "Install from:"
+msgstr "ইনস্টলেশনের উৎসস্থল:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
+msgid "_Repositories..."
+msgstr "সংগ্রহস্থল...(_R)"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
+msgid "Show all packages"
+msgstr "সকল প্যাকেজ প্রদর্শন করা হবে"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
+msgid "Show new versions only"
+msgstr "শুধুমাত্র নতুন সংস্করণ প্রদর্শন করা হবে"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
+msgid "Show updates only"
+msgstr "শুধুমাত্র আপডেট প্রদর্শন করা হবে"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
+msgid "_Unselect All"
+msgstr "সমগ্র নির্বাচন বাতিল করা হবে (_U)"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "সমগ্র নির্বাচন (_A)"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
+msgid "label124"
+msgstr "label124"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
+msgid "Overall Progress:"
+msgstr "সর্বমোট প্রগতি:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
+msgid "Downloading extensions..."
+msgstr "অতিরিক্ত সামগ্রী ডাউনলোড করা হচ্ছে..."
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
+msgid "Extension Manager"
+msgstr "অতিরিক্ত সামগ্রী পরিচালন ব্যবস্থা"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
+msgid "Additional extensions are required to perform this operation."
+msgstr "এই কাজ সঞ্চালনার জন্য অতিরিক্ত সামগ্রীর উপস্থিতি প্রয়োজন।"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
+msgid "The following extensions will be installed:"
+msgstr "নিম্নলিখিত অতিরিক্ত সামগ্রী ইনস্টল করা হবে:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
+msgid "<big><b>Extension Manager</b></big>"
+msgstr "<big><b>এক্সটেনশন পরিচালনব্যবস্থা</b></big>"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
+msgid "The following extensions are currently installed:"
+msgstr "নিম্নলিখিত অতিরিক্ত সামগ্রী বর্তমানে ইনস্টল করা আছে:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
+msgid "_Install Extensions..."
+msgstr "অতিরিক্ত সামগ্রী ইনস্টল করুন...(_I)"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
+msgid "_Uninstall..."
+msgstr "আন-ইনস্টল করুন...(_U)"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
+msgid "Enable"
+msgstr "সক্রিয় করুন"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
+msgid "Disable"
+msgstr "নিষ্ক্রিয় করুন"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
+msgid "Details"
+msgstr "বিবরণ"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
+msgid "Extension Repository Management"
+msgstr "অতিরিক্ত সামগ্রীর সংগ্রহস্থল পরিচালন ব্যবস্থা"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
+msgid "Add New Repository"
+msgstr "নতুন সংগ্রহস্থল যোগ করুন"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
+msgid "Select the location of the repository you want to register:"
+msgstr "নিবন্ধনের উদ্দেশ্যে চিহ্নিত সংগ্রহস্থলের অবস্থান নির্বাচন করুন:"
+
+#. Container child vbox89.Gtk.Box+BoxChild
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
+msgid "Register an on-line repository"
+msgstr "একটি অন-লাইন সংগ্রহস্থল নিবন্ধন করুন"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
+msgid "Url:"
+msgstr "Url:"
+
+#. Container child vbox89.Gtk.Box+BoxChild
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
+msgid "Register a local repository"
+msgstr "স্থানীয় সংগ্রহস্থল নিবন্ধন করুন"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
+msgid "Path:"
+msgstr "পাথ:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
+msgid "Browse..."
+msgstr "ব্রাউজ করুন..."
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
+msgid "Version:"
+msgstr "সংস্করণ:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
+msgid "Author:"
+msgstr "নির্মাতা:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
+msgid "Copyright:"
+msgstr "স্বত্বাধিকার:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
+msgid "Extension Dependencies:"
+msgstr "অতিরিক্ত সামগ্রীর নির্ভরতা:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
+msgid "All registered repositories"
+msgstr "সকল নিবন্ধিত সংগ্রহস্থল"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
+msgid "Are you sure you want to cancel the installation?"
+msgstr "আপনি কি নিশ্চিতরূপে এই ইনস্টলেশন বাতিল করতে ইচ্ছুক?"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
+msgid "The following packages will be uninstalled:"
+msgstr "নিম্নলিখিত প্যাকেজগুলি আন-ইনস্টল করা হবে:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+msgid ""
+"There are other extensions that depend on the previous ones which will also "
+"be uninstalled:"
+msgstr ""
+"পূর্ববর্তী অতিরিক্ত সামগ্রীর উপর নির্ভরশীল অন্যান্য অতিরিক্ত সামগ্রীগুলিও আন-ইনস্টল করা "
+"হবে:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+msgid ""
+"The selected extensions can't be installed because there are dependency "
+"conflicts."
+msgstr ""
+"নির্ভরতা সংক্রান্ত দ্বন্দ্ব উপস্থিত থাকার ফলে নির্বাচিত অতিরিক্ত সামগ্রীগুলি ইনস্টল করা "
+"যাবে না।"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
+msgid "The following packages will be installed:"
+msgstr "নিম্নলিখিত প্যাকেজগুলি ইনস্টল করা হবে:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
+msgid " (in user directory)"
+msgstr " (ব্যবহারকারীর ডিরেক্টরির মধ্যে)"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
+msgid "The following packages need to be uninstalled:"
+msgstr "নিম্নলিখিত প্যাকেজগুলি আন-ইনস্টল করা প্রয়োজন:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
+msgid "The following dependencies could not be resolved:"
+msgstr "নিম্নলিখিত নির্ভরতাগুলি মীমাংসা করা যায়নি:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
+msgid "The installation has been successfully completed."
+msgstr "সাফল্যের সাথে ইনস্টলেশন সমাপ্ত হয়েছে।"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
+msgid "The installation failed!"
+msgstr "ইনস্টলেশন বিফল!"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
+msgid "The installation has completed with warnings."
+msgstr "ইনস্টলেশন সমাপ্ত হয়েছে কিন্তু কিছু সতর্কবার্তা সৃষ্টি হয়েছে।"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
+msgid "The uninstallation has been successfully completed."
+msgstr "সাফল্যের সাথে আন-ইনস্টল করা হয়েছে।"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
+msgid "The uninstallation failed!"
+msgstr "আন-ইনস্টল করতে ব্যর্থ!"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
+msgid "The uninstallation has completed with warnings."
+msgstr "আন-ইনস্টল করা হয়েছে কিন্তু কিছু সতর্কবার্তা সৃষ্টি হয়েছে।"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
+msgid "Repository"
+msgstr "সংগ্রহস্থল"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
+msgid "Installation cancelled"
+msgstr "ইনস্টলেশন বাতিল করা হয়েছে"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
+msgid "Some of the required extensions were not found"
+msgstr "কয়েকটি আবশ্যক অতিরিক্ত সামগ্রী পাওয়া যায়নি"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
+msgid "Installation failed"
+msgstr "ইনস্টলেশন বিফল"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
+msgid "Extension"
+msgstr "অতিরিক্ত সামগ্রী"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
+#: ../src/Widgets/InfoBox.cs:214
+msgid "Version"
+msgstr "সংস্করণ"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
+msgid "Other"
+msgstr "অন্যান্য"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
+msgid "Url"
+msgstr "Url"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#, csharp-format
+msgid "Exception occurred: {0}"
+msgstr "উৎপন্ন এক্সেপশন: {0}"
+
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
+msgid "Disabled extensions can't be loaded."
+msgstr "নিষ্ক্রিয় অতিরিক্ত সামগ্রীগুলি লোড করা যাবে না।"
+
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#, csharp-format
+msgid "Loading {0} extension"
+msgstr "{0} অতিরিক্ত সামগ্রী লোড করা হচ্ছে"
+
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#, csharp-format
+msgid "The required extension '{0}' is disabled."
+msgstr "আবশ্যক অতিরিক্ত সামগ্রী '{0}' নিষ্ক্রিয় করা হয়েছে।"
+
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#, csharp-format
+msgid "The required extension '{0}' is not installed."
+msgstr "আবশ্যক অতিরিক্ত সামগ্রী '{0}' ইনস্টল করা হয়নি।"
+
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#, csharp-format
+msgid "(provided by {0})"
+msgstr "({0} দ্বারা উপলব্ধ)"
+
+#: ../src/CameraFileSelectionDialog.cs:76
+msgid "Preview"
+msgstr "পূর্বদৃশ্য"
+
+#: ../src/CameraFileSelectionDialog.cs:78
+msgid "Path"
+msgstr "পাথ"
+
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+msgid "File"
+msgstr "ফাইল"
+
+#: ../src/CameraFileSelectionDialog.cs:102
+msgid "Select Tag"
+msgstr "ট্যাগ নির্বাচন"
+
+#: ../src/CameraFileSelectionDialog.cs:138
+msgid "Downloading Previews"
+msgstr "পূর্বদৃশ্য ডাউনলোড করা হচ্ছে"
+
+#: ../src/CameraFileSelectionDialog.cs:148
+#, csharp-format
+msgid "Downloading Preview of {0}"
+msgstr "{0}-র পূর্বদৃশ্য ডাউনলোড করা হচ্ছে"
+
+#: ../src/CameraFileSelectionDialog.cs:220
+#, csharp-format
+msgid "Copying file {0} of {1}"
+msgstr "{0} ফাইল কপি করা হচ্ছে, সর্বমোট {1}"
+
+#: ../src/CameraFileSelectionDialog.cs:235
+msgid "Error transferring file"
+msgstr "ফাইল স্থানান্তর করতে সমস্যা"
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Download Complete"
+msgstr "ডাউনলোড সমাপ্ত"
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "ফাইল কপি করা সমাপ্ত হয়েছে"
+
+#: ../src/CameraFileSelectionDialog.cs:268
+#, csharp-format
+msgid "Transferring \"{0}\" from camera"
+msgstr "ক্যামেরা থেকে \"{0}\" স্থানান্তর করা হচ্ছে"
+
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+msgid "Camera"
+msgstr "ক্যামেরা"
+
+#: ../src/CameraSelectionDialog.cs:30
+msgid "Port"
+msgstr "পোর্ট"
+
+#: ../src/Core.cs:203
+#, csharp-format
+msgid "No photos matching {0} found"
+msgstr "{0}-র সাথে সুসংগত কোনো ফটো পাওয়া যায়নি"
+
+#: ../src/Core.cs:204
+#, csharp-format
+msgid ""
+"The tag \"{0}\" is not applied to any photos. Try adding\n"
+"the tag to some photos or selecting a different tag in the\n"
+"F-Spot preference dialog."
+msgstr ""
+"\"{0}\" ট্যাগটি কোনো ফটোর জন্য প্রয়োগ করা হয়নি। কয়েকটি ফটোর\n"
+"ক্ষেত্রে এই ট্যাগটি যোগ করুন অথবা F-Spot সংক্রান্ত পছন্দের \n"
+"ডায়লগ থেকে একটি ভিন্ন ট্যাগ নির্বাচন করুন।"
+
+#: ../src/Core.cs:208
+msgid "Search returned no results"
+msgstr "অনুসন্ধানের কোনো ফলাফল পাওয়া যায়নি"
+
+#: ../src/Core.cs:209
+msgid ""
+"The tag F-Spot is looking for does not exist. Try\n"
+"selecting a different tag in the F-Spot preference\n"
+"dialog."
+msgstr ""
+"F-Spot দ্বারা অনুসন্ধান করা ট্যাগটি অনুপস্থিত। \n"
+"F-Spot সংক্রান্ত পছন্দের ডায়লগ থেকে \n"
+"একটি ভিন্ন ট্যাগ নির্বাচন করুন।"
+
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Core/Photo.cs:473
+msgid "Reparented"
+msgstr "ঊর্ধ্বতন সম্পর্ক পরিবর্তিত হয়েছে"
+
+#: ../src/Core/Photo.cs:473
+#, csharp-format
+msgid "Reparented ({0})"
+msgstr "ঊর্ধ্বতন সম্পর্ক পরিবর্তিত হয়েছে ({0})"
+
+#: ../src/Core/Photo.cs:492
+#, csharp-format
+msgid "Modified"
+msgid_plural "Modified ({0})"
+msgstr[0] "পরিবর্তিত"
+msgstr[1] "পরিবর্তিত ({0})"
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1}"
+msgstr "{1}-র মধ্যে পরিবর্তিত"
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1} ({0})"
+msgstr "{1}-র মধ্যে পরিবর্তিত ({0})"
+
+#. Note that the original version is never stored in the photo_versions table in the
+#. database.
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
+msgid "Original"
+msgstr "মূল"
+
+#: ../src/Editors/AutoStretchEditor.cs:17
+msgid "Auto Color"
+msgstr "স্বয়ংক্রিয় রং নির্ধারণ"
+
+#: ../src/Editors/ColorEditor.cs:38
+msgid "Adjust Colors"
+msgstr "রং পরিবর্তন করুন"
+
+#: ../src/Editors/ColorEditor.cs:41
+msgid "Adjust"
+msgstr "পরিবর্তন করুন"
+
+#: ../src/Editors/CropEditor.cs:35
+msgid "4 x 3 (Book)"
+msgstr "৪ x ৩ (বই)"
+
+#: ../src/Editors/CropEditor.cs:36
+msgid "4 x 6 (Postcard)"
+msgstr "৪ x ৬ (পোস্ট-কার্ড)"
+
+#: ../src/Editors/CropEditor.cs:37
+msgid "5 x 7 (L, 2L)"
+msgstr "৫ x ৭ (L, 2L)"
+
+#: ../src/Editors/CropEditor.cs:38
+msgid "8 x 10"
+msgstr "৮ x ১০"
+
+#: ../src/Editors/CropEditor.cs:39
+msgid "Square"
+msgstr "চতুর্ভুজ"
+
+#: ../src/Editors/CropEditor.cs:42
+msgid "Crop"
+msgstr "ছাঁটাই করুন"
+
+#: ../src/Editors/CropEditor.cs:73
+msgid "Select the area that needs cropping."
+msgstr "ছাঁটাই করার উদ্দেশ্যে প্রয়োজনীয় ক্ষেত্র নির্বাচন করুন।"
+
+#: ../src/Editors/CropEditor.cs:98
+msgid "No Constraint"
+msgstr "সীমা বিহীন"
+
+#: ../src/Editors/CropEditor.cs:99
+msgid "Same as photo"
+msgstr "ফটোর অনুরূপ"
+
+#: ../src/Editors/CropEditor.cs:104
+msgid "Custom Ratios..."
+msgstr "স্বনির্ধারিত অনুপাত..."
+
+#: ../src/Editors/DesaturateEditor.cs:17
+msgid "Desaturate"
+msgstr "ডি-স্যাচুরেট"
+
+#: ../src/Editors/RedEyeEditor.cs:19
+msgid "Red-eye Reduction"
+msgstr "রেড-আই হ্রাস"
+
+#: ../src/Editors/RedEyeEditor.cs:21
+msgid "Fix!"
+msgstr "সংশোধন করা হবে!"
+
+#: ../src/Editors/RedEyeEditor.cs:25
+msgid "Select the eyes you wish to fix."
+msgstr "সংশোধনের উদ্দেশ্যে চোখ নির্ধারণ করুন।"
+
+#: ../src/Editors/SepiaEditor.cs:17
+msgid "Sepia Tone"
+msgstr "সেপিয়া আভা"
+
+#: ../src/Editors/SoftFocusEditor.cs:28
+msgid "Soft Focus"
+msgstr "হালকা ফোকাস"
+
+#: ../src/Editors/TiltEditor.cs:28
+msgid "Straighten"
+msgstr "সোজা করুন"
+
+#: ../src/FileImportBackend.cs:288
+msgid "Import error"
+msgstr "ইম্পোর্টে সমস্যা"
+
+#: ../src/FileImportBackend.cs:289
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "{0}{2}{2}{1} ইম্পোর্ট করতে সমস্যা"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "\"{0}\" ধরনের ফাইল সংরক্ষণের কোনো উপায় নেই"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "এক্সেপশনের ব্যবস্থাপনা হয়নি"
+
+#: ../src/FSpot.addin.xml.h:1
+msgid "Copy Photo Locat_ion"
+msgstr "ফটোর অবস্থান কপি করুন (_i)"
+
+#: ../src/FSpot.addin.xml.h:2
+msgid "Export to"
+msgstr "এক্সপোর্টের গন্তব্যস্থল"
+
+#: ../src/FSpot.addin.xml.h:3
+msgid "Open _With"
+msgstr "চিহ্নিত বস্তু সহযোগে খুলুন (_W)"
+
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
+msgid "Rem_ove Tag"
+msgstr "ট্যাগ সরিয়ে ফেলুন (_o)"
+
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
+#: ../src/SingleView.cs:451 ../src/ui/main_window.ui.h:16
+msgid "Rotate _Left"
+msgstr "বাঁদিকে ঘোরানো হবে (_L)"
+
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:452 ../src/ui/main_window.ui.h:17
+msgid "Rotate _Right"
+msgstr "ডানদিকের ঘোরানো হবে_R)"
+
+#: ../src/FSpot.addin.xml.h:7
+msgid "Tools"
+msgstr "সরঞ্জাম"
+
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
+msgid "_Attach Tag"
+msgstr "ট্যাগ যোগ করুন (_A)"
+
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
+msgid "_Delete From Drive"
+msgstr "ড্রাইভ থেকে মুছে ফেলুন (_D)"
+
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
+msgid "_Remove From Catalog"
+msgstr "ক্যাটালগ থেকে সরিয়ে ফেলা হবে (_R)"
+
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "১০২৪ px"
+
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "৩২০ px"
+
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "৪৮০ px"
+
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "৬৪০ px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "৮০০ px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>সংশোধন (_r)</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>ছবির প্রক্ষেপণ</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>মাপ</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>সারসংক্ষেপ</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>স্বচ্ছ্ব অংশ</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>ইম্পোর্ট করা সকল ছবি প্রদর্শন করা হবে</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>সাদা রংয়ের ভারসাম্য (_W)</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr "<small><i>বড় করে প্রদর্শিত ছবিগুলির ক্ষেত্রে প্রক্ষেপণ সক্রিয় করা হবে। ছবি প্রদর্শনের জন্য এটি নিষ্ক্রিয় না করা উচিত, কিন্তু আইকনের বিন্যাসের ক্ষেত্রে প্রক্ষেপণ নিষ্ক্রিয় করা সুবিধাজনক হতে পারে।</i></small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr "<small><i>ছবির স্বচ্ছ অংশগুলি প্রদর্শনের পদ্ধতি নির্বাচন করা যাবে। এই বিকল্পের প্রয়োগের ফলে, মূল ফটোর মধ্যে কোনো প্রভাব পড়বে না। কিন্তু এই বৈশিষ্ট্যে ক্ষেত্রে চৌখুপ্পি বিন্যাস অথবা স্বনির্ধারিত রং নির্বাচন করা হলে আইকন অথবা স্বচ্ছ অংশ বিশিষ্ট ছবি প্রদর্শনে সুবিধা হবে।</i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "পটভূমি রূপে (_b)"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "স্বনির্ধারিত রং রূপ: (_c)"
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "চৌখুপ্পি বিন্যাসে (_p)"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "ট্যাগ যোগ করুন:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "ট্যাগ যোগ করুন:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "বৈপরিত্য: (_o)"
+
+#: ../src/f-spot.glade.h:31
+msgid "Camera Selection"
+msgstr "ক্যামেরা নির্বাচন"
+
+#: ../src/f-spot.glade.h:32
+msgid "Copy files to the Photos folder"
+msgstr "Photos ফোল্ডারের মধ্যে ফাইল কপি করা হবে"
+
+#: ../src/f-spot.glade.h:33
+msgid "Create Mail"
+msgstr "মেইল তৈরি করুন"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create _icon for this tag when first used"
+msgstr "প্রথমবার ট্যাগ ব্যবহৃত হলে, ট্যাগের আইকন নির্মাণ করা হবে (_i)"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "নির্বাচিত ফটোগুলি সংযুক্ত করে (সম্ভব হলে, মাপ পরিবর্তন করে) একটু মেইল প্রস্তুত করুন"
+
+#: ../src/f-spot.glade.h:36
+msgid "Detect duplicates"
+msgstr "প্রতিলিপি সনাক্ত করা হবে"
+
+#: ../src/f-spot.glade.h:37
+msgid "Display File _Names"
+msgstr "ফাইলের নাম প্রদর্শন করা হবে (_N)"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "সুনির্দিষ্ট রোলের মধ্যে ইম্পোর্ট করা ফটোগুলি শুধুমাত্র প্রদর্শন করা হবে।"
+
+#: ../src/f-spot.glade.h:39
+msgid "Do not send a mail"
+msgstr "মেইল পাঠানো হবে না"
+
+#: ../src/f-spot.glade.h:40
+msgid "E-_Mail:"
+msgstr "ই-মেইল: (_M)"
+
+#: ../src/f-spot.glade.h:41
+msgid "E_xport titles and comments"
+msgstr "শিরোনাম ও মন্তব্য এক্সপোর্ট করা হবে (_x)"
+
+#: ../src/f-spot.glade.h:42
+msgid "Estimated new size"
+msgstr "নতুন আনুমানিক মাপ"
+
+#: ../src/f-spot.glade.h:44
+msgid "Extra large"
+msgstr "অতিরিক্ত বড়"
+
+#: ../src/f-spot.glade.h:45
+msgid "F-Spot View"
+msgstr "F-Spot প্রদর্শন"
+
+#: ../src/f-spot.glade.h:47
+msgid "Filter on selected rolls"
+msgstr "নির্বাচিত রোল অনুযায়ী ফিল্টার করা হবে"
+
+#: ../src/f-spot.glade.h:48
+msgid "G_allery:"
+msgstr "গ্যালারি: (_a)"
+
+#: ../src/f-spot.glade.h:49
+msgid "Gallery"
+msgstr "গ্যালারি"
+
+#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:267
+msgid "Import"
+msgstr "ইম্পোর্ট করুন"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:52
+msgid "Import Source:"
+msgstr "ইম্পোর্টের উৎসস্থল:"
+
+#: ../src/f-spot.glade.h:53
+msgid "Include subfolders"
+msgstr "সাবফোল্ডার অন্তর্ভুক্ত করা হবে"
+
+#: ../src/f-spot.glade.h:54
+msgid "Large"
+msgstr "বড়"
+
+#: ../src/f-spot.glade.h:55
+msgid "Manage your custom selection ratios"
+msgstr "নির্বাচনের স্বনির্ধারিত অনুপাত পরিচালনা করুন"
+
+#: ../src/f-spot.glade.h:56
+msgid "Medium"
+msgstr "মাঝারি"
+
+#: ../src/f-spot.glade.h:58
+msgid "Number of photos in selected rolls:"
+msgstr "নির্বাচিত রোলের মধ্যে উপস্থিত ফটোর সংখ্যা:"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of pictures"
+msgstr "ছবির সংখ্যা"
+
+#: ../src/f-spot.glade.h:60
+msgid "Open _Folder..."
+msgstr "ফোল্ডার খুলুন...(_F)"
+
+#: ../src/f-spot.glade.h:62
+msgid "Original size (possible very large file size)"
+msgstr "মূল মাপ (সম্ভবত বৃহৎ মাপের ফাইল)"
+
+#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "ঊর্ধ্বতন ট্যাগ: (_a)"
+
+#: ../src/f-spot.glade.h:64
+msgid "Pause"
+msgstr "স্থগিত করুন"
+
+#: ../src/f-spot.glade.h:65
+msgid "Preferences"
+msgstr "পছন্দসই মান"
+
+#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "পূর্ববর্তী"
+
+#: ../src/f-spot.glade.h:67
+msgid "Repair"
+msgstr "সংশোধন করুন"
+
+#: ../src/f-spot.glade.h:70
+msgid "Select Photos to Copy From Camera..."
+msgstr "ক্যামেরা থেকে কপি করার উদ্দেশ্যে ফটো নির্বাচন করুন..."
+
+#: ../src/f-spot.glade.h:71
+msgid "Select a Tag..."
+msgstr "একটি ট্যাগ নির্বাচন করুন..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select the camera from which you want to transfer files"
+msgstr "ফাইল স্থানান্তর করার উদ্দেশ্যে ক্যামেরা নির্বাচন করুন"
+
+#: ../src/f-spot.glade.h:73
+msgid "Selected Camera: "
+msgstr "নির্বাচিত ক্যামেরা: "
+
+#: ../src/f-spot.glade.h:74
+msgid "Selection Constraints"
+msgstr "নির্বাচন সংক্রান্ত সীমা"
+
+#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "পটভূমি রূপে নির্ধারণ করুন (_B)"
+
+#: ../src/f-spot.glade.h:76
+msgid "Show all photos."
+msgstr "সকল ফটো প্রদর্শন করা হবে।"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show or hide the side pane"
+msgstr "পার্শ্ববর্তী পেইন প্রদর্শন অথবা আড়াল করা হবে"
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the toolbar"
+msgstr "টুল-বার প্রদর্শন অথবা আড়াল করা হবে"
+
+#: ../src/f-spot.glade.h:79
+msgid "Side _pane"
+msgstr "পার্শ্ববর্তী পেইন (_p)"
+
+#: ../src/f-spot.glade.h:80
+msgid "Small"
+msgstr "ছোট"
+
+#: ../src/f-spot.glade.h:81
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"মূল মাপের কোনো ছবি ঘোরানো হবে কি না তা নির্ধারণ করুন। ছোট মাপের ছবি "
+"স্বয়ংক্রিয়ভাবে ঘোরানো হবে।"
+
+#: ../src/f-spot.glade.h:82
+msgid "Strip image _metadata"
+msgstr "ছবির মিটাডাটা ছাঁটাই করা হবে (_m)"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:84
+msgid "Te_mp:"
+msgstr "তাপমাত্রা: (_m)"
+
+#: ../src/f-spot.glade.h:85
+msgid "Tiny"
+msgstr "ক্ষুদ্র"
+
+#: ../src/f-spot.glade.h:86
+msgid "Total original size"
+msgstr "সর্বমোট মূল মাপ"
+
+#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "বড় মাপে প্রদর্শন (_i)"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "ছোট মাপে প্রদর্শন (_o)"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "বড় মাপে প্রদর্শন"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "ছোট মাপে প্রদর্শন"
+
+#: ../src/f-spot.glade.h:91
+msgid "_Brightness:"
+msgstr "উজ্জ্বলতা: (_B)"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "মেইল তৈরি করুন (_C)"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "সম্পাদনা (_E)"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "এক্সপোজার: (_E)"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "Flickr (_F)"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "সম্পূর্ণ পর্দায় প্রদর্শন (_F)"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "গ্যালারি (_G)"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "সাহায্য (_H)"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "হিউ: (_H)"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "বড় মাপে প্রদর্শনকালে প্রক্ষেপণ করা হবে (_I"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "নতুন উইন্ডো (_N)"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "আপলোড সমাপ্ত হলে ব্রাউজারের মধ্যে অ্যালবাম প্রদর্শন করা হবে (_O)"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "আপলোড সমাপ্ত হলে গন্তব্যস্থল প্রদর্শন করা হবে (_O)"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "ফটো (_P)"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "স্যাচুরেশন: (_S)"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "ফটোর সর্বাধিক মাপ: (_S)"
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "স্লাইড-শো (_S)"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "মিটাডাটা ছাঁটাই করা হবে (_S)"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "ট্যাগের নাম: (_T)"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "বর্ণাভা: (_T)"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "টুল-বার (_T)"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "URI: (_U)"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "প্রদর্শন (_V)"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "ভার্চুয়াল ফাইল-সিস্টেম (_V)"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "এবং"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"চিহ্নিত তারিখে\n"
+"চিহ্নিত তারিখের পরে\n"
+"চিহ্নিত তারিখের মধ্যে"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
+
+#: ../src/FullScreenView.cs:58
+msgid "Hide"
+msgstr "আড়াল করুন"
+
+#: ../src/FullScreenView.cs:60
+msgid "Hide Toolbar"
+msgstr "টুল-বার আড়াল করা হবে"
+
+#: ../src/FullScreenView.cs:66
+msgid "Info"
+msgstr "তথ্য"
+
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+msgid "Image Information"
+msgstr "ছবি সংক্রান্ত তথ্য"
+
+#: ../src/FullScreenView.cs:73
+msgid "Exit fullscreen"
+msgstr "সম্পূর্ণ পর্দায় প্রদর্শন বন্ধ করা হবে"
+
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
+#: ../src/SingleView.cs:101
+msgid "Slideshow"
+msgstr "স্লাইড-শো"
+
+#: ../src/FullScreenView.cs:82
+msgid "Start slideshow"
+msgstr "স্লাইড-শো আরম্ভ করুন"
+
+#: ../src/FullScreenView.cs:128
+msgid "Slide transition:"
+msgstr "স্লাইড পরিবর্তন:"
+
+#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
+msgid "More dates"
+msgstr "অতিরিক্ত তারিখ"
+
+#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
+msgid "More"
+msgstr "অতিরিক্ত"
+
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
+msgid "_Clear Date Range"
+msgstr "তারিখের সীমা মুছে ফেলা হবে (_C)"
+
+#: ../src/Imaging/Exif.cs:228
+msgid "Image Directory"
+msgstr "ছবির ডিরেক্টরি"
+
+#: ../src/Imaging/Exif.cs:230
+msgid "Thumbnail Directory"
+msgstr "থাম্ব-নেইল ডিরেক্টরি"
+
+#: ../src/Imaging/Exif.cs:232
+msgid "Exif Directory"
+msgstr "Exif ডিরেক্টরি"
+
+#: ../src/Imaging/Exif.cs:234
+msgid "GPS Directory"
+msgstr "GPS ডিরেক্টরি"
+
+#: ../src/Imaging/Exif.cs:236
+msgid "InterOperability Directory"
+msgstr "InterOperability ডিরেক্টরি"
+
+#: ../src/Imaging/Exif.cs:238
+msgid "Unknown Directory"
+msgstr "অজানা ডিরেক্টরির"
+
+#: ../src/Imaging/ImageFile.cs:116
+msgid "Writing to this file format is not supported"
+msgstr "এই বিন্যাসের ফাইলে লেখা সমর্থিত নয়"
+
+#: ../src/Imaging/IptcFile.cs:145
+msgid "IPTC Information Interchange Model (IIM) Version number"
+msgstr "IPTC ইনফোর্মেশন ইন্টারচেঞ্জ মডেল (IIM) সংস্করণ সংখ্যা"
+
+#: ../src/Imaging/IptcFile.cs:147
+msgid "OSI Destination routing information"
+msgstr "OSI ডেস্টিনেশন রাউটিং সংক্রান্ত তথ্য"
+
+#: ../src/Imaging/IptcFile.cs:149
+msgid "IPTC file format"
+msgstr "IPTC ফাইলের বিন্যাস"
+
+#: ../src/Imaging/IptcFile.cs:151
+msgid "Identifies the provider and product"
+msgstr "উপলব্ধকারী ও উৎপাদন চিহ্নিত করতে ব্যবহৃত"
+
+#: ../src/Imaging/IptcFile.cs:153
+msgid "A unique number identifying the envelope"
+msgstr "খাম সনাক্ত করতে ব্যবহৃত একটি স্বতন্ত্র সংখ্যা"
+
+#: ../src/Imaging/IptcFile.cs:155
+msgid "A unique number"
+msgstr "স্বতন্ত্র সংখ্যা"
+
+#: ../src/Imaging/IptcFile.cs:157
+msgid "The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
+msgstr "১ (অত্যন্ত জরুরি) থেকে ৯-য়ের (স্বল্প জরুরি) মধ্যে গুরুত্বের মাত্রা নির্দেশকারী খাম"
+
+#: ../src/Imaging/IptcFile.cs:159
+msgid "The year, month and day (CCYYMMDD) the service sent the material"
+msgstr "পরিসেবা দ্বারা যে বৎসর, মাস ও দিনে (CCYYMMDD) সামগ্রী পাঠানো হয়েছিল"
+
+#: ../src/Imaging/IptcFile.cs:161
+msgid "The hour, minute and second (HHMMSS) the service sent the material"
+msgstr "পরিসেবা দ্বারা যে ঘন্টা, মিনিট ও সেকেন্ডে (HHMMSS) সামগ্রী পাঠানো হয়েছিল"
+
+#: ../src/Imaging/IptcFile.cs:163
+msgid "The character set designation"
+msgstr "ক্যারেক্টার সেট নির্ধারণ"
+
+#: ../src/Imaging/IptcFile.cs:165
+msgid "External globally unique object identifier"
+msgstr "বহিস্থিত গ্লোবাল ইউনিক অবজেক্ট আইডেন্টিফায়ার"
+
+#: ../src/Imaging/IptcFile.cs:170
+msgid "Abstract Relationship Method (ARM) identifier"
+msgstr "অ্যাবস্ট্র্যাক্ট রিলেশনশিপ মেথড (ARM) সনাক্তকারী"
+
+#: ../src/Imaging/IptcFile.cs:172
+msgid "Abstract Relationship Method (ARM) version number."
+msgstr "অ্যাবস্ট্র্যাক্ট রিলেশনশিপ মেথড (ARM) সংস্করণ সংখ্যা"
+
+#: ../src/Imaging/IptcFile.cs:175
+msgid "Number identifying the IIM version this application record uses"
+msgstr "এই অ্যাপ্লিকেশন রেকর্ড দ্বারা ব্যবহৃত IIM সংখ্যা চিহ্নকারী সংখ্যা"
+
+#: ../src/Imaging/IptcFile.cs:177
+msgid "Object type reference"
+msgstr "অবজেক্টের ধরনের রেফারেন্স"
+
+#: ../src/Imaging/IptcFile.cs:182
+msgid "Object attribute reference"
+msgstr "অবজেক্টের অ্যাট্রিবিউটের রেফারেন্স"
+
+#: ../src/Imaging/IptcFile.cs:188 ../src/Imaging/IptcFile.cs:192
+msgid "Object name"
+msgstr "অবজেক্টের নাম"
+
+#: ../src/Imaging/IptcFile.cs:190
+msgid "Status of the objectdata according to the provider"
+msgstr "উপলব্ধকারী অনুযায়ী objectdata-র অবস্থা"
+
+#: ../src/Imaging/IptcFile.cs:194
+msgid "Location within a city or area where the object originates"
+msgstr "শহর অথবা অঞ্চলের যে অবস্থান থেকে বস্তুটির উৎপত্তি হচ্ছে"
+
+#: ../src/Imaging/IptcFile.cs:197
+msgid "Name of the city the content is focussing on"
+msgstr "সামগ্রীটি যে শহরের প্রতি নির্দেশ করছে"
+
+#: ../src/Imaging/IptcFile.cs:200
+msgid "Copyright information for"
+msgstr "চিহ্নিত সামগ্রী সংক্রান্ত স্বত্বাধিকার"
+
+#: ../src/Imaging/IptcFile.cs:203
+msgid "Full name of the country of the focus of the content"
+msgstr "সামগ্রীটি যে দেশের প্রতি নির্দেশ করছে সেটির সম্পূর্ণ নাম"
+
+#: ../src/Imaging/IptcFile.cs:206
+msgid "Two or three letter ISO3166 code of the country of the focus of the content"
+msgstr "সামগ্রীটি যে দেশের প্রতি নির্দেশ করছে সেটির দুই অথবা তিন অক্ষর বিশিষ্ট ISO3166 নাম"
+
+#: ../src/Imaging/IptcFile.cs:209
+msgid "Creator of the content"
+msgstr "সামগ্রীর নির্মাতা"
+
+#: ../src/Imaging/IptcFile.cs:212
+msgid "Provider of the object"
+msgstr "অবজেক্ট উপলব্ধকারী"
+
+#: ../src/Imaging/IptcFile.cs:215
+msgid "The title of the author or creator"
+msgstr "লেখক অথবা নির্মাতার শিরোনাম"
+
+#: ../src/Imaging/IptcFile.cs:218
+msgid ""
+"The person involved in writing, editing or correcting the object data or "
+"caption/abstract"
+msgstr "বস্তুর তথ্য অথবা শিরোনাম/সারসংক্ষেপ লেখা, সম্পাদনা অথবা সংশোধনের কাজের সাথে যুক্ত ব্যক্তি"
+
+#: ../src/Imaging/IptcFile.cs:222
+msgid "Headline of the content"
+msgstr "তথ্যের শিরোনাম"
+
+#: ../src/Imaging/IptcFile.cs:225
+msgid "Instructions from the creator to the receiver not covered by other fields"
+msgstr "নির্মাতা থেকে প্রাপকের উদ্দেশ্যে উপলব্ধ নির্দেশগুলি অন্য কোনো ক্ষেত্রের এক্তিয়ারভুক্ত নয়"
+
+#: ../src/Imaging/IptcFile.cs:228
+msgid "Intellectual genre of the object"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:241
+msgid "Unknown IIM DataSet"
+msgstr "অজানা IIM DataSet"
+
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:357
+msgid "Select Folder"
+msgstr "ফোল্ডার নির্বাচন"
+
+#: ../src/ImportCommand.cs:259
+msgid "(No Cameras Detected)"
+msgstr "(কোনো ক্যামেরা সনাক্ত হয়নি)"
+
+#: ../src/ImportCommand.cs:404
+#, csharp-format
+msgid "Loading {0} of {1}"
+msgstr "{0} লোড করা হচ্ছে, সর্বমোট {1}"
+
+#: ../src/ImportCommand.cs:470
+msgid "Done Loading"
+msgstr "লোড করা সমাপ্ত হয়েছে"
+
+#: ../src/ImportCommand.cs:684
+msgid "Directory does not exist."
+msgstr "ডিরেক্টরি উপস্থিত নেই"
+
+#: ../src/ImportCommand.cs:685
+#, csharp-format
+msgid ""
+"The directory you selected \"{0}\" does not exist. Please choose a "
+"different directory"
+msgstr ""
+"আপনার নির্বাচিত ডিরেক্টরি \"{0}\" উপস্থিত নেই। অনুগ্রহ করে একটি ভিন্ন ডিরেক্টরি "
+"নির্বাচন করুন"
+
+#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
+#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/XmpTagsImporter.cs:89
+msgid "Import Tags"
+msgstr "ট্যাগ ইম্পোর্ট করুন"
+
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:84
+msgid "Rotate Left"
+msgstr "বাঁদিকে ঘোরানো হবে"
+
+#: ../src/ItemAction.cs:80
+msgid "Rotate picture left"
+msgstr "ছবিটি বাঁদিকে ঘোরানো হবে"
+
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:89
+msgid "Rotate Right"
+msgstr "ডানদিকে ঘোরানো হবে"
+
+#: ../src/ItemAction.cs:92
+msgid "Rotate picture right"
+msgstr "ছবিটি ডানদিকে ঘোরানো হবে"
+
+#: ../src/ItemAction.cs:103
+msgid "Next picture"
+msgstr "পরবর্তী ছবি"
+
+#: ../src/ItemAction.cs:124
+msgid "Previous picture"
+msgstr "পূর্ববর্তী ছবি"
+
+#: ../src/MainWindow.cs:269
+msgid "Import new images"
+msgstr "নতুন ছবি ইম্পোর্ট করুন"
+
+#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+msgid "Browse"
+msgstr "ব্রাউজ করুন"
+
+#: ../src/MainWindow.cs:289
+msgid "Browse many photos simultaneously"
+msgstr "একসাথে অধিক সংখ্যক ফটো দেখুন"
+
+#: ../src/MainWindow.cs:293
+msgid "Edit Image"
+msgstr "ছবি সম্পাদনা"
+
+#: ../src/MainWindow.cs:297
+msgid "View and edit a photo"
+msgstr "ফটো প্রদর্শন ও সম্পাদনা"
+
+#: ../src/MainWindow.cs:302 ../src/SingleView.cs:96
+msgid "Fullscreen"
+msgstr "সম্পূর্ণ পর্দায় প্রদর্শন"
+
+#: ../src/MainWindow.cs:304 ../src/SingleView.cs:98
+msgid "View photos fullscreen"
+msgstr "ফটোগুলি সম্পূর্ণ পর্দায় প্রদর্শন করা হবে"
+
+#: ../src/MainWindow.cs:309 ../src/SingleView.cs:103
+msgid "View photos in a slideshow"
+msgstr "স্লাইড-শো রূপে ছবিগুলি প্রদর্শন করা হবে"
+
+#: ../src/MainWindow.cs:324
+msgid "Previous photo"
+msgstr "পূর্ববর্তী ফটো"
+
+#: ../src/MainWindow.cs:329
+msgid "Next photo"
+msgstr "পরবর্তী ফটো"
+
+#: ../src/MainWindow.cs:1488
+msgid "No cameras detected."
+msgstr "কোনো ক্যামেরা সনাক্ত করা হয়নি।"
+
+#: ../src/MainWindow.cs:1489
+msgid ""
+"F-Spot was unable to find any cameras attached to this system. Double check "
+"that the camera is connected and has power"
+msgstr ""
+"F-Spot দ্বারা এই সিস্টেমের সাথে সংযুক্ত কোনো ক্যামেরা সনাক্ত করা সম্ভব হয়নি। অনুগ্রহ "
+"করে পরীক্ষা করুন ক্যামেরাটি সংযুক্ত কি না ও সেটি চালু কি না।"
+
+#: ../src/MainWindow.cs:1528
+msgid "Error connecting to camera"
+msgstr "ক্যামেরার সাথে সংযোগ স্থাপন করতে সমস্যা"
+
+#: ../src/MainWindow.cs:1529
+#, csharp-format
+msgid "Received error \"{0}\" while connecting to camera"
+msgstr "ক্যামেরার সাথে সংযোগ স্থাপনের প্রচেষ্টাকালে \"{0}\" ত্রুটি প্রাপ্ত হয়েছে"
+
+#. Translators, The singular case will never happen here.
+#: ../src/MainWindow.cs:1815
+#, csharp-format
+msgid "Merge the selected tag"
+msgid_plural "Merge the {0} selected tags?"
+msgstr[0] "নির্বাচিত ট্যাগ একত্রিত করুন"
+msgstr[1] "{0}-টি নির্বাচিত ট্যাগ একত্রিত করা হবে কি?"
+
+#: ../src/MainWindow.cs:1842
+msgid ""
+"This operation will merge the selected tags and any sub-tags into a single "
+"tag."
+msgstr "এর ফলে, নির্বাচিত ট্যাগ ও সেগুলির সাব-ট্যাগগুলি একটি ট্যাগের মধ্যে একত্রিত করা হবে।"
+
+#: ../src/MainWindow.cs:1844
+msgid "_Merge Tags"
+msgstr "ট্যাগ একত্রিত করুন (_M)"
+
+#: ../src/MainWindow.cs:2049
+#, csharp-format
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] "{0} ফটো, সর্বমোট {1}"
+msgstr[1] "{0} ফটো, সর্বমোট {1}"
+
+#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:493
+#, csharp-format
+msgid "{0} Photo"
+msgid_plural "{0} Photos"
+msgstr[0] "{0}-টি ফটো"
+msgstr[1] "{0}-টি ফটো"
+
+#: ../src/MainWindow.cs:2054
+#, csharp-format
+msgid " ({0} selected)"
+msgid_plural " ({0} selected)"
+msgstr[0] " ({0}-টি নির্বাচিত)"
+msgstr[1] " ({0}-টি নির্বাচিত)"
+
+#: ../src/MainWindow.cs:2135
+msgid "_Ok"
+msgstr "ঠিক আছে (_O)"
+
+#: ../src/MainWindow.cs:2136
+msgid "Error Deleting Picture"
+msgstr "ছবি মুছে ফেলতে সমস্যা"
+
+#: ../src/MainWindow.cs:2141
+#, csharp-format
+msgid "No permission to delete the file:{1}{0}"
+msgstr "ফাইল মুছে ফেলার অনুমতি নেই:{1}{0}"
+
+#: ../src/MainWindow.cs:2145
+#, csharp-format
+msgid "An error of type {0} occurred while deleting the file:{2}{1}"
+msgstr "এই ফাইলটি মুছে ফেলার সময় {0} ধরনের একটি ত্রুটি দেখা দিয়েছে:{2}{1}"
+
+#: ../src/MainWindow.cs:2177
+#, csharp-format
+msgid "Delete the selected photo permanently?"
+msgid_plural "Delete the {0} selected photos permanently?"
+msgstr[0] "নির্বাচিত ফটোটি স্থায়ীরূপে বর্জন করা হবে কি?"
+msgstr[1] "নির্বাচিত {0}-টি ফটো স্থায়ীরূপে বর্জন করা হবে কি?"
+
+#: ../src/MainWindow.cs:2181
+msgid "This deletes all versions of the selected photo from your drive."
+msgid_plural "This deletes all versions of the selected photos from your drive."
+msgstr[0] "এর ফলে, ড্রাইভে উপস্থিত এই ফটোর সকল সংস্করণ মুছে ফেলা হবে"
+msgstr[1] "এর ফলে, ড্রাইভে উপস্থিত এই ফটোর সকল সংস্করণ মুছে ফেলা হবে।"
+
+#: ../src/MainWindow.cs:2184
+msgid "_Delete photo"
+msgid_plural "_Delete photos"
+msgstr[0] "ছবি মুছে ফেলুন (_D)"
+msgstr[1] "ছবি মুছে ফেলুন (_D)"
+
+#: ../src/MainWindow.cs:2220
+#, csharp-format
+msgid "Remove the selected photo from F-Spot?"
+msgid_plural "Remove the {0} selected photos from F-Spot?"
+msgstr[0] "নির্বাচিত ফটোটি F-Spot থেকে মুছে ফেলা হবে কি?"
+msgstr[1] "নির্বাচিত {0}-টি ফটো F-Spot থেকে মুছে ফেলা হবে কি?"
+
+#: ../src/MainWindow.cs:2225
+msgid ""
+"If you remove photos from the F-Spot catalog all tag information will be "
+"lost. The photos remain on your computer and can be imported into F-Spot "
+"again."
+msgstr "F-Spot ক্যাটালগ থেকে সকল ফটো সরিয়ে ফেলা হলে ট্যাগ সংক্রান্ত সকল তথ্য হারিয়ে যাবে। ফটোগুলি আপনার কম্পিউটারের মধ্যে উপস্থিত থাকবে ও পুনরায় F-Spot-র মধ্যে ইম্পোর্ট করা যাবে।"
+
+#: ../src/MainWindow.cs:2226
+msgid "_Remove from Catalog"
+msgstr "ক্যাটালগ থেকে মুছে ফেলুন (_R)"
+
+#: ../src/MainWindow.cs:2289
+#, csharp-format
+msgid "Delete tag \"{0}\"?"
+msgstr "\"{0}\" ট্যাগ মুছে ফেলা হবে কি?"
+
+#: ../src/MainWindow.cs:2291
+#, csharp-format
+msgid "Delete the {0} selected tags?"
+msgstr "{0}-টি নির্বাচিত ট্যাগ মুছে ফেলা হবে কি?"
+
+#: ../src/MainWindow.cs:2296
+msgid "photo"
+msgid_plural "photos"
+msgstr[0] "ফটো"
+msgstr[1] "ফটো"
+
+#: ../src/MainWindow.cs:2298
+#, csharp-format
+msgid "If you delete this tag, the association with {0} {1} will be lost."
+msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] "এই ট্যাগ মুছে ফেলা হলে, {0} {1}-র সাথে সম্পর্ক মুছে যাবে।"
+msgstr[1] "এই ট্যাগ মুছে ফেলা হলে, {0} {1}-র সাথে সম্পর্ক মুছে যাবে।"
+
+#: ../src/MainWindow.cs:2303
+msgid "_Delete tag"
+msgid_plural "_Delete tags"
+msgstr[0] "ট্যাগ মুছে ফেলুন (_D)"
+msgstr[1] "ট্যাগ মুছে ফেলুন (_D)"
+
+#. A Category is not empty. Can not delete it.
+#: ../src/MainWindow.cs:2317
+msgid "Tag is not empty"
+msgstr "ট্যাগটি ফাঁকা নয়"
+
+#: ../src/MainWindow.cs:2318
+#, csharp-format
+msgid ""
+"Can not delete tags that have tags within them. Please delete tags under "
+"\"{0}\" first"
+msgstr ""
+"অন্তর্ভুক্ত ট্যাগ সহ ট্যাগগুলি মুছে ফেলা যাবে না। অনুগ্রহ করে \"{0}\"-র অধীন উপস্থিত "
+"ট্যাগ প্রথমে মুছে ফেলুন"
+
+#: ../src/MainWindow.cs:2750
+msgid "Rotate selected photo left"
+msgid_plural "Rotate selected photos left"
+msgstr[0] "নির্বাচিত ফটোটি বাঁদিকে ঘোরানো হবে"
+msgstr[1] "নির্বাচিত ফটোগুলি বাঁদিকে ঘোরানো হবে"
+
+#: ../src/MainWindow.cs:2763
+msgid "Rotate selected photo right"
+msgid_plural "Rotate selected photos right"
+msgstr[0] "নির্বাচিত ফটোটি ডানদিকে ঘোরানো হবে"
+msgstr[1] "নির্বাচিত ফটোগুলি ডানদিকে ঘোরানো হবে"
+
+#: ../src/MainWindow.cs:2774
+#, csharp-format
+msgid "Find _Selected Tag"
+msgid_plural "Find _Selected Tags"
+msgstr[0] "নির্বাচিত ট্যাগ অনুসন্ধান করুন (_S)"
+msgstr[1] "নির্বাচিত ট্যাগ অনুসন্ধান করুন (_S)"
+
+#: ../src/MainWindow.cs:2778
+#, csharp-format
+msgid "Find Selected Tag _With"
+msgid_plural "Find Selected Tags _With"
+msgstr[0] "চিহ্নিত বস্তু সহযোগে ট্যাগ অনুসন্ধান করুন (_W)"
+msgstr[1] "চিহ্নিত বস্তু সহযোগে ট্যাগ অনুসন্ধান করুন (_W)"
+
+#: ../src/MainWindow.cs:2819
+msgid "Create New Version?"
+msgid_plural "Create New Versions?"
+msgstr[0] "নতুন সংস্করণ তৈরি করা হবে কি?"
+msgstr[1] "নতুন সংস্করণ তৈরি করা হবে কি?"
+
+#: ../src/MainWindow.cs:2821
+#, csharp-format
+msgid ""
+"Before launching {1}, should F-Spot create a new version of the selected "
+"photo to preserve the original?"
+msgid_plural ""
+"Before launching {1}, should F-Spot create new versions of the selected "
+"photos to preserve the originals?"
+msgstr[0] "{1} আরম্ভ করার পূর্বে, নির্বাচিত ফটোটির মূল সংস্করণ অক্ষত রাখার উদ্দেশ্যে F-Spot দ্বারা এটির একটি নতুন সংস্করণ নির্মাণ করা হবে কি?"
+msgstr[1] "{1} আরম্ভ করার পূর্বে, নির্বাচিত ফটোগুলির মূল সংস্করণ অক্ষত রাখার উদ্দেশ্যে F-Spot দ্বারা এটির একটি নতুন সংস্করণ নির্মাণ করা হবে কি?"
+
+#: ../src/MainWindow.cs:2843
+msgid "XCF version"
+msgstr "XCF সংস্করণ"
+
+#: ../src/MetadataStore.cs:19
+msgid "Creator"
+msgstr "নির্মাতা"
+
+#: ../src/MetadataStore.cs:20
+msgid "Title"
+msgstr "শিরোনাম"
+
+#: ../src/MetadataStore.cs:21
+msgid "Copyright"
+msgstr "স্বত্বাধিকার"
+
+#: ../src/MetadataStore.cs:22
+msgid "Subject and Keywords"
+msgstr "বিষয় ও প্রাসঙ্গিক শব্দ"
+
+#: ../src/MetadataStore.cs:23
+msgid "Compression"
+msgstr "কম্প্রেশন"
+
+#: ../src/MetadataStore.cs:25
+msgid "Planar Configuration"
+msgstr "Planar কনফিগারেশন"
+
+#: ../src/MetadataStore.cs:27
+msgid "Orientation"
+msgstr "দিশা"
+
+#: ../src/MetadataStore.cs:29
+msgid "Photometric Interpretation"
+msgstr "ফটোমেট্রিক ইন্টারপ্রিটেশন"
+
+#: ../src/MetadataStore.cs:31
+msgid "Resolution Unit"
+msgstr "রেজোলিউশনের মানক"
+
+#: ../src/MetadataStore.cs:33
+msgid "Exposure Program"
+msgstr "এক্সপোজার প্রোগ্রাম"
+
+#: ../src/MetadataStore.cs:35
+msgid "Metering Mode"
+msgstr "মিটারিং মোড"
+
+#: ../src/MetadataStore.cs:37
+msgid "Exposure Mode"
+msgstr "এক্সপোজারের মোড"
+
+#: ../src/MetadataStore.cs:39
+msgid "Custom Rendered"
+msgstr "স্বনির্ধারিতভাবে রেন্ডার করা হয়েছে"
+
+#: ../src/MetadataStore.cs:41
+msgid "Components Configuration"
+msgstr "অংশবিশেষের কনফিগারেশন"
+
+#: ../src/MetadataStore.cs:43
+msgid "Light Source"
+msgstr "আলোর উৎস"
+
+#: ../src/MetadataStore.cs:45
+msgid "Sensing Method"
+msgstr "সংবেদনশিলতার পদ্ধতি"
+
+#: ../src/MetadataStore.cs:47
+msgid "Color Space"
+msgstr "রংয়ের ক্ষেত্র"
+
+#: ../src/MetadataStore.cs:49
+msgid "White Balance"
+msgstr "সাদা রংয়ের ভারসাম্য"
+
+#: ../src/MetadataStore.cs:51
+msgid "Focal Plane Resolution Unit"
+msgstr "ফোকাল প্লেইন রেসোলিউশনের মানক"
+
+#: ../src/MetadataStore.cs:53
+msgid "File Source Type"
+msgstr "ফাইলের উৎসের ধরন"
+
+#: ../src/MetadataStore.cs:55
+msgid "Scene Capture Type"
+msgstr ""
+
+#: ../src/MetadataStore.cs:57
+msgid "Gain Control"
+msgstr "গেইন নিয়ন্ত্রণ"
+
+#: ../src/MetadataStore.cs:59
+msgid "Contrast"
+msgstr "বৈপরিত্য"
+
+#: ../src/MetadataStore.cs:61
+msgid "Saturation"
+msgstr "স্যাচুরেশন"
+
+#: ../src/MetadataStore.cs:63
+msgid "Sharpness"
+msgstr "তীক্ষ্ণতা"
+
+#: ../src/MetadataStore.cs:65
+msgid "Scene Type"
+msgstr ""
+
+#. Fixme this should really set parent menu
+#. items insensitve
+#: ../src/PhotoTagMenu.cs:74
+msgid "(No Tags)"
+msgstr "(ট্যাগ অনুপস্থিত)"
+
+#: ../src/PhotoVersionCommands.cs:58
+msgid "Create New Version"
+msgstr "নতুন সংস্করণ নির্মাণ করুন"
+
+#: ../src/PhotoVersionCommands.cs:59
+msgid "Name:"
+msgstr "নাম:"
+
+#: ../src/PhotoVersionCommands.cs:63
+msgid "Rename Version"
+msgstr "সংস্করণের নাম পরিবর্তন করুন"
+
+#: ../src/PhotoVersionCommands.cs:64
+msgid "New name:"
+msgstr "নতুন নাম:"
+
+#: ../src/PhotoVersionCommands.cs:110
+msgid "Could not create a new version"
+msgstr "নতুন সংস্করণ নির্মাণ করতে ব্যর্থ"
+
+#: ../src/PhotoVersionCommands.cs:111
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to create version \"{1}\""
+msgstr "\"{0}\" একসেপশন প্রাপ্ত হয়েছে। \"{1}\" সংস্করণ নির্মাণ করতে ব্যর্থ"
+
+#: ../src/PhotoVersionCommands.cs:138
+msgid "Really Delete?"
+msgstr "নিশ্চিতরূপে মুছে ফেলা হবে কি?"
+
+#: ../src/PhotoVersionCommands.cs:139
+msgid "Cancel"
+msgstr "বাতিল"
+
+#: ../src/PhotoVersionCommands.cs:140
+msgid "Delete"
+msgstr "মুছে ফেলুন"
+
+#: ../src/PhotoVersionCommands.cs:144
+#, csharp-format
+msgid "Really delete version \"{0}\"?"
+msgstr "নিশ্চিতরূপে \"{0}\" সংস্করণটি মুছে ফেলা হবে কি?"
+
+#: ../src/PhotoVersionCommands.cs:154
+msgid "Could not delete a version"
+msgstr "একটি সংস্করণ মুছে ফেলা যায়নি"
+
+#: ../src/PhotoVersionCommands.cs:155
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
+msgstr "এক্সেপশন \"{0}\" প্রাপ্ত হয়েছে। সংস্করণ \"{1}\" মুছে ফেলতে ব্যর্থ"
+
+#: ../src/PhotoVersionCommands.cs:196
+msgid "Could not rename a version"
+msgstr "সংস্করণের নাম পরিবর্তন করতে ব্যর্থ"
+
+#: ../src/PhotoVersionCommands.cs:197
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
+msgstr "এক্সেপশন \"{0}\" প্রাপ্ত হয়েছে। সংস্করণ \"{1}\"-র নাম পরিবর্তন করতে ব্যর্থ"
+
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:562
+#: ../src/Widgets/InfoBox.cs:564
+msgid "(No Edits)"
+msgstr "(সম্পাদনা বিনা)"
+
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
+msgid "Error editing photo"
+msgstr "ফটো সম্পাদনা করতে ত্রুটি"
+
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "এক্সেপশন \"{0}\" প্রাপ্ত হয়েছে। {1} ফটো সংরক্ষণ করতে ব্যর্থ"
+
+#: ../src/PhotoView.cs:356
+msgid "Comment:"
+msgstr "মন্তব্য:"
+
+#: ../src/Preferences.cs:149
+msgid "Photos"
+msgstr "ফটো"
+
+#: ../src/PrintOperation.cs:32
+msgid "Image Settings"
+msgstr "ছবির বৈশিষ্ট্য"
+
+#: ../src/QueryWidget.cs:58
+msgid "Find: "
+msgstr "অনুসন্ধান: "
+
+#: ../src/QueryWidget.cs:63
+msgid "Untagged photos"
+msgstr "ট্যাগবিহীন ফটো"
+
+#: ../src/QueryWidget.cs:71
+msgid "Rated photos"
+msgstr "গুণমাপ বিশিষ্ট ফটো"
+
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/QueryWidget.cs:80
+msgid "Import roll"
+msgstr "ইম্পোর্ট করা রোল"
+
+#: ../src/QueryWidget.cs:104
+msgid "Clear search"
+msgstr "অনুসন্ধানের তথ্য মুছে ফেলুন"
+
+#: ../src/QueryWidget.cs:111
+msgid "Refresh search"
+msgstr "নতুন করে অনুসন্ধান"
+
+#: ../src/QueryWidget.cs:113
+msgid "No matching photos found"
+msgstr "সুসংগত কোনো ফটো পাওয়া যায়নি"
+
+#: ../src/QueryWidget.cs:155
+msgid "Hide _Find Bar"
+msgstr "অনুসন্ধানের বার আড়াল করা হবে (_F)"
+
+#: ../src/QueryWidget.cs:161
+msgid "Show _Find Bar"
+msgstr "অনুসন্ধানের বার প্রদর্শন করা হবে (_F)"
+
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
+msgid "Unable to rotate this type of photo"
+msgstr "এই ধরনে ফটো ঘোরাতে ব্যর্থ"
+
+#: ../src/RotateCommand.cs:131
+msgid "Unable to rotate readonly file"
+msgstr "শুধুমাত্র পাঠযোগ্য ফাইল ঘোরাতে ব্যর্থ"
+
+#: ../src/RotateCommand.cs:198
+msgid "Rotating photos"
+msgstr "ফটো ঘোরানো হচ্ছে"
+
+#: ../src/RotateCommand.cs:209
+#, csharp-format
+msgid "Rotating photo \"{0}\""
+msgstr "ফটো \"{0}\" ঘোরানো হচ্ছে"
+
+#: ../src/RotateCommand.cs:222
+msgid "Directory not found"
+msgstr "ডিরেক্টরি পাওয়া যায়নি"
+
+#: ../src/RotateCommand.cs:242
+#, csharp-format
+msgid "Unable to rotate photo"
+msgid_plural "Unable to rotate {0} photos"
+msgstr[0] "ফটো ঘোরাতে ব্যর্থ"
+msgstr[1] "{0}-টি ফটো ঘোরাতে ব্যর্থ"
+
+#: ../src/RotateCommand.cs:244
+#, csharp-format
+msgid ""
+"The photo could not be rotated because it is on a read only file system or "
+"media such as a CDROM. Please check the permissions and try again."
+msgid_plural ""
+"{0} photos could not be rotated because they are on a read only file system "
+"or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] "শুধুমাত্র পাঠযোগ্য কোনো ফাইল-সিস্টেম অথবা মিডিয়া যেমন CDROM-র মধ্যে উপস্থিত থাকার ফলে এই ফটোটি আবর্তন করা সম্ভব হয়নি। অনুগ্রহ করে অনুমতি পরীক্ষা করে পুনরায় প্রচেষ্টা করুন।"
+msgstr[1] "শুধুমাত্র পাঠযোগ্য কোনো ফাইল-সিস্টেম অথবা মিডিয়া যেমন CDROM-র মধ্যে উপস্থিত থাকার ফলে {0}-টি ফটো আবর্তন করা সম্ভব হয়নি। অনুগ্রহ করে অনুমতি পরীক্ষা করে পুনরায় প্রচেষ্টা করুন।"
+
+#: ../src/RotateCommand.cs:271
+#, csharp-format
+msgid "Received error \"{0}\" while attempting to rotate {1}"
+msgstr "{1} ঘোরানোর সময় ত্রুটি \"{0}\" উৎপন্ন হয়েছে"
+
+#: ../src/RotateCommand.cs:276
+msgid "Error while rotating photo."
+msgstr "ফটোর ঘোরানোর সময় সমস্যা"
+
+#: ../src/SendEmail.cs:240
+msgid "Preparing email"
+msgstr "ই-মেইল প্রস্তুত করা হয়েছে"
+
+#: ../src/SendEmail.cs:292
+#, csharp-format
+msgid "Exporting picture \"{0}\""
+msgstr "ছবি \"{0}\" এক্সপোর্ট করা হয়েছে"
+
+#: ../src/SendEmail.cs:314
+msgid "Error processing image"
+msgstr "ছবি প্রক্রিয়াকরণে ত্রুটি"
+
+#: ../src/SendEmail.cs:315
+#, csharp-format
+msgid "An error occured while processing \"{0}\": {1}"
+msgstr "\"{0}\" প্রক্রিয়াকরণে ত্রুটি দেখা দিয়েছে: {1}"
+
+#. Send the mail :)
+#: ../src/SendEmail.cs:330
+msgid "my photos"
+msgstr "my photos"
+
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "তীক্ষ্ণতার মাত্রা বৃদ্ধি করা ফটো সংরক্ষণ করতে ত্রুটি"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "তীক্ষ্ণতা বৃদ্ধি করুন"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "পরিমাণ:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "ব্যাসার্ধ:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "প্রান্তিকমাপ:"
+
+#: ../src/SingleView.cs:86
+msgid "Rotate photo left"
+msgstr "ফটো বাঁদিকে ঘোরানো হবে"
+
+#: ../src/SingleView.cs:91
+msgid "Rotate photo right"
+msgstr "ফটো ডানদিকে ঘোরানো হবে"
+
+#: ../src/SingleView.cs:128
+msgid "Folder"
+msgstr "ফোল্ডার"
+
+#: ../src/SingleView.cs:354
+msgid "Open"
+msgstr "খুলুন"
+
+#: ../src/SingleView.cs:454
+msgid "Set as Background"
+msgstr "পটভূমি রূপে নির্ধারণ করা হবে"
+
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
+msgid "This name is already in use"
+msgstr "এই নামটি বর্তমানে ব্যবহৃত হচ্ছে"
+
+#: ../src/TagCommands.cs:144
+msgid "Create New Tag"
+msgstr "নতুন ট্যাগ নির্মাণ করুন"
+
+#: ../src/TagCommands.cs:145
+msgid "Name of New Tag:"
+msgstr "নতুন ট্যাগের নাম:"
+
+#: ../src/TagPopup.cs:26
+#, csharp-format
+msgid "Find"
+msgid_plural "Find"
+msgstr[0] "অনুসন্ধান করুন"
+msgstr[1] "অনুসন্ধান করুন"
+
+#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
+msgid "Create New Tag..."
+msgstr "নতুন ট্যাগ নির্মাণ করুন..."
+
+#: ../src/TagPopup.cs:42
+msgid "Edit Selected Tag..."
+msgstr "নির্বাচিত ট্যাগ সম্পাদনা করুন..."
+
+#: ../src/TagPopup.cs:46
+msgid "Delete Tag"
+msgid_plural "Delete Tags"
+msgstr[0] "ট্যাগ মুছে ফেলুন"
+msgstr[1] "ট্যাগ মুছে ফেলুন"
+
+#: ../src/TagPopup.cs:52
+msgid "Attach Tag to Selection"
+msgid_plural "Attach Tags to Selection"
+msgstr[0] "নির্বাচনের মধ্যে ট্যাগ সংযুক্ত করুন"
+msgstr[1] "নির্বাচনের মধ্যে ট্যাগ সংযুক্ত করুন"
+
+#: ../src/TagPopup.cs:56
+msgid "Remove Tag From Selection"
+msgid_plural "Remove Tags From Selection"
+msgstr[0] "নির্বাচন থেকে ট্যাগ সরিয়ে ফেলুন"
+msgstr[1] "নির্বাচন থেকে ট্যাগ সরিয়ে ফেলুন"
+
+#: ../src/TagPopup.cs:62
+msgid "Merge Tags"
+msgstr "ট্যাগ একত্রিত করুন"
+
+#: ../src/TagQueryWidget.cs:34
+#, csharp-format
+msgid "Include Photos Tagged \"{0}\""
+msgstr "\"{0}\" ট্যাগ সহ ফটো অন্তর্ভুক্ত করা হবে"
+
+#: ../src/TagQueryWidget.cs:39
+#, csharp-format
+msgid "Exclude Photos Tagged \"{0}\""
+msgstr "\"{0}\" ট্যাগ সহ ফটো অন্তর্ভুক্ত করা হবে না"
+
+#: ../src/TagQueryWidget.cs:44
+msgid "Remove From Search"
+msgstr "অনুসন্ধান থেকে সরিয়ে ফেলুন"
+
+#: ../src/TagQueryWidget.cs:88
+#, csharp-format
+msgid "Find _With"
+msgid_plural "Find _With"
+msgstr[0] "চিহ্নিত বস্তু সহযোগে অনুসন্ধান করুন (_W)"
+msgstr[1] "চিহ্নিত বস্তু সহযোগে অনুসন্ধান করুন (_W)"
+
+#: ../src/TagQueryWidget.cs:114
+msgid "All"
+msgstr "সকল"
+
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
+#, csharp-format
+msgid "Not {0}"
+msgstr "{0} নয়"
+
+#: ../src/TagQueryWidget.cs:278
+msgid "Drag tags here to search for them"
+msgstr "ট্যাগ অনুসন্ধান করার জন্য এইখানে টেনে আনুন"
+
+#: ../src/TagSelectionWidget.cs:497
+msgid "Error renaming tag"
+msgstr "ট্যাগের নাম পরিবর্তন করতে সমস্যা"
+
+#: ../src/TagStore.cs:203
+msgid "Favorites"
+msgstr "জনপ্রিয়"
+
+#: ../src/TagStore.cs:208
+msgid "Hidden"
+msgstr "আড়াল করা"
+
+#: ../src/TagStore.cs:216
+msgid "People"
+msgstr "ব্যক্তিরা"
+
+#: ../src/TagStore.cs:221
+msgid "Places"
+msgstr "স্থান"
+
+#: ../src/TagStore.cs:226
+msgid "Events"
+msgstr "ঘটনা"
+
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:408
+msgid "(None)"
+msgstr "(শূণ্য)"
+
+#: ../src/Term.cs:298
+msgid " and "
+msgstr " and "
+
+#. operators.Add (Catalog.GetString (" && "));
+#: ../src/Term.cs:300
+msgid ", "
+msgstr ", "
+
+#: ../src/Term.cs:356
+msgid " or "
+msgstr " or "
+
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
+msgid "or"
+msgstr "or"
+
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "থাম্ব-নেইল আপডেট করা হচ্ছে"
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "ছবি \"{0}\" আপডেট করা হচ্ছে"
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
+msgid "Photo management for GNOME"
+msgstr "GNOME-এ ব্যবহারযোগ্য ফটো পরিচালন ব্যবস্থা"
+
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "স্বত্বাধিকার © ২০০৩-২০০৯ Novell Inc."
+
+#: ../src/UI.Dialog/AboutDialog.cs:100
+msgid "translator-credits"
+msgstr "রুণা ভট্টাচার্য্য (runab at redhat.com)"
+
+#: ../src/UI.Dialog/AboutDialog.cs:105
+msgid "F-Spot Website"
+msgstr "F-Spot ওয়েব-সাইট"
+
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
+#, csharp-format
+msgid "Shift all photos by {0}"
+msgstr "প্রত্যেকটি ফটো {0} দ্বারা স্থানান্তর করুন"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "আজ"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "গতকাল"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "গত ৭ দিন"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "গত ৩০ দিন"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "গত ৯০ দিন"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "গত ৩৬০ দিন"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "বর্তমান সপ্তাহ (সোম-রবি)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "গত সপ্তাহ (সোম-রবি)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "স্বনির্ধারিত সীমা"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "{0} ট্যাগের আইকন সম্পাদনা করুন"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "ফাইল থেকে ফটো নির্বাচন করুন"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>ফটো থেকে</b>\n"
+" এই ট্যাগের জন্য ট্যাগ নির্মাণের উদ্দেশ্যে আপনার লাইব্রেরির কোনো একটি ফটো প্রয়োগ করা যাবে।\n"
+" কিন্তু, প্রথমে এই ট্যাগের সাথে অন্তত একটি ফটো যুক্ত করা আবশ্যক।\n"
+" অনুগ্রহ করে একটি ফটোকে '{0}' রূপে ট্যাগ করুন ও আইকন রূপে সেটি ব্যবহার করার জন্য\n"
+" এইখানে প্রত্যাবর্তন করুন।"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "ছবি লোড করতে ব্যর্থ"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "ট্যাগের জন্য আইকন রূপে \"{0}\" লোড করতে ব্যর্থ"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "ফটো {0}, সর্বমোট {1}"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
+msgstr "F-Spot একটি গুরুতর সমস্যার সম্মুখীন হয়েছে"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "ত্রুটির বিবরণ"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr "ব্যবস্থা না করা একটি এক্সেপশন উৎপন্ন হয়েছে: "
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:53
+#: ../src/UI.Dialog/PreferenceDialog.cs:71
+msgid "None"
+msgstr "শূণ্য"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:55
+msgid "System profile"
+msgstr "সিস্টেমের প্রোফাইল"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:84
+msgid "Standard theme"
+msgstr "প্রমিত থিম"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "ডাটাবেস লোড করতে সমস্যা"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#, csharp-format
+msgid ""
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
+msgstr ""
+"ফটোর ডাটাবেস লোড করার সময় F-Spot একটি সমস্যার সম্মুখীন হয়েছে। পুরোনো ডাটাবেসটি "
+"{0}-এ স্থানান্তর করা হয়েছে ও একটি নতুন ডাটাবেস তৈরি করা হয়েছে।"
+
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "লেবেল"
+
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "অনুপাত"
+
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
+msgid "Retry"
+msgstr "পুনঃপ্রচেষ্টা"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "৫"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+#| msgid "<b>Account</b>"
+msgid "<b>Action</b>"
+msgstr "<b>কর্ম</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+#| msgid "<b>Photos</b>"
+msgid "<b>Reference Photo</b>"
+msgstr "<b>রেফারেন্সের ফটো</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "সময় পরিবর্তন করুন"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "পরিবর্তিত তারিখ: "
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+#| msgid "More dates"
+msgid "Current date:"
+msgstr "বর্তমান তারিখ:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+#| msgid "Same as photo"
+msgid "Space all photos by"
+msgstr "প্রতিটি ফটোর মধ্যে চিহ্নিত মাপের শূণ্যস্থান রাখা হবে"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+#| msgid "Preferences"
+msgid "difference:"
+msgstr "ব্যবধান:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+#| msgid "Rotating photo \"{0}\""
+msgid "min. Starting at {0}"
+msgstr "মিনিট। {0} থেকে আরম্ভ"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+#| msgid "<b>Style</b>"
+msgid "<b>End Date</b>"
+msgstr "<b>সমাপ্তির তারিখ</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+#| msgid "<b>Style</b>"
+msgid "<b>Select period</b>"
+msgstr "<b>নির্বাচিত সময়কাল</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+#| msgid "<b>Style</b>"
+msgid "<b>Start Date</b>"
+msgstr "<b>আরম্ভের তারিখ</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "বাতিল, বর্তমানে নির্ধারিত সময়ের রেখা পরিবর্তন করা হবে না। "
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "শুধুমাত্র এই তারিখের মধ্যে তোলা ফটোগুলি প্রদর্শন করা হবে।"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "তারিখের সীমা নির্ধারণ করুন"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+#| msgid "Edit Image"
+msgid "Edit Tag"
+msgstr "ট্যাগ সম্পাদনা"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+#| msgid "Edit"
+msgid "Edit icon"
+msgstr "আইকন সম্পাদনা"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+#| msgid "_Account:"
+msgid "_Icon:"
+msgstr "আইকন: (_I)"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+#| msgid "<b>Photos</b>"
+msgid "<b>From External Photo</b>"
+msgstr "<b>বহিস্থিত ফটো থেকে</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+#| msgid "<b>Photos</b>"
+msgid "<b>From Photo</b>"
+msgstr "<b>ফটো থেকে</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+#| msgid "<b>Destination</b>"
+msgid "<b>Predefined icons</b>"
+msgstr "<b>পূর্বনির্ধারিত আইকন</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+#| msgid "<b>Size</b>"
+msgid "<b>Preview</b>"
+msgstr "<b>পূর্বদৃশ্য</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "চিহ্নিত সামগ্রী থেকে আইকনের বিন্যাস নির্মাণ করা হবে"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+#| msgid "Edit Image"
+msgid "Edit Tag Icon"
+msgstr "ট্যাগ আইকন সম্পাদনা"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "কোনো ছবি উপস্থিত নেই (_i)"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+#| msgid "Photo {0} of {1}"
+msgid "Photo 0 of 0"
+msgstr "ফটো 0, সর্বমোট 0"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "প্রদর্শনের জন্য ব্যবহারযোগ্য রংয়ের প্রোফাইল:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "প্রিন্ট করার উদ্দেশ্যে ব্যবহৃত রংয়ের প্রোফাইল"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+#| msgid "Preferences"
+msgid "F-Spot Preferences"
+msgstr "F-Spot সংক্রান্ত পছন্দ"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-Spot-র চেহারা:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+"সম্ভব হলে ছবির ফাইলের মধ্যে\n"
+"<small>অন্যান্য ছবি সম্পাদনার প্রোগ্রামের মধ্যে এইগুলি ব্যবহারযোগ্য করা সম্ভব হবে।</small>"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+#| msgid "Select Folder"
+msgid "Select A Folder"
+msgstr "একটি ফোল্ডার নির্বাচন করুন"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "ছবির ফাইল থেকে পৃথকভাবে"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "ফটোর ট্যাগ ও বিবরণ সংরক্ষণ করা হবে:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "ফটো ইম্পোর্ট করার সময়, চিহ্নিত স্থানে সেগুলি কপি করা হবে:"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+#| msgid "<b>Destination</b>"
+msgid "<b>Max Rating</b>"
+msgstr "<b>সর্বাধিক গুণমাপ</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+#| msgid "<b>Destination</b>"
+msgid "<b>Min Rating</b>"
+msgstr "<b>সর্বনিম্ন গুণমাপ</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "গুণমাপের ফিল্টার ধার্য করুন"
+
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "সময় পরিবর্তন করুন...(_T)"
+
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "ক্রমবিন্যাসের সূত্র (_b)"
+
+#: ../src/ui/main_window.ui.h:4
+#| msgid "Date"
+msgid "By _Date"
+msgstr "তারিখ অনুযায়ী (_D)"
+
+#: ../src/ui/main_window.ui.h:5
+msgid "By _Import Roll"
+msgstr "ইম্পোর্ট করা রোল অনুযায়ী (_I)"
+
+#: ../src/ui/main_window.ui.h:6
+msgid "By _Rating"
+msgstr "গুণমাপ অনুযায়ী (_R)"
+
+#: ../src/ui/main_window.ui.h:7
+#| msgid "Copy Photo Locat_ion"
+msgid "Copy Locat_ion"
+msgstr "অবস্থান কপি করুন (_i)"
+
+#: ../src/ui/main_window.ui.h:8
+#| msgid "Create New Tag..."
+msgid "Create New _Tag..."
+msgstr "নতুন ট্যাগ নির্মাণ করুন...(_T)"
+
+#: ../src/ui/main_window.ui.h:9
+#| msgid "Create New Version"
+msgid "Create _New Version..."
+msgstr "নতুন সংস্করণ নির্মাণ করুন...(_N)"
+
+#: ../src/ui/main_window.ui.h:11
+#| msgid "Find"
+#| msgid_plural "Find"
+msgid "Fin_d"
+msgstr "অনুসন্ধান করুন (_d)"
+
+#: ../src/ui/main_window.ui.h:12
+#| msgid "Extension"
+msgid "Manage _Extensions"
+msgstr "অতিরিক্ত সামগ্রী পরিচালনা (_E)"
+
+#: ../src/ui/main_window.ui.h:13
+#| msgid "Page Setup"
+msgid "Page Set_up..."
+msgstr "পৃষ্ঠা প্রস্তুতি...(_u)"
+
+#: ../src/ui/main_window.ui.h:14
+msgid "Re_fresh Thumbnail"
+msgstr "থাম্ব-নেইল নতুন করে প্রদর্শন করা হবে (_f)"
+
+#: ../src/ui/main_window.ui.h:19
+#| msgid "Select Folder"
+msgid "Select _None"
+msgstr "কিছু নির্বাচন করা হবে না (_N)"
+
+#: ../src/ui/main_window.ui.h:20
+msgid "Send by _Mail..."
+msgstr "মেইল দ্বারা পাঠানো হবে...(_M)"
+
+#: ../src/ui/main_window.ui.h:22
+#| msgid "Side _pane"
+msgid "Side_bar"
+msgstr "সাইড-বার (_b)"
+
+#: ../src/ui/main_window.ui.h:23
+#| msgid "Tags"
+msgid "T_ags"
+msgstr "ট্যাগ (_a)"
+
+#: ../src/ui/main_window.ui.h:25
+#| msgid "Thumbnail Directory"
+msgid "Thumbnail _elements"
+msgstr "থাম্ব-নেইলের বস্তু (_e)"
+
+#: ../src/ui/main_window.ui.h:26
+#| msgid "_Toolbar"
+msgid "Too_lbar"
+msgstr "টুল-বার (_l)"
+
+#: ../src/ui/main_window.ui.h:27
+#| msgid "_View"
+msgid "View"
+msgstr "প্রদর্শন"
+
+#: ../src/ui/main_window.ui.h:33
+#| msgid "Attach Tag to Selection"
+#| msgid_plural "Attach Tags to Selection"
+msgid "_Attach Tag to Selection"
+msgstr "নির্বাচনের মধ্যে ট্যাগ সংযুক্ত করুন (_A)"
+
+#: ../src/ui/main_window.ui.h:35
+msgid "_Clear Rating Filter"
+msgstr "গুণমাপের ফিল্টার পরিশ্রুত করুন (_C)"
+
+#: ../src/ui/main_window.ui.h:36
+msgid "_Clear Roll Filter"
+msgstr "রোল ফিল্টার পরিশ্রুত করুন (_C)"
+
+#: ../src/ui/main_window.ui.h:38
+#| msgid "Comment:"
+msgid "_Components"
+msgstr "অন্তর্ভুক্ত সামগ্রী (_C)"
+
+#: ../src/ui/main_window.ui.h:39
+msgid "_Contents"
+msgstr "সূচি (_C)"
+
+#: ../src/ui/main_window.ui.h:40
+#| msgid "Date"
+msgid "_Dates"
+msgstr "তারিখ (_D)"
+
+#: ../src/ui/main_window.ui.h:42
+#| msgid "Merge the selected tag"
+#| msgid_plural "Merge the {0} selected tags?"
+msgid "_Delete Selected Tag"
+msgstr "নির্বাচিত ট্যাগ মুছে ফেলুন (_D)"
+
+#: ../src/ui/main_window.ui.h:43
+#| msgid "Rename Version"
+msgid "_Delete Version"
+msgstr "সংস্করণ মুছে ফেলুন (_D)"
+
+#: ../src/ui/main_window.ui.h:45
+#| msgid "Edit Selected Tag..."
+msgid "_Edit Selected Tag..."
+msgstr "নির্বাচিত ট্যাগ সম্পাদনা করুন...(_E)"
+
+#: ../src/ui/main_window.ui.h:46
+#| msgid "Export to"
+msgid "_Export to"
+msgstr "এক্সপোর্টের গন্তব্যস্থল (_E)"
+
+#: ../src/ui/main_window.ui.h:47
+msgid "_Filmstrip"
+msgstr "ফিল্মের পাতা (_F)"
+
+#: ../src/ui/main_window.ui.h:50
+#| msgid "Hidden"
+msgid "_Hidden"
+msgstr "আড়াল করা (_H)"
+
+#: ../src/ui/main_window.ui.h:51
+#| msgid "Import"
+msgid "_Import..."
+msgstr "ইম্পোর্ট করুন...(_I)"
+
+#: ../src/ui/main_window.ui.h:52
+#| msgid "Large"
+msgid "_Large"
+msgstr "বড় (_L)"
+
+#: ../src/ui/main_window.ui.h:53
+msgid "_Last Import Roll"
+msgstr "ইম্পোর্ট করা সর্বশেষ রোল (_L)"
+
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr "ঘষা কাঁচ (_L)"
+
+#: ../src/ui/main_window.ui.h:55
+#| msgid "Medium"
+msgid "_Medium"
+msgstr "মাঝারি (_M)"
+
+#: ../src/ui/main_window.ui.h:57
+#| msgid "_Edit"
+msgid "_Quit"
+msgstr "প্রস্থান (_Q)"
+
+#: ../src/ui/main_window.ui.h:58
+#| msgid "Ratio"
+msgid "_Ratings"
+msgstr "গুণমাপ (_R)"
+
+#: ../src/ui/main_window.ui.h:60
+#| msgid "Remove Tag From Selection"
+#| msgid_plural "Remove Tags From Selection"
+msgid "_Remove Tag From Selection"
+msgstr "নির্বাচন থেকে ট্যাগ সরিয়ে ফেলুন (_R)"
+
+#: ../src/ui/main_window.ui.h:61
+#| msgid "Rename Version"
+msgid "_Rename Version"
+msgstr "সংস্করণের নাম পরিবর্তন করুন (_R)"
+
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "বিপরীত অনুক্রম (_R)"
+
+#: ../src/ui/main_window.ui.h:63
+#| msgid "Select Export Folder"
+msgid "_Select Import Rolls..."
+msgstr "ইম্পোর্ট রোল নির্বাচন করুন...(_S)"
+
+#: ../src/ui/main_window.ui.h:64
+#| msgid "Select a Tag..."
+msgid "_Set Date Range..."
+msgstr "তারিখের সীমা নির্ধারণ করুন...(_S)"
+
+#: ../src/ui/main_window.ui.h:65
+msgid "_Set Rating filter..."
+msgstr "গুণমাপের ফিল্টার নির্ধারণ করুন... (_S)"
+
+#: ../src/ui/main_window.ui.h:66
+msgid "_Sharpen..."
+msgstr "তীক্ষ্ণতা...(_S)"
+
+#: ../src/ui/main_window.ui.h:68
+#| msgid "Small"
+msgid "_Small"
+msgstr "ছোট (_S)"
+
+#: ../src/ui/main_window.ui.h:69
+msgid "_Tag Icons"
+msgstr "ট্যাগের আইকন (_T)"
+
+#: ../src/ui/main_window.ui.h:70
+#| msgid "Tags"
+msgid "_Tags"
+msgstr "ট্যাগ (_T)"
+
+#: ../src/ui/main_window.ui.h:71
+#| msgid "_Title:"
+msgid "_Timeline"
+msgstr "সময়ের রেখার (_T)"
+
+#: ../src/ui/main_window.ui.h:72
+#| msgid "Tools"
+msgid "_Tools"
+msgstr "সরঞ্জাম (_T)"
+
+#: ../src/ui/main_window.ui.h:73
+#| msgid "Untagged photos"
+msgid "_Untagged Photos"
+msgstr "ট্যাগবিহীন ফটো (_U)"
+
+#: ../src/ui/main_window.ui.h:74
+#| msgid "Version"
+msgid "_Version"
+msgstr "সংস্করণ (_V)"
+
+#: ../src/Updater.cs:616
+msgid "Updating F-Spot Database"
+msgstr "F-Spot ডাটাবেস আপডেট করা হচ্ছে"
+
+#: ../src/Updater.cs:617
+msgid ""
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
+msgstr ""
+"F-Spot গ্যালারির ডাটাবেস আপডেট করা হচ্ছে। এই কাজে কিছু সময় ব্যায় হওয়ার সম্ভাবনা "
+"রয়েছে। অনুগ্রহ করে অপেক্ষা করুন।"
+
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "অস্থায়ী ফাইল নির্মাণ করতে ব্যর্থ"
+
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "পৃষ্ঠা প্রস্তুতি"
+
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "কাগজের মাপ: {0} x {1} মিলিমিটার"
+
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "পৃষ্ঠার মাপ ও দিশা নির্ধারণ করুন"
+
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "প্রতি পৃষ্ঠায় ফটোর সংখ্যা"
+
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "পুনরাবৃত্তি"
+
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "কাটার চিহ্নগুলি প্রিন্ট করা হবে"
+
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "ফটোর বিন্যাস"
+
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "সম্পূর্ণ পৃষ্ঠায় (প্রান্তরেখা বিহীন)"
+
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "প্রদর্শনের মাপ"
+
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "পূরণ করুন"
+
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "মাপ অনুসারে"
+
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "সাদা রংয়ের প্রান্ত"
+
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "স্বনির্ধারিত লেখা"
+
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "ফটো সম্বন্ধীশ তথ্য"
+
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "ফাইলের নাম প্রিন্ট করা হবে"
+
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "ফটোর তারিখ প্রিন্ট করা হবে"
+
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "ফটোর সময় প্রিন্ট করা হবে"
+
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "ফটোর ট্যাগ প্রিন্ট করা হবে"
+
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "ফটোর মন্তব্য প্রিন্ট করা হবে"
+
+#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+msgid "Edit"
+msgstr "সম্পাদনা"
+
+#: ../src/Widgets/EditorPage.cs:197
+msgid ""
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
+msgstr ""
+"এটি ব্যবহার করার জন্য একটি মান নির্বাচিত থাকা আবশ্যক। অনুগ্রহ করে ফটোর একটি অংশ "
+"ছবি নির্বাচন করুন ও পুনরায় প্রচেষ্টা করুন"
+
+#: ../src/Widgets/EditorPage.cs:215
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "পরিবর্তিত ফটো সংরক্ষণ করতে ত্রুটি"
+msgstr[1] "পরিবর্তিত ফটোগুলি সংরক্ষণ করতে ত্রুটি"
+
+#: ../src/Widgets/EditorPage.cs:217
+#, csharp-format
+msgid ""
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
+msgstr "\"{0}\" এক্সেপশন প্রাপ্ত হয়েছে। উল্লেখ্য, সম্পাদনার পূর্বে RAW ফাইলগুলিকে JPEG-এ রূপান্তর করা আবশ্যক।"
+
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "অনুভূমিক (_H)"
+
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "উলম্ব (_V)"
+
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "অনুসন্ধান:"
+
+#: ../src/Widgets/FolderTreePage.cs:21
+msgid "Folders"
+msgstr "ফোল্ডার"
+
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "ফাইল-সিস্টেম"
+
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "রেখাচিত্র"
+
+#: ../src/Widgets/InfoBox.cs:217
+msgid "Date"
+msgstr "তারিখ"
+
+#: ../src/Widgets/InfoBox.cs:223
+msgid "Exposure"
+msgstr "এক্সোপাজার"
+
+#: ../src/Widgets/InfoBox.cs:227
+msgid "Focal Length"
+msgstr "ফোক্যাল লেংথ"
+
+#: ../src/Widgets/InfoBox.cs:233
+msgid "File Size"
+msgstr "ফাইলের মাপ"
+
+#: ../src/Widgets/InfoBox.cs:236
+msgid "Rating"
+msgstr "গুণমাপ"
+
+#: ../src/Widgets/InfoBox.cs:389 ../src/Widgets/InfoBox.cs:397
+#: ../src/Widgets/InfoBox.cs:427
+msgid "(wrong format)"
+msgstr "(ভুল বিন্যাস)"
+
+#: ../src/Widgets/InfoBox.cs:417 ../src/Widgets/InfoBox.cs:440
+#: ../src/Widgets/InfoBox.cs:450 ../src/Widgets/InfoBox.cs:459
+msgid "(Unknown)"
+msgstr "(অজানা)"
+
+#: ../src/Widgets/InfoBox.cs:560
+#, csharp-format
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(একটি সম্পাদনা)"
+msgstr[1] "({0}-টি সম্পাদনা)"
+
+#: ../src/Widgets/InfoBox.cs:574
+msgid "(File read error)"
+msgstr "(ফাইল পড়তে সমস্যা)"
+
+#: ../src/Widgets/InfoBox.cs:619
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0}-টি ফটো"
+
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:639
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"{0} তারিখে \n"
+"{1} ও {2}-র মধ্যে"
+
+#: ../src/Widgets/InfoBox.cs:644
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"{0} \n"
+"ও {1}-র মধ্যে"
+
+#: ../src/Widgets/InfoBox.cs:671
+msgid "(At least one File not found)"
+msgstr "(অন্তত একটি ফাইল পাওয়া যায়নি)"
+
+#: ../src/Widgets/InfoBox.cs:788
+msgid "Show Photo Name"
+msgstr "ফটোর নাম প্রদর্শন করা হবে"
+
+#: ../src/Widgets/InfoBox.cs:797
+msgid "Show Date"
+msgstr "তারিখ প্রদর্শন করা হবে"
+
+#: ../src/Widgets/InfoBox.cs:806
+msgid "Show Size"
+msgstr "মাপ প্রদর্শন করা হবে"
+
+#: ../src/Widgets/InfoBox.cs:815
+msgid "Show Exposure"
+msgstr "এক্সপোজার প্রদর্শন করা হবে"
+
+#: ../src/Widgets/InfoBox.cs:824
+msgid "Show Focal Length"
+msgstr "ফোক্যাল লেংথ প্রদর্শন করা হবে"
+
+#: ../src/Widgets/InfoBox.cs:833
+msgid "Show Camera"
+msgstr "ক্যামেরা প্রদর্শন করা হবে"
+
+#: ../src/Widgets/InfoBox.cs:842
+msgid "Show File Size"
+msgstr "ফাইলের মাপ প্রদর্শন করা হবে"
+
+#: ../src/Widgets/MetadataDisplay.cs:23
+msgid "Metadata"
+msgstr "মিটাডাটা"
+
+#: ../src/Widgets/MetadataDisplay.cs:104
+msgid "Extended Metadata"
+msgstr "অতিরিক্ত মিটাডাটা"
+
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:392
+msgid "No Extended Metadata Available"
+msgstr "কোনো অতিরিক্ত মিটাডাটা উপস্থিত নেই"
+
+#: ../src/Widgets/MetadataDisplay.cs:410
+msgid "No active photo"
+msgstr "কোনো সক্রিয় ফটো উপস্থিত নেই"
+
+#: ../src/Widgets/MetadataDisplay.cs:412
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "\"{0}\" ফটোটি উপস্থিত নেই"
+
+#: ../src/Widgets/MetadataDisplay.cs:415
+msgid "No metadata available"
+msgstr "কোনো মিটাডাটা উপলব্ধ নয়"
+
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "কোনো অ্যাপ্লিকেশন উপলব্ধ নয়"
+
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "গুণমাপ:"
+
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "দেশ"
+
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "শহর"
+
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "রাজ্য"
+
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "F-Spot থেকে স্লাইড-শো প্রদর্শন করা হবে"
+
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot ফটো"
+
diff --git a/po/ca.po b/po/ca.po
index 3e557e0..12e3c6f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,19 +1,21 @@
#
-# Copyright (C) 2004-2009 Jordi Mas i Hernàndez, jmas at softcatala.org
+# Copyright (C) 2004-2010 Jordi Mas i Hernàndez, jmas at softcatala.org
# This file is distributed under the same license as the F-Spot package.
#
# Correccions i suggeriments: Francesc Dorca, David Gil, Anna Grau, Josep Puigdemont, Gil Forcada, Sílvia Miranda i David Planella
#
-# N.T: El "Gallery" és un programari (veure http://gallery.menalto.com).
+# N.T:
+# 1. El "Gallery" és un programari (veure http://gallery.menalto.com).
+# 2. "Live Web Gallery" és un programari de Microsoft
#
msgid ""
msgstr ""
"Project-Id-Version: F-Spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 17:45+0200\n"
-"PO-Revision-Date: 2009-01-12 14:47+0100\n"
+"POT-Creation-Date: 2010-03-07 10:57+0100\n"
+"PO-Revision-Date: 2010-03-06 22:31+0100\n"
"Last-Translator: Jordi Mas <jmas at softcatala.org>\n"
-"Language-Team: Catalan\n"
+"Language-Team: Catalan <tradgnome at softcatala.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -40,14 +42,14 @@ msgstr "S'està transferint la fotografia «{0}» al CD-ROM"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:637 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} de {1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
@@ -78,11 +80,11 @@ msgstr "s'està copiant..."
#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
msgid "<b><i>There is some previously scheduled items to write</i></b>"
msgstr ""
-"<b><i>Hi ha alguns elements per a escriure planificats anteriorment</i></b>"
+"<b><i>Hi ha alguns elements per escriure planificats anteriorment</i></b>"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
msgid "<b>Photos to Burn</b>"
-msgstr "<b>Fotografies per a enregistrar</b>"
+msgstr "<b>Fotografies per enregistrar</b>"
#
#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
@@ -93,22 +95,15 @@ msgstr "<b>Fotografies per a enregistrar</b>"
msgid "Autorotate"
msgstr "Rotació automàtica"
-#
-#
#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
msgid "Create CD"
-msgstr "_Crea un CD"
+msgstr "Crea un CD"
-#
-#
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Mida"
-#
-#
-#
#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
msgid "Size of the exported selection:"
msgstr "Mida de la selecció exportada:"
@@ -123,7 +118,7 @@ msgstr "N_avega pels fitxers planificats anteriorment"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:9
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "E_xporta"
@@ -150,21 +145,23 @@ msgid ""
msgstr ""
"L'F-Spot iniciarà ara el navegador perquè pugueu habilitar els permisos que "
"acabeu de seleccionar.\n"
+"\n"
"Quan el Facebook us demani tornar a aquesta aplicació, feu clic a «D'acord»."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
-msgstr "Hi ha massa imatges a exportar"
+msgstr "Hi ha massa imatges per exportar"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"El Facebook només permet 60 fotografies per àlbum. Refineu la selecció i "
+"El Facebook només permet {0} fotografies per àlbum. Refineu la selecció i "
"proveu-ho de nou."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -172,21 +169,19 @@ msgstr ""
msgid "Uploading Pictures"
msgstr "S'estan pujant les fotografies"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "L'àlbum ha de tenir un nom"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
-msgstr "Introduïu un nom per l'àlbum o seleccioneu un àlbum existent."
+msgstr "Introduïu un nom per a l'àlbum o seleccioneu un àlbum existent."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "S'ha produït un error en crear un àlbum nou"
-#
-#
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -197,30 +192,29 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
msgstr "S'està pujant la fotografia «{0}» ({1} de {2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
msgstr "S'ha produït un error en pujar al Facebook: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "S'ha produït un error"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
@@ -228,6 +222,10 @@ msgstr "S'ha produït un error"
msgid "Upload Complete"
msgstr "S'ha acabat la pujada"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Visiteu el grup de l'F-Spot al Facebook"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "S'està esperant l'autenticació"
@@ -241,9 +239,10 @@ msgid ""
"re-use it on future Facebook exports."
msgstr ""
"L'F-Spot iniciarà ara el navegador perquè pugueu entrar al Facebook.\n"
+"\n"
"Quan el Facebook us demani tornar a aquesta aplicació, feu clic a «D'acord». "
-"Si és possible, l'F-Spot desarà en la memòria cau la sessió al gnome-keyring "
-"i la reutilitzarà en futures exportacions al Facebook."
+"L'F-Spot desarà la sessió en la memòria cau del gnome-keyring i, si és "
+"possible, la reutilitzarà en futures exportacions al Facebook."
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
msgid "Authenticating..."
@@ -259,7 +258,7 @@ msgid ""
"There was a problem logging into Facebook. Check your credentials and try "
"again."
msgstr ""
-"S'ha produït un error a l'entrar al Facebook. Comproveu les vostres "
+"S'ha produït un error en entrar al Facebook. Comproveu les vostres "
"credencials i torneu-ho a provar."
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
@@ -268,19 +267,22 @@ msgstr "S'està autoritzant la sessió"
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
msgid "Session established, fetching user info..."
-msgstr "S'ha establert la sessió, obtenint la informació de l'usuari..."
+msgstr "S'ha establert la sessió; s'està obtenint la informació de l'usuari..."
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
msgid "Session established, fetching friend list..."
-msgstr "S'ha establert la sessió, obtenint la llista d'amics..."
+msgstr "S'ha establert la sessió; s'està obtenint la llista d'amics..."
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
msgid "Session established, fetching friend details..."
-msgstr "S'ha establert la sessió, obtenint els detalls de la llista d'amics..."
+msgstr ""
+"S'ha establert la sessió; s'estan obtenint els detalls de la llista "
+"d'amics..."
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
msgid "Session established, fetching photo albums..."
-msgstr "S'ha establert la sessió, obtenint els àlbums de fotografies..."
+msgstr ""
+"S'ha establert la sessió; s'estan obtenint els àlbums de fotografies..."
#. Note for translators: {0} and {1} are respectively firstname and surname of the user
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
@@ -290,7 +292,7 @@ msgstr "{0} {1} ha entrat al Facebook"
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
msgid "Facebook Connection Error"
-msgstr "S'ha produït un error de connexió amb Facebook"
+msgstr "S'ha produït un error de connexió amb el Facebook"
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
#, csharp-format
@@ -300,7 +302,7 @@ msgid ""
"Facebook said: {0}"
msgstr ""
"S'ha produït un error en baixar la vostra informació del Facebook.\n"
-"Facebook reporta: {0}"
+"Missatge del Facebook: {0}"
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
msgid "You are not logged in."
@@ -325,11 +327,9 @@ msgstr "Crea un àlbum nou"
msgid "Description"
msgstr "Descripció"
-#
-#
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
msgid "Export to Facebook"
-msgstr "Exporta-ho al Facebook..."
+msgstr "Exporta al Facebook"
#
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
@@ -353,8 +353,7 @@ msgstr "Surt"
#
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Nom"
@@ -409,7 +408,7 @@ msgstr ""
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
msgid "Complete Authorization"
-msgstr "Autorització completada"
+msgstr "Acaba el procés d'autorització"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
#, csharp-format
@@ -423,17 +422,17 @@ msgstr "S'estan comprovant les credencials..."
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
#, csharp-format
msgid "Welcome {0} you are connected to {1}"
-msgstr "Benvingut a {0}; esteu connectat a {1}"
+msgstr "Benvingut, {0}; esteu connectat a {1}"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
#, csharp-format
msgid "Sign in as a different user"
-msgstr "Entreu com a un usuari diferent"
+msgstr "Entreu amb un nom d'usuari diferent"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
#, csharp-format
msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "Utilitzats {0} dels {1} permesos a la vostra quota mensual"
+msgstr "{0} utilitzats de la vostra quota mensual de {1}"
#
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
@@ -469,8 +468,8 @@ msgid ""
"F-Spot was unable to log on to {0}. Make sure you have given the "
"authentication using {0} web browser interface."
msgstr ""
-"L'F-Spot no ha pogut iniciar la sessió al {0}. Assegureu-vos que teniu "
-"l'autenticació per a utilitzar la interfície web del {0}."
+"L'F-Spot no ha pogut iniciar la sessió al {0}. Assegureu-vos que heu "
+"introduït la informació d'autenticació des de la interfície web del {0}."
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
#: ../src/f-spot.glade.h:8
@@ -482,7 +481,7 @@ msgstr "<b>Compte</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Fotografies</b>"
@@ -504,8 +503,8 @@ msgstr "<b>Permisos de visualització</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exporta"
@@ -521,8 +520,8 @@ msgid ""
"account. Press the \"Authorize\" button to open a web browser and give F-"
"Spot the authorization. "
msgstr ""
-"Heu d'autoritzar l'F-Spot a pujar les fotografies al vostre compte de {0}. "
-"Premeu el botó «Autoritza» per a obrir el navegador i autoritzar l'F-Spot."
+"Heu d'autoritzar l'F-Spot a pujar les fotografies al vostre compte del {0}. "
+"Premeu el botó «Autoritza» per obrir el navegador i autoritzar l'F-Spot."
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
msgid "Ignore _top level tags"
@@ -538,7 +537,7 @@ msgstr "Públic"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
msgid "Strip _metadata"
-msgstr "Suprimeix les _metadades"
+msgstr "Extreure les _metadades"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
msgid "Visible to Family"
@@ -600,28 +599,29 @@ msgstr ""
#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
msgid "Error: Error while transferring; Aborting"
msgstr ""
-"Error: s'ha produït un error durant la transferència; s'està interrompent"
+"Error: s'ha produït un error durant la transferència; s'interromprà "
+"l'operació."
#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
msgid "Error: File Already Exists; Aborting"
-msgstr "Error: el fitxer ja existeix; s'està interrompent"
+msgstr "Error: el fitxer ja existeix; s'interromprà l'operació."
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Clar"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Fosc"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Anterior"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Índex"
@@ -629,41 +629,41 @@ msgstr "Índex"
#
#
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Etiquetes"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Següent"
# La cadena acaba amb el nom de l'aplicació -> F-Spot
#
#
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galeria generada per l'"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Mostra els estils"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Amaga els estils"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Etiquetes: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Pàgina:"
@@ -734,16 +734,16 @@ msgid ""
"Cannot connect to a Gallery for which the version is unknown.\n"
"Please check that you have Remote plugin 1.0.8 or later"
msgstr ""
-"No es pot connectar a un Gallery pel qual la versió és desconeguda.\n"
+"No es pot connectar a una galeria de la qual es desconeix la versió.\n"
"Comproveu que teniu el connector Remote 1.0.8 o posterior"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
msgid "Invalid URL"
-msgstr "URL no vàlida"
+msgstr "L'URL no és vàlid"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "L'entrada de la URL de la galeria sembla no ser una URL vàlida"
+msgstr "Sembla que l'entrada de l'URL de la galeria no és un URL vàlid"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
@@ -756,11 +756,11 @@ msgstr "S'ha produït un error en connectar amb la galeria"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
#, csharp-format
msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "S'ha produït el següent error en intentar entrar: {0}"
+msgstr "S'ha produït l'error següent en intentar entrar: {0}"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
msgid "A Gallery with this name already exists"
-msgstr "Ja existeix un Gallery amb aquest nom"
+msgstr "Ja existeix una galeria amb aquest nom"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
#, csharp-format
@@ -768,7 +768,7 @@ msgid ""
"There is already a Gallery with the same name in your registered Galleries. "
"Please choose a unique name."
msgstr ""
-"Ja existeix un Gallery amb el mateix nom en els Gallery registrats. Escolliu "
+"Ja existeix una galeria amb aquest nom a les galeries registrades. Escolliu "
"un nom únic."
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
@@ -786,7 +786,7 @@ msgid ""
"Only letters, numbers, - and _ are allowed"
msgstr ""
"El nom de la galeria conté caràcters no vàlids.\n"
-"Només es permeten números, lletres, - i _"
+"Només es permeten nombres, lletres, - i _"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
#, csharp-format
@@ -888,7 +888,7 @@ msgstr "Àlbum _pare:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:10
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Contrasenya:"
@@ -899,7 +899,7 @@ msgstr "_Títol:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:11
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Nom d'usuari:"
@@ -910,13 +910,13 @@ msgstr "S'ha produït un error en llegir la resposta del servidor"
#. failed to find the response
#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
msgid "Server returned response without Gallery content"
-msgstr "El servidor ha retornat una resposta sense contingut del Gallery"
+msgstr "El servidor ha retornat una resposta sense contingut de la galeria"
#
#
#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
msgid "Error while creating new album"
-msgstr "S'ha produït un error en crear un àlbum nou"
+msgstr "S'ha produït un error en crear l'àlbum nou"
#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
#, csharp-format
@@ -925,7 +925,7 @@ msgid ""
"requested operation:\n"
"{0} ({1})"
msgstr ""
-"S'ha produït el següent error en intentar executar l'operació demanada:\n"
+"S'ha produït l'error següent en intentar executar l'operació demanada:\n"
"{0} ({1})"
#
@@ -943,7 +943,7 @@ msgstr "S'ha produït un error en crear l'àlbum"
#, csharp-format
msgid ""
"The following error was encountered while attempting to create an album: {0}"
-msgstr "S'ha produït el següent error en intentar crear un àlbum: {0}"
+msgstr "S'ha produït l'error següent en intentar crear un àlbum: {0}"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
#, csharp-format
@@ -953,7 +953,7 @@ msgstr "{0} enviats"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
#, csharp-format
msgid "{0} of approx. {1}"
-msgstr "{0} de aproximadament {1}"
+msgstr "{0} d'aproximadament {1}"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
@@ -972,8 +972,8 @@ msgid ""
"The selected album has a limit of {0} pictures,\n"
"which would be passed with the current selection of {1} images"
msgstr ""
-"L'àlbum seleccionat està limitat a {0} fotografies,\n"
-"per aquest motiu seria passat amb una selecció de {1} fotografies"
+"L'àlbum seleccionat té una limitació de {0} fotografies;\n"
+"amb la selecció actual de {1} fotografies se superaria el límit"
#
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
@@ -993,9 +993,9 @@ msgid ""
"Enter the letters as they are shown in the image in\n"
"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
msgstr ""
-"Verifiqueu que els paràmetres per aquesta galleria són correctes.\n"
-"Introduïu les lletres que es mostren en la imatge en el camp «captcha».\n"
-"<i>Es diferència entre majúscules i minúscules</i>"
+"Verifiqueu que els paràmetres d'aquesta galeria són correctes.\n"
+"Introduïu les lletres que es mostren a la imatge en el camp «captcha».\n"
+"<i>No es diferencia entre majúscules i minúscules</i>"
#
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
@@ -1047,7 +1047,7 @@ msgstr "S'està entrant al Tabblo"
#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
msgid "Obtaining URL for upload"
-msgstr "S'està obtenint la URL per la pujada"
+msgstr "S'està obtenint l'URL per a la pujada"
#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
msgid "_Tabblo..."
@@ -1069,63 +1069,68 @@ msgid "Error uploading to Tabblo: "
msgstr "S'ha produït un error en pujar al Tabblo: "
#
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
msgid "<b>F-Spot tags</b>"
-msgstr "<b>Etiquetes del F-Spot</b>"
+msgstr "<b>Etiquetes de l'F-Spot</b>"
#
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
msgid "<b>Tabblo account</b>"
-msgstr "<b>Compte a Tabblo</b>"
+msgstr "<b>Compte del Tabblo</b>"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
msgid ""
"<small><i>F-Spot tags can help you track the export status of photos. "
"Example: Use one tag for the photos that you plan to export, and another one "
"for those already exported. Here, you can tell F-Spot to automatically "
"replace these tags as appropriate.</i></small>"
msgstr ""
+"<small><i>Les etiquetes de l'F-Spot poden ajudar-vos a fer un seguiment de "
+"l'estat d'exportació de les fotografies. Per exemple, podeu utilitzar una "
+"etiqueta per a les fotografies que penseu exportar i una altra per a les que "
+"ja heu exportat. Aquí podeu indicar a l'F-Spot que ha de reemplaçar aquestes "
+"etiquetes automàticament. </i></small>"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
msgid "Rem_ove from exported photos:"
msgstr "Supr_imeix de les fotografies exportades:"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:7
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
msgid "Select..."
msgstr "Selecciona..."
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:8
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
msgid "_Attach to exported photos:"
-msgstr "_Adjunta a fotografies exportades:"
+msgstr "_Adjunta a les fotografies exportades:"
#
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
msgid "<b>{0}</b>."
msgstr "<b>{0}</b>."
#
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
msgid "A trust error occured while attempting to access"
msgstr "S'ha produït un error de confiança en intentar accedir"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
msgid "Abort this session"
msgstr "Cancel·la aquesta sessió"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
msgid "Always trust this site's certificate"
msgstr "Confia sempre en el certificat d'aquest lloc"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
msgid "Do you wish to:"
msgstr "Voleu:"
#
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
msgid "Trust Error"
msgstr "S'ha produït un error de confiança"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
msgid "Trust the site's certificate this once"
msgstr "Confia en el certificat d'aquest lloc només aquest cop"
@@ -1136,7 +1141,7 @@ msgid "Compressed fil_e..."
msgstr "Fitxer comprimi_t..."
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "No hi ha cap selecció disponible"
@@ -1146,7 +1151,7 @@ msgid ""
"This tool requires an active selection. Please select one or more pictures "
"and try again"
msgstr ""
-"Aquesta eina requereix una selecció activa. Seleccioneu una o més "
+"Aquesta eina requereix una selecció activa. Seleccioneu una o diverses "
"fotografies i proveu-ho una altra vegada"
#
@@ -1167,7 +1172,6 @@ msgstr "S'està preparant la fotografia «{0}»"
#
#
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "C_rea"
@@ -1193,10 +1197,10 @@ msgid ""
"needs to analyze your image collection. This is not done by default as it's "
"time consuming. You can Start or Pause this update process using this dialog."
msgstr ""
-"Per tal de detectar les imatges duplicades que heu importat abans de la "
-"versió 0.5.0, l'F-Spot necessita analitzar la col·lecció d'imatges. Això no "
-"es fa per defecte i requereix força temps. Podeu iniciar o fer pausa en "
-"aquest procés d'actualització utilitzant aquest diàleg."
+"Per tal de detectar les imatges duplicades que hàgiu importat abans de la "
+"versió 0.5.0, l'F-Spot ha d'analitzar la col·lecció d'imatges. Això no es fa "
+"per defecte perquè requereix força temps. Podeu iniciar aquest procés "
+"d'actualització o fer-hi una pausa des d'aquest quadre de diàleg."
#: ../extensions/Tools/HashJob/HashJob.cs:59
#, csharp-format
@@ -1221,8 +1225,115 @@ msgstr "Aturat"
# N.T.: Afegeixo aquí "detectar" perquè sinó és força difícil d'entendre el significat
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Dispersió per a detectar duplicats"
+msgid "Check for Duplicates..."
+msgstr "Comprova els duplicats..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Galeria de l'F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Sembla que la galeria web és fora de línia"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Mostra-ho tot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} fotografia"
+msgstr[1] "{0} fotografies"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Visualització actual"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Seleccionat"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Live Web Gallery"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>La galeria es manté activa fins que la desactiveu o tanqueu l'F-"
+"Spot. \n"
+"Assegureu-vos que els visualitzadors locals hi accedeixen saltant-se el "
+"servidor HTTP intermediari.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Quan la galeria està activa, l'URL de dalt és el que heu d'obrir \n"
+"en un altre ordinador per accedir a les fotografies compartides.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Activa i desactiva la galeria web"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Permet als visualitzadors afegir etiquetes"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Copia l'URL al porta-retalls"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "La Live Web Gallery de l'F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL de la galeria:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Limita el nombre de fotografies compartides a"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Opcions:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Fotografies amb etiquetes"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Fotografies seleccionades"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Compartir:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Visualitzacions:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "cap"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galeria: {0}, fotografies: {1}, darrer client: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "La galeria és inactiva"
#
#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
@@ -1252,8 +1363,8 @@ msgid ""
"<small><i>Choose the location of the database you want to import from</i></"
"small>"
msgstr ""
-"<small><i>Escolliu la ubicació de la base de dades que voleu importar des "
-"de</i></small>"
+"<small><i>Escolliu la ubicació de la base de dades que voleu importar</i></"
+"small>"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
msgid ""
@@ -1264,6 +1375,12 @@ msgid ""
"\"Everything\" will import everything, creating duplicates if you already "
"imported from that database.</i></small>"
msgstr ""
+"<small><i>Escolliu quins elements voleu importar de la base de dades.\n"
+"«Només rodets nous» és una opció pràctica que evitarà que es tornin a "
+"importar fotografies que potser ja heu importat anteriorment.\n"
+"«Un únic rodet d'importació» permet triar quin rodet s'ha de fusionar.\n"
+"«Tot» ho importa tot i crearà duplicats si ja havíeu importat des d'aquesta "
+"base de dades.</i></small>"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
msgid ""
@@ -1272,24 +1389,17 @@ msgid ""
"small>"
msgstr ""
"<small><i>Copia les imatges localment o mantén-les on són. Si escolliu la "
-"darrera opció, assegureu-vos que la ubicació és accessible des de l'F-Spot.</"
-"i></small>"
+"darrera opció, assegureu-vos que l'F-Spot podrà accedir a la ubicació.</i></"
+"small>"
-#
-#
-#
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
msgid "A Single Import Roll"
-msgstr "Un únic rodet a importar"
+msgstr "Un únic rodet per importar"
-#
-#
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
msgid "Copy images to photos folder"
msgstr "Copia les imatges a la carpeta de les fotografies"
-#
-#
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
msgid "Database Location:"
msgstr "Ubicació de la base de dades:"
@@ -1305,20 +1415,20 @@ msgstr "Importa:"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
msgid "Keep the images at their original location"
-msgstr "Manté les imatges a la seva ubicació original"
+msgstr "Mantén les imatges a la ubicació original"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
msgid "Merge another F-Spot collection"
-msgstr "Fusiona amb una altra col·leció de l'F-Spot"
+msgstr "Fusiona amb una altra col·lecció de l'F-Spot"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
msgid "New Rolls Only"
msgstr "Només rodets nous"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:51
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
-msgstr "Ometre"
+msgstr "Omet"
#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
#, csharp-format
@@ -1328,7 +1438,7 @@ msgid ""
msgstr ""
"<big>La base de dades fa referència a fitxers continguts a la carpeta <b>{0}"
"</b>.\n"
-" Seleccioneu la carpeta perquè es pugui fer la correspondència.</big>"
+" Seleccioneu la carpeta perquè es pugui fer el mapatge.</big>"
#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
msgid "Configure Screensaver"
@@ -1350,7 +1460,7 @@ msgstr "Mostra:"
#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
msgid "Images tagged with:"
-msgstr "Imatges etiquetades com:"
+msgstr "Imatges etiquetades com a:"
#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
msgid "Make F-Spot my screensaver"
@@ -1361,26 +1471,31 @@ msgid "Screensaver Configuration"
msgstr "Configuració de l'estalvi de pantalla"
#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
msgid "F-Spot Photo Manager"
msgstr "Gestor fotogràfic F-Spot"
-#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot.desktop.in.in.h:3
msgid "Organize, enjoy, and share your photos"
-msgstr "Organitzeu, gaudiu i compartiu fotografies"
+msgstr "Organitzeu, visualitzeu i compartiu fotografies"
-#: ../f-spot.desktop.in.in.h:3 ../f-spot-import.desktop.in.in.h:3
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
msgid "Photo Manager"
msgstr "Gestor fotogràfic"
-#: ../f-spot-import.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:3
msgid "Import into F-Spot"
msgstr "Importa a l'F-Spot"
-#: ../f-spot-view.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:2
msgid "F-Spot Photo Viewer"
msgstr "Visualitzador fotogràfic F-Spot"
-#: ../f-spot-view.desktop.in.in.h:2
+#: ../f-spot-view.desktop.in.in.h:3
msgid "Photo Viewer"
msgstr "Visualitzador fotogràfic"
@@ -1397,323 +1512,6 @@ msgstr "El tipus de transformació %d és desconegut"
msgid "Operation failed"
msgstr "L'operació ha fallat"
-#
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paquet"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Instal·lació de complements"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Seleccioneu els complements a instal·lar i feu clic a Següent</b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Instal·la des de:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "D_ipòsits..."
-
-#
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Mostra tots els paquets"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Mostra només les versions noves"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Mostra només les actualitzacions"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Dessele_cciona-ho tot"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Selecciona-ho _tot"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Progrés global:"
-
-#
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "S'estan baixant els complements..."
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Gestor de complements"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Calen alguns complements addicionals per a realitzar aquesta operació."
-
-#
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "S'instal·laran els complements següents:"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Gestor de complements</b></big>"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Els complements següents estan instal·lats:"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Instal·la complements..."
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Desinsta·la..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Habilita"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Inhabilita"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Detalls"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Gestió dels dipòsits de complements"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Afegeix un dipòsit nou"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Seleccioneu la ubicació del dipòsit que voleu registrar:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Registra un dipòsit en línia"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Registra un dipòsit local"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Camí:"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Navega..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Versió:"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Autor:"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Dependències del complement:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Tots els dipòsits registrats"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Esteu segur que voleu cancel·lar la instal·lació?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Es desintal·laran els paquets següents:"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"També es desinstal·laran altres complements que depenen dels anteriors:"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr ""
-"Els complements seleccionats no poden instal·lar-se perquè hi ha conflictes "
-"amb les dependències."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "S'instal·laran els paquets següents:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (al directori de l'usuari)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "S'han de desinstal·lar els paquets següents:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "No s'han pogut resoldre les dependències següents:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "La instal·lació s'ha completat satisfactòriament."
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "La instal·lació ha fallat"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "La instal·lació s'ha completat amb avisos."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "La desinstal·lació s'ha completat satisfactòriament."
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "La desinstal·lació ha fallat"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "La desinstal·lació s'ha completat amb avisos."
-
-#
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Dipòsit"
-
-#
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "S'ha cancel·lat la instal·lació"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "No s'han trobat alguns dels complements necessaris"
-
-#
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "La instal·lació ha fallat"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Complement"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Versió"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Altres"
-
-#
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "S'ha produït l'excepció: «{0}»"
-
-#
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "No es poden carregar els complements inhabilitats."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "S'està carregant el complement {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "El complement necessari «{0}» està inhabilitat."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "El complement necessari «{0}» no està instal·lat."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(proporcionat per {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Previsualització"
@@ -1722,7 +1520,7 @@ msgstr "Previsualització"
msgid "Path"
msgstr "Camí"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Fitxer"
@@ -1749,19 +1547,19 @@ msgid "Error transferring file"
msgstr "S'ha produït un error en transferir el fitxer"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "S'han copiat els fitxers"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "S'ha acabat la baixada"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "S'han copiat els fitxers"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "S'està transferint la fotografia «{0}» des de la càmera"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Càmera"
@@ -1769,12 +1567,12 @@ msgstr "Càmera"
msgid "Port"
msgstr "Port"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "No s'ha trobat cap fotografia que coincideixi amb {0}"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1785,19 +1583,19 @@ msgstr ""
"la a algunes fotografies o de seleccionar una etiqueta diferent\n"
"en el diàleg de preferències de l'F-Spot."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "La cerca no ha retornat cap resultat"
#
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
"dialog."
msgstr ""
"L'etiqueta que l'F-Spot està cercant no existeix. Proveu\n"
-"de seleccionar-ne una altra en el diàleg preferències de l'F-Spot."
+"de seleccionar-ne una altra en el diàleg de preferències de l'F-Spot."
#
#
@@ -1821,20 +1619,20 @@ msgstr[0] "Modificada"
msgstr[1] "Modificades ({0})"
# N.T: Ha de ser femení ja que es refereix a la versió de la fotografia
-#: ../src/Core/Photo.cs:516
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Modificada en {1}"
# N.T: Ha de ser femení ja que es refereix a la versió de la fotografia
-#: ../src/Core/Photo.cs:516
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Modificada en {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Original"
@@ -1854,19 +1652,19 @@ msgstr "Ajusta"
#: ../src/Editors/CropEditor.cs:35
msgid "4 x 3 (Book)"
-msgstr "4 x 3 (llibre)"
+msgstr "10 x 7,6 cm (llibre)"
#: ../src/Editors/CropEditor.cs:36
msgid "4 x 6 (Postcard)"
-msgstr "4 x 6 (postal)"
+msgstr "10 x 15 cm (postal)"
#: ../src/Editors/CropEditor.cs:37
msgid "5 x 7 (L, 2L)"
-msgstr "5 x 7 (L, 2L)"
+msgstr "13 x 18 cm (L, 2L)"
#: ../src/Editors/CropEditor.cs:38
msgid "8 x 10"
-msgstr "8 x 10"
+msgstr "20 x 25 cm"
#: ../src/Editors/CropEditor.cs:39
msgid "Square"
@@ -1891,11 +1689,11 @@ msgstr "La mateixa que la fotografia"
#: ../src/Editors/CropEditor.cs:104
msgid "Custom Ratios..."
-msgstr "Ràtios personalitzades..."
+msgstr "Relacions personalitzades..."
#: ../src/Editors/DesaturateEditor.cs:17
msgid "Desaturate"
-msgstr "Dessaturació"
+msgstr "Dessatura"
#: ../src/Editors/RedEyeEditor.cs:19
msgid "Red-eye Reduction"
@@ -1903,33 +1701,33 @@ msgstr "Reducció d'ulls vermells"
#: ../src/Editors/RedEyeEditor.cs:21
msgid "Fix!"
-msgstr "Arregla"
+msgstr "Corregeix"
#: ../src/Editors/RedEyeEditor.cs:25
msgid "Select the eyes you wish to fix."
-msgstr "Seleccioneu els ulls que voleu arreglar."
+msgstr "Seleccioneu els ulls que voleu corregir."
#: ../src/Editors/SepiaEditor.cs:17
msgid "Sepia Tone"
msgstr "Tons sèpia"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Focus suau"
#
#
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Adreça"
#
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Error d'importació"
# , csharp-format
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "S'ha produït un error en importar {0}{2}{2}{1}"
@@ -1946,8 +1744,8 @@ msgstr "S'ha produït una excepció no gestionada"
#
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Copia la u_bicació de la fotografia"
+msgid "Copy Photo"
+msgstr "Copia la fotografia"
#
#: ../src/FSpot.addin.xml.h:2
@@ -1963,13 +1761,13 @@ msgstr "_Obre amb"
msgid "Rem_ove Tag"
msgstr "Suprimeix l'eti_queta"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:453 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Gira a l'_esquerra"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:454 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Gira a la _dreta"
@@ -2057,9 +1855,9 @@ msgid ""
"disable this for viewing photos, but disabling the interpolation could be "
"usefull in icon design.</i></small>"
msgstr ""
-"<small><i>Habiliteu-ho per permetre la interpolació en imatges ampliades. No "
-"hauríeu d'inhabilitar-ho per visualitzar fotografies; en canvi pot ser útil "
-"en dissenyar icones.</i></small>"
+"<small><i>Habiliteu aquesta opció per permetre la interpolació en imatges "
+"ampliades. No la inhabiliteu per visualitzar fotografies; en canvi, pot ser "
+"útil en dissenyar icones.</i></small>"
#: ../src/f-spot.glade.h:22
msgid ""
@@ -2068,7 +1866,7 @@ msgid ""
"color could be usefull when viewing icons or other artworks with transparent "
"parts.</i></small>"
msgstr ""
-"<small><i>Podeu escollir com es mostren les parts transparents en les "
+"<small><i>Podeu escollir com es mostren les parts transparents de les "
"imatges. Aquesta opció no té efecte en les fotografies, però habilitar "
"aquest patró de verificació o color personalitzat pot ser útil en mostrar "
"icones o altres elements artístics amb parts transparents.</i></small>"
@@ -2088,7 +1886,7 @@ msgstr "Com a _color personalitzat: "
#
#: ../src/f-spot.glade.h:25
msgid "As check _pattern"
-msgstr "Com a patró de verificació"
+msgstr "Com a patró de _verificació"
#
#: ../src/f-spot.glade.h:26
@@ -2108,202 +1906,199 @@ msgid "C_ontrast:"
msgstr "C_ontrast:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "C_rea"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Selecció de la càmera"
#
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Copia els fitxers a la carpeta de les fotografies"
-#
-#
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Crea un correu"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Crea una _icona per a aquesta etiqueta quan s'utilitzi per primer cop"
#
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr ""
"Crea un correu amb les fotografies adjuntes seleccionades (possiblement "
"canviades de mida)"
-#
-#
-#
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Detecta els duplicats"
-#
-#
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Mostra el _nom dels fitxers"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr ""
"Mostra només aquelles fotografies que s'han importat de rodets específics."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "No enviïs un correu"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "Adre_ça electrònica:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "E_xporta els títols i els comentaris"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Mida nova estimada"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Molt gran"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "Visualització de l'F-Spot"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
-msgstr "Filtra pels rodetes seleccionats"
+msgstr "Filtra en els rodetes seleccionats"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_aleria:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galeria"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Importa"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Font d'importació:"
#
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Inclou els subdirectoris"
#
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Gran"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
-msgstr "Gestiona la selecció de ràtios personalitzada"
+msgstr "Gestiona la selecció de relacions personalitzades"
#
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Mitjana"
#
#
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Nombre de fotografies als rodets seleccionats:"
#
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Nombre d'imatges"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Obre una _carpeta..."
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Mida original (possiblement un fitxer de mida molt gran)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Etiqueta p_are:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pausa"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Preferències"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Anterior"
#
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Repara"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Seleccioneu els fitxers que s'han de copiar de la càmera..."
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Selecciona una etiqueta..."
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Seleccioneu la càmera des d'on vulgueu transferir els fitxers"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Càmera seleccionada: "
#
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Selecció de les restriccions"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Estableix com a _fons"
#
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Mostra totes les fotografies."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
-msgstr "Mostra o amaga la barra lateral"
+msgstr "Mostra o amaga la subfinestra lateral"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Mostra o amaga la barra d'eines"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
-msgstr "Barra _lateral"
+msgstr "Subfinestra _lateral"
#
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Petita"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2311,40 +2106,40 @@ msgstr ""
"Indiqueu si les fotografies de mida original s'han de girar o no. Les de "
"mida més petita es giren automàticament."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Suprimeix les _metadades de la imatge"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Tem_peratura:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
-msgstr "Minúscul"
+msgstr "Minúscula"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Mida original total"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "_Amplia"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "_Redueix"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Amplia"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Redueix"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Lluminositat:"
@@ -2353,7 +2148,7 @@ msgstr "_Lluminositat:"
#
#: ../src/f-spot.glade.h:93
msgid "_Create Mail"
-msgstr "_Crea un correu"
+msgstr "_Crea el correu"
#
#
@@ -2411,7 +2206,7 @@ msgstr "O_bre la destinació quan finalitzi l'exportació"
#
#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
msgid "_Photo"
-msgstr "_Fotografies"
+msgstr "_Fotografia"
#: ../src/f-spot.glade.h:110
msgid "_Saturation:"
@@ -2427,7 +2222,7 @@ msgstr "_Projecció de diapositives"
#: ../src/f-spot.glade.h:113
msgid "_Strip metadata"
-msgstr "_Suprimeix les metadades"
+msgstr "E_xtreu les metadades"
#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
msgid "_Tag Name:"
@@ -2491,7 +2286,7 @@ msgstr "Informació"
#
#
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Informació de la imatge"
@@ -2499,8 +2294,8 @@ msgstr "Informació de la imatge"
msgid "Exit fullscreen"
msgstr "Surt del mode de pantalla completa"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Projecció de diapositives"
@@ -2551,7 +2346,7 @@ msgstr "Directori d'interoperabilitat"
msgid "Unknown Directory"
msgstr "El directori és desconegut"
-#: ../src/Imaging/ImageFile.cs:94
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr ""
"No es pot escriure en aquest format de fitxer per manca de compatibilitat"
@@ -2574,30 +2369,29 @@ msgstr "Identifica el proveïdor i el producte"
#: ../src/Imaging/IptcFile.cs:153
msgid "A unique number identifying the envelope"
-msgstr "Un número únic per identificar el sobre"
+msgstr "Un nombre únic que identifica el sobre"
#: ../src/Imaging/IptcFile.cs:155
msgid "A unique number"
-msgstr "Un número únic"
+msgstr "Un nombre únic"
#: ../src/Imaging/IptcFile.cs:157
msgid ""
"The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
msgstr ""
-"La prioritat de tractament del sobre és entre 1 (urgència màxima) i 9 "
+"La prioritat de tractament del sobre, entre 1 (urgència màxima) i 9 "
"(urgència mínima)"
#
#: ../src/Imaging/IptcFile.cs:159
msgid "The year, month and day (CCYYMMDD) the service sent the material"
msgstr ""
-"L'any, el mes i el dia (CCAAMMDD) en els quals el servei va enviar el "
-"material"
+"L'any, el mes i el dia (CCAAMMDD) en què el servei va enviar el material"
#: ../src/Imaging/IptcFile.cs:161
msgid "The hour, minute and second (HHMMSS) the service sent the material"
msgstr ""
-"L'hora, els minuts i els segons (HHMMSS) en els quals el servei va enviar el "
+"L'hora, els minuts i els segons (HHMMSS) en què el servei va enviar el "
"material"
#: ../src/Imaging/IptcFile.cs:163
@@ -2634,7 +2428,7 @@ msgstr "Nom de l'objecte"
#: ../src/Imaging/IptcFile.cs:190
msgid "Status of the objectdata according to the provider"
-msgstr "Estat de les dades de l'objecte d'acord amb el proveïdor"
+msgstr "Estat de les dades de l'objecte segons el proveïdor"
#: ../src/Imaging/IptcFile.cs:194
msgid "Location within a city or area where the object originates"
@@ -2689,17 +2483,19 @@ msgstr "Titular del contingut"
#: ../src/Imaging/IptcFile.cs:225
msgid ""
"Instructions from the creator to the receiver not covered by other fields"
-msgstr "Instruccions complementàries del creador per al destinatari"
+msgstr ""
+"Instruccions complementàries del creador per al destinatari que no apareixen "
+"en cap altre camp"
#: ../src/Imaging/IptcFile.cs:228
msgid "Intellectual genre of the object"
-msgstr "Tipus d'objecte"
+msgstr "Categoria intel·lectual de l'objecte"
#: ../src/Imaging/IptcFile.cs:241
msgid "Unknown IIM DataSet"
msgstr "El joc de dades IIM és desconegut"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:359
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Seleccioneu una carpeta"
@@ -2728,14 +2524,13 @@ msgid ""
msgstr "El directori seleccionat «{0}» no existeix. Escolliu-ne un altre"
#
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Importa les etiquetes"
+msgid "Imported Tags"
+msgstr "Etiquetes importades"
#
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:86
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Gira a l'esquerra"
@@ -2745,7 +2540,7 @@ msgid "Rotate picture left"
msgstr "Gira la fotografia cap a l'esquerra"
#
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Gira a la dreta"
@@ -2770,53 +2565,53 @@ msgstr "Fotografia anterior"
#
#
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importa imatges noves"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Navega"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Navega per diverses fotografies simultàniament"
#
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Edita la imatge"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Visualitza i edita una fotografia"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Pantalla completa"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Visualitza les fotografies a pantalla completa"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
-msgstr "Projecta les fotografies com a diapositives"
+msgstr "Visualitza les fotografies en una projecció de diapositives"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Fotografia anterior"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Fotografia següent"
-#: ../src/MainWindow.cs:1486
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "No s'ha detectat cap càmera."
#
-#: ../src/MainWindow.cs:1487
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2824,24 +2619,24 @@ msgstr ""
"L'F-Spot no ha pogut trobar cap càmera connectada a aquest sistema. "
"Comproveu que la càmera estigui connectada i engegada"
-#: ../src/MainWindow.cs:1526
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "S'ha produït un error en connectar amb la càmera"
-#: ../src/MainWindow.cs:1527
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "S'ha rebut l'error «{0}» mentre es connectava amb la càmera"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1828
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Voleu fusionar l'etiqueta seleccionada?"
msgstr[1] "Voleu fusionar les {0} etiquetes seleccionades?"
-#: ../src/MainWindow.cs:1855
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2850,58 +2645,58 @@ msgstr ""
"una de sola."
#
-#: ../src/MainWindow.cs:1857
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "F_usiona les etiquetes"
-#: ../src/MainWindow.cs:2062
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} fotografia de {1}"
msgstr[1] "{0} fotografies de {1}"
-#: ../src/MainWindow.cs:2064 ../src/SingleView.cs:495
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} fotografia"
msgstr[1] "{0} fotografies"
-#: ../src/MainWindow.cs:2067
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} seleccionada)"
msgstr[1] " ({0} seleccionades)"
-#: ../src/MainWindow.cs:2148
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_D'acord"
-#: ../src/MainWindow.cs:2149
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "S'ha produït un error en suprimir la fotografia"
# , csharp-format
-#: ../src/MainWindow.cs:2154
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "No teniu permís per suprimir el fitxer:{1}{0}"
-#: ../src/MainWindow.cs:2158
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "S'ha produït un error de tipus {0} en suprimir el fitxer:{2}{1}"
-#: ../src/MainWindow.cs:2190
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Voleu suprimir permanentment la fotografia seleccionada?"
msgstr[1] "Voleu suprimir permanentment les {0} fotografies seleccionades?"
-#: ../src/MainWindow.cs:2194
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
@@ -2910,20 +2705,20 @@ msgstr[0] ""
msgstr[1] ""
"Se suprimiran del disc totes les versions de les fotografies seleccionades."
-#: ../src/MainWindow.cs:2197
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Suprimeix la fotografia"
msgstr[1] "_Suprimeix les fotografies"
-#: ../src/MainWindow.cs:2233
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Voleu suprimir la fotografia seleccionada de l'F-Spot?"
msgstr[1] "Voleu suprimir les {0} fotografies seleccionades de l'F-Spot?"
-#: ../src/MainWindow.cs:2238
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2933,29 +2728,29 @@ msgstr ""
"etiquetes es perdrà. Les fotografies, però, es mantindran a l'ordinador i es "
"podran tornar a importar a l'F-Spot."
-#: ../src/MainWindow.cs:2239
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "Suprimeix del catà_leg"
-#: ../src/MainWindow.cs:2302
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Voleu suprimir l'etiqueta «{0}»?"
-#: ../src/MainWindow.cs:2304
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
-msgstr "Voleu suprimir les etiquetes {0} seleccionades?"
+msgstr "Voleu suprimir les {0} etiquetes seleccionades?"
#
#
-#: ../src/MainWindow.cs:2309
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "fotografia"
msgstr[1] "fotografies"
-#: ../src/MainWindow.cs:2311
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -2965,18 +2760,18 @@ msgstr[0] ""
msgstr[1] ""
"Si suprimiu aquestes etiquetes, les associacions amb {0} {1} es perdran."
-#: ../src/MainWindow.cs:2316
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Suprimeix l'etiqueta"
msgstr[1] "_Suprimeix les etiquetes"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2330
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "L'etiqueta no és buida"
-#: ../src/MainWindow.cs:2331
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2985,19 +2780,19 @@ msgstr ""
"No es poden suprimir etiquetes que en contenen d'altres. Primer suprimiu les "
"etiquetes «{0}»"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Gira la fotografia seleccionada cap a l'esquerra"
msgstr[1] "Gira les fotografies seleccionades cap a l'esquerra"
-#: ../src/MainWindow.cs:2776
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Gira la fotografia seleccionada cap a la dreta"
msgstr[1] "Gira les fotografies seleccionades cap a la dreta"
-#: ../src/MainWindow.cs:2787
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
@@ -3005,20 +2800,20 @@ msgstr[0] "_Cerca l'etiqueta seleccionada"
msgstr[1] "_Cerca les etiquetes seleccionades"
# csharp-format
-#: ../src/MainWindow.cs:2791
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "C_erca l'etiqueta seleccionada amb"
-msgstr[1] "C_erca les etiquetes seleccionada amb"
+msgstr[1] "C_erca les etiquetes seleccionades amb"
-#: ../src/MainWindow.cs:2832
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Voleu crear una versió nova?"
msgstr[1] "Voleu crear versions noves?"
-#: ../src/MainWindow.cs:2834
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -3027,13 +2822,13 @@ msgid_plural ""
"Before launching {1}, should F-Spot create new versions of the selected "
"photos to preserve the originals?"
msgstr[0] ""
-"Abans d'activar {1}, voleu crear una versió nova de la fotografia "
+"Abans d'iniciar {1}, voleu crear una versió nova de la fotografia "
"seleccionada per preservar l'original?"
msgstr[1] ""
-"Abans d'activar {1}, voleu crear versions noves de les fotografies "
+"Abans d'iniciar {1}, voleu crear versions noves de les fotografies "
"seleccionades per preservar els originals?"
-#: ../src/MainWindow.cs:2856
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "Versió XCF"
@@ -3057,87 +2852,93 @@ msgstr "Assumpte i paraules clau"
msgid "Compression"
msgstr "Compressió"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Configuració planar"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientació"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Interpretació fotomètrica"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Unitat de resolució"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Programa d'exposició"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Mode de mesura"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Mode d'exposició"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Tractament personalitzat"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Configuració dels components"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Font de la llum"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Mètode de detecció"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Espai de colors"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Balanç de blancs"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Unitat de resolució del pla focal"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Tipus de font del fitxer"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Tipus de captura d'escena"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Control de guany"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Contrast"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Saturació"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Nitidesa"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Tipus d'escena"
@@ -3174,7 +2975,7 @@ msgstr "S'ha rebut l'excepció «{0}». No s'ha pogut crear la versió «{1}»"
#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
-msgstr "Esteu segur que voleu suprimir?"
+msgstr "Esteu segur que la voleu suprimir?"
#: ../src/PhotoVersionCommands.cs:139
msgid "Cancel"
@@ -3206,28 +3007,30 @@ msgstr "No s'ha pogut canviar el nom de la versió"
#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
-msgstr "S'ha rebut l'excepció «{0}». No s'ha pogut desar la versió com a «{1}»"
+msgstr ""
+"S'ha rebut l'excepció «{0}». No s'ha pogut canviar el nom de la vesió a «{1}»"
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:549
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Cap modificació)"
-#: ../src/PhotoView.cs:169 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "S'ha produït un error en editar la fotografia"
-#: ../src/PhotoView.cs:170 ../src/Sharpener.cs:73
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "S'ha rebut l'excepció «{0}». No s'ha pogut desar la fotografia «{1}»"
-#: ../src/PhotoView.cs:359
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Comentari:"
#
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Fotografies"
@@ -3267,7 +3070,7 @@ msgstr "Neteja la cerca"
#
#: ../src/QueryWidget.cs:111
msgid "Refresh search"
-msgstr "Neteja la cerca"
+msgstr "Actualitza la cerca"
#
#: ../src/QueryWidget.cs:113
@@ -3294,7 +3097,7 @@ msgstr "No s'ha pogut girar aquest tipus de fotografia"
#
#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
-msgstr "No s'ha pogut girar el fitxer de només lectura"
+msgstr "No s'ha pogut girar el fitxer només de lectura"
#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
@@ -3326,12 +3129,12 @@ msgid_plural ""
"{0} photos could not be rotated because they are on a read only file system "
"or media such as a CDROM. Please check the permissions and try again."
msgstr[0] ""
-"La fotografia no s'ha pogut girar perquè és en un sistema de fitxers només "
-"de lectura o en un suport com ara el CD-ROM. Verifiqueu-ne els permisos i "
+"No s'ha pogut girar la fotografia perquè és en un sistema de fitxers només "
+"de lectura o en un suport com ara un CD-ROM. Verifiqueu-ne els permisos i "
"torneu-ho a provar."
msgstr[1] ""
-"Algunes fotografies {0} no s'han pogut girar perquè són en un sistema de "
-"fitxers només de lectura o en un suport com ara el CD-ROM. Verifiqueu-ne els "
+"No s'han pogut girar {0} fotografies perquè són en un sistema de fitxers "
+"només de lectura o en un suport com ara un CD-ROM. Verifiqueu-ne els "
"permisos i torneu-ho a provar."
#: ../src/RotateCommand.cs:271
@@ -3341,7 +3144,7 @@ msgstr "S'ha produït l'error «{0}» mentre s'intentava girar {1}"
#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
-msgstr "S'ha produït un error en girar la fotografia"
+msgstr "S'ha produït un error en girar la fotografia."
#
#: ../src/SendEmail.cs:240
@@ -3363,11 +3166,10 @@ msgstr "S'ha produït un error en processar la imatge"
msgid "An error occured while processing \"{0}\": {1}"
msgstr "S'ha produït un error en processar «{0}»: {1}"
-#
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "les meves fotografies"
+msgid "My Photos"
+msgstr "Les meves fotografies"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3390,26 +3192,26 @@ msgid "Threshold:"
msgstr "Llindar:"
#
-#: ../src/SingleView.cs:88
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Gira la fotografia cap a l'esquerra"
#
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Gira la fotografia cap a la dreta"
-#: ../src/SingleView.cs:130
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Carpeta"
#
-#: ../src/SingleView.cs:356
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Obre"
#
-#: ../src/SingleView.cs:456
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Estableix com a fons"
@@ -3438,10 +3240,9 @@ msgstr[1] "Cerca"
msgid "Create New Tag..."
msgstr "Crea una etiqueta nova..."
-#
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Edita l'etiqueta seleccionada..."
+msgid "Edit Tag..."
+msgstr "Edita l'etiqueta..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3527,7 +3328,7 @@ msgid "Events"
msgstr "Esdeveniments"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Cap)"
@@ -3562,20 +3363,20 @@ msgid "Updating picture \"{0}\""
msgstr "S'està actualitzant la fotografia «{0}»"
#
-#: ../src/UI.Dialog/AboutDialog.cs:71
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Gestió fotogràfica per al GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:72
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:95
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr "Jordi Mas i Hernàndez <jmas at softcatala.org>"
#
-#: ../src/UI.Dialog/AboutDialog.cs:100
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "Lloc web de l'F-Spot"
@@ -3625,7 +3426,7 @@ msgstr "Interval personalitzat"
#: ../src/UI.Dialog/EditTagIconDialog.cs:46
#, csharp-format
msgid "Edit Icon for Tag {0}"
-msgstr "Edita la icona per a l'etiqueta {0}"
+msgstr "Edita la icona de l'etiqueta {0}"
#
#: ../src/UI.Dialog/EditTagIconDialog.cs:68
@@ -3645,9 +3446,9 @@ msgstr ""
"\n"
"<b>Des d'una fotografia</b>\n"
" Podeu emprar una de les fotografies de la biblioteca com a icona \n"
-" per a aquesta etiqueta. Tot i així, heu de tenir primer una fotografia \n"
+" per a aquesta etiqueta. Tot i així, heu de tenir almenys una fotografia \n"
" associada amb aquesta etiqueta. Etiqueteu una fotografia com a «{0}» i \n"
-" torneu aquí per a usar-la com a icona."
+" torneu aquí per utilitzar-la com a icona."
#
#
@@ -3658,7 +3459,7 @@ msgstr "No s'ha pogut carregar la imatge"
#: ../src/UI.Dialog/EditTagIconDialog.cs:169
#, csharp-format
msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "No s'ha pogut carregar «{0}» com a icona per l'etiqueta"
+msgstr "No s'ha pogut carregar «{0}» com a icona de l'etiqueta"
#: ../src/UI.Dialog/EditTagIconDialog.cs:207
#, csharp-format
@@ -3677,16 +3478,16 @@ msgstr "Detalls de l'error"
msgid "An unhandled exception was thrown: "
msgstr "S'ha produït una excepció no gestionada: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Cap"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Perfil del sistema"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Aparença estàndard"
@@ -3701,7 +3502,7 @@ msgid ""
"F-Spot encountered an error while loading the photo database. The old "
"database has be moved to {0} and a new database has been created."
msgstr ""
-"L'F-Spot ha trobat un error mentre s'estava carregant la base de dades de "
+"L'F-Spot ha trobat un error mentre es carregava la base de dades de "
"fotografies. La base de dades antiga s'ha mogut a {0} i se n'ha creat una de "
"nova."
@@ -3715,10 +3516,10 @@ msgstr "Etiqueta"
#
#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
msgid "Ratio"
-msgstr "Ràtio"
+msgstr "Relació"
#
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Torna-ho a intentar"
@@ -3793,7 +3594,7 @@ msgstr "Només es mostraran les fotografies realitzades entre aquestes dates."
#
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
msgid "Set date range"
-msgstr "Estableix un rang de dates"
+msgstr "Estableix un interval de dates"
#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
msgid "<small></small>"
@@ -3834,7 +3635,7 @@ msgstr "Dissenya una icona des de"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
msgid "Edit Tag Icon"
-msgstr "Edita l'etiqueta de la icona"
+msgstr "Edita la icona de l'etiqueta"
#
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
@@ -3880,7 +3681,7 @@ msgstr "De forma separada dels fitxers d'imatge"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
msgid "Store tags and descriptions for photos:"
-msgstr "Emmagatzema les etiquetes i descripcions per fotografies:"
+msgstr "Emmagatzema les etiquetes i descripcions de les fotografies:"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
msgid "When importing photos, copy them to:"
@@ -3927,8 +3728,8 @@ msgid "By _Rating"
msgstr "Per _puntuació"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Copia la _ubicació"
+msgid "Copy"
+msgstr "Copia"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3938,10 +3739,6 @@ msgstr "_Crea una etiqueta nova..."
msgid "Create _New Version..."
msgstr "Crea una versió _nova..."
-#: ../src/ui/main_window.ui.h:10
-msgid "F-Spot"
-msgstr "F-Spot"
-
#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "_Cerca"
@@ -3961,6 +3758,10 @@ msgstr "C_onfiguració de la pàgina..."
msgid "Re_fresh Thumbnail"
msgstr "Actualitza la _miniatura"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Selecciona-ho _tot"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "No seleccionis _res"
@@ -4008,7 +3809,7 @@ msgstr "N_eteja el filtre de puntuacions"
#
#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
-msgstr "_Neteja el filtre del rodet"
+msgstr "_Neteja el filtre de rodets"
#
#: ../src/ui/main_window.ui.h:38
@@ -4033,11 +3834,9 @@ msgid "_Delete Version"
msgstr "_Suprimeix la versió"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Edita l'etiqueta seleccionada..."
+msgid "_Edit Tag..."
+msgstr "_Edita l'etiqueta..."
-#
-#
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
msgstr "_Exporta a"
@@ -4059,7 +3858,7 @@ msgstr "_Importa..."
#
#: ../src/ui/main_window.ui.h:52
msgid "_Large"
-msgstr "_Gran"
+msgstr "_Grans"
#
#
@@ -4075,7 +3874,7 @@ msgstr "_Lupa"
#
#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
-msgstr "_Mitjana"
+msgstr "_Mitjanes"
#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
@@ -4103,7 +3902,7 @@ msgstr "Ordre _invers"
#
#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
-msgstr "_Seleccioneu els rodets a importar..."
+msgstr "_Seleccioneu els rodets que s'han d'importar..."
#
#: ../src/ui/main_window.ui.h:64
@@ -4123,7 +3922,7 @@ msgstr "Nitide_sa..."
#
#: ../src/ui/main_window.ui.h:68
msgid "_Small"
-msgstr "_Petita"
+msgstr "_Petites"
#
#
@@ -4153,11 +3952,11 @@ msgstr "_Fotografies sense etiqueta"
msgid "_Version"
msgstr "_Versió"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "S'està actualitzant la base de dades de l'F-Spot"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -4258,11 +4057,11 @@ msgid "Print photo comment"
msgstr "Imprimeix el comentari de la fotografia"
#
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Edita"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -4271,20 +4070,20 @@ msgstr ""
"fotografia i proveu-ho una altra vegada"
#
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "S'ha produït un error en desar la fotografia retocada"
msgstr[1] "S'ha produït un error en desar les fotografies retocades"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
"JPEG before you can edit them."
msgstr ""
-"S'ha rebut una excepció «{0}». Tingueu en compte que heu de convertir fitxers "
-"RAW dins del JPEG abans de que pugueu editar-los."
+"S'ha rebut una excepció «{0}». Tingueu en compte que heu de convertir els "
+"fitxers RAW a JPEG per poder editar-los."
#: ../src/Widgets/Filmstrip.cs:572
msgid "_Horizontal"
@@ -4298,7 +4097,7 @@ msgstr "_Vertical"
msgid "Find:"
msgstr "Cerca:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Carpetes"
@@ -4312,22 +4111,23 @@ msgid "Histogram"
msgstr "Histograma"
#
-#
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Versió"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Data"
-#
-#
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Exposició"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Longitud focal"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Mida del fitxer"
@@ -4335,31 +4135,39 @@ msgstr "Mida del fitxer"
#
# TODO: Valoració?
#
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Puntuació"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(format erroni)"
+
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
msgid "(Unknown)"
msgstr "(Desconegut)"
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr "(format erroni)"
+#: ../src/Widgets/InfoBox.cs:561
+#, csharp-format
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "({0} edició)"
+msgstr[1] "({0} edicions)"
-#: ../src/Widgets/InfoBox.cs:558
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(error de lectura del fitxer)"
# csharp-format
-#: ../src/Widgets/InfoBox.cs:603
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} fotografies"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:623
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4368,7 +4176,7 @@ msgstr ""
"Al {0} entre \n"
"les {1} i les {2}"
-#: ../src/Widgets/InfoBox.cs:628
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4378,66 +4186,66 @@ msgstr ""
"i les {1}"
#
-#: ../src/Widgets/InfoBox.cs:655
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(falta almenys un fitxer)"
#
-#: ../src/Widgets/InfoBox.cs:772
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Mostra el nom de la fotografia"
#
-#: ../src/Widgets/InfoBox.cs:781
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Mostra la data"
#
-#: ../src/Widgets/InfoBox.cs:790
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Mostra la mida"
-#: ../src/Widgets/InfoBox.cs:799
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Mostra l'exposició"
-#: ../src/Widgets/InfoBox.cs:808
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Mostra la longitud focal"
#
-#: ../src/Widgets/InfoBox.cs:817
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Mostra la càmera"
-#: ../src/Widgets/InfoBox.cs:826
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Mostra la mida del fitxer"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metadades"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Metadades ampliades"
#
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "No hi ha metadades ampliades disponibles"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "No hi ha cap fotografia activa"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "La fotografia «{0}» no existeix"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "No hi ha metadades disponibles"
@@ -4476,10 +4284,255 @@ msgstr "Mostra una projecció de diapositives des de l'F-Spot"
msgid "F-Spot photos"
msgstr "Fotografies de l'F-Spot"
-#~ msgid "(One Edit)"
-#~ msgid_plural "({0} Edits)"
-#~ msgstr[0] "({0} edició)"
-#~ msgstr[1] "({0} edicions)"
+#
+#
+#~ msgid "Package"
+#~ msgstr "Paquet"
+
+#
+#~ msgid "Extension Installation"
+#~ msgstr "Instal·lació de complements"
+
+#
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr ""
+#~ "<b>Seleccioneu els complements a instal·lar i feu clic a Següent</b>"
+
+#~ msgid "Install from:"
+#~ msgstr "Instal·la des de:"
+
+#~ msgid "_Repositories..."
+#~ msgstr "D_ipòsits..."
+
+#
+#
+#~ msgid "Show all packages"
+#~ msgstr "Mostra tots els paquets"
+
+#~ msgid "Show new versions only"
+#~ msgstr "Mostra només les versions noves"
+
+#~ msgid "Show updates only"
+#~ msgstr "Mostra només les actualitzacions"
+
+#
+#~ msgid "_Unselect All"
+#~ msgstr "Dessele_cciona-ho tot"
+
+#~ msgid "label124"
+#~ msgstr "label124"
+
+#~ msgid "Overall Progress:"
+#~ msgstr "Progrés global:"
+
+#
+#
+#~ msgid "Downloading extensions..."
+#~ msgstr "S'estan baixant els complements..."
+
+#
+#~ msgid "Extension Manager"
+#~ msgstr "Gestor de complements"
+
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr ""
+#~ "Calen alguns complements addicionals per a realitzar aquesta operació."
+
+#
+#
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "S'instal·laran els complements següents:"
+
+#
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Gestor de complements</b></big>"
+
+#
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Els complements següents estan instal·lats:"
+
+#
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Instal·la complements..."
+
+#
+#~ msgid "_Uninstall..."
+#~ msgstr "_Desinsta·la..."
+
+#~ msgid "Enable"
+#~ msgstr "Habilita"
+
+#
+#~ msgid "Disable"
+#~ msgstr "Inhabilita"
+
+#
+#~ msgid "Details"
+#~ msgstr "Detalls"
+
+#
+#~ msgid "Extension Repository Management"
+#~ msgstr "Gestió dels dipòsits de complements"
+
+#~ msgid "Add New Repository"
+#~ msgstr "Afegeix un dipòsit nou"
+
+#
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Seleccioneu la ubicació del dipòsit que voleu registrar:"
+
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registra un dipòsit en línia"
+
+#~ msgid "Url:"
+#~ msgstr "Url:"
+
+#~ msgid "Register a local repository"
+#~ msgstr "Registra un dipòsit local"
+
+#
+#~ msgid "Path:"
+#~ msgstr "Camí:"
+
+#
+#~ msgid "Browse..."
+#~ msgstr "Navega..."
+
+#~ msgid "Version:"
+#~ msgstr "Versió:"
+
+#
+#~ msgid "Author:"
+#~ msgstr "Autor:"
+
+#
+#~ msgid "Copyright:"
+#~ msgstr "Copyright:"
+
+#
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Dependències del complement:"
+
+#~ msgid "All registered repositories"
+#~ msgstr "Tots els dipòsits registrats"
+
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Esteu segur que voleu cancel·lar la instal·lació?"
+
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Es desintal·laran els paquets següents:"
+
+#
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "També es desinstal·laran altres complements que depenen dels anteriors:"
+
+#
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Els complements seleccionats no poden instal·lar-se perquè hi ha "
+#~ "conflictes amb les dependències."
+
+#~ msgid "The following packages will be installed:"
+#~ msgstr "S'instal·laran els paquets següents:"
+
+#~ msgid " (in user directory)"
+#~ msgstr " (al directori de l'usuari)"
+
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "S'han de desinstal·lar els paquets següents:"
+
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "No s'han pogut resoldre les dependències següents:"
+
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "La instal·lació s'ha completat satisfactòriament."
+
+#
+#~ msgid "The installation failed!"
+#~ msgstr "La instal·lació ha fallat"
+
+#
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "La instal·lació s'ha completat amb avisos."
+
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "La desinstal·lació s'ha completat satisfactòriament."
+
+#
+#~ msgid "The uninstallation failed!"
+#~ msgstr "La desinstal·lació ha fallat"
+
+#
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "La desinstal·lació s'ha completat amb avisos."
+
+#
+#
+#~ msgid "Repository"
+#~ msgstr "Dipòsit"
+
+#
+#
+#~ msgid "Installation cancelled"
+#~ msgstr "S'ha cancel·lat la instal·lació"
+
+#
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "No s'han trobat alguns dels complements necessaris"
+
+#
+#
+#~ msgid "Installation failed"
+#~ msgstr "La instal·lació ha fallat"
+
+#
+#~ msgid "Extension"
+#~ msgstr "Complement"
+
+#~ msgid "Other"
+#~ msgstr "Altres"
+
+#
+#~ msgid "Url"
+#~ msgstr "Url"
+
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "S'ha produït l'excepció: «{0}»"
+
+#
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "No es poden carregar els complements inhabilitats."
+
+#~ msgid "Loading {0} extension"
+#~ msgstr "S'està carregant el complement {0}"
+
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "El complement necessari «{0}» està inhabilitat."
+
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "El complement necessari «{0}» no està instal·lat."
+
+#~ msgid "(provided by {0})"
+#~ msgstr "(proporcionat per {0})"
+
+#
+#~ msgid "my photos"
+#~ msgstr "les meves fotografies"
+
+#
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Edita l'etiqueta seleccionada..."
+
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Copia la _ubicació"
+
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Edita l'etiqueta seleccionada..."
#~ msgid "Dissolve"
#~ msgstr "Dissol"
@@ -4598,9 +4651,6 @@ msgstr "Fotografies de l'F-Spot"
#~ msgid "<b>Printer Details</b>"
#~ msgstr "<b>Detalls de la impressora</b>"
-#~ msgid "C_aption:"
-#~ msgstr "Llegend_a:"
-
#~ msgid "Co_nfigure"
#~ msgstr "Co_nfigura"
diff --git a/po/cs.po b/po/cs.po
index 0d91e49..503f48f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,14 +10,15 @@
# Jakub Friedl <jfriedl at suse.cz>, 2006, 2007.
# Pavel Šefránek <ps at pjoul.cz>, 2008.
# Petr Kovar <pknbe at volny.cz>, 2008.
-# Zdeněk Hataš <zdenek.hatas at gmail.com>, 2008, 2009.
+# Zdeněk Hataš <zdenek.hatas at gmail.com>, 2008, 2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-05 20:10+0200\n"
-"PO-Revision-Date: 2009-08-31 20:55+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-"
+"spot&component=General\n"
+"POT-Creation-Date: 2010-03-08 11:57+0000\n"
+"PO-Revision-Date: 2010-03-11 11:01+0100\n"
"Last-Translator: Zdeněk Hataš <zdenek.hatas at gmail.com>\n"
"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -36,7 +37,7 @@ msgstr "_CD..."
#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
#: ../src/CameraFileSelectionDialog.cs:199
msgid "Transferring Pictures"
-msgstr "Přenáším obrázky"
+msgstr "Přenáší se obrázky"
#: ../extensions/Exporters/CDExport/CDExport.cs:218
#, csharp-format
@@ -48,14 +49,14 @@ msgstr "Na CD se přenáší obrázek \"{0}\""
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} z {1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
@@ -104,7 +105,7 @@ msgid "Create CD"
msgstr "Vytvořit CD"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Velikost"
@@ -122,6 +123,7 @@ msgstr "Procházet frontu plánovaných sou_borů"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Exportovat"
@@ -151,19 +153,20 @@ msgstr ""
"Poté co vás Facebook nasměruje k návratu do této aplikace, klikněte na "
"tlačítko \"OK\" níže."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
msgstr "Příliš mnoho obrázků k exportu"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"Facebook umožňuje vložit pouze 60 fotografií na jedno album. Upravte prosím "
+"Facebook umožňuje vložit pouze {0} fotografií na jedno album. Upravte prosím "
"výběr a zkuste to znovu."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -171,19 +174,19 @@ msgstr ""
msgid "Uploading Pictures"
msgstr "Přenášejí se obrázky"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "Album musí mít název"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
msgstr "Pojmenujte prosím své album, nebo zvolte existující."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "Vytváření nového alba selhalo"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -194,30 +197,29 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
msgstr "Nahrává se obrázek \"{0}\" ({1} z {2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
msgstr "Chyba při nahrávání na Facebook: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Chyba"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
@@ -225,6 +227,10 @@ msgstr "Chyba"
msgid "Upload Complete"
msgstr "Nahrávání dokončeno"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Navštivte Facebook skupinu F-Spot"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "Čeká se na autentizaci"
@@ -245,7 +251,7 @@ msgstr ""
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
msgid "Authenticating..."
-msgstr "Autentizuje se..."
+msgstr "Probíhá autentizace..."
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
msgid "Error logging into Facebook"
@@ -342,8 +348,7 @@ msgid "Logout"
msgstr "Odhlásit"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Název"
@@ -353,7 +358,7 @@ msgstr "Nejste přihlášen"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
msgid "Permissions:"
-msgstr "Práva:"
+msgstr "Oprávnění:"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
msgid "Stay Connected"
@@ -465,6 +470,7 @@ msgstr "<b>Účet</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Fotografie</b>"
@@ -486,7 +492,8 @@ msgstr "<b>Oprávnění k prohlížení</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exportovat"
@@ -582,58 +589,58 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Chyba: Soubor už existuje; ruším"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Světlé"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Tmavé"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Předchozí"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Index"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Štítky"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Následující"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galerie generovaná programem"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Ukázat styly"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Skrýt styly"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Štítky: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Strana:"
@@ -850,6 +857,7 @@ msgstr "Nadřazené alb_um:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Heslo:"
@@ -860,6 +868,7 @@ msgstr "_Titulek:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Uživatelské jméno:"
@@ -1010,12 +1019,72 @@ msgstr "Nahrávání ukončeno"
msgid "Error uploading to Tabblo: "
msgstr "Chyba při nahrávání na Tabblo: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Štítky F-Spot</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Účet Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>Štítky F-Spot vám pomohou kontrolovat stav exportu fotografií. "
+"Příklad: Jedním štítkem označte fotografie, které hodláte exportovat a jiným "
+"ty, které již byly exportovány. Zde můžete programu F-Spot říci aby nahradil "
+"štítky dle potřeby.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Odstranit exportované fotografie:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Vybrat..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "Připojit exportov_ané fotografie:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Při pokusu o přístup došlo k chybě důvěryhodnosti"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Zrušit toto sezení"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Vždy věřit cerifikátu tohoto serveru"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Přejete si:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Chyba důvěryhodnosti"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Věřit certifikátu tohoto serveru pouze nyní"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Komprimova_ný soubor..."
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Žádný výběr není k dispozici"
@@ -1041,7 +1110,6 @@ msgid "Preparing photo \"{0}\""
msgstr "Připravuje se fotografie \"{0}\""
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "Vy_tvořit"
@@ -1089,8 +1157,118 @@ msgid "Stopped"
msgstr "Zastaveno"
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Zjistit duplicity"
+msgid "Check for Duplicates..."
+msgstr "Zjistit duplicity..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Galerie F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Webová galerie je zřejmě nedostupná"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Zobrazit vše"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} fotografie"
+msgstr[1] "{0} fotografie"
+msgstr[2] "{0} fotografií"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Aktuální pohled"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Vybrané"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Živá webová galerie"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Galerie zůstává aktivní do doby než ji deaktivujete, nebo "
+"ukončíte\n"
+"práci s programem F-Spot. Ujistěte se, že k ní lokální návštěvníci "
+"přistupují bez použití HTTP proxy.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Pokud je galerie aktivní, použijte pro přístupke sdíleným "
+"fotografiím \n"
+"z jiného počítače níže uvedené URL.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Aktivuje a deaktivuje webovou galerii"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Povolit návštěvníkům přidávat štítky"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Kopírovat URL do schránky"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "Živá webová galerie F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL Galerie:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Omezit počet sdílených fotografií na"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Volby:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Fotografie se štítky"
+
+#
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Vybrané fotografie"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Sdílení:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Zobrazení:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "není"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galerie: {0}, Fotografií: {1}, Poslední uživatel: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Galerie není aktivní"
#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
msgid "Merge Db"
@@ -1176,7 +1354,7 @@ msgid "New Rolls Only"
msgstr "Pouze nové filmy"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:51
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Přeskočit"
@@ -1219,26 +1397,31 @@ msgid "Screensaver Configuration"
msgstr "Nastavení spořiče obrazovky"
#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
msgid "F-Spot Photo Manager"
msgstr "Správce fotografií F-Spot"
-#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot.desktop.in.in.h:3
msgid "Organize, enjoy, and share your photos"
msgstr "Organizuje, prohlíží a sdílí vaše fotografie"
-#: ../f-spot.desktop.in.in.h:3 ../f-spot-import.desktop.in.in.h:3
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
msgid "Photo Manager"
msgstr "Správce fotografií"
-#: ../f-spot-import.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:3
msgid "Import into F-Spot"
msgstr "Importovat do F-Spot"
-#: ../f-spot-view.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:2
msgid "F-Spot Photo Viewer"
msgstr "Prohlížeč fotografií F-Spot"
-#: ../f-spot-view.desktop.in.in.h:2
+#: ../f-spot-view.desktop.in.in.h:3
msgid "Photo Viewer"
msgstr "Prohlížeč fotografií"
@@ -1255,284 +1438,6 @@ msgstr "Neznámý typ transformace %d"
msgid "Operation failed"
msgstr "Operace selhala"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Balíček"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Instalace rozšíření"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr ""
-"<b>Vyberte rozšíření, která chcete nainstalovat, a klikněte na Následující</"
-"b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Nainstalovat z:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Repositáře..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Zobrazovat všechny balíčky"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Zobrazovat jen nové verze"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Zobrazovat jen aktualizace"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "_Zrušit výběr všeho"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Vybrat vš_e"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "popisek124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Celkový průběh:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Stahuji rozšíření..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Správce rozšíření"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "K provedení této akce jsou vyžadována další rozšíření."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Budou nainstalována následující rozšíření:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Správce rozšíření</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Právě se instalují následující rozšíření:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Instalovat rozšíření..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "O_debrat..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Povolit"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Zakázat"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Detaily"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Správa repositářů rozšíření"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Přidat nový repositář"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Vyberte umístění repositáře, který chcete přidat:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Přidat vzdálený repositář"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "URL:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Přidat místní repositář"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Umístění:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Procházet..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Verze:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Autorská práva:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Závislosti rozšíření:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Všechny registrované repositáře"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Opravdu chcete zrušit instalaci?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Následující balíčky budou odebrány:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"Existují další na těchto závislá rozšíření, která budou také odstraněna:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr ""
-"Zvolená rozšíření nemohou být nainstalována, protože nastal konflikt "
-"závislostí."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Následující balíčky budou nainstalovány:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (v uživatelském adresáři)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Následující balíčky musí být odebrány:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Následující závislosti nemohou být vyřešeny:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Instalace byla úspěšně dokončena."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Instalace selhala!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Instalace byla dokončena s varováními."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Odebrání bylo úspěšně dokončeno."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Odebrání selhalo!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Odebrání bylo dokončeno s varováními."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Repositář"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Instalace zrušena"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Některá z požadovaných rozšíření nebyla nalezena"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Chyba při instalaci"
-
-# TODO: možná rozšíření (?)
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Přípona"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Verze"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Ostatní"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "URL"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Došlo k výjimce: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Zakázaná rozšíření není možno načíst."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Načítá se {0} rozšíření"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Vyžadované rozšíření \"{0}\" je zakázáno."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Vyžadované rozšíření \"{0}\" není nainstalováno."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(poskytuje {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Náhled"
@@ -1541,7 +1446,7 @@ msgstr "Náhled"
msgid "Path"
msgstr "Cesta"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Soubor"
@@ -1568,19 +1473,19 @@ msgid "Error transferring file"
msgstr "Chyba při přenosu souboru"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Dokončeno kopírování souborů"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Stahování hotovo"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Dokončeno kopírování souborů"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "Přenáším z fotoaparátu \"{0}\""
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Fotoaparát"
@@ -1588,12 +1493,12 @@ msgstr "Fotoaparát"
msgid "Port"
msgstr "Port"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Nenalezena žádná fotografie odpovídající {0}"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1604,11 +1509,11 @@ msgstr ""
"označit některé fotografie nebo vyberte jiný\n"
"v dialogu nastavení."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Hledání nevrátilo žádné výsledky"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1635,19 +1540,19 @@ msgstr[0] "Změněn"
msgstr[1] "Změněny ({0})"
msgstr[2] "Změněno ({0})"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Změněn v {1}"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Změněn v {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:666 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Originál"
@@ -1723,19 +1628,19 @@ msgstr "Označte oči, které chcete opravit."
msgid "Sepia Tone"
msgstr "Sépie"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Změkčení okrajů"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Narovnání"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Chyba importu"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Chyba importu {0}{2}{2}{1}"
@@ -1750,8 +1655,8 @@ msgid "Unhandled exception"
msgstr "Neobsloužená výjimka"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "_Kopírovat umístění fotografie"
+msgid "Copy Photo"
+msgstr "Kopírovat fotografii"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1765,13 +1670,13 @@ msgstr "Otevřít _v"
msgid "Rem_ove Tag"
msgstr "_Odstranit štítek"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:453 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Otočit do_leva"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:454 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Otočit do_prava"
@@ -1899,182 +1804,186 @@ msgid "C_ontrast:"
msgstr "K_ontrast:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "Vy_tvořit"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Výběr fotoaparátu"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Kopírovat soubory do složky Photos"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Vytvořit e-mail"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Vytvořit _ikonu pro tento štítek poté, co bude prvně použit"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr ""
"Vytvořit e-mail s přiloženými zvolenými fotografiemi (s možností změny "
"velikosti)"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Detekovat duplicity"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Zobrazovat _názvy souborů"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr "Zobrazit pouze fotografie ze zadaných filmů."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Neodesílat e-mail"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "E-_mail:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "E_xportovat popisky a poznámky"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Odhadovaná nová velikost"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Extra velký"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "Pohled F-Spot"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Použít filtr hledání na vyfotografované filmy"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_alerie:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galerie"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Import"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Zdroj importu:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Včetně podadresářů"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
-msgstr "Velký"
+msgstr "Velké"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Spravovat vaše vlastní poměry výběru"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Střední"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Počet fotografií ve zvolených filmech:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Počet obrázků"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Otevřít _složku..."
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Původní velikost (pravděpodobně velmi velký soubor)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "_Rodičovský štítek:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pozastavit"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Nastavení"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Předchozí"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Opravit"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Zvolte fotografie, které se mají kopírovat z fotoaparátu..."
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Vyberte štítek..."
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Vyberte fotoaparát, ze kterého chcete přenést soubory"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Zvolený fotoaparát: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Omezení výběru"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Nastavit jako _pozadí"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Zobrazit všechny fotografie."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Zobrazit nebo skrýt boční panel"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Zobrazit nebo skrýt lištu nástrojů"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "Boční _panel"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
-msgstr "Malý"
+msgstr "Malé"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2082,40 +1991,40 @@ msgstr ""
"Zvolte, zda má být obrázek v původní velikosti otočen či nikoliv. Menší "
"velikosti jsou otočeny automaticky."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Odstranit _metadata obrázku"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Tep_lota:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Drobný"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Celková původní velikost"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "Zvětš_it"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "Z_menšit"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Zvětšit"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Zmenšit"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Jas:"
@@ -2125,7 +2034,7 @@ msgstr "Vy_tvořit e-mail"
#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
msgid "_Edit"
-msgstr "Ú_pravy"
+msgstr "U_pravit"
#: ../src/f-spot.glade.h:98
msgid "_Exposure:"
@@ -2149,7 +2058,7 @@ msgstr "_Nápověda"
#: ../src/f-spot.glade.h:103
msgid "_Hue:"
-msgstr "_Zabarvení:"
+msgstr "_Odstín:"
#: ../src/f-spot.glade.h:104
msgid "_Interpolate image on zoom"
@@ -2205,7 +2114,7 @@ msgstr "_URI:"
#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
msgid "_View"
-msgstr "_Zobrazení"
+msgstr "_Zobrazit"
#: ../src/f-spot.glade.h:119
msgid "_Virtual Filesystem"
@@ -2242,7 +2151,7 @@ msgstr "Skrýt lištu nástrojů"
msgid "Info"
msgstr "Informace"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Informace o obrázku"
@@ -2250,8 +2159,8 @@ msgstr "Informace o obrázku"
msgid "Exit fullscreen"
msgstr "Ukončit celou obrazovku"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Promítání snímků"
@@ -2299,7 +2208,7 @@ msgstr "Informace InterOperability"
msgid "Unknown Directory"
msgstr "Neznámé informace"
-#: ../src/Imaging/ImageFile.cs:113
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Zápis do tohoto formátu souboru není podporován"
@@ -2435,7 +2344,7 @@ msgstr "Intelektuální žánr objektu"
msgid "Unknown IIM DataSet"
msgstr "Neznámý DataSet IIMF"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:359
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Vybrat složku"
@@ -2452,11 +2361,11 @@ msgstr "Načítám {0} z {1}"
msgid "Done Loading"
msgstr "Načítání dokončeno"
-#: ../src/ImportCommand.cs:683
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "Adresář neexistuje."
-#: ../src/ImportCommand.cs:684
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
@@ -2464,13 +2373,12 @@ msgid ""
msgstr ""
"Adresář {0}, který jste vybrali, neexistuje. Zvolte prosím jiný adresář"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Importovat štítky"
+msgid "Imported Tags"
+msgstr "Importované štítky"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:86
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Otočit doleva"
@@ -2478,7 +2386,7 @@ msgstr "Otočit doleva"
msgid "Rotate picture left"
msgstr "Otočit obrázek doleva"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Otočit doprava"
@@ -2494,69 +2402,69 @@ msgstr "Další obrázek"
msgid "Previous picture"
msgstr "Předchozí obrázek"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importovat nové fotografie"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Procházet"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Proházet mnoho fotografií zároveň"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Upravit obrázek"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Zobrazit a upravit fotografii"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Celá obrazovka"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Zobrazit fotografie na celé obrazovce"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Zobrazovat fotografie jako prezentaci"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Předchozí fotografie"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Následující fotografie"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Nedetekován žádný fotoaparát."
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
msgstr ""
-"F-Spot nemohl najít žádný fotoaparát připojený k tomuto systému. "
-"Zkontrolujte, že fotoaparát je připojen a je napájen"
+"F-Spot nenalezl žádný fotoaparát připojený k tomuto systému. Zkontrolujte, "
+"že fotoaparát je připojen a je napájen"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Chyba při připojování k fotoaparátu"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Zachycena chyba \"{0}\" při připojování k fotoaparátu"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
@@ -2564,7 +2472,7 @@ msgstr[0] "Sloučit zvolený štítek"
msgstr[1] "Sloučit zvolené {0} štítky?"
msgstr[2] "Sloučit zvolených {0} štítků?"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2572,11 +2480,11 @@ msgstr ""
"Tato operace sloučí zvolené štítky a všechny podřízené štítky do jednoho "
"štítku."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Sloučit štítky"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
@@ -2584,7 +2492,7 @@ msgstr[0] "Fotografie {0} z {1}"
msgstr[1] "Fotografie {0} z {1}"
msgstr[2] "Fotografie {0} z {1}"
-#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:495
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
@@ -2592,7 +2500,7 @@ msgstr[0] "{0} fotografie"
msgstr[1] "{0} fotografie"
msgstr[2] "{0} fotografií"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
@@ -2600,25 +2508,25 @@ msgstr[0] " ({0} vybrána)"
msgstr[1] " ({0} vybrány)"
msgstr[2] " ({0} vybráno)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Budiž"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Chyba při odstraňování obrázků"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Chybí oprávnění ke smazání souboru:{1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Při mazání souboru {2}{1} došlo k chybě typu {0}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
@@ -2626,7 +2534,7 @@ msgstr[0] "Natrvalo odstranit zvolenou fotografii?"
msgstr[1] "Natrvalo odstranit zvolené {0} fotografie?"
msgstr[2] "Natrvalo odstranit zvolených {0} fotografií?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
@@ -2635,14 +2543,14 @@ msgstr[1] "To odstraní všechny verze zvolených fotografií z vašeho disku."
msgstr[2] "To odstraní všechny verze zvolených fotografií z vašeho disku."
#
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Odstranit fotografii"
msgstr[1] "_Odstranit fotografie"
msgstr[2] "_Odstranit fotografie"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
@@ -2650,7 +2558,7 @@ msgstr[0] "Odstranit zvolenou fotografii z F-Spot?"
msgstr[1] "Odstranit zvolené {0} fotografie z F-Spot?"
msgstr[2] "Odstranit zvolených {0} fotografií z F-Spot?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2660,28 +2568,28 @@ msgstr ""
"budou ztraceny. Fotografie zůstávají ve vašem počítači a lze je do F-Spot "
"znovu importovat."
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Odstranit z katalogu"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Odstranit štítek \"{0}\"?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Odstranit {0} zvolených štítků?"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "fotografie"
msgstr[1] "fotografie"
msgstr[2] "fotografie"
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -2690,7 +2598,7 @@ msgstr[0] "Pokud odstraníte tento štítek, asociace s {0} {1} bude ztracena."
msgstr[1] "Pokud odstraníte tyto štítky, asociace s {0} {1} bude ztracena."
msgstr[2] "Pokud odstraníte tyto štítky, asociace s {0} {1} bude ztracena."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "O_dstranit štítek"
@@ -2698,11 +2606,11 @@ msgstr[1] "O_dstranit štítky"
msgstr[2] "O_dstranit štítků"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Štítek není prázdný"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2711,21 +2619,21 @@ msgstr ""
"Nemohu odstranit štítky, které obsahují štítky. Nejdříve prosím odstraňte "
"štítky pod \"{0}\""
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Otočit zvolenou fotografii doleva"
msgstr[1] "Otočit zvolené fotografie doleva"
msgstr[2] "Otočit zvolené fotografie doleva"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Otočit zvolenou fotografii doprava"
msgstr[1] "Otočit zvolené fotografie doprava"
msgstr[2] "Otočit zvolené fotografie doprava"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
@@ -2733,22 +2641,22 @@ msgstr[0] "Na_jít zvolený štítek"
msgstr[1] "Na_jít zvolené štítky"
msgstr[2] "Na_jít zvolené štítky"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
-msgstr[0] "Najít zvolený štítek _s"
-msgstr[1] "Najít zvolené štítky _s"
-msgstr[2] "Najít zvolené štítky _s"
+msgstr[0] "Vyhledat zvolený štítek _s"
+msgstr[1] "Vyhledat zvolené štítky _s"
+msgstr[2] "Vyhledat zvolené štítky _s"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Vytvořit novou verzi?"
msgstr[1] "Vytvořit nové verze?"
msgstr[2] "Vytvořit nové verze?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2766,7 +2674,7 @@ msgstr[2] ""
"Má F-Spot vytvořit novou verzi zvolené fotografie před spuštěním {1} pro "
"zachování originálů?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "Verze XCF"
@@ -2790,87 +2698,93 @@ msgstr "Předmět a klíčová slova"
msgid "Compression"
msgstr "Komprese"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Plošná konfigurace"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientace"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Fotometrická interpretace"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Jednotka rozlišení"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Program expozice:"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Režim měření"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Režim expozice"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Vlastní vykreslení"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Nastavení součástí"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Zdroj světla"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Metoda zachycování"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Prostor barev"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Vyvážení bílé"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Jednotka rozlišení roviny zaostření"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Typ zdroje souboru"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Typ zachycení scény"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Ovládání zisku"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Sytost"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Ostrost"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Typ scény"
@@ -2940,26 +2854,26 @@ msgstr "Nemohu přejmenovat verzi"
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Zachycena výjimka \"{0}\". Nelze přejmenovat verzi na \"{1}\""
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:554
-#: ../src/Widgets/InfoBox.cs:556
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Žádné úpravy)"
-#: ../src/PhotoView.cs:169 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Chyba při upravování fotografie"
-#: ../src/PhotoView.cs:170 ../src/Sharpener.cs:73
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "Zachycena výjimka \"{0}\". Nelze uložit fotografii {1}"
-#: ../src/PhotoView.cs:359
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Poznámka:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Fotografie"
@@ -3082,8 +2996,8 @@ msgstr "Při zpracovávání \"{0}\" došlo k chybě: {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "mé fotografie"
+msgid "My Photos"
+msgstr "Mé fotografie"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3105,23 +3019,23 @@ msgstr "Poloměr:"
msgid "Threshold:"
msgstr "Práh:"
-#: ../src/SingleView.cs:88
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Otočit fotografii doleva"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Otočit fotografii doprava"
-#: ../src/SingleView.cs:130
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Složka"
-#: ../src/SingleView.cs:356
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Otevřít"
-#: ../src/SingleView.cs:456
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Nastavit jako pozadí"
@@ -3142,17 +3056,17 @@ msgstr "Název nového štítku:"
#, csharp-format
msgid "Find"
msgid_plural "Find"
-msgstr[0] "Najít"
-msgstr[1] "Najít"
-msgstr[2] "Najít"
+msgstr[0] "Hledat"
+msgstr[1] "Hledat"
+msgstr[2] "Hledat"
#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
msgid "Create New Tag..."
msgstr "Vytvořit nový štítek..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Upravit zvolený štítek..."
+msgid "Edit Tag..."
+msgstr "Upravit štítek..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3197,9 +3111,9 @@ msgstr "Nezahrnovat do vyhledávání"
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
-msgstr[0] "Najít _s"
-msgstr[1] "Najít _s"
-msgstr[2] "Najít _s"
+msgstr[0] "Vyhledat _s"
+msgstr[1] "Vyhledat _s"
+msgstr[2] "Vyhledat _s"
#: ../src/TagQueryWidget.cs:114
msgid "All"
@@ -3239,7 +3153,7 @@ msgid "Events"
msgstr "Události"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Není)"
@@ -3272,24 +3186,24 @@ msgstr "Aktualizují se náhledy"
msgid "Updating picture \"{0}\""
msgstr "Aktualizuje se obrázek \"{0}\""
-#: ../src/UI.Dialog/AboutDialog.cs:71
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Správce fotografií pro GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:72
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:95
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"Miloslav Trmač <mitr at volny.cz>\n"
-"Jakub Friedl <jfriedl at suse.cz>\n"
+"Jakub Friedl <jfriedl at suse.cz>\n"
"Pavel Šefránek <ps at pjoul.cz>\n"
"Petr Kovář <pknbe at volny.cz>\n"
"Zdeněk Hataš <zdenek.hatas at gmail.com>"
-#: ../src/UI.Dialog/AboutDialog.cs:100
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "Webová stránka programu F-Spot"
@@ -3388,16 +3302,16 @@ msgstr "Podrobnosti o chybě"
msgid "An unhandled exception was thrown: "
msgstr "Nastala neobsloužená výjimka: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Není"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Systémový profil"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Výchozí motiv"
@@ -3422,7 +3336,7 @@ msgstr "Popisek"
msgid "Ratio"
msgstr "Poměr"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Znovu"
@@ -3472,7 +3386,7 @@ msgstr "min. Začít na {0}"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
msgid "<b>End Date</b>"
-msgstr "<b>Koncové datumí</b>"
+msgstr "<b>Datum konce</b>"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
msgid "<b>Select period</b>"
@@ -3480,7 +3394,7 @@ msgstr "<b>Vybrat rozmezí</b>"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
msgid "<b>Start Date</b>"
-msgstr "<b>Počáteční datum</b>"
+msgstr "<b>Datum počátku</b>"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
msgid "Cancel, do not change the current timeline. "
@@ -3615,8 +3529,8 @@ msgid "By _Rating"
msgstr "Podle _hodnocení"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "K_opírovat umístění"
+msgid "Copy"
+msgstr "Kopírovat"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3626,13 +3540,9 @@ msgstr "Vy_tvořit nový štítek..."
msgid "Create _New Version..."
msgstr "Vytvořit _novou verzi..."
-#: ../src/ui/main_window.ui.h:10
-msgid "F-Spot"
-msgstr "F-Spot"
-
#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
-msgstr "_Najít"
+msgstr "Hle_dat"
# TODO: možná rozšíření (?)
#: ../src/ui/main_window.ui.h:12
@@ -3647,6 +3557,10 @@ msgstr "Na_stavení stránky..."
msgid "Re_fresh Thumbnail"
msgstr "Obnovit ná_hledy"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Vybrat vš_e"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Zrušit _výběr"
@@ -3673,7 +3587,7 @@ msgstr "_Lišta nástrojů"
#: ../src/ui/main_window.ui.h:27
msgid "View"
-msgstr "Zobrazení"
+msgstr "Zobrazit"
#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
@@ -3708,8 +3622,8 @@ msgid "_Delete Version"
msgstr "O_dstranit verzi"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "Upravit zvolený štít_ek..."
+msgid "_Edit Tag..."
+msgstr "_Upravit štítek..."
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
@@ -3807,11 +3721,11 @@ msgstr "Fotografie _bez štítků"
msgid "_Version"
msgstr "_Verze"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "Aktualizuje se databáze programu F-Spot"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -3904,11 +3818,11 @@ msgstr "Tisknout štítky fotografie"
msgid "Print photo comment"
msgstr "Tisknout komentář fotografie"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
-msgstr "Úpravy"
+msgstr "Upravit"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -3916,14 +3830,14 @@ msgstr ""
"Tento nástroj vyžaduje aktivní výběr. Zvolte prosím oblast fotografie a "
"zkuste tuto operaci znovu"
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Chyba při ukládání upravené fotografie"
msgstr[1] "Chyba při ukládání upravených fotografií"
msgstr[2] "Chyba při ukládání upravených fotografií"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
@@ -3944,7 +3858,7 @@ msgstr "Na _výšku"
msgid "Find:"
msgstr "Hledat:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Složky"
@@ -3956,36 +3870,41 @@ msgstr "Systém souborů"
msgid "Histogram"
msgstr "Histogram"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Verze"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Datum"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Expozice"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Ohnisková vzdálenost"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Velikost souboru"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Hodnocení"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Není známo)"
-
-#: ../src/Widgets/InfoBox.cs:419
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(špatný formát)"
-#: ../src/Widgets/InfoBox.cs:552
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Není známo)"
+
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
@@ -3993,17 +3912,17 @@ msgstr[0] "(Jedna úprava)"
msgstr[1] "({0} úpravy)"
msgstr[2] "({0} úprav)"
-#: ../src/Widgets/InfoBox.cs:566
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(Chyba čtení souboru)"
-#: ../src/Widgets/InfoBox.cs:611
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} fotografií"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:631
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4012,7 +3931,7 @@ msgstr ""
"Dne {0} mezi \n"
"{1} a {2}"
-#: ../src/Widgets/InfoBox.cs:636
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4021,61 +3940,61 @@ msgstr ""
"Mezi {0} \n"
"a {1}"
-#: ../src/Widgets/InfoBox.cs:663
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(Nejméně jeden soubor nebyl nalezen)"
-#: ../src/Widgets/InfoBox.cs:780
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Zobrazit název fotografie"
-#: ../src/Widgets/InfoBox.cs:789
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Zobrazit datum"
-#: ../src/Widgets/InfoBox.cs:798
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Zobrazit velikost"
-#: ../src/Widgets/InfoBox.cs:807
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Zobrazit expozici"
-#: ../src/Widgets/InfoBox.cs:816
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Zobrazit ohniskovou vzdálenost"
-#: ../src/Widgets/InfoBox.cs:825
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Zobrazit fotoaparát"
-#: ../src/Widgets/InfoBox.cs:834
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Zobrazit velikost souboru"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metadata"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Rozšířená metadata"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Rozšířená metadata nejsou k dispozici"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Žádná aktivní fotografie"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "Fotografie \"{0}\" neexistuje"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Žádná metadata nejsou k dispozici"
@@ -4107,3 +4026,4 @@ msgstr "Promítat snímky z F-Spotu"
#: ../tools/f-spot-screensaver.desktop.in.h:2
msgid "F-Spot photos"
msgstr "Fotografie F-Spotu"
+
diff --git a/po/da.po b/po/da.po
index 2eac30b..b137d54 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,6 +4,7 @@
# Martin Willemoes Hansen <mwh at sysrq.dk>, 2004, 05.
# Peter Bach <bach.peter at gmail.com>, 2007-08.
# Mads Bille Lundby <lundbymads at gmail.com>, 2009.
+# Jacob Ilsø Christensen <jacobilsoe at gmail.com>, 2009.
#
# Husk at tilføje dig i credit-listen (besked id "translator-credits")
#
@@ -11,372 +12,1358 @@ msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-27 23:32+0200\n"
-"PO-Revision-Date: 2009-05-27 00:52+0100\n"
-"Last-Translator: Mads Lundby <lundbymads at gmail.com>\n"
+"POT-Creation-Date: 2009-12-17 23:45+0100\n"
+"PO-Revision-Date: 2009-10-23 23:13+0200\n"
+"Last-Translator: Jacob Ilsø Christensen <jacobilsoe at gmail.com>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\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"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Version:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_Cd..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Overfører billeder"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Overfører billede \"{0}\" til cd"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} af {1}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "Færdig med afsendelse af fotos"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Overførsel fuldført"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "Fejl under overførsel"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "Fejl ved overførsel"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "kopierer..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr ""
+"<b><i>Der er nogle tidligere planlagte elementer klar til skrivning</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Fotos som skal brændes</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Autorotér"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Forfatter:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Opret cd"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Ophavsret:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Størrelse"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Udvidelsesafhængigheder:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Størrelse på det eksporterede udvalg:"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Alle registrerede arkiver"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Gennemse tidligere planlagte filer"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Er du sikker på, at du vil afbryde installationen?"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Eksportér"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Følgende pakker vil blive afinstalleret:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "_Skriv kun disse fotos til cd"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "Venter på godkendelse"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
msgstr ""
-"Der er andre udvidelser, som afhænger af de forrige, der også vil blive "
-"afinstalleret:"
+"F-Spot vil nu starte din browser, så du kan aktivere den tilladelse, du lige "
+"har valgt.\n"
+"\n"
+"Klik \"Ok\" nedenfor så snart Facebook siger, at du kan vende tilbage til "
+"dette program."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "For mange billeder til eksport"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
msgstr ""
-"De valgte udvidelser kan ikke installeres, fordi der er "
-"afhængighedskonflikter."
+"Facebook tillader kun {0} fotos pr. album. Begræns dit udvalg og forsøg igen."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Følgende pakker vil blive installeret:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Overfører billeder"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (i brugermappe)"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "Album skal have et navn"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Det vil være nødvendigt at afinstallere følgende pakker:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "Giv dit album et navn eller vælg et eksisterende album."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Følgende afhængigheder kunne ikke løses:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "Oprettelse af nyt album mislykkedes"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Installationen er gennemført problemfrit."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"Der opstod en fejl under oprettelse af nyt album.\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Installationen mislykkedes!"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Overfører billede \"{0}\" ({1} af {2})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Installationen er gennemført med advarsler."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Fejl ved overførsel til Facebook: {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Afinstallationen er gennemført problemfrit."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Fejl"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Afinstallationen mislykkedes!"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Overførsel fuldført"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Afinstallationen er gennemført med advarsler."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Arkiv"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Venter på godkendelse"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Installation afbrudt"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"F-Spot vil nu starte din browser, så du kan logge ind på Facebook.\n"
+"\n"
+"Klik \"Ok\" nedenfor så snart Facebook siger, at du kan vende tilbage til "
+"dette program. Hvis det er muligt, vil F-Spot gemme din session i gnome-"
+"keyring og genbruge den i fremtidige Facebook-eksporteringer."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Nogle af de påkrævede udvidelser blev ikke fundet"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Godkender..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Installation mislykkedes"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Fejl ved indlogning i Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Udvidelse"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr ""
+"Der opstod et problem med at logge ind i Facebook. Tjek dine "
+"legitimationsoplysninger og forsøg igen."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Version"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Autoriserer session"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "Session oprettet. Henter brugerinformation..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "Session oprettet. Henter venneliste..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "Session oprettet. Henter detaljer om venner..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "Session oprettet. Henter fotoalbum..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} er logget ind i Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Andre"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Fejl under forbindelse til Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:9
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"Der opstod en fejl ved hentning af dine informationer fra Facebook.\n"
+"\n"
+"Facebook meldte: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Du er ikke logget ind."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Bekræft fotos automatisk"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Billedtekst"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Opret et nyt album"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Eksportér til Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "I dette foto"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Placering"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Logind"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Logud"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Navn"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Du er ikke logget ind"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Tilladelser:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Forbliv tilsluttet"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Brug et eksisterende album"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Hvem er det?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Autorisér"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Der opstod en undtagelse: {0}"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"Vend tilbage til dette vindue efter at du har afsluttet "
+"autorisationsprocessen på {0} og klik \"Udfør autorisation\"-knappen "
+"nedenunder"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Pakke"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Afslut autorisation"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Installation af udvidelse"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Logger på {0}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Vælg udvidelserne der skal installeres og klik på næste</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Tjekker legitimationsoplysninger..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Installér fra:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Velkommen {0} du er forbundet til {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Arkiver..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Log ind som en anden bruger"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Vis alle pakker"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "Brugt {0} af din tilladte månedlige kvote på {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Vis kun nye udgaver"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Kan ikke logge ind"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Vis kun opdateringer"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Venter på svar {0} af {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "_Afmarkér alt"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "Overfører billede \"{0}\""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:105
-msgid "Select _All"
-msgstr "Markér _alt"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Fejl ved overførsel til {0}: {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "Kunne ikke logge ind."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"F-Spot kunne ikke logge ind på {0}. Kontrollér at du har givet godkendelse "
+"gennem {0}-brugerfladen i webbrowseren."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Konto</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Fotos</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Stil</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Visningsrettigheder</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../src/f-spot.glade.h:43
+msgid "Export"
+msgstr "Eksportér"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "mærke124"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "Eksportér mærke_hierarki"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Samlet fremgang:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"F-Spot mangler din autorisation for at kunne overføre fotos til din {0}-"
+"konto. Tryk \"Autorisér\"-knappen for at åbne en webbrowser og give F-Spot "
+"autorisationen. "
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Henter udvidelser..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "Ignorér _topniveaumærker"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Udvidelseshåndtering"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Privat"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Yderligere udvidelser er påkrævet for at udføre denne handling."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Offentlig"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Følgende udvidelser vil blive installeret:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "Fjern _metadata"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Udvidelseshåndtering</b></big>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Synlig for familie"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Følgende udvidelser er installeret lige nu:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Synlig for venner"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Installér udvidelser..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "_Eksportér mærker"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Afinstallér..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "_Skalér til: "
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:13
-msgid "Enable"
-msgstr "Aktivér"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "_Vis fotos i browser når overførslen er færdig"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Deaktivér"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "billedpunkter"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:799
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:543
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:694
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:177
-msgid "Error"
-msgstr "Fejl"
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "_Mappe..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Vælg eksportmappe"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "Opbygger galleri"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "Fejl ved overførsel af billede \"{0}\" til galleri:{2}{1}"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "Fejl: Fejl ved overførsel; afbryder"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Fejl: Filen findes allerede; Afbryder"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+msgid "Light"
+msgstr "Lys"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+msgid "Dark"
+msgstr "Mørk"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+msgid "Prev"
+msgstr "Forrige"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Indeks"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:64
+msgid "Tags"
+msgstr "Mærker"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
+#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Næste"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+msgid "Gallery generated by"
+msgstr "Galleri skabt af"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+msgid "Show Styles"
+msgstr "Vis stile"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+msgid "Hide Styles"
+msgstr "Skjul stile"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Mærker: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+msgid "Page:"
+msgstr "Side:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Mål</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Eksportmetode</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "Opret _galleri med brug af \"Original\""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "Opret selvstændigt _webgalleri"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "B_eskrivelse:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "Eksportér _mærker"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "Eksportér mærke_ikoner"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Detaljer"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Eksport af mappe"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Udvidelsesarkivhåndtering"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "G_allerinavn:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Tilføj nyt arkiv"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "Åbn _målet, når eksport er færdig"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Vælg placeringen af det arkiv du vil registrere:"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Mappe:"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Registrer et arkiv på nettet"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "_Gem kun filerne"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Adresse:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "_Webgalleri..."
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Registrér et lokalt arkiv"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Kan ikke tilslutte til et galleri, for hvilket versionen er ukendt.\n"
+"Tjek at du har Remote-udvidelsesmodul 1.0.8 eller senere"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Sti:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "Ugyldig URL"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Gennemse..."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "Galleri-URL ser ikke ud til at være gyldig"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "Fejl ved tilslutning til galleri"
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
#, csharp-format
-msgid "(provided by {0})"
-msgstr "(leveret af {0})"
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "Følgende fejl opstod ved forsøg på at logge ind: {0}"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Deaktiverede udvidelser kan ikke indlæses."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "Der findes allerede et galleri med dette navn"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Indlæser udvidelsen {0}"
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+"Der findes allerede et galleri med det samme navn i dine registrerede "
+"gallerier. Vælg et unikt navn."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(TopNiveau)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "Ugyldigt Gallerinavn"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Gallerinavnet indeholder ugyldige tegn.\n"
+"Kun bogstaver, tal, - og _ er tilladt"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Den påkrævede udvidelse \"{0}\" er deaktiveret."
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Fejl ved overførsel af billede \"{0}\" til galleri: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(Intet galleri)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(Ikke tilsluttet)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(Ingen album)"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Ingen konto valgt"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Album</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Galleri</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Fejl ved tilslutning til galleri</span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "Eksportér _titler og kommentarer"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "Åbn _albummet i browseren når overførslen er færdig"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Kontrollér venligst at indstillingerne for dette galleri er korrekte."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "_Albumnavn:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Beskrivelse:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "_Eksportér til album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "_Gallerinavn:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Galleri:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "_Overordnet album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+msgid "_Password:"
+msgstr "_Adgangskode:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Titel:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+msgid "_Username:"
+msgstr "_Brugernavn:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "Fejl ved læsning af serversvar"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Server returnerede svar uden galleriindhold"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "Fejl ved oprettelse af nyt album"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Den påkrævede udvidelse \"{0}\" er ikke installeret."
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"Der opstod følgende fejl ved forsøg på at udføre den forespurgte handling:\n"
+"{0} ({1})"
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "F-Spot fotofremviser"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "Fotofremviser"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "Fejl ved oprettelse af album"
-#: ../f-spot-import.desktop.in.in.h:1 ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "F-Spot fotohåndtering"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr "Følgende fejl opstod under forsøg på at oprette et album: {0}"
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "Importér til F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} Sendt"
-#: ../f-spot-import.desktop.in.in.h:3 ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "Fotohåndtering"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} af ca. {1}"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "Organisér, nyd og del dine fotos"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Fejl ved overførsel til galleri: {0}"
-#: ../libeog/image-view.c:2124
-msgid "interpolation type"
-msgstr "interpoleringstype"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Tilgængelig plads: {0}, {1}% brugt ud af {2}"
-#: ../libeog/image-view.c:2125
-msgid "the type of interpolation to use"
-msgstr "interpoleringstypen der skal bruges"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"Det valgte album har en grænse på {0} billeder,\n"
+"og denne overskrides med det nuværende udvalg på {1} billeder"
-# jf. de efterfølgende strenge
-#: ../libeog/image-view.c:2131 ../libeog/image-view.c:2138
-msgid "check type"
-msgstr "type af tern"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>PicasaWeb-eksport</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>Din Google-konto er låst</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Kontrollér at indstillingerne for dette galleri er korrekte.\n"
+"Indtast bogstaverne som de er vist i billedet i\n"
+"\"Captcha\"-feltet. <i>Bogstaverne er ikke versalfølsomme</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Offentligt album"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "_Albumtitel:"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "_Autorotér"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>SmugMug-eksport</b>"
-#: ../libeog/image-view.c:2132
-msgid "the type of chequering to use"
-msgstr "den slags tern som skal bruges"
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Konto:"
-#: ../libeog/image-view.c:2139
-msgid "the size of chequers to use"
-msgstr "størrelsen af de tern, som skal bruges"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Overfører foto \"{0}\""
-#: ../libeog/image-view.c:2145
-msgid "dither"
-msgstr "farvereducering"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Logger ind i Tabblo"
-#: ../libeog/image-view.c:2146
-msgid "dither type"
-msgstr "farvereduceringstype"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Henter adresse til afsendelse"
-#: ../libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:222
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "Afsendelse af fotos fuldført"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Overførsel fuldført"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Fejl ved overførsel til Tabblo: "
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "Komprimeret f_il..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:196
+msgid "No selection available"
+msgstr "Intet valgt område tilgængeligt"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"Dette værktøj kræver en aktiv markering. Vælg et eller flere billeder og "
+"prøv igen"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Vælg eksportmappe"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Eksporterer filer"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Klargør foto \"{0}\""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+#: ../src/f-spot.glade.h:92
+msgid "_Create"
+msgstr "_Opret"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "_Filnavn:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Placering:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Skala:"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"For at genkende kopier af billeder, du importerede før version 0.5.0, skal F-"
+"Spot analysere din billedsamling. Dette sker ikke som standard, da det er "
+"tidskrævende. Du kan starte eller midlertidigt afbryde denne "
+"opdateringsproces i dette vindue."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+"Du har i øjeblikket {0} fotos, der mangler md5-beregning og {1} jobs i kø"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Luk"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "Behandler billeder..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "Stoppet"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Hash for Duplicates"
+msgstr "Udskil kopier"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "F-Spot-galleri"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Webgalleriet ser ud til at være offline lige nu"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Vis alle"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} foto"
+msgstr[1] "{0} fotos"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Aktuel visning"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Markeret"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Live webgalleri"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Galleriet forbliver aktivt indtil du enten deaktiverer det eller "
+"lukker\n"
+"F-Spot. Sikr dig, at lokale seere tilgår det ved at omgå HTTP-proxyen.</i></"
+"small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Når galleriet er aktivt, skal URL'en ovenfor benyttes for at "
+"tilgå\n"
+"de delte fotos fra en anden computer.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Aktiverer og deaktiverer webgalleriet"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Tillad seere at tilføje mærker"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Kopiér URL til udklipsholder"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spot live webgalleri"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL til galleri:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Begræns antal delte fotos til"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Tilvalg:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Fotos med mærker"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Markerede fotos"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Del:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Visninger:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "ingen"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galleri: {0}, Fotos: {1}, Seneste klient: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Galleri er inaktivt"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Sammenflet databaser"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Fejl ved åbning af den valgte fil"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"Filen du valgte er ikke en gyldig eller understøttet database.\n"
+"\n"
+"Undtagelse \"{0}\" modtaget."
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+"<small><i>Vælg placeringen af databasen du ønsker at importere fra </i></"
+"small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>Vælg hvad der skaĺ importeres fra den valgte database.\n"
+"\"Kun nye ruller\" er det smarte tilvalg, der vil hindre genimport af fotos, "
+"du kunne have importeret under en tidligere handling.\n"
+"\"En enkelt importrulle\" lader dig vælge, hvilken rulle du ønsker at "
+"flette tilbage.\n"
+"\"Alting\" vil importere alt og opretter kopier, hvis du allerede har "
+"importeret fra den database.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>Kopiér billederne lokalt eller bevar dem, hvor de er. Hvis du "
+"vælger sidste mulighed, bør du sikre dig, at denne placering forbliver "
+"tilgængelig fra f-spot</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "En enkelt importrulle"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Kopiér billeder til fotomappe"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Placering af database:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Alting"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Importér:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "Behold billederne på deres oprindelige placering"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "Sammenflet en anden F-Spot-samling"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "Kun nye ruller"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Spring over"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>Databasen henviser til filer indeholdt i <b>{0}</b>-mappen.\n"
+" Vælg venligst denne mappe, så jeg kan foretage afbildningen.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "Konfigurér pauseskærm"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Alle billeder"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Forsinkelse:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Vis:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Billeder mærket med:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "Gør F-Spot til min pauseskærm"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Konfiguration af pauseskærm"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-Spot fotohåndtering"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Organisér, nyd og del dine fotos"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Fotohåndtering"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Importér til F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-Spot fotofremviser"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Fotofremviser"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
msgstr "Fil ikke fundet"
-#: ../libfspot/f-jpeg-utils.c:464
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr "Ukendt omdannelsestype %d"
-#: ../libfspot/f-jpeg-utils.c:472
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
msgstr "Handlingen mislykkedes"
@@ -388,16 +1375,10 @@ msgstr "Forhåndsvisning"
msgid "Path"
msgstr "Sti"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:73
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
msgid "File"
msgstr "Fil"
-#: ../src/CameraFileSelectionDialog.cs:82
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1234
-msgid "Index"
-msgstr "Indeks"
-
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
msgstr "Vælg mærke"
@@ -411,12 +1392,6 @@ msgstr "Henter miniaturebilleder"
msgid "Downloading Preview of {0}"
msgstr "Henter miniaturebillede af {0}"
-#: ../src/CameraFileSelectionDialog.cs:199
-#: ../extensions/Exporters/CDExport/CDExport.cs:246
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
-msgid "Transferring Pictures"
-msgstr "Overfører billeder"
-
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
@@ -427,19 +1402,19 @@ msgid "Error transferring file"
msgstr "Fejl ved filoverførsel"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Færdig med at kopiere filer"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Hentning fuldført"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Færdig med at kopiere filer"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "Overfører \"{0}\" fra kamera"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Kamera"
@@ -447,12 +1422,12 @@ msgstr "Kamera"
msgid "Port"
msgstr "Port"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:265
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Ingen fotos svarende til {0} fundet"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:266
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -463,11 +1438,11 @@ msgstr ""
"tilføje mærket til nogle fotos eller vælg et andet mærke\n"
"i F-Spot-indstillingsvinduet."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:270
msgid "Search returned no results"
msgstr "Søgning fandt ingen resultater"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:271
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -494,19 +1469,19 @@ msgid_plural "Modified ({0})"
msgstr[0] "Ændret"
msgstr[1] "({0}) ændret"
-#: ../src/Core/Photo.cs:516
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Ændret i {1}"
-#: ../src/Core/Photo.cs:516
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Ændret i {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:91
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
msgid "Original"
msgstr "Original"
@@ -582,14 +1557,32 @@ msgstr "Vælg øjnene du ønsker at reparere."
msgid "Sepia Tone"
msgstr "Sepia-farvetone"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Blødt fokus"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Ret op"
+#: ../src/FileImportBackend.cs:288
+msgid "Import error"
+msgstr "Importfejl"
+
+#: ../src/FileImportBackend.cs:289
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Fejl ved import af {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Ingen måde at gemme filer af typen \"{0}\" på"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Uhåndterbar undtagelse"
+
#: ../src/FSpot.addin.xml.h:1
msgid "Copy Photo Locat_ion"
msgstr "Kopiér billedplacer_ing"
@@ -602,17 +1595,17 @@ msgstr "Eksportér til"
msgid "Open _With"
msgstr "Åbn _med"
-#: ../src/FSpot.addin.xml.h:4 ../src/f-spot.glade.h:100
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
msgstr "F_jern mærke"
-#: ../src/FSpot.addin.xml.h:5 ../src/SingleView.cs:451
-#: ../src/f-spot.glade.h:102
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
+#: ../src/SingleView.cs:438 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Rotér til _venstre"
-#: ../src/FSpot.addin.xml.h:6 ../src/SingleView.cs:452
-#: ../src/f-spot.glade.h:103
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:439 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Rotér til _højre"
@@ -620,40 +1613,454 @@ msgstr "Rotér til _højre"
msgid "Tools"
msgstr "Værktøjer"
-#: ../src/FSpot.addin.xml.h:8 ../src/f-spot.glade.h:137
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "_Vedhæft mærke"
-#: ../src/FSpot.addin.xml.h:9 ../src/f-spot.glade.h:148
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
msgstr "Slet fra _disk"
-#: ../src/FSpot.addin.xml.h:10 ../src/f-spot.glade.h:180
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
msgstr "_Fjern fra katalog"
-#: ../src/FileImportBackend.cs:285
-msgid "Import error"
-msgstr "Importfejl"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:286
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr "Fejl ved import af {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
-#: ../src/FileImportBackend.cs:287 ../src/UI.Dialog/ThreadProgressDialog.cs:51
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-msgid "Skip"
-msgstr "Spring over"
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
-#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "Ingen måde at gemme filer af typen \"{0}\" på"
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
-#: ../src/FormClient.cs:295
-msgid "Unhandled exception"
-msgstr "Uhåndterbar undtagelse"
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>_Rettelser</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Billedinterpolation</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Størrelse</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Sammendrag</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Gennemsigtige dele</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Vis alle importerede billeder</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>_Hvidbalance</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr ""
+"<small><i>Aktivér dette for at tillade interpolation på zoomede billeder. Du "
+"bør ikke deaktivere dette for visning af fotos, men deaktivering af "
+"interpolationen kan være nyttigt i ikondesign.</i></small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>Du kan vælge, hvordan gennemsigtige dele i billeder skal vises. "
+"Dette tilvalg har ingen effekt på fotos, men opsætning som ternet mønster "
+"eller valgfri farve kan være nyttigt ved visning af ikoner og andet "
+"kunstnerisk materiale med gennemsigtige områder.</i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "Som _baggrund"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "Som _brugerdefineret farve: "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "Som _ternet mønster"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Vedhæft mærker:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Vedhæft mærke:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "Cd"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "K_ontrast:"
+
+#: ../src/f-spot.glade.h:31
+msgid "Camera Selection"
+msgstr "Kameravalg"
+
+#: ../src/f-spot.glade.h:32
+msgid "Copy files to the Photos folder"
+msgstr "Kopiér filer til fotomappen"
+
+# Ja, der er tale om e-post
+#: ../src/f-spot.glade.h:33
+msgid "Create Mail"
+msgstr "Opret e-brev"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create _icon for this tag when first used"
+msgstr "Opret _ikon når dette mærke anvendes første gang"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "Opret et e-brev med de valgte fotos (eventuelt formindsket) vedhæftet"
+
+#: ../src/f-spot.glade.h:36
+msgid "Detect duplicates"
+msgstr "Opdag kopier"
+
+#: ../src/f-spot.glade.h:37
+msgid "Display File _Names"
+msgstr "Vis fil_navne"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "Vis kun de billeder der blev importeret i angivne ruller."
+
+#: ../src/f-spot.glade.h:39
+msgid "Do not send a mail"
+msgstr "Send ikke et e-brev"
+
+#: ../src/f-spot.glade.h:40
+msgid "E-_Mail:"
+msgstr "E-_post:"
+
+#: ../src/f-spot.glade.h:41
+msgid "E_xport titles and comments"
+msgstr "_Eksportér titler og kommentarer"
+
+#: ../src/f-spot.glade.h:42
+msgid "Estimated new size"
+msgstr "Anslået ny størrelse"
+
+#: ../src/f-spot.glade.h:44
+msgid "Extra large"
+msgstr "Ekstra stor"
+
+#: ../src/f-spot.glade.h:45
+msgid "F-Spot View"
+msgstr "F-Spot-visning"
+
+#: ../src/f-spot.glade.h:47
+msgid "Filter on selected rolls"
+msgstr "Filtrér på valgte ruller"
+
+#: ../src/f-spot.glade.h:48
+msgid "G_allery:"
+msgstr "G_alleri:"
+
+#: ../src/f-spot.glade.h:49
+msgid "Gallery"
+msgstr "Galleri"
+
+#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Importér"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:52
+msgid "Import Source:"
+msgstr "Importkilde:"
+
+#: ../src/f-spot.glade.h:53
+msgid "Include subfolders"
+msgstr "Inkludér undermapper"
+
+#: ../src/f-spot.glade.h:54
+msgid "Large"
+msgstr "Stor"
+
+#: ../src/f-spot.glade.h:55
+msgid "Manage your custom selection ratios"
+msgstr "Håndtér dine tilpassede markeringsforhold"
+
+#: ../src/f-spot.glade.h:56
+msgid "Medium"
+msgstr "Middel"
+
+#: ../src/f-spot.glade.h:58
+msgid "Number of photos in selected rolls:"
+msgstr "Antal fotos i valgte ruller:"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of pictures"
+msgstr "Antal billeder"
+
+#: ../src/f-spot.glade.h:60
+msgid "Open _Folder..."
+msgstr "Åbn _mappe..."
+
+#: ../src/f-spot.glade.h:62
+msgid "Original size (possible very large file size)"
+msgstr "Original størrelse (muligvis meget stor filstørrelse)"
+
+#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "Over_ordnet mærke:"
+
+#: ../src/f-spot.glade.h:64
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/f-spot.glade.h:65
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../src/f-spot.glade.h:67
+msgid "Repair"
+msgstr "Reparér"
+
+#: ../src/f-spot.glade.h:70
+msgid "Select Photos to Copy From Camera..."
+msgstr "Vælg fotos som skal kopieres fra kamera..."
+
+#: ../src/f-spot.glade.h:71
+msgid "Select a Tag..."
+msgstr "Vælg et mærke..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select the camera from which you want to transfer files"
+msgstr "Vælg kameraet du vil overføre filer fra"
+
+#: ../src/f-spot.glade.h:73
+msgid "Selected Camera: "
+msgstr "Valgt kamera: "
+
+#: ../src/f-spot.glade.h:74
+msgid "Selection Constraints"
+msgstr "Begrænsninger for udvalg"
+
+#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "Anvend som _baggrund"
+
+#: ../src/f-spot.glade.h:76
+msgid "Show all photos."
+msgstr "Vis alle fotos."
+
+#: ../src/f-spot.glade.h:77
+msgid "Show or hide the side pane"
+msgstr "Vis eller skjul sidepanel"
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the toolbar"
+msgstr "Vis eller skjul værktøjslinjen"
+
+#: ../src/f-spot.glade.h:79
+msgid "Side _pane"
+msgstr "Side_panel"
+
+#: ../src/f-spot.glade.h:80
+msgid "Small"
+msgstr "Lille"
+
+#: ../src/f-spot.glade.h:81
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"Angiv om et billede i original størrelse skal roteres eller ej. Mindre "
+"størrelser bliver automatisk roteret."
+
+#: ../src/f-spot.glade.h:82
+msgid "Strip image _metadata"
+msgstr "Fjern _metadata for billede"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:84
+msgid "Te_mp:"
+msgstr "Te_mperatur:"
+
+#: ../src/f-spot.glade.h:85
+msgid "Tiny"
+msgstr "Meget lille"
+
+#: ../src/f-spot.glade.h:86
+msgid "Total original size"
+msgstr "Total original størrelse"
+
+#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "Zoom _ind"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "Zoom _ud"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Zoom ind"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Zoom ud"
+
+#: ../src/f-spot.glade.h:91
+msgid "_Brightness:"
+msgstr "_Lysstyrke:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_Opret e-brev"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "_Redigér"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "_Eksponering:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "_Fuldskærm"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Galleri"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "_Hjælp"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "_Farvetone:"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "_Interpolér billede ved zoom"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Nyt vindue"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "_Åbn albummet i browser når overførslen er færdig"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "_Åbn målet når eksport er fuldført"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Foto"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "_Mætning:"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "_Skalér ikke billeder til større end: "
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "_Diasshow"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "_Fjern metadata"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "_Mærkenavn:"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "_Nuance:"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "_Værktøjslinje"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "_Vis"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "_Virtuelt filsystem"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "og"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"på\n"
+"efter\n"
+"mellem"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
#: ../src/FullScreenView.cs:58
msgid "Hide"
@@ -667,7 +2074,7 @@ msgstr "Skjul værktøjslinje"
msgid "Info"
msgstr "Information"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Information om billede"
@@ -675,8 +2082,8 @@ msgstr "Information om billede"
msgid "Exit fullscreen"
msgstr "Forlad fuldskærm"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:319
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Diasshow"
@@ -688,60 +2095,16 @@ msgstr "Start diasshow"
msgid "Slide transition:"
msgstr "Diasovergang:"
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "Opløs"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "Vend"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "Overdæk"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "Afsløre"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "Udvisk"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "Del"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "Skub"
-
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "Flere datoer"
-#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "Flere mapper"
-
# evt. mere?
-#: ../src/GroupSelector.cs:63 ../src/GroupSelector.cs:64
+#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
msgid "More"
msgstr "Flere"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "Arrangér efter _måned"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "Arrangér efter m_appe"
-
-#: ../src/GroupSelector.cs:523 ../src/f-spot.glade.h:184
-msgid "_Reverse Order"
-msgstr "_Omvendt rækkefølge"
-
-#: ../src/GroupSelector.cs:529 ../src/f-spot.glade.h:140
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "_Ryd datointerval"
@@ -770,7 +2133,7 @@ msgstr "InterOperability-mappe"
msgid "Unknown Directory"
msgstr "Ukendt mappe"
-#: ../src/Imaging/ImageFile.cs:91
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Skrivning til dette filformat understøttes ikke"
@@ -908,7 +2271,7 @@ msgstr "Objektets intellektuelle genre"
msgid "Unknown IIM DataSet"
msgstr "Ukendt IIM-datasæt"
-#: ../src/ImportCommand.cs:47 ../src/SingleView.cs:357
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Vælg mappe"
@@ -925,16 +2288,11 @@ msgstr "Indlæser {0} af {1}"
msgid "Done Loading"
msgstr "Indlæsning udført"
-#: ../src/ImportCommand.cs:540 ../src/MainWindow.cs:279
-#: ../src/f-spot.glade.h:78
-msgid "Import"
-msgstr "Importér"
-
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "Mappen findes ikke."
-#: ../src/ImportCommand.cs:671
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
@@ -942,12 +2300,12 @@ msgid ""
msgstr "Mappen du valgte, \"{0}\", findes ikke. Vælg venligst en anden mappe"
#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:724 ../src/ImportCommand.cs:726
+#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
#: ../src/XmpTagsImporter.cs:89
msgid "Import Tags"
msgstr "Importmærker"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:286 ../src/SingleView.cs:86
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Rotér til venstre"
@@ -955,7 +2313,7 @@ msgstr "Rotér til venstre"
msgid "Rotate picture left"
msgstr "Rotér billede til venstre"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:290 ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Rotér til højre"
@@ -963,113 +2321,59 @@ msgstr "Rotér til højre"
msgid "Rotate picture right"
msgstr "Rotér billede til højre"
-#: ../src/ItemAction.cs:102 ../src/f-spot.glade.h:86
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:999
-msgid "Next"
-msgstr "Næste"
-
#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "Næste billede"
-#: ../src/ItemAction.cs:123 ../src/f-spot.glade.h:98
-msgid "Previous"
-msgstr "Forrige"
-
#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "Forrige billede"
-#: ../src/Loupe.cs:62
-msgid "Error saving sharpened photo"
-msgstr "Fejl ved gemning af skærpet foto"
-
-#: ../src/Loupe.cs:63 ../src/PhotoView.cs:164
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "Undtagelsen \"{0}\" blev modtaget. Kunne ikke gemme foto {1}"
-
-#: ../src/Loupe.cs:92
-msgid "Sharpen"
-msgstr "Skærp"
-
-#: ../src/Loupe.cs:102
-msgid "Amount:"
-msgstr "Mængde:"
-
-#: ../src/Loupe.cs:103
-msgid "Radius:"
-msgstr "Radius:"
-
-#: ../src/Loupe.cs:104
-msgid "Threshold:"
-msgstr "Grænseværdi:"
-
-#: ../src/MainWindow.cs:281
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importér nye billeder"
-#: ../src/MainWindow.cs:297 ../src/f-spot.glade.h:46
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Gennemse"
-#: ../src/MainWindow.cs:301
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Gennemse mange fotos samtidigt"
-#: ../src/MainWindow.cs:305
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Redigér billede"
-#: ../src/MainWindow.cs:309
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Vis og redigér et foto"
-#: ../src/MainWindow.cs:314 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Fuldskærm"
-#: ../src/MainWindow.cs:316 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Vis fotos på hele skærmen"
-#: ../src/MainWindow.cs:321 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Vis fotos i et diasshow"
-#: ../src/MainWindow.cs:336
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Forrige foto"
-#: ../src/MainWindow.cs:341
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Næste foto"
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/MainWindow.cs:354 ../src/Widgets/Sidebar.cs:73
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1168
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1208
-msgid "Tags"
-msgstr "Mærker"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/MainWindow.cs:662 ../src/UI.Dialog/AdjustTimeDialog.cs:135
-#: ../src/UI.Dialog/ProgressDialog.cs:92
-#: ../extensions/Exporters/CDExport/CDExport.cs:164
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:783
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} af {1}"
-
-#: ../src/MainWindow.cs:1673
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Ingen kameraer fundet."
-#: ../src/MainWindow.cs:1674
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -1077,24 +2381,24 @@ msgstr ""
"F-Spot kunne ikke finde nogle tilsluttede kameraer på dette system. "
"Kontrollér at kameraet er tilsluttet og har strøm"
-#: ../src/MainWindow.cs:1713
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Fejl ved tilslutning til kamera"
-#: ../src/MainWindow.cs:1714
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Modtog fejl \"{0} ved tilslutning til kamera"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:2053
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Sammenføj det markerede mærke"
msgstr[1] "Sammenføj de {0} markerede mærker?"
-#: ../src/MainWindow.cs:2080
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -1102,77 +2406,77 @@ msgstr ""
"Denne handling vil sammenføje de valgte mærker og alle undermærker til et "
"enkelt mærke."
-#: ../src/MainWindow.cs:2082
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "Sammenføj _mærker"
-#: ../src/MainWindow.cs:2287
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} foto ud af {1}"
msgstr[1] "{0} fotos ud af {1}"
-#: ../src/MainWindow.cs:2289 ../src/SingleView.cs:494
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:480
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} foto"
msgstr[1] "{0} fotos"
-#: ../src/MainWindow.cs:2292
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} valgt)"
msgstr[1] " ({0} valgte)"
-#: ../src/MainWindow.cs:2373
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_O.k."
-#: ../src/MainWindow.cs:2374
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Fejl ved sletning af billede"
-#: ../src/MainWindow.cs:2379
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Ingen rettigheder til at slette filen:{1}{0}"
-#: ../src/MainWindow.cs:2383
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "En fejl af typen {0} opstod ved sletning af filen:{2}{1}"
-#: ../src/MainWindow.cs:2415
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Slet det markerede foto permanent?"
msgstr[1] "Slet de {0} markerede fotos permanent?"
-#: ../src/MainWindow.cs:2419
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
msgstr[0] "Dette sletter alle versioner af det markerede foto fra din disk."
msgstr[1] "Dette sletter alle versioner af de markerede fotos fra din disk."
-#: ../src/MainWindow.cs:2422
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Slet foto"
msgstr[1] "_Slet fotos"
-#: ../src/MainWindow.cs:2458
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Fjern det markerede foto fra F-Spot?"
msgstr[1] "Fjern de {0} markerede fotos fra F-Spot?"
-#: ../src/MainWindow.cs:2463
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -1181,27 +2485,27 @@ msgstr ""
"Hvis du fjerner fotos fra F-Spot-samlingen, vil alle mærkeinformationer gå "
"tabt. Fotoene vil blive på din maskine og kan importeres i F-Spot igen."
-#: ../src/MainWindow.cs:2464
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Fjern fra samling"
-#: ../src/MainWindow.cs:2527
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Slet mærke \"{0}\"?"
-#: ../src/MainWindow.cs:2529
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Slet de {0} markerede mærker?"
-#: ../src/MainWindow.cs:2534
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "foto"
msgstr[1] "fotos"
-#: ../src/MainWindow.cs:2536
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -1210,18 +2514,18 @@ msgstr[0] "Hvis du sletter dette mærke, vil tilknytningen til {0} {1} gå tabt.
msgstr[1] ""
"Hvis du sletter disse mærker, vil tilknytningen til {0} {1} gå tabt."
-#: ../src/MainWindow.cs:2541
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Slet mærke"
msgstr[1] "_Slet mærker"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2555
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Mærke er ikke tomt"
-#: ../src/MainWindow.cs:2556
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -1230,39 +2534,39 @@ msgstr ""
"Kan ikke slette mærker, som har mærker indeni. Vær venlig at slette mærker "
"under \"{0}\" først"
-#: ../src/MainWindow.cs:2994
+#: ../src/MainWindow.cs:2781
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Rotér det valgte foto til venstre"
msgstr[1] "Rotér de valgte fotos til venstre"
-#: ../src/MainWindow.cs:3007
+#: ../src/MainWindow.cs:2794
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Rotér det valgte foto til højre"
msgstr[1] "Rotér de valgte fotos til højre"
-#: ../src/MainWindow.cs:3015
+#: ../src/MainWindow.cs:2805
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Find _valgt mærke"
msgstr[1] "Find _valgte mærker"
-#: ../src/MainWindow.cs:3019
+#: ../src/MainWindow.cs:2809
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Find valgt mærke _med"
msgstr[1] "Find valgte mærker _med"
-#: ../src/MainWindow.cs:3057
+#: ../src/MainWindow.cs:2850
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Opret ny version?"
msgstr[1] "Opret nye versioner?"
-#: ../src/MainWindow.cs:3059
+#: ../src/MainWindow.cs:2852
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -1277,116 +2581,122 @@ msgstr[1] ""
"Før opstart af {1}, skal F-Spot da oprette nye versioner af de valgte fotos "
"for at bevare originalerne?"
-#: ../src/MainWindow.cs:3081
+#: ../src/MainWindow.cs:2874
msgid "XCF version"
msgstr "XCF-version"
-#: ../src/MetadataStore.cs:18
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "Skaber"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "Titel"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "Ophavsret"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "Emne og nøgleord"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "Komprimering"
-#: ../src/MetadataStore.cs:24
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Planær konfiguration"
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientering"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Fotometrisk fortolkning"
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Opløsningsenhed"
-#: ../src/MetadataStore.cs:32
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Eksponeringsprogram"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Metertilstand"
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Eksponeringstilstand"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Tilpasset gengivelse"
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Komponentkonfiguration"
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Lyskilde"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Sensormetode"
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Farverum"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Hvidbalance"
# På dansk hedder det fokal plan. Kilde:
# http://www.nordisk-forum.dk/misc/lidt_om_moa_og_mil_dot.pdf
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Enhed for opløsning i fokalplan"
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Filkildetype"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Fanget scenetype"
# Jeg fandt disse forklaringer på gain:
# http://photo.net/nikon-camera-forum/00Nc3i
# Hvis der er nogen, der har et godt bud på et dansk ord er de meget velkomne.
-#: ../src/MetadataStore.cs:56
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Forstærkelseskontrol"
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Mætning"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Skarphed"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Scenetype"
@@ -1456,92 +2766,99 @@ msgstr "Kunne ikke omdøbe en version"
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Undtagelse \"{0}\" modtaget. Kunne ikke omdøbe version til \"{1}\""
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:549
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Ingen redigeringer)"
-#: ../src/PhotoView.cs:163 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Fejl ved fotoredigering"
-#: ../src/PhotoView.cs:301
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "Undtagelsen \"{0}\" blev modtaget. Kunne ikke gemme foto {1}"
+
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Kommentar:"
-#: ../src/Preferences.cs:148
+#: ../src/Preferences.cs:149
msgid "Photos"
msgstr "Fotos"
-#: ../src/PrintOperation.cs:31
+#: ../src/PrintOperation.cs:32
msgid "Image Settings"
msgstr "Billedopsætning"
-#: ../src/QueryWidget.cs:47
+#: ../src/QueryWidget.cs:58
msgid "Find: "
msgstr "Find: "
-#: ../src/QueryWidget.cs:52
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "Umærkede fotos"
-#: ../src/QueryWidget.cs:60
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "Vurderede fotos"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:69
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
msgstr "Importrulle"
-#: ../src/QueryWidget.cs:89
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "Nulstil søgning"
-#: ../src/QueryWidget.cs:96
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "Genopfrisk søgning"
-#: ../src/QueryWidget.cs:98
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "Ingen matchende fotos fundet"
-#: ../src/QueryWidget.cs:136
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "Skjul _søgepanel"
-#: ../src/QueryWidget.cs:142
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "Vis _søgepanel"
-#: ../src/RotateCommand.cs:94 ../src/RotateCommand.cs:109
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
msgid "Unable to rotate this type of photo"
msgstr "Kan ikke rotere foto af denne type"
-#: ../src/RotateCommand.cs:129
+#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
msgstr "Kan ikke rotere skrivebeskyttet fil"
-#: ../src/RotateCommand.cs:196
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
msgstr "Roterer fotos"
-#: ../src/RotateCommand.cs:207
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
msgstr "Roterer foto \"{0}\""
-#: ../src/RotateCommand.cs:220
+#: ../src/RotateCommand.cs:222
msgid "Directory not found"
msgstr "Mappe blev ikke fundet"
-#: ../src/RotateCommand.cs:240
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
msgstr[0] "Kan ikke rotere foto"
msgstr[1] "Kan ikke rotere {0} fotos"
-#: ../src/RotateCommand.cs:242
+#: ../src/RotateCommand.cs:244
#, csharp-format
msgid ""
"The photo could not be rotated because it is on a read only file system or "
@@ -1558,121 +2875,91 @@ msgstr[1] ""
"filsystem eller et medie såsom en cd-rom. Kontrollér venligst dine "
"skriverettigheder og prøv igen."
-#: ../src/RotateCommand.cs:269
+#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
msgstr "Modtog fejl \"{0} ved forsøg på at rotere {1}"
-#: ../src/RotateCommand.cs:274
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
msgstr "Fejl ved rotering af foto."
-#: ../src/SendEmail.cs:239
+#: ../src/SendEmail.cs:240
msgid "Preparing email"
msgstr "Forbereder e-post"
-#: ../src/SendEmail.cs:291
+#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
msgstr "Eksporterer billede \"{0}\""
-#: ../src/SendEmail.cs:313
+#: ../src/SendEmail.cs:314
msgid "Error processing image"
msgstr "Fejl ved billedbehandling"
-#: ../src/SendEmail.cs:314
+#: ../src/SendEmail.cs:315
#, csharp-format
msgid "An error occured while processing \"{0}\": {1}"
msgstr "Der opstod en fejl ved behandling af \"{0}\": {1}"
#. Send the mail :)
-#: ../src/SendEmail.cs:329
+#: ../src/SendEmail.cs:330
msgid "my photos"
msgstr "mine fotos"
-#: ../src/SingleView.cs:88
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Fejl ved gemning af skærpet foto"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Skærp"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Mængde:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Radius:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Grænseværdi:"
+
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Rotér foto til venstre"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Rotér foto til højre"
-#. Obsolete, remove after db rev4
-#: ../src/SingleView.cs:128 ../src/UI.Dialog/ui/PreferenceDialog.glade.h:14
-#: ../src/Widgets/MetadataDisplay.cs:221 ../src/Widgets/MetadataDisplay.cs:223
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Mappe"
-#: ../src/SingleView.cs:354
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Åben"
-#: ../src/SingleView.cs:454
+#: ../src/SingleView.cs:441
msgid "Set as Background"
msgstr "Benyt som baggrund"
-#: ../src/TagCommands.cs:91 ../src/TagCommands.cs:219
-#: ../src/TagSelectionWidget.cs:506
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "Dette navn er allerede i brug"
-#: ../src/TagCommands.cs:138
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "Opret nyt mærke"
-#: ../src/TagCommands.cs:139
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "Nye mærkes navn:"
-#: ../src/TagCommands.cs:285
-msgid "Edit Tag"
-msgstr "Redigér mærke"
-
-#: ../src/TagCommands.cs:286
-msgid "Tag Name:"
-msgstr "Mærkenavn:"
-
-#: ../src/TagCommands.cs:402
-msgid "Unable to load image"
-msgstr "Kunne ikke indlæse billede"
-
-#: ../src/TagCommands.cs:403
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "Kan ikke indlæse \"{0}\" som ikon for mærket"
-
-#: ../src/TagCommands.cs:447
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "Foto {0} af {1}"
-
-#: ../src/TagCommands.cs:477
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "Redigér ikon for mærke {0}"
-
-#: ../src/TagCommands.cs:493
-msgid "Select Photo from file"
-msgstr "Vælg foto fra fil"
-
-#: ../src/TagCommands.cs:516
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-"\n"
-"<b>Fra foto</b>\n"
-"Du kan bruge et af dine billeder fra samlingen som et ikon\n"
-"for dette mærke. Du skal dog mindst have ét foto, der er tilknyttet\n"
-" dette mærke. Mærk et foto som \"{0}\" og vend tilbage hertil for at\n"
-" bruge det som et ikon."
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
@@ -1710,66 +2997,66 @@ msgstr[1] "Fjern mærker fra markering"
msgid "Merge Tags"
msgstr "Sammenføj mærker"
-#: ../src/TagQueryWidget.cs:32
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr "Inkludér fotos mærket \"{0}\""
-#: ../src/TagQueryWidget.cs:37
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr "Udeluk fotos mærket \"{0}\""
-#: ../src/TagQueryWidget.cs:42
+#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
msgstr "Fjern fra søgning"
-#: ../src/TagQueryWidget.cs:86
+#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
msgstr[0] "Find _med"
msgstr[1] "Find _med"
-#: ../src/TagQueryWidget.cs:112
+#: ../src/TagQueryWidget.cs:114
msgid "All"
msgstr "Alle"
-#: ../src/TagQueryWidget.cs:147 ../src/Term.cs:592
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "Ikke {0}"
-#: ../src/TagQueryWidget.cs:277
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr "Træk mærker hertil for at søge efter dem"
-#: ../src/TagSelectionWidget.cs:505
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "Fejl ved omdøbning af mærke"
-#: ../src/TagStore.cs:198
+#: ../src/TagStore.cs:203
msgid "Favorites"
msgstr "Favoritter"
-#: ../src/TagStore.cs:203
+#: ../src/TagStore.cs:208
msgid "Hidden"
msgstr "Skjulte"
-#: ../src/TagStore.cs:211
+#: ../src/TagStore.cs:216
msgid "People"
msgstr "Mennesker"
-#: ../src/TagStore.cs:216
+#: ../src/TagStore.cs:221
msgid "Places"
msgstr "Steder"
-#: ../src/TagStore.cs:221
+#: ../src/TagStore.cs:226
msgid "Events"
msgstr "Begivenheder"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:234 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Ingen)"
@@ -1788,78 +3075,125 @@ msgstr " eller "
#. OPS The operators we support, case insensitive
#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:380 ../src/Widgets/FindBar.cs:177
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "eller"
-#: ../src/UI.Dialog/AboutDialog.cs:70
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Opdaterer miniaturer"
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "Opdaterer billede \"{0}\""
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Fotohåndtering til GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:71
-msgid "Copyright © 2003-2008 Novell Inc."
-msgstr "Copyright © 2003-2008 Novell Inc."
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:94
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"Martin Willemoes Hansen\n"
"Peter Bach\n"
"Mads Bille Lundby\n"
+"Jacob Ilsø Christensen\n"
"\n"
"Dansk-gruppen <dansk at dansk-gruppen.dk>\n"
"Mere info: http://www.dansk-gruppen.dk"
-#: ../src/UI.Dialog/AboutDialog.cs:99
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "F-Spot hjemmeside"
-#: ../src/UI.Dialog/AdjustTimeDialog.cs:118 ../src/f-spot.glade.h:114
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
msgid "Shift all photos by {0}"
msgstr "Skift alle fotos med {0}"
-#: ../src/UI.Dialog/DateRangeDialog.cs:102
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
msgid "Today"
msgstr "I dag"
-#: ../src/UI.Dialog/DateRangeDialog.cs:104
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
msgid "Yesterday"
msgstr "I går"
-#: ../src/UI.Dialog/DateRangeDialog.cs:106
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
msgid "Last 7 days"
msgstr "Sidste 7 dage"
-#: ../src/UI.Dialog/DateRangeDialog.cs:108
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
msgid "Last 30 days"
msgstr "Sidste 30 dage"
-#: ../src/UI.Dialog/DateRangeDialog.cs:110
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
msgid "Last 90 days"
msgstr "Sidste 90 dage"
-#: ../src/UI.Dialog/DateRangeDialog.cs:112
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
msgid "Last 360 days"
msgstr "Sidste 360 dage"
-#: ../src/UI.Dialog/DateRangeDialog.cs:114
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
msgid "Current Week (Mon-Sun)"
msgstr "Indeværende uge (man-søn)"
-#: ../src/UI.Dialog/DateRangeDialog.cs:116
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
msgid "Previous Week (Mon-Sun)"
msgstr "Forrige uge (man-søn)"
-#: ../src/UI.Dialog/DateRangeDialog.cs:132
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:11
-msgid "All Images"
-msgstr "Alle billeder"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:134
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
msgid "Customized Range"
msgstr "Tilpasset område"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Redigér ikon for mærke {0}"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "Vælg foto fra fil"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>Fra foto</b>\n"
+"Du kan bruge et af dine billeder fra samlingen som et ikon\n"
+"for dette mærke. Du skal dog mindst have ét foto, der er tilknyttet\n"
+" dette mærke. Mærk et foto som \"{0}\" og vend tilbage hertil for at\n"
+" bruge det som et ikon."
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Kunne ikke indlæse billede"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "Kan ikke indlæse \"{0}\" som ikon for mærket"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "Foto {0} af {1}"
+
#: ../src/UI.Dialog/ExceptionDialog.cs:24
msgid "F-Spot Encountered a Fatal Error"
msgstr "F-Spot oplevede en fatal fejl"
@@ -1872,6 +3206,19 @@ msgstr "Detaljeret beskrivelse af fejl"
msgid "An unhandled exception was thrown: "
msgstr "En uhåndterbar undtagelse blev kastet: "
+#: ../src/UI.Dialog/PreferenceDialog.cs:53
+#: ../src/UI.Dialog/PreferenceDialog.cs:71
+msgid "None"
+msgstr "Ingen"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:55
+msgid "System profile"
+msgstr "Systemprofil"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:84
+msgid "Standard theme"
+msgstr "Standardtema"
+
#: ../src/UI.Dialog/RepairDbDialog.cs:20
msgid "Error loading database."
msgstr "Fejl ved indlæsning af database."
@@ -1893,2197 +3240,1072 @@ msgstr "Mærkat"
msgid "Ratio"
msgstr "Forhold"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Prøv igen"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:1
-msgid "<b>Color Management</b>"
-msgstr "<b>Farvehåndtering</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:2
-msgid "<b>Import Settings</b>"
-msgstr "<b>Importindstillinger</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:3
-msgid "<b>Metadata</b>"
-msgstr "<b>Metadata</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:4
-msgid "<b>Screensaver</b>"
-msgstr "<b>Pauseskærm</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:5
-msgid "<b>Theming</b>"
-msgstr "<b>Temaer</b>"
-
-# Jeg har valgt ikke at skrive "nyligt importerede", da det henviser til datid. Newly henviser til fremtidige "nyimporterede" billeder.
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:6
-msgid ""
-"<small><i>Choose the folder where F-Spot should store newly imported photos</"
-"i></small>"
-msgstr ""
-"<small><i>Vælg mappen, hvori F-Spot skal lagre nye importerede billeder</i></"
-"small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:7
-msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr ""
-"<small><i>Aktivér dette tilvalg for at gemme mærker og beskrivelser \n"
-"inden i understøttede billedeformater.</i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:9
-msgid ""
-"<small><i>While acting as a screensaver, F-Spot can display all of your "
-"images, or a small subset based on tags.</i></small>"
-msgstr ""
-"<small><i>Ved pauseskærm kan F-Spot vise alle dine billeder, eller et lille "
-"udsnit baseret på mærker.</i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:10
-msgid ""
-"<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
-msgstr ""
-"<small><i>Du skal genstarte f-spot for at indlæse det nye tema</i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:12
-msgid "Custom Theme"
-msgstr "Tilpasset tema:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:15
-msgid "From List:"
-msgstr "Fra liste:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:16
-msgid "From gtkrc File:"
-msgstr "Fra gtkrc-fil:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:17
-msgid "Images tagged with:"
-msgstr "Billeder mærket med:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:18
-msgid "Make F-Spot your screensaver"
-msgstr "Gør F-Spot til din pauseskærm"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:19 ../src/f-spot.glade.h:97
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:20
-msgid "Select A Folder"
-msgstr "Vælg en mappe"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:21
-msgid "Select A gtkrc File"
-msgstr "Vælg en gtkrc-fil"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:22
-msgid "System Theme"
-msgstr "Systemtema"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:23
-msgid "Try to use the system display profile"
-msgstr "Forsøg at bruge systemets visningsprofil"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:24
-msgid "Write _metadata to file"
-msgstr "Skriv _metadata til fil"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:25
-msgid "_Display:"
-msgstr "_Vis:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:26
-msgid "_Print output:"
-msgstr "_Udskriv uddata:"
-
-#: ../src/Updater.cs:528
-msgid "Updating F-Spot Database"
-msgstr "Opdaterer F-Spot-database"
-
-#: ../src/Updater.cs:529
-msgid ""
-"Please wait while your F-Spot gallery's database is updated. This may take "
-"some time."
-msgstr ""
-"Vent venligst mens din F-Spot-galleridatabase opdateres. Dette kan tage et "
-"stykke tid."
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:35
-msgid "Unable to create temporary file"
-msgstr "Kan ikke oprette midlertidig fil"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
-#: ../src/Utils/GnomeUtil.cs:49
-msgid ""
-"The \"F-Spot Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"F-Spot-manualen\" blev ikke fundet. Kontrollér om din installation er "
-"blevet udført problemfrit."
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
-#: ../src/Widgets/CustomPrintWidget.cs:98
-msgid "Page Setup"
-msgstr "Sideopsætning"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Handling</b>"
-#: ../src/Widgets/CustomPrintWidget.cs:102
-#: ../src/Widgets/CustomPrintWidget.cs:106
-#: ../src/Widgets/CustomPrintWidget.cs:112
-#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr "Papirstørrelse: {0} x {1} mm"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Referencefoto</b>"
-#: ../src/Widgets/CustomPrintWidget.cs:109
-msgid "Set Page Size and Orientation"
-msgstr "Angiv sidestørrelse og orientering"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Justér tid"
-#: ../src/Widgets/CustomPrintWidget.cs:124
-msgid "Photos per page"
-msgstr "Fotos pr. side"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Justeret dato: "
-#. ppp1.Toggled += TriggerChanged;
-#. ppp2.Toggled += TriggerChanged;
-#. ppp4.Toggled += TriggerChanged;
-#. ppp9.Toggled += TriggerChanged;
-#: ../src/Widgets/CustomPrintWidget.cs:136
-msgid "Repeat"
-msgstr "Gentag"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Aktuelle dato:"
-#: ../src/Widgets/CustomPrintWidget.cs:137
-msgid "Print cut marks"
-msgstr "Udskriv udklipningsmærker"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Spred alle fotos med"
-#: ../src/Widgets/CustomPrintWidget.cs:145
-msgid "Full Page (no margin)"
-msgstr "Hel side (ingen margin)"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "forskel:"
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Widgets/CustomPrintWidget.cs:149
-msgid "Zoom"
-msgstr "Zoom"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "min. Starter ved {0}"
-#: ../src/Widgets/CustomPrintWidget.cs:150
-msgid "Fill"
-msgstr "Udfyld"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>Slutdato</b>"
-#: ../src/Widgets/CustomPrintWidget.cs:151
-msgid "Scaled"
-msgstr "Skaleret"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Vælg periode</b>"
-#: ../src/Widgets/CustomPrintWidget.cs:157
-msgid "White borders"
-msgstr "Hvide kanter"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Startdato</b>"
-#: ../src/Widgets/CustomPrintWidget.cs:161
-msgid "Custom Text: "
-msgstr "Tilpasset tekst: "
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Annullér, ændr ikke den nuværende tidslinje. "
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:71
-msgid "Edit"
-msgstr "Redigér"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Der vil kun blive vist billeder, som er taget inden for disse datoer."
-#: ../src/Widgets/EditorPage.cs:201
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:46
-msgid "No selection available"
-msgstr "Intet valgt område tilgængeligt"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Sæt datointerval"
-#: ../src/Widgets/EditorPage.cs:202
-msgid ""
-"This tool requires an active selection. Please select a region of the photo "
-"and try the operation again"
-msgstr ""
-"Dette værktøj kræver en aktiv markering. Vælg et område af fotoet og forsøg "
-"handlingen igen"
-
-#: ../src/Widgets/EditorPage.cs:220
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] "Fejl ved gemning af tilpasset foto"
-msgstr[1] "Fejl ved gemning af tilpassede fotos"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#: ../src/Widgets/EditorPage.cs:222
-#, csharp-format
-msgid ""
-"Received exception \"{0}\". Note that you have to develop RAW files into "
-"JPEG before you can edit them."
-msgstr ""
-"Undtagelse \"{0}\" modtaget. Bemærk at du skal fremkalde RAW-filer til JPEG, "
-"før du kan redigere dem."
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Redigér mærke"
-#: ../src/Widgets/FindBar.cs:58
-msgid "Find:"
-msgstr "Find:"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Redigér ikon"
-#: ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:206
-msgid "and"
-msgstr "og"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Ikon:"
-#: ../src/Widgets/InfoBox.cs:182
-msgid "Histogram"
-msgstr "Histogram"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Fra ekstern foto</b>"
-#: ../src/Widgets/InfoBox.cs:217
-msgid "Date"
-msgstr "Dato"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Fra foto</b>"
-#: ../src/Widgets/InfoBox.cs:220
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:5
-msgid "Size"
-msgstr "Størrelse"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Prædefinerede ikoner</b>"
-#: ../src/Widgets/InfoBox.cs:223
-msgid "Exposure"
-msgstr "Eksponering"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Forhåndsvisning</b>"
-#: ../src/Widgets/InfoBox.cs:227
-msgid "Focal Length"
-msgstr "Brændvidde"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Design ikon fra"
-#: ../src/Widgets/InfoBox.cs:233
-msgid "File Size"
-msgstr "Filstørrelse"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Redigér mærkeikon"
-#: ../src/Widgets/InfoBox.cs:236
-msgid "Rating"
-msgstr "Vurdering"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Intet _billede"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Ukendt)"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "Foto 0 af 0"
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr "(forkert format)"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Farveprofil til skærm:"
-#: ../src/Widgets/InfoBox.cs:558
-msgid "(File read error)"
-msgstr "(Fejl ved læsning af fil)"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Farveprofil til udskrivning:"
-#: ../src/Widgets/InfoBox.cs:603
-#, csharp-format
-msgid "{0} Photos"
-msgstr "{0} fotos"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "F-Spot-indstillinger"
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:623
-#, csharp-format
-msgid ""
-"On {0} between \n"
-"{1} and {2}"
-msgstr ""
-"{0} mellem \n"
-"{1} og {2}"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-Spot-udseende:"
-#: ../src/Widgets/InfoBox.cs:628
-#, csharp-format
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
-"Between {0} \n"
-"and {1}"
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
-"Mellem {0} \n"
-"og {1}"
-
-#: ../src/Widgets/InfoBox.cs:655
-msgid "(At least one File not found)"
-msgstr "(Mindst én fil ikke fundet)"
+"I billedfilerne når det er muligt\n"
+"<small>Gør dem tilgængelige for andre billedredigeringsprogrammer.</small>"
-#: ../src/Widgets/InfoBox.cs:772
-msgid "Show Photo Name"
-msgstr "Vis fotonavn"
-
-#: ../src/Widgets/InfoBox.cs:781
-msgid "Show Date"
-msgstr "Vis dato"
-
-#: ../src/Widgets/InfoBox.cs:790
-msgid "Show Size"
-msgstr "Vis størrelse"
-
-#: ../src/Widgets/InfoBox.cs:799
-msgid "Show Exposure"
-msgstr "Vis eksponering"
-
-#: ../src/Widgets/InfoBox.cs:808
-msgid "Show Focal Length"
-msgstr "Vis brændvidde"
-
-#: ../src/Widgets/InfoBox.cs:817
-msgid "Show Camera"
-msgstr "Vis kamera"
-
-#: ../src/Widgets/InfoBox.cs:826
-msgid "Show File Size"
-msgstr "Vis filstørrelse"
-
-#: ../src/Widgets/MetadataDisplay.cs:23
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ../src/Widgets/MetadataDisplay.cs:104
-msgid "Extended Metadata"
-msgstr "Udvidet metadata"
-
-#: ../src/Widgets/MetadataDisplay.cs:225
-msgid "Picasaweb"
-msgstr "Picasaweb"
-
-#: ../src/Widgets/MetadataDisplay.cs:227
-msgid "SmugMug"
-msgstr "SmugMug"
-
-#: ../src/Widgets/MetadataDisplay.cs:229
-msgid "Gallery2"
-msgstr "Galleri2"
-
-#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:389
-msgid "No Extended Metadata Available"
-msgstr "Ingen udvidede metadata tilgængelige"
-
-#: ../src/Widgets/MetadataDisplay.cs:407
-msgid "No active photo"
-msgstr "Intet aktivt foto"
-
-#: ../src/Widgets/MetadataDisplay.cs:409
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "Fotoet \"{0}\" findes ikke"
-
-#: ../src/Widgets/MetadataDisplay.cs:412
-msgid "No metadata available"
-msgstr "Ingen metadata tilgængelige"
-
-#: ../src/Widgets/OpenWithMenu.cs:69
-msgid "No applications available"
-msgstr "Ingen programmer tilgængelige"
-
-#: ../src/Widgets/RatingMenuItem.cs:56
-msgid "Rating:"
-msgstr "Vurdering:"
-
-#: ../src/XmpTagsImporter.cs:90
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:6
-msgid "Location"
-msgstr "Placering"
-
-#: ../src/XmpTagsImporter.cs:91
-msgid "Country"
-msgstr "Land"
-
-#: ../src/XmpTagsImporter.cs:92
-msgid "City"
-msgstr "By"
-
-#: ../src/XmpTagsImporter.cs:93
-msgid "State"
-msgstr "Stat"
-
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/f-spot.glade.h:2
-msgid "0000:00:00 00:00:00"
-msgstr "0000:00:00 00:00:00"
-
-#: ../src/f-spot.glade.h:3
-msgid "00:00:00"
-msgstr "00:00:00"
-
-#: ../src/f-spot.glade.h:4
-msgid "1 of 1"
-msgstr "1 af 1"
-
-#: ../src/f-spot.glade.h:5
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/f-spot.glade.h:6
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/f-spot.glade.h:7
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/f-spot.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../src/f-spot.glade.h:9
-msgid "640 px"
-msgstr "640 px"
-
-#: ../src/f-spot.glade.h:10
-msgid "800 px"
-msgstr "800 px"
-
-#: ../src/f-spot.glade.h:11
-msgid "<b></b>"
-msgstr "<b></b>"
-
-#: ../src/f-spot.glade.h:12
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>Konto</b>"
-
-#: ../src/f-spot.glade.h:13
-msgid "<b>Action</b>"
-msgstr "<b>Handling</b>"
-
-#: ../src/f-spot.glade.h:14
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>Album</b>"
-
-#: ../src/f-spot.glade.h:15
-msgid "<b>Co_rrections</b>"
-msgstr "<b>_Rettelser</b>"
-
-#: ../src/f-spot.glade.h:16
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>Mål</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Vælg en mappe"
-#: ../src/f-spot.glade.h:17
-msgid "<b>From External Photo</b>"
-msgstr "<b>Fra ekstern foto</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "Adskilt fra billedfilerne"
-#: ../src/f-spot.glade.h:18
-msgid "<b>From Photo</b>"
-msgstr "<b>Fra foto</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Gem fotomærker og -beskrivelser:"
-#: ../src/f-spot.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>Galleri</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "Kopiér fotos hertil ved importering:"
-#: ../src/f-spot.glade.h:20
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>Billedinterpolation</b>"
-
-#: ../src/f-spot.glade.h:21
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
msgid "<b>Max Rating</b>"
msgstr "<b>Maks. vurdering</b>"
-#: ../src/f-spot.glade.h:22
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
msgid "<b>Min Rating</b>"
msgstr "<b>Min. vurdering</b>"
-#: ../src/f-spot.glade.h:23
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
-msgid "<b>Photos</b>"
-msgstr "<b>Fotos</b>"
-
-#: ../src/f-spot.glade.h:24
-msgid "<b>Predefined</b>"
-msgstr "<b>Prædefineret</b>"
-
-#: ../src/f-spot.glade.h:25
-msgid "<b>Preview</b>"
-msgstr "<b>Forhåndsvisning</b>"
-
-#: ../src/f-spot.glade.h:26
-msgid "<b>Reference Photo</b>"
-msgstr "<b>Referencefoto</b>"
-
-#: ../src/f-spot.glade.h:27
-msgid "<b>Size</b>"
-msgstr "<b>Størrelse</b>"
-
-#: ../src/f-spot.glade.h:28
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>Stil</b>"
-
-#: ../src/f-spot.glade.h:29
-msgid "<b>Summary</b>"
-msgstr "<b>Sammendrag</b>"
-
-#: ../src/f-spot.glade.h:30
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>Gennemsigtige dele</b>"
-
-#: ../src/f-spot.glade.h:31
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>Vis alle importerede billeder</b>"
-
-#: ../src/f-spot.glade.h:32
-msgid "<b>_White Balance</b>"
-msgstr "<b>_Hvidbalance</b>"
-
-#: ../src/f-spot.glade.h:33
-msgid "<small></small>"
-msgstr "<small></small>"
-
-#: ../src/f-spot.glade.h:34
-msgid ""
-"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
-"disable this for viewing photos, but disabling the interpolation could be "
-"usefull in icon design.</i></small>"
-msgstr ""
-"<small><i>Aktivér dette for at tillade interpolation på zoomede billeder. Du "
-"bør ikke deaktivere dette for visning af fotos, men deaktivering af "
-"interpolationen kan være nyttigt i ikondesign.</i></small>"
-
-#: ../src/f-spot.glade.h:35
-msgid ""
-"<small><i>You can choose how to display transparent parts in images. This "
-"option has no effect on photos, but setting this as check pattern or custom "
-"color could be usefull when viewing icons or other artworks with transparent "
-"parts.</i></small>"
-msgstr ""
-"<small><i>Du kan vælge, hvordan gennemsigtige dele i billeder skal vises. "
-"Dette tilvalg har ingen effekt på fotos, men opsætning som ternet mønster "
-"eller valgfri farve kan være nyttigt ved visning af ikoner og andet "
-"kunstnerisk materiale med gennemsigtige områder.</i></small>"
-
-#: ../src/f-spot.glade.h:36
-msgid "Adjust Time"
-msgstr "Justér tid"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Sæt vurderingsfilter"
-#: ../src/f-spot.glade.h:37
+#: ../src/ui/main_window.ui.h:1
msgid "Adjust _Time..."
msgstr "Justér _tid..."
-#: ../src/f-spot.glade.h:38
-msgid "Adjusted date: "
-msgstr "Justeret dato: "
-
-#: ../src/f-spot.glade.h:39
+#: ../src/ui/main_window.ui.h:2
msgid "Arrange _by"
msgstr "Arrangér _efter"
-#: ../src/f-spot.glade.h:40
-msgid "As _background"
-msgstr "Som _baggrund"
-
-#: ../src/f-spot.glade.h:41
-msgid "As _custom color: "
-msgstr "Som _brugerdefineret farve: "
-
-#: ../src/f-spot.glade.h:42
-msgid "As check _pattern"
-msgstr "Som _ternet mønster"
-
-#: ../src/f-spot.glade.h:43
-msgid "Attach Tags:"
-msgstr "Vedhæft mærker:"
-
-#: ../src/f-spot.glade.h:44
-msgid "Attach tag:"
-msgstr "Vedhæft mærke:"
-
-#: ../src/f-spot.glade.h:45
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "Autorotér"
-
-#: ../src/f-spot.glade.h:47
+#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
msgstr "Efter _dato"
-#: ../src/f-spot.glade.h:48
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
msgstr "Efter _importrulle"
-#: ../src/f-spot.glade.h:49
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
msgstr "Efter _vurdering"
-#: ../src/f-spot.glade.h:50
-msgid "CD"
-msgstr "Cd"
-
-#: ../src/f-spot.glade.h:51
-msgid "C_ontrast:"
-msgstr "K_ontrast:"
-
-#: ../src/f-spot.glade.h:52
-msgid "Camera Selection"
-msgstr "Kameravalg"
-
-#: ../src/f-spot.glade.h:53
+#: ../src/ui/main_window.ui.h:7
msgid "Copy Locat_ion"
msgstr "Kopiér _placering"
-#: ../src/f-spot.glade.h:54
-msgid "Copy files to the Photos folder"
-msgstr "Kopiér filer til fotomappen"
-
-# Ja, der er tale om e-post
-#: ../src/f-spot.glade.h:55
-msgid "Create Mail"
-msgstr "Opret e-brev"
-
-#: ../src/f-spot.glade.h:56
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "Opret nyt _mærke..."
-#: ../src/f-spot.glade.h:57
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "Opret _ny version..."
-#: ../src/f-spot.glade.h:58
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr "Opret et e-brev med de valgte fotos (eventuelt formindsket) vedhæftet"
-
-#: ../src/f-spot.glade.h:59
-msgid "Current date:"
-msgstr "Aktuelle dato:"
-
-#: ../src/f-spot.glade.h:60
-msgid "Detect duplicates"
-msgstr "Opdag kopier"
-
-#: ../src/f-spot.glade.h:61
-msgid "Display File _Names"
-msgstr "Vis fil_navne"
-
-#: ../src/f-spot.glade.h:62
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "Vis kun de billeder der blev importeret i angivne ruller."
-
-#: ../src/f-spot.glade.h:63
-msgid "Do not send a mail"
-msgstr "Send ikke et e-brev"
-
-#: ../src/f-spot.glade.h:64
-msgid "E-_Mail:"
-msgstr "E-_post:"
-
-#: ../src/f-spot.glade.h:65
-msgid "E_xport titles and comments"
-msgstr "_Eksportér titler og kommentarer"
-
-#: ../src/f-spot.glade.h:66
-msgid "Edit Tag Icon"
-msgstr "Redigér mærkeikon"
-
-#: ../src/f-spot.glade.h:67
-msgid "Edit icon"
-msgstr "Redigér ikon"
-
-#: ../src/f-spot.glade.h:68
-msgid "Estimated new size"
-msgstr "Anslået ny størrelse"
-
-#: ../src/f-spot.glade.h:69
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
-msgid "Export"
-msgstr "Eksportér"
-
-#: ../src/f-spot.glade.h:70
-msgid "Extra large"
-msgstr "Ekstra stor"
-
-#: ../src/f-spot.glade.h:71
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:72
-msgid "F-Spot View"
-msgstr "F-Spot-visning"
-
-#: ../src/f-spot.glade.h:74
-msgid "Filter on selected rolls"
-msgstr "Filtrér på valgte ruller"
-
-#: ../src/f-spot.glade.h:75
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "Fin_d"
-#: ../src/f-spot.glade.h:76
-msgid "G_allery:"
-msgstr "G_alleri:"
-
-#: ../src/f-spot.glade.h:77
-msgid "Gallery"
-msgstr "Galleri"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:80
-msgid "Import Source:"
-msgstr "Importkilde:"
-
-#: ../src/f-spot.glade.h:81
-msgid "Include subfolders"
-msgstr "Inkludér undermapper"
-
-#: ../src/f-spot.glade.h:82
-msgid "Large"
-msgstr "Stor"
-
-#: ../src/f-spot.glade.h:83
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
msgstr "Håndtér _udvidelser"
-#: ../src/f-spot.glade.h:84
-msgid "Manage your custom selection ratios"
-msgstr "Håndtér dine tilpassede markeringsforhold"
-
-#: ../src/f-spot.glade.h:85
-msgid "Medium"
-msgstr "Middel"
-
-#: ../src/f-spot.glade.h:87
-msgid "No _image"
-msgstr "Intet _billede"
-
-#: ../src/f-spot.glade.h:88
-msgid "Number of photos in selected rolls:"
-msgstr "Antal fotos i valgte ruller:"
-
-#: ../src/f-spot.glade.h:89
-msgid "Number of pictures"
-msgstr "Antal billeder"
-
-#: ../src/f-spot.glade.h:90
-msgid "Open _Folder..."
-msgstr "Åbn _mappe..."
-
-#: ../src/f-spot.glade.h:92
-msgid "Original size (possible very large file size)"
-msgstr "Original størrelse (muligvis meget stor filstørrelse)"
-
-#: ../src/f-spot.glade.h:93
-msgid "P_arent Tag:"
-msgstr "Over_ordnet mærke:"
-
-#: ../src/f-spot.glade.h:94
+#: ../src/ui/main_window.ui.h:13
msgid "Page Set_up..."
msgstr "Side_opsætning..."
-#: ../src/f-spot.glade.h:95
-msgid "Pause"
-msgstr "Pause"
-
-#: ../src/f-spot.glade.h:96
-msgid "Photo 0 of 0"
-msgstr "Foto 0 af 0"
-
-#: ../src/f-spot.glade.h:99
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
msgstr "_Opdatér miniature"
-#: ../src/f-spot.glade.h:101
-msgid "Repair"
-msgstr "Reparér"
-
-#: ../src/f-spot.glade.h:104
-msgid "Select Photos to Copy From Camera..."
-msgstr "Vælg fotos som skal kopieres fra kamera..."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Markér _alt"
-#: ../src/f-spot.glade.h:106
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Markér _intet"
-#: ../src/f-spot.glade.h:107
-msgid "Select a Tag..."
-msgstr "Vælg et mærke..."
-
-#: ../src/f-spot.glade.h:108
-msgid "Select the camera from which you want to transfer files"
-msgstr "Vælg kameraet du vil overføre filer fra"
-
-#: ../src/f-spot.glade.h:109
-msgid "Selected Camera: "
-msgstr "Valgt kamera: "
-
-#: ../src/f-spot.glade.h:110
-msgid "Selection Constraints"
-msgstr "Begrænsninger for udvalg"
-
-#: ../src/f-spot.glade.h:111
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
msgstr "Send via _e-post..."
-#: ../src/f-spot.glade.h:112
-msgid "Set Rating Filter"
-msgstr "Sæt vurderingsfilter"
-
-#: ../src/f-spot.glade.h:113
-msgid "Set as _Background"
-msgstr "Anvend som _baggrund"
-
-#: ../src/f-spot.glade.h:115
-msgid "Show all photos."
-msgstr "Vis alle fotos."
-
-#: ../src/f-spot.glade.h:116
-msgid "Show or hide the side pane"
-msgstr "Vis eller skjul sidepanel"
-
-#: ../src/f-spot.glade.h:117
-msgid "Show or hide the toolbar"
-msgstr "Vis eller skjul værktøjslinjen"
-
-#: ../src/f-spot.glade.h:118
-msgid "Side _pane"
-msgstr "Side_panel"
-
-#: ../src/f-spot.glade.h:119
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "Side_bjælke"
-#: ../src/f-spot.glade.h:120
-msgid "Small"
-msgstr "Lille"
-
-#: ../src/f-spot.glade.h:121
-msgid "Space all photos by"
-msgstr "Spred alle fotos med"
-
-#: ../src/f-spot.glade.h:122
-msgid ""
-"Specify if an original size picture should be rotated or not. Smaller sizes "
-"are automatically rotated."
-msgstr ""
-"Angiv om et billede i original størrelse skal roteres eller ej. Mindre "
-"størrelser bliver automatisk roteret."
-
-#: ../src/f-spot.glade.h:123
-msgid "Strip image _metadata"
-msgstr "Fjern _metadata for billede"
-
-#: ../src/f-spot.glade.h:124
+#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
msgstr "_Mærker"
-#: ../src/f-spot.glade.h:125
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1180
-msgid "Tags: "
-msgstr "Mærker: "
-
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:127
-msgid "Te_mp:"
-msgstr "Te_mperatur:"
-
-#: ../src/f-spot.glade.h:128
+#: ../src/ui/main_window.ui.h:25
msgid "Thumbnail _elements"
msgstr "Miniature_elementer"
-#: ../src/f-spot.glade.h:129
-msgid "Tiny"
-msgstr "Meget lille"
-
-#: ../src/f-spot.glade.h:130
+#: ../src/ui/main_window.ui.h:26
msgid "Too_lbar"
msgstr "Værktøjs_linje"
-#: ../src/f-spot.glade.h:131
-msgid "Total original size"
-msgstr "Total original størrelse"
-
-#: ../src/f-spot.glade.h:132
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "Vis"
-#: ../src/f-spot.glade.h:133
-msgid "Zoom _in"
-msgstr "Zoom _ind"
-
-#: ../src/f-spot.glade.h:134
-msgid "Zoom _out"
-msgstr "Zoom _ud"
-
-#: ../src/f-spot.glade.h:135
-msgid "Zoom in"
-msgstr "Zoom ind"
-
-#: ../src/f-spot.glade.h:136
-msgid "Zoom out"
-msgstr "Zoom ud"
-
-#: ../src/f-spot.glade.h:138
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
msgstr "_Vedhæft mærke til markering"
-#: ../src/f-spot.glade.h:139
-msgid "_Brightness:"
-msgstr "_Lysstyrke:"
-
-#: ../src/f-spot.glade.h:141
+#: ../src/ui/main_window.ui.h:35
msgid "_Clear Rating Filter"
msgstr "_Ryd vurderingsfilter"
-#: ../src/f-spot.glade.h:142
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
msgstr "_Ryd rullefilter"
-#: ../src/f-spot.glade.h:143
+#: ../src/ui/main_window.ui.h:38
msgid "_Components"
msgstr "_Komponenter"
-#: ../src/f-spot.glade.h:144
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
msgstr "_Indhold"
-#: ../src/f-spot.glade.h:145
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-msgid "_Create"
-msgstr "_Opret"
-
-#: ../src/f-spot.glade.h:146
-msgid "_Create Mail"
-msgstr "_Opret e-brev"
-
-#: ../src/f-spot.glade.h:147
+#: ../src/ui/main_window.ui.h:40
msgid "_Dates"
msgstr "_Datoer"
-#: ../src/f-spot.glade.h:149
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
msgstr "_Slet markeret mærke"
-#: ../src/f-spot.glade.h:150
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
msgstr "_Slet version"
-#: ../src/f-spot.glade.h:151
-msgid "_Edit"
-msgstr "_Redigér"
-
-#: ../src/f-spot.glade.h:152
+#: ../src/ui/main_window.ui.h:45
msgid "_Edit Selected Tag..."
msgstr "_Redigér markeret mærke..."
-#: ../src/f-spot.glade.h:153
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export"
-msgstr "_Eksportér"
-
-#: ../src/f-spot.glade.h:154
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "_Eksportér mærker"
-
-#: ../src/f-spot.glade.h:155
+#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
msgstr "_Eksportér til"
-#: ../src/f-spot.glade.h:156
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-msgid "_Export to Album:"
-msgstr "_Eksportér til album:"
-
-#: ../src/f-spot.glade.h:157
-msgid "_Exposure:"
-msgstr "_Eksponering:"
-
-#: ../src/f-spot.glade.h:158
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
msgstr "_Filmklip"
-#: ../src/f-spot.glade.h:159
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:160
-msgid "_Folder"
-msgstr "_Mappe"
-
-#: ../src/f-spot.glade.h:161
-msgid "_Fullscreen"
-msgstr "_Fuldskærm"
-
-#: ../src/f-spot.glade.h:162
-msgid "_Gallery"
-msgstr "_Galleri"
-
-#: ../src/f-spot.glade.h:163
-msgid "_Help"
-msgstr "_Hjælp"
-
-#: ../src/f-spot.glade.h:164
+#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
msgstr "_Skjult"
-#: ../src/f-spot.glade.h:165
-msgid "_Hue:"
-msgstr "_Farvetone:"
-
-#: ../src/f-spot.glade.h:166
-msgid "_Icon:"
-msgstr "_Ikon:"
-
-#: ../src/f-spot.glade.h:167
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
msgstr "_Importér..."
-#: ../src/f-spot.glade.h:168
-msgid "_Interpolate image on zoom"
-msgstr "_Interpolér billede ved zoom"
-
-#: ../src/f-spot.glade.h:169
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
msgstr "_Stor"
# Her er jeg i tvivl om det er importrulle eller importerede rulle
-#: ../src/f-spot.glade.h:170
+#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
msgstr "_Sidste importerede rulle"
-#: ../src/f-spot.glade.h:171
+#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
msgstr "_Lup"
-#: ../src/f-spot.glade.h:172
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
msgstr "_Middel"
-#: ../src/f-spot.glade.h:173
-msgid "_Month"
-msgstr "_Måned"
-
-#: ../src/f-spot.glade.h:174
-msgid "_New Window"
-msgstr "_Nyt vindue"
-
-#: ../src/f-spot.glade.h:175
-msgid "_Open album in browser when done uploading"
-msgstr "_Åbn albummet i browser når overførslen er færdig"
-
-#: ../src/f-spot.glade.h:176
-msgid "_Open destination when done exporting"
-msgstr "_Åbn målet når eksport er fuldført"
-
-#: ../src/f-spot.glade.h:177
-msgid "_Photo"
-msgstr "_Foto"
-
-#: ../src/f-spot.glade.h:178
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
msgstr "_Afslut"
-#: ../src/f-spot.glade.h:179
+#: ../src/ui/main_window.ui.h:58
msgid "_Ratings"
msgstr "_Vurderinger"
-#: ../src/f-spot.glade.h:181
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
msgstr "_Fjern mærke fra markering"
-#: ../src/f-spot.glade.h:182
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
msgstr "_Omdøb version"
-#: ../src/f-spot.glade.h:183
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-msgid "_Resize to: "
-msgstr "_Skalér til: "
-
-#: ../src/f-spot.glade.h:185
-msgid "_Saturation:"
-msgstr "_Mætning:"
-
-#: ../src/f-spot.glade.h:186
-msgid "_Scale photos to no larger than: "
-msgstr "_Skalér ikke billeder til større end: "
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "_Omvendt rækkefølge"
-#: ../src/f-spot.glade.h:187
+#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
msgstr "_Vælg importerede ruller..."
-#: ../src/f-spot.glade.h:188
+#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
msgstr "_Sæt datointerval..."
-#: ../src/f-spot.glade.h:189
+#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
msgstr "_Sæt vurderingsfilter..."
-#: ../src/f-spot.glade.h:190
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "_Skærp..."
-#: ../src/f-spot.glade.h:191
-msgid "_Slideshow"
-msgstr "_Diasshow"
-
-#: ../src/f-spot.glade.h:192
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
msgstr "_Lille"
-#: ../src/f-spot.glade.h:193
-msgid "_Strip metadata"
-msgstr "_Fjern metadata"
-
-#: ../src/f-spot.glade.h:194
+#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
msgstr "_Mærkeikoner"
-#: ../src/f-spot.glade.h:195
-msgid "_Tag Name:"
-msgstr "_Mærkenavn:"
-
-#: ../src/f-spot.glade.h:196
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
msgstr "_Mærker"
-#: ../src/f-spot.glade.h:197
+#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
msgstr "_Tidslinje"
-#: ../src/f-spot.glade.h:198
-msgid "_Tint:"
-msgstr "_Nuance:"
-
-#: ../src/f-spot.glade.h:199
-msgid "_Toolbar"
-msgstr "_Værktøjslinje"
-
-#: ../src/f-spot.glade.h:200
+#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
msgstr "_Værktøjer"
-#: ../src/f-spot.glade.h:201
-msgid "_URI:"
-msgstr "_URI:"
-
-#: ../src/f-spot.glade.h:202
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
msgstr "_Umærkede fotos"
-#: ../src/f-spot.glade.h:203
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
msgstr "_Version"
-#: ../src/f-spot.glade.h:204
-msgid "_View"
-msgstr "_Vis"
-
-#: ../src/f-spot.glade.h:205
-msgid "_Virtual Filesystem"
-msgstr "_Virtuelt filsystem"
+#: ../src/Updater.cs:616
+msgid "Updating F-Spot Database"
+msgstr "Opdaterer F-Spot-database"
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:208
+#: ../src/Updater.cs:617
msgid ""
-"at\n"
-"after\n"
-"between"
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
msgstr ""
-"på\n"
-"efter\n"
-"mellem"
-
-#: ../src/f-spot.glade.h:211
-msgid "difference:"
-msgstr "forskel:"
-
-#: ../src/f-spot.glade.h:212
-msgid "img_000.jpg"
-msgstr "img_000.jpg"
-
-#: ../src/f-spot.glade.h:213
-msgid "min. Starting at {0}"
-msgstr "min. Starter ved {0}"
+"Vent venligst mens din F-Spot-galleridatabase opdateres. Dette kan tage et "
+"stykke tid."
-#: ../src/f-spot.glade.h:214
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
-msgid "pixels"
-msgstr "billedpunkter"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "Kan ikke oprette midlertidig fil"
-#: ../src/f-spot.glade.h:215
-msgid "x"
-msgstr "x"
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Sideopsætning"
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "Vis et diasshow fra F-Spot"
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Papirstørrelse: {0} x {1} mm"
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "F-Spot-fotos"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "Angiv sidestørrelse og orientering"
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_Cd..."
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Fotos pr. side"
-#: ../extensions/Exporters/CDExport/CDExport.cs:162
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "Overfører billede \"{0}\" til cd"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Gentag"
-#: ../extensions/Exporters/CDExport/CDExport.cs:177
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:551
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:702
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
-msgid "Done Sending Photos"
-msgstr "Færdig med afsendelse af fotos"
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Udskriv udklipningsmærker"
-#: ../extensions/Exporters/CDExport/CDExport.cs:179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
-msgid "Transfer Complete"
-msgstr "Overførsel fuldført"
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "Layout af fotos"
-#: ../extensions/Exporters/CDExport/CDExport.cs:186
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
-msgid "Error While Transferring"
-msgstr "Fejl under overførsel"
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "Hel side (ingen margin)"
-#: ../extensions/Exporters/CDExport/CDExport.cs:193
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
-msgid "Error Transferring"
-msgstr "Fejl ved overførsel"
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Zoom"
-#: ../extensions/Exporters/CDExport/CDExport.cs:206
-msgid "copying..."
-msgstr "kopierer..."
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Udfyld"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr ""
-"<b><i>Der er nogle tidligere planlagte elementer klar til skrivning</i></b>"
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Skaleret"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>Fotos som skal brændes</b>"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "Hvide kanter"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:4
-msgid "Create CD"
-msgstr "Opret cd"
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Tilpasset tekst"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:6
-msgid "Size of the exported selection:"
-msgstr "Størrelse på det eksporterede udvalg:"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Fotoinformationer"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr "_Gennemse tidligere planlagte filer"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "Udskriv filnavn"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:8
-msgid "_Write only these photos to CD"
-msgstr "_Skriv kun disse fotos til cd"
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "Udskriv fotodato"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "Udskriv fototidspunkt"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr..."
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "Udskriv fotomærker"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-msgid "_Zooomr..."
-msgstr "_Zooomr..."
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "Udskriv fotokommentar"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "Autorisér"
+#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+msgid "Edit"
+msgstr "Redigér"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
+#: ../src/Widgets/EditorPage.cs:197
msgid ""
-"Return to this window after you have finished the authorization process on "
-"{0} and click the \"Complete Authorization\" button below"
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
msgstr ""
-"Vend tilbage til dette vindue efter at du har afsluttet "
-"autorisationsprocessen på {0} og klik \"Udfør autorisation\"-knappen "
-"nedenunder"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "Afslut autorisation"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "Logger på {0}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr "Tjekker legitimationsoplysninger..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "Velkommen {0} du er forbundet til {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "Log ind som en anden bruger"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "Brugt {0} af din tilladte månedlige kvote på {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "Kan ikke logge ind"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "Venter på svar {0} af {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:779
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "Overfører billede \"{0}\""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "Fejl ved overførsel til {0}: {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:810
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:553
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
-msgid "Upload Complete"
-msgstr "Overførsel fuldført"
+"Dette værktøj kræver en aktiv markering. Vælg et område af fotoet og forsøg "
+"handlingen igen"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-msgid "Unable to log on."
-msgstr "Kunne ikke logge ind."
+#: ../src/Widgets/EditorPage.cs:215
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Fejl ved gemning af tilpasset foto"
+msgstr[1] "Fejl ved gemning af tilpassede fotos"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#: ../src/Widgets/EditorPage.cs:217
#, csharp-format
msgid ""
-"F-Spot was unable to log on to {0}. Make sure you have given the "
-"authentication using {0} web browser interface."
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
msgstr ""
-"F-Spot kunne ikke logge ind på {0}. Kontrollér at du har givet godkendelse "
-"gennem {0}-brugerfladen i webbrowseren."
+"Undtagelse \"{0}\" modtaget. Bemærk at du skal fremkalde RAW-filer til JPEG, "
+"før du kan redigere dem."
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:732
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:477
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:598
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
-msgid "Uploading Pictures"
-msgstr "Overfører billeder"
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Vandret"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>Visningsrettigheder</b>"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "_Lodret"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "Eksportér mærke_hierarki"
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Find:"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
-msgid ""
-"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
-msgstr ""
-"F-Spot mangler din autorisation for at kunne overføre fotos til din {0}-"
-"konto. Tryk \"Autorisér\"-knappen for at åbne en webbrowser og give F-Spot "
-"autorisationen. "
+#: ../src/Widgets/FolderTreePage.cs:21
+msgid "Folders"
+msgstr "Mapper"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "Ignorér _topniveaumærker"
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Filsystem"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "Privat"
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Histogram"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "Offentlig"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Version"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "Fjern _metadata"
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Dato"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "Synlig for familie"
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Eksponering"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "Synlig for venner"
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "Brændvidde"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-msgid "_View photos in browser when done uploading"
-msgstr "_Vis fotos i browser når overførslen er færdig"
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Filstørrelse"
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "_Mappe..."
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Vurdering"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
-msgid "Select Export Folder"
-msgstr "Vælg eksportmappe"
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(forkert format)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
-msgid "Building Gallery"
-msgstr "Opbygger galleri"
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Ukendt)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "Fejl ved overførsel af billede \"{0}\" til galleri:{2}{1}"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
-msgid "Error: Error while transferring; Aborting"
-msgstr "Fejl: Fejl ved overførsel; afbryder"
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(Én redigering)"
+msgstr[1] "({0} redigeringer)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
-msgid "Error: File Already Exists; Aborting"
-msgstr "Fejl: Filen findes allerede; Afbryder"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:810
-msgid "Light"
-msgstr "Lys"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:811
-msgid "Dark"
-msgstr "Mørk"
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:991
-msgid "Prev"
-msgstr "Forrige"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1103
-msgid "Gallery generated by"
-msgstr "Galleri skabt af"
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(Fejl ved læsning af fil)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1143
-msgid "Show Styles"
-msgstr "Vis stile"
+#: ../src/Widgets/InfoBox.cs:620
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0} fotos"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1144
-msgid "Hide Styles"
-msgstr "Skjul stile"
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"{0} mellem \n"
+"{1} og {2}"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1311
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1444
-msgid "Page:"
-msgstr "Side:"
+#: ../src/Widgets/InfoBox.cs:645
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"Mellem {0} \n"
+"og {1}"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(Mindst én fil ikke fundet)"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>Eksportmetode</b>"
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Vis fotonavn"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr "Opret _galleri med brug af \"Original\""
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Vis dato"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr "Opret selvstændigt _webgalleri"
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Vis størrelse"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "B_eskrivelse:"
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Vis eksponering"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
-msgid "Export _tags"
-msgstr "Eksportér _mærker"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "Vis brændvidde"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
-msgid "Export tag _icons"
-msgstr "Eksportér mærke_ikoner"
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Vis kamera"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-msgid "Folder Export"
-msgstr "Eksport af mappe"
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Vis filstørrelse"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-msgid "G_allery Name:"
-msgstr "G_allerinavn:"
+#: ../src/Widgets/MetadataDisplay.cs:23
+msgid "Metadata"
+msgstr "Metadata"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
-msgid "Open _destination when done exporting"
-msgstr "Åbn _målet, når eksport er færdig"
+#: ../src/Widgets/MetadataDisplay.cs:104
+msgid "Extended Metadata"
+msgstr "Udvidet metadata"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-msgid "_Folder:"
-msgstr "_Mappe:"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:392
+msgid "No Extended Metadata Available"
+msgstr "Ingen udvidede metadata tilgængelige"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-msgid "_Save the files only"
-msgstr "_Gem kun filerne"
+#: ../src/Widgets/MetadataDisplay.cs:410
+msgid "No active photo"
+msgstr "Intet aktivt foto"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-msgid "Web _Gallery..."
-msgstr "_Webgalleri..."
+#: ../src/Widgets/MetadataDisplay.cs:412
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "Fotoet \"{0}\" findes ikke"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
-msgstr ""
-"Kan ikke tilslutte til et galleri, for hvilket versionen er ukendt.\n"
-"Tjek at du har Remote-udvidelsesmodul 1.0.8 eller senere"
+#: ../src/Widgets/MetadataDisplay.cs:415
+msgid "No metadata available"
+msgstr "Ingen metadata tilgængelige"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:393
-msgid "Invalid URL"
-msgstr "Ugyldig URL"
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Ingen programmer tilgængelige"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:394
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "Galleri-URL ser ikke ud til at være gyldig"
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "Vurdering:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:404
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:431
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:442
-msgid "Error while connecting to Gallery"
-msgstr "Fejl ved tilslutning til galleri"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Land"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:405
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:432
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:443
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "Følgende fejl opstod ved forsøg på at logge ind: {0}"
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "By"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:419
-msgid "A Gallery with this name already exists"
-msgstr "Der findes allerede et galleri med dette navn"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Stat"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:420
-#, csharp-format
-msgid ""
-"There is already a Gallery with the same name in your registered Galleries. "
-"Please choose a unique name."
-msgstr ""
-"Der findes allerede et galleri med det samme navn i dine registrerede "
-"gallerier. Vælg et unikt navn."
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Vis et diasshow fra F-Spot"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:530
-msgid "(TopLevel)"
-msgstr "(TopNiveau)"
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot-fotos"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:592
-msgid "Invalid Gallery name"
-msgstr "Ugyldigt Gallerinavn"
+#~ msgid "Package"
+#~ msgstr "Pakke"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:593
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
-"Gallerinavnet indeholder ugyldige tegn.\n"
-"Kun bogstaver, tal, - og _ er tilladt"
+#~ msgid "Extension Installation"
+#~ msgstr "Installation af udvidelse"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:798
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Fejl ved overførsel af billede \"{0}\" til galleri: {1}"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Vælg udvidelserne der skal installeres og klik på næste</b>"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:826
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:725
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
-msgid "(No Gallery)"
-msgstr "(Intet galleri)"
+#~ msgid "Install from:"
+#~ msgstr "Installér fra:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:918
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:848
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(Not Connected)"
-msgstr "(Ikke tilsluttet)"
+#~ msgid "_Repositories..."
+#~ msgstr "_Arkiver..."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:919
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
-msgid "(No Albums)"
-msgstr "(Ingen album)"
+#~ msgid "Show all packages"
+#~ msgstr "Vis alle pakker"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:971
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:914
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
-msgid "No account selected"
-msgstr "Ingen konto valgt"
+#~ msgid "Show new versions only"
+#~ msgstr "Vis kun nye udgaver"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr ""
-"<span weight='bold' size='larger'>Fejl ved tilslutning til galleri</span>\n"
+#~ msgid "Show updates only"
+#~ msgstr "Vis kun opdateringer"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-msgid "Export _titles and comments"
-msgstr "Eksportér _titler og kommentarer"
+#~ msgid "_Unselect All"
+#~ msgstr "_Afmarkér alt"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "Åbn _albummet i browseren når overførslen er færdig"
+#~ msgid "label124"
+#~ msgstr "mærke124"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "Kontrollér venligst at indstillingerne for dette galleri er korrekte."
+#~ msgid "Overall Progress:"
+#~ msgstr "Samlet fremgang:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-msgid "U_RL:"
-msgstr "U_RL:"
+#~ msgid "Downloading extensions..."
+#~ msgstr "Henter udvidelser..."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-msgid "_Album Name:"
-msgstr "_Albumnavn:"
+#~ msgid "Extension Manager"
+#~ msgstr "Udvidelseshåndtering"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "_Beskrivelse:"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "Yderligere udvidelser er påkrævet for at udføre denne handling."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-msgid "_Gallery Name:"
-msgstr "_Gallerinavn:"
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Følgende udvidelser vil blive installeret:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "_Galleri:"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Udvidelseshåndtering</b></big>"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-msgid "_Parent Album:"
-msgstr "_Overordnet album:"
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Følgende udvidelser er installeret lige nu:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
-msgid "_Password:"
-msgstr "_Adgangskode:"
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Installér udvidelser..."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-msgid "_Title:"
-msgstr "_Titel:"
+#~ msgid "_Uninstall..."
+#~ msgstr "_Afinstallér..."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-msgid "_Username:"
-msgstr "_Brugernavn:"
+#~ msgid "Enable"
+#~ msgstr "Aktivér"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr "Fejl ved læsning af serversvar"
+#~ msgid "Disable"
+#~ msgstr "Deaktivér"
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
-msgstr "Server returnerede svar uden galleriindhold"
+#~ msgid "Details"
+#~ msgstr "Detaljer"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
-msgid "Error while creating new album"
-msgstr "Fejl ved oprettelse af nyt album"
+#~ msgid "Extension Repository Management"
+#~ msgstr "Udvidelsesarkivhåndtering"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to perform the "
-"requested operation:\n"
-"{0} ({1})"
-msgstr ""
-"Der opstod følgende fejl ved forsøg på at udføre den forespurgte handling:\n"
-"{0} ({1})"
+#~ msgid "Add New Repository"
+#~ msgstr "Tilføj nyt arkiv"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
-msgstr "F_acebook..."
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Vælg placeringen af det arkiv du vil registrere:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:257
-msgid "Too many images to export"
-msgstr "For mange billeder til eksport"
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registrer et arkiv på nettet"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:257
-msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
-"selection and try again."
-msgstr ""
-"Facebook tillader kun 60 fotos pr. album. Begræns dit udvalg og forsøg igen."
+#~ msgid "Url:"
+#~ msgstr "Adresse:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:367
-msgid "You are not logged in."
-msgstr "Du er ikke logget ind."
+#~ msgid "Register a local repository"
+#~ msgstr "Registrér et lokalt arkiv"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:322
-msgid "Waiting for authentication"
-msgstr "Venter på godkendelse"
+#~ msgid "Path:"
+#~ msgstr "Sti:"
-# Husk mig - sådan hedder det på facebooks hjemmeside.
-# Har omformuleret en smule for læsevenligheden
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:322
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook. Turn "
-"on the \"Save my login information\" checkbox on Facebook and F-Spot will "
-"log into Facebook automatically from now on."
-msgstr ""
-"F-Spot vil nu starte din browser, så du kan logge ind på Facebook. Hvis du "
-"markerer afkrydningsfeltet \"Husk mig\" på Facebook, vil F-Spot automatisk "
-"logge ind på Facebook fremover."
+#~ msgid "Browse..."
+#~ msgstr "Gennemse..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:328
-msgid "Error logging into Facebook"
-msgstr "Fejl ved indlogning i Facebook"
+#~ msgid "Version:"
+#~ msgstr "Version:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:328
-msgid ""
-"There was a problem logging into Facebook. Check your credentials and try "
-"again."
-msgstr ""
-"Der opstod et problem med at logge ind i Facebook. Tjek dine "
-"legitimationsoplysninger og forsøg igen."
+#~ msgid "Author:"
+#~ msgstr "Forfatter:"
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:341
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr "{0} {1} er logget ind i Facebook"
+#~ msgid "Copyright:"
+#~ msgstr "Ophavsret:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:491
-msgid "Album must have a name"
-msgstr "Album skal have et navn"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Udvidelsesafhængigheder:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:491
-msgid "Please name your album or choose an existing album."
-msgstr "Giv dit album et navn eller vælg et eksisterende album."
+#~ msgid "All registered repositories"
+#~ msgstr "Alle registrerede arkiver"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:504
-msgid "Creating a new album failed"
-msgstr "Oprettelse af nyt album mislykkedes"
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Er du sikker på, at du vil afbryde installationen?"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:504
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
-"Der opstod en fejl under oprettelse af nyt album.\n"
-"\n"
-"{0}"
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Følgende pakker vil blive afinstalleret:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:528
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:661
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "Overfører billede \"{0}\" ({1} af {2})"
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Der er andre udvidelser, som afhænger af de forrige, der også vil blive "
+#~ "afinstalleret:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:542
-#, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr "Fejl ved overførsel til Facebook: {0}"
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "De valgte udvidelser kan ikke installeres, fordi der er "
+#~ "afhængighedskonflikter."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:1
-msgid "Caption"
-msgstr "Billedtekst"
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Følgende pakker vil blive installeret:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:2
-msgid "Create a new album"
-msgstr "Opret et nyt album"
+#~ msgid " (in user directory)"
+#~ msgstr " (i brugermappe)"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:3
-msgid "Description"
-msgstr "Beskrivelse"
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Det vil være nødvendigt at afinstallere følgende pakker:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:4
-msgid "Export to Facebook"
-msgstr "Eksportér til Facebook"
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Følgende afhængigheder kunne ikke løses:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:5
-msgid "In this photo"
-msgstr "I dette foto"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Installationen er gennemført problemfrit."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:7
-msgid "Login"
-msgstr "Logind"
+#~ msgid "The installation failed!"
+#~ msgstr "Installationen mislykkedes!"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:8
-msgid "Logout"
-msgstr "Logud"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Installationen er gennemført med advarsler."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:10
-msgid "This is who I am"
-msgstr "Dette er, hvem jeg er"
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Afinstallationen er gennemført problemfrit."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:11
-msgid "Use an existing album"
-msgstr "Brug et eksisterende album"
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Afinstallationen mislykkedes!"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:12
-msgid "Who is this?"
-msgstr "Hvem er det?"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Afinstallationen er gennemført med advarsler."
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-msgid "Compressed fil_e..."
-msgstr "Komprimeret f_il..."
+#~ msgid "Repository"
+#~ msgstr "Arkiv"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-msgid ""
-"This tool requires an active selection. Please select one or more pictures "
-"and try again"
-msgstr ""
-"Dette værktøj kræver en aktiv markering. Vælg et eller flere billeder og "
-"prøv igen"
+#~ msgid "Installation cancelled"
+#~ msgstr "Installation afbrudt"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:63
-msgid "Select export folder"
-msgstr "Vælg eksportmappe"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Nogle af de påkrævede udvidelser blev ikke fundet"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:101
-msgid "Exporting files"
-msgstr "Eksporterer filer"
+#~ msgid "Installation failed"
+#~ msgstr "Installation mislykkedes"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:107
-#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "Klargør foto \"{0}\""
+#~ msgid "Extension"
+#~ msgstr "Udvidelse"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-msgid "_File name:"
-msgstr "_Filnavn:"
+#~ msgid "Other"
+#~ msgstr "Andre"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-msgid "_Location:"
-msgstr "_Placering:"
+#~ msgid "Url"
+#~ msgstr "Url"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
-msgid "_Scale:"
-msgstr "_Skala:"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Der opstod en undtagelse: {0}"
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-msgid "Merge Db"
-msgstr "Sammenflet databaser"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Deaktiverede udvidelser kan ikke indlæses."
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
-msgid "Error opening the selected file"
-msgstr "Fejl ved åbning af den valgte fil"
+#~ msgid "Loading {0} extension"
+#~ msgstr "Indlæser udvidelsen {0}"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
-#, csharp-format
-msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-"Filen du valgte er ikke en gyldig eller understøttet database.\n"
-"\n"
-"Undtagelse \"{0}\" modtaget."
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Den påkrævede udvidelse \"{0}\" er deaktiveret."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-msgid ""
-"<small><i>Choose the location of the database you want to import from</i></"
-"small>"
-msgstr ""
-"<small><i>Vælg placeringen af databasen du ønsker at importere fra </i></"
-"small>"
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Den påkrævede udvidelse \"{0}\" er ikke installeret."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
-"you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already "
-"imported from that database.</i></small>"
-msgstr ""
-"<small><i>Vælg hvad der skaĺ importeres fra den valgte database.\n"
-"\"Kun nye ruller\" er det smarte tilvalg, der vil hindre genimport af fotos, "
-"du kunne have importeret under en tidligere handling.\n"
-"\"En enkelt importrulle\" lader dig vælge, hvilken rulle du ønsker at "
-"flette tilbage.\n"
-"\"Alting\" vil importere alt og opretter kopier, hvis du allerede har "
-"importeret fra den database.</i></small>"
+#~ msgid "(provided by {0})"
+#~ msgstr "(leveret af {0})"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
-msgid ""
-"<small><i>Copy the images locally or keep them where they are. If you chose "
-"the later, be sure that this location will stay accessible from f-spot.</i></"
-"small>"
-msgstr ""
-"<small><i>Kopiér billederne lokalt eller bevar dem, hvor de er. Hvis du "
-"vælger sidste mulighed, bør du sikre dig, at denne placering forbliver "
-"tilgængelig fra f-spot</i></small>"
+#~ msgid "interpolation type"
+#~ msgstr "interpoleringstype"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
-msgid "A Single Import Roll"
-msgstr "En enkelt importrulle"
+#~ msgid "the type of interpolation to use"
+#~ msgstr "interpoleringstypen der skal bruges"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
-msgid "Copy images to photos folder"
-msgstr "Kopiér billeder til fotomappe"
+# jf. de efterfølgende strenge
+#~ msgid "check type"
+#~ msgstr "type af tern"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-msgid "Database Location:"
-msgstr "Placering af database:"
+#~ msgid "the type of chequering to use"
+#~ msgstr "den slags tern som skal bruges"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr "Alting"
+#~ msgid "the size of chequers to use"
+#~ msgstr "størrelsen af de tern, som skal bruges"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-msgid "Import:"
-msgstr "Importér:"
+#~ msgid "dither"
+#~ msgstr "farvereducering"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr "Behold billederne på deres oprindelige placering"
+#~ msgid "dither type"
+#~ msgstr "farvereduceringstype"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another f-spot collection"
-msgstr "Sammenflet en anden f-spot-samling"
+#~ msgid "Dissolve"
+#~ msgstr "Opløs"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr "Kun nye ruller"
+#~ msgid "Flip"
+#~ msgstr "Vend"
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-"<big>Databasen henviser til filer indeholdt i <b>{0}</b>-mappen.\n"
-" Vælg venligst denne mappe, så jeg kan foretage afbildningen.</big>"
+#~ msgid "Cover"
+#~ msgstr "Overdæk"
-#: ../extensions/Tools/HashJob/HashJob.cs:53
-msgid ""
-"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
-"needs to analyze your image collection. This is not done by default as it's "
-"time consuming. You can Start or Pause this update process using this dialog."
-msgstr ""
-"For at genkende kopier af billeder, du importerede før version 0.5.0, skal F-"
-"Spot analysere din billedsamling. Dette sker ikke som standard, da det er "
-"tidskrævende. Du kan starte eller midlertidigt afbryde denne "
-"opdateringsproces i dette vindue."
+#~ msgid "Reveal"
+#~ msgstr "Afsløre"
-#: ../extensions/Tools/HashJob/HashJob.cs:102
-msgid "Processing images..."
-msgstr "Behandler billeder..."
+#~ msgid "Wipe"
+#~ msgstr "Udvisk"
-#: ../extensions/Tools/HashJob/HashJob.cs:108
-msgid "Stopped"
-msgstr "Stoppet"
+#~ msgid "Split"
+#~ msgstr "Del"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb..."
+#~ msgid "Push"
+#~ msgstr "Skub"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "Fejl ved oprettelse af album"
+#~ msgid "More directories"
+#~ msgstr "Flere mapper"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to create an album: {0}"
-msgstr "Følgende fejl opstod under forsøg på at oprette et album: {0}"
+#~ msgid "Arrange by _Month"
+#~ msgstr "Arrangér efter _måned"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:621
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} Sendt"
+#~ msgid "Arrange by _Folder"
+#~ msgstr "Arrangér efter m_appe"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:623
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{0} af ca. {1}"
+#~ msgid "Tag Name:"
+#~ msgstr "Mærkenavn:"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:692
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "Fejl ved overførsel til galleri: {0}"
+#~ msgid "<b>Color Management</b>"
+#~ msgstr "<b>Farvehåndtering</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:776
-#, csharp-format
-msgid "Available space: {0}, {1}% used out of {2}"
-msgstr "Tilgængelig plads: {0}, {1}% brugt ud af {2}"
+#~ msgid "<b>Import Settings</b>"
+#~ msgstr "<b>Importindstillinger</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:890
-#, csharp-format
-msgid ""
-"The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images"
-msgstr ""
-"Det valgte album har en grænse på {0} billeder,\n"
-"og denne overskrides med det nuværende udvalg på {1} billeder"
+#~ msgid "<b>Metadata</b>"
+#~ msgstr "<b>Metadata</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>PicasaWeb-eksport</b>"
+#~ msgid "<b>Screensaver</b>"
+#~ msgstr "<b>Pauseskærm</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid ""
-"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr "<span weight='bold' size='larger'>Din Google-konto er låst</span>\n"
+#~ msgid "<b>Theming</b>"
+#~ msgstr "<b>Temaer</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-"Kontrollér at indstillingerne for dette galleri er korrekte.\n"
-"Indtast bogstaverne som de er vist i billedet i\n"
-"\"Captcha\"-feltet. <i>Bogstaverne er ikke versalfølsomme</i>"
+# Jeg har valgt ikke at skrive "nyligt importerede", da det henviser til datid. Newly henviser til fremtidige "nyimporterede" billeder.
+#~ msgid ""
+#~ "<small><i>Choose the folder where F-Spot should store newly imported "
+#~ "photos</i></small>"
+#~ msgstr ""
+#~ "<small><i>Vælg mappen, hvori F-Spot skal lagre nye importerede billeder</"
+#~ "i></small>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "Offentligt album"
+#~ msgid ""
+#~ "<small><i>Enable this option to store tags and descriptions inside \n"
+#~ "supported image formats.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Aktivér dette tilvalg for at gemme mærker og beskrivelser \n"
+#~ "inden i understøttede billedeformater.</i></small>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "_Albumtitel:"
+#~ msgid ""
+#~ "<small><i>While acting as a screensaver, F-Spot can display all of your "
+#~ "images, or a small subset based on tags.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Ved pauseskærm kan F-Spot vise alle dine billeder, eller et "
+#~ "lille udsnit baseret på mærker.</i></small>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "_Autorotér"
+#~ msgid ""
+#~ "<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Du skal genstarte f-spot for at indlæse det nye tema</i></small>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr "_Captcha:"
+#~ msgid "Custom Theme"
+#~ msgstr "Tilpasset tema:"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>SmugMug-eksport</b>"
+#~ msgid "From List:"
+#~ msgstr "Fra liste:"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "_Konto:"
+#~ msgid "From gtkrc File:"
+#~ msgstr "Fra gtkrc-fil:"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug..."
+#~ msgid "Select A gtkrc File"
+#~ msgstr "Vælg en gtkrc-fil"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:126
-#, csharp-format
-msgid "Uploading photo \"{0}\""
-msgstr "Overfører foto \"{0}\""
+#~ msgid "Try to use the system display profile"
+#~ msgstr "Forsøg at bruge systemets visningsprofil"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:181
-msgid "Logging into Tabblo"
-msgstr "Logger ind i Tabblo"
+#~ msgid "Write _metadata to file"
+#~ msgstr "Skriv _metadata til fil"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:241
-msgid "Obtaining URL for upload"
-msgstr "Henter adresse til afsendelse"
+#~ msgid "_Print output:"
+#~ msgstr "_Udskriv uddata:"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr "_Tabblo..."
+#~ msgid ""
+#~ "The \"F-Spot Manual\" could not be found. Please verify that your "
+#~ "installation has been completed successfully."
+#~ msgstr ""
+#~ "\"F-Spot-manualen\" blev ikke fundet. Kontrollér om din installation er "
+#~ "blevet udført problemfrit."
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:166
-msgid "Done sending photos"
-msgstr "Afsendelse af fotos fuldført"
+#~ msgid "Picasaweb"
+#~ msgstr "Picasaweb"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:168
-msgid "Upload complete"
-msgstr "Overførsel fuldført"
+#~ msgid "SmugMug"
+#~ msgstr "SmugMug"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:174
-msgid "Error uploading to Tabblo: "
-msgstr "Fejl ved overførsel til Tabblo: "
+#~ msgid "Gallery2"
+#~ msgstr "Galleri2"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
-msgid "<b>Tabblo account</b>"
-msgstr "<b>Tabblokonto</b>"
+#~ msgid "1 of 1"
+#~ msgstr "1 af 1"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
-msgid "<b>{0}</b>."
-msgstr "<b>{0}</b>."
+#~ msgid "_Folder"
+#~ msgstr "_Mappe"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
-msgid "A trust error occured while attempting to access"
-msgstr "Der opstod en tillidsfejl ved forsøg på adgang"
+#~ msgid "_Month"
+#~ msgstr "_Måned"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
-msgid "Abort this session"
-msgstr "Afbryd denne session"
+#~ msgid "img_000.jpg"
+#~ msgstr "img_000.jpg"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
-msgid "Always trust this site's certificate"
-msgstr "Stol altid på denne sides certifikat"
+# Husk mig - sådan hedder det på facebooks hjemmeside.
+# Har omformuleret en smule for læsevenligheden
+#~ msgid ""
+#~ "F-Spot will now launch your browser so that you can log into Facebook. "
+#~ "Turn on the \"Save my login information\" checkbox on Facebook and F-Spot "
+#~ "will log into Facebook automatically from now on."
+#~ msgstr ""
+#~ "F-Spot vil nu starte din browser, så du kan logge ind på Facebook. Hvis "
+#~ "du markerer afkrydningsfeltet \"Husk mig\" på Facebook, vil F-Spot "
+#~ "automatisk logge ind på Facebook fremover."
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
-msgid "Do you wish to:"
-msgstr "Ønsker du at:"
+#~ msgid "This is who I am"
+#~ msgstr "Dette er, hvem jeg er"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
-msgid "Trust Error"
-msgstr "Tillidsfejl"
+#~ msgid "<b>Tabblo account</b>"
+#~ msgstr "<b>Tabblokonto</b>"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
-msgid "Trust the site's certificate this once"
-msgstr "Stole på sidens certifikat denne gang"
+#~ msgid "<b>{0}</b>."
+#~ msgstr "<b>{0}</b>."
-#~ msgid "<b>End Date</b>"
-#~ msgstr "<b>Slutdato</b>"
+#~ msgid "A trust error occured while attempting to access"
+#~ msgstr "Der opstod en tillidsfejl ved forsøg på adgang"
-#~ msgid "<b>Select period</b>"
-#~ msgstr "<b>Vælg periode</b>"
+#~ msgid "Abort this session"
+#~ msgstr "Afbryd denne session"
-#~ msgid "<b>Start Date</b>"
-#~ msgstr "<b>Startdato</b>"
+#~ msgid "Always trust this site's certificate"
+#~ msgstr "Stol altid på denne sides certifikat"
-#~ msgid "Cancel, do not change the current timeline. "
-#~ msgstr "Annullér, ændr ikke den nuværende tidslinje. "
+#~ msgid "Do you wish to:"
+#~ msgstr "Ønsker du at:"
-#~ msgid "Only photos taken within these dates will be displayed."
-#~ msgstr ""
-#~ "Der vil kun blive vist billeder, som er taget inden for disse datoer."
+#~ msgid "Trust Error"
+#~ msgstr "Tillidsfejl"
-#~ msgid "Set date range"
-#~ msgstr "Sæt datointerval"
+#~ msgid "Trust the site's certificate this once"
+#~ msgstr "Stole på sidens certifikat denne gang"
#~ msgid "Blackout"
#~ msgstr "Gå i sort"
@@ -4472,9 +4694,6 @@ msgstr "Stole på sidens certifikat denne gang"
#~ msgid "_Border:"
#~ msgstr "_Kant:"
-#~ msgid "_Destination Temp"
-#~ msgstr "_Målmidl"
-
#~ msgid "_File"
#~ msgstr "_Fil"
@@ -4706,9 +4925,6 @@ msgstr "Stole på sidens certifikat denne gang"
#~ msgid "Use static HTML."
#~ msgstr "Brug statisk HTML."
-#~ msgid "_Close"
-#~ msgstr "_Luk"
-
#~ msgid "_Delete from Drive"
#~ msgstr "_Slet fra disk"
diff --git a/po/de.po b/po/de.po
index 0d938dc..5e2be8e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,16 +5,17 @@
# Hendrik Richter <hendrikr at gnome.org>, 2006, 2008.
# Hanno Böck <hanno at hboeck.de>, 2008.
# Arun Persaud <arun at nubati.net>, 2008.
-# Mario Blättermann <mariobl at gnome.org>, 2008, 2009.
+# Mario Blättermann <mariobl at gnome.org>, 2008-2010.
# Christian Kirbach <Christian.Kirbach at googlemail.com>, 2009.
+#
msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-"
"spot&component=General\n"
-"POT-Creation-Date: 2009-10-16 12:38+0000\n"
-"PO-Revision-Date: 2009-10-16 19:35+0200\n"
-"Last-Translator: Christian Kirbach <Christian.Kirbach at googlemail.com>\n"
+"POT-Creation-Date: 2010-03-01 17:06+0000\n"
+"PO-Revision-Date: 2010-03-01 21:50+0100\n"
+"Last-Translator: Mario Blättermann <mariobl at gnome.org>\n"
"Language-Team: German <gnome-de at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +44,7 @@ msgstr "Übertragung des Bilds »{0}« auf CD"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:623 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
@@ -80,8 +81,7 @@ msgstr "wird kopiert …"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr ""
-"<b><i>Es exisitieren schon Daten, die gespeichert werden müssen</i></b>"
+msgstr "<b><i>Es exisitieren schon Daten, die gespeichert werden müssen</i></b>"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
msgid "<b>Photos to Burn</b>"
@@ -100,7 +100,7 @@ msgid "Create CD"
msgstr "CD erstellen"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Größe"
@@ -118,6 +118,7 @@ msgstr "Vorher geplante Dateien durch_suchen"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "E_xportieren"
@@ -136,11 +137,11 @@ msgstr "Es wird auf Legitimation gewartet"
#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
msgid ""
-"F-Spot will now launch your browser so that you can enable the permission "
-"you just selected.\n"
+"F-Spot will now launch your browser so that you can enable the permission you "
+"just selected.\n"
"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok"
-"\" below."
+"Once you are directed by Facebook to return to this application, click \"Ok\" "
+"below."
msgstr ""
"F-Spot startet nun Ihren Browser, so dass Sie die gerade gewählten "
"Zugriffsrechte aktualisieren können.\n"
@@ -212,7 +213,6 @@ msgstr "Fehler beim Hochladen zu Facebook: {0}"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Fehler"
@@ -224,6 +224,10 @@ msgstr "Fehler"
msgid "Upload Complete"
msgstr "Hochladen abgeschlossen"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "F-Spot-Gruppe auf Facebook besuchen"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "Es wird auf Legitimation gewartet"
@@ -232,12 +236,12 @@ msgstr "Es wird auf Legitimation gewartet"
msgid ""
"F-Spot will now launch your browser so that you can log into Facebook.\n"
"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok"
-"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
-"re-use it on future Facebook exports."
+"Once you are directed by Facebook to return to this application, click \"Ok\" "
+"below. F-Spot will cache your session in gnome-keyring, if possible, and re-"
+"use it on future Facebook exports."
msgstr ""
-"F-Spot wird nun Ihren Browser starten, so dass Sie sich bei Facebook "
-"anmelden können.\n"
+"F-Spot wird nun Ihren Browser starten, so dass Sie sich bei Facebook anmelden "
+"können.\n"
"\n"
"Sobald Sie von Facebook dazu geführt werden, zu dieser Anwendung "
"zurückzukehren, klicken Sie auf »OK«."
@@ -341,8 +345,7 @@ msgid "Logout"
msgstr "Abmelden"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Name"
@@ -465,6 +468,7 @@ msgstr "<b>Konto</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Fotos</b>"
@@ -486,7 +490,8 @@ msgstr "<b>Betrachtungsrechte</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exportieren"
@@ -497,8 +502,8 @@ msgstr "Markierungs-_Rangordnung exportieren"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
msgid ""
"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
+"account. Press the \"Authorize\" button to open a web browser and give F-Spot "
+"the authorization. "
msgstr ""
"F-Spot benötigt Ihre Legitimierung, um Fotos zu Ihrem {0}-Benutzerkonto "
"hochzuladen. Bitte klicken Sie auf den »Legitimieren«-Knopf, um einen Browser "
@@ -582,58 +587,58 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Fehler: Datei ist bereits vorhanden, abgebrochen"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Hell"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Dunkel"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Vorheriges"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Index"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:327 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Markierungen"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Nächstes"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galerie erstellt mit"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Stile anzeigen"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Stile verbergen"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Markierungen: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Seite:"
@@ -853,6 +858,7 @@ msgstr "Überge_ordnetes Album:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Passwort:"
@@ -863,6 +869,7 @@ msgstr "_Titel:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Benutzername:"
@@ -882,8 +889,8 @@ msgstr "Fehler beim Erstellen eines neuen Albums"
#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
#, csharp-format
msgid ""
-"The following error was encountered while attempting to perform the "
-"requested operation:\n"
+"The following error was encountered while attempting to perform the requested "
+"operation:\n"
"{0} ({1})"
msgstr ""
"Der folgende Fehler trat beim Versuch auf, die gewünschte Aktion "
@@ -940,8 +947,7 @@ msgid "<b>PicasaWeb Export</b>"
msgstr "<b>PicasaWeb Export</b>"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid ""
-"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
msgstr ""
"<span weight='bold' size='larger'>Ihr Google-Konto ist gesperrt</span>\n"
@@ -1014,12 +1020,73 @@ msgstr "Hochladen abgeschlossen"
msgid "Error uploading to Tabblo: "
msgstr "Fehler beim Hochladen zu Tabblo: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot-Markierungen</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo-Konto</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>F-Spot-Markierungen können Ihnen dabei helfen, den Exportstatus "
+"Ihrer Fotos zu verfolgen. Beispiel: Verwenden Sie eine bestimmte Markierung "
+"für Fotos, die Sie exportieren wollen, und eine weitere für jene Fotos, die "
+"bereits exportiert wurden. So können Sie F-Spot anweisen, diese Markierungen "
+"automatisch wie gewünscht zu ersetzen.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "Aus exp_ortierten Fotos entfernen:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Auswählen …"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "An exportierte Fotos _anhängen:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Es gab einen Vertrauensfehler beim Verbindungsaufbau"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Sitzung wird abgebrochen"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Diesem Zertifikat immer vertrauen"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Möchten Sie:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Vertrauensfehler"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Diesem Zertifikat nur dieses Mal vertrauen"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Komprimierte _Datei …"
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Keine Auswahl verfügbar"
@@ -1045,7 +1112,6 @@ msgid "Preparing photo \"{0}\""
msgstr "Bereite Foto »{0}« vor"
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "_Erstellen"
@@ -1069,9 +1135,8 @@ msgid ""
msgstr ""
"Um Duplikate von Bildern zu erkennen, die von F-Spot-Versionen vor 0.5.0 "
"importiert wurden, muss Ihre Bildersammlung analysiert werden. Dies wird "
-"nicht automatisch erledigt, da es längere Zeit in Anspruch nimmt. Sie "
-"können mit Hilfe dieses Dialogs den Aktualisierungsvorgang starten oder "
-"unterbrechen."
+"nicht automatisch erledigt, da es längere Zeit in Anspruch nimmt. Sie können "
+"mit Hilfe dieses Dialogs den Aktualisierungsvorgang starten oder unterbrechen."
#: ../extensions/Tools/HashJob/HashJob.cs:59
#, csharp-format
@@ -1095,8 +1160,9 @@ msgstr "Gestoppt"
# Ist hier "Hash" ein Verb?
# Und wenn? Wie willst du das dann übersetzen?
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Prüfsumme für Duplikate"
+#| msgid "Hash for Duplicates"
+msgid "Check for Duplicates..."
+msgstr "Nach Duplikaten suchen …"
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
msgid "F-Spot Gallery"
@@ -1291,7 +1357,7 @@ msgid "New Rolls Only"
msgstr "Nur neue Importe"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:55
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Überspringen"
@@ -1376,285 +1442,6 @@ msgstr "Unbekannter Transformationstyp %d"
msgid "Operation failed"
msgstr "Aktion ist fehlgeschlagen"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paket"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Erweiterungen installieren"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr ""
-"<b>Wählen Sie die zu installierende Erweiterung und klicken Sie auf »Weiter«</"
-"b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Installieren von:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Repositories …"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Alle Pakete anzeigen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Nur neue Versionen anzeigen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Nur Aktualisierungen anzeigen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Auswahl _rückgängig"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "_Alles auswählen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Fortschritt insgesamt:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Erweiterungen werden heruntergeladen …"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Erweiterungsmanager"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr ""
-"Es werden weitere Erweiterungen benötigt, um diesen Schritt durchzuführen."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Die folgenden Erweiterungen werden installiert:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Erweiterungsverwaltung</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Die folgenden Erweiterungen sind im Moment installiert:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "Erweiterungen _installieren …"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Deinstallieren …"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Aktivieren"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Deaktivieren"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Details"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Verwaltung von Erweiterungs-Softwarequellen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Neue Softwarequelle hinzufügen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Auswahl der Adresse der Softwarequelle, die hinzugefügt werden sollen:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Eine Online-Softwarequelle registrieren"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Adresse:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Eine lokale Softwarequelle registrieren"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Pfad:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Durchsuchen …"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Version:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Urheberrecht:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Abhängigkeiten der Erweiterungen:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Alle registrierten Softwarequellen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Sind Sie sicher, dass Sie die Installation abbrechen wollen?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Die folgenden Pakete werden entfernt:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"Es gibt weitere Erweiterungen, die von den vorherigen abhängig sind, die "
-"ebenfalls entfernt werden:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr ""
-"Die ausgewählten Erweiterungen können nicht installiert werden, da es "
-"weitere Abhängigkeiten gibt."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Die folgenden Pakete werden installiert:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr "(im Benutzerordner)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Die folgenden Pakete müssen entfernt werden:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Die folgenden Abhängigkeiten konnten nicht erfüllt werden:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Die Installation wurde erfolgreich durchgeführt."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Die Installation ist fehlgeschlagen!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Die Installation wurde mit Warnungen durchgeführt."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Die Deinstallation wurde erfolgreich durchgeführt."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Die Deinstallation ist fehlgeschlagen!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Die Deinstallation wurde mit Warnungen durchgeführt."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Software-Quelle"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Installation abgebrochen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Einige der benötigten Erweiterungen wurden nicht gefunden"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Installation ist fehlgeschlagen"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Erweiterung"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Version"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Andere"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Adresse"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Ausnahme aufgetreten: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Deaktivierte Erweiterungen können nicht geladen werden."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Laden der Erweiterung {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Die benötigte Erweiterung »{0}« ist deaktiviert."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Die benötigte Erweiterung »{0}« ist nicht installiert."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(zur Verfügung gestellt von {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Vorschau"
@@ -1663,7 +1450,7 @@ msgstr "Vorschau"
msgid "Path"
msgstr "Pfad"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Datei"
@@ -1702,7 +1489,7 @@ msgstr "Kopieren der Dateien abgeschlossen"
msgid "Transferring \"{0}\" from camera"
msgstr "Übertragung der Datei »{0}« von der Kamera"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Kamera"
@@ -1710,12 +1497,12 @@ msgstr "Kamera"
msgid "Port"
msgstr "Anschluss"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Keine Fotos gefunden, die mit {0} übereinstimmen"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1723,14 +1510,14 @@ msgid ""
"F-Spot preference dialog."
msgstr ""
"Die Markierung »{0}« wird bei keinem Foto genutzt. Versuchen\n"
-"Sie, die Markierung zu einigen Fotos hinzuzufügen oder wählen Sie eine "
-"andere Markierung im F-Spot-Einstellungsdialog."
+"Sie, die Markierung zu einigen Fotos hinzuzufügen oder wählen Sie eine andere "
+"Markierung im F-Spot-Einstellungsdialog."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Die Suche brachte keine Ergebnisse"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1769,7 +1556,7 @@ msgstr "Bearbeitet in {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Original"
@@ -1845,19 +1632,19 @@ msgstr "Wählen Sie die Augen, die korrigiert werden sollen."
msgid "Sepia Tone"
msgstr "Sepiafarben"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Weicher Fokus"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Begradigung"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Fehler beim Importieren"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Fehler beim Importieren von {0}{2}{2}{1}"
@@ -1872,8 +1659,8 @@ msgid "Unhandled exception"
msgstr "Unverarbeitete Ausnahme"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "_Ort des Fotos kopieren"
+msgid "Copy Photo"
+msgstr "Foto kopieren"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1887,13 +1674,13 @@ msgstr "Öffnen _mit"
msgid "Rem_ove Tag"
msgstr "Markierung ent_fernen"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:451 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69 ../src/SingleView.cs:425
+#: ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "_Links drehen"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:452 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70 ../src/SingleView.cs:426
+#: ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "_Rechts drehen"
@@ -2022,182 +1809,186 @@ msgid "C_ontrast:"
msgstr "K_ontrast:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Erstellen"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Kameraauswahl"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Dateien in den Fotoordner kopieren"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Mail erstellen"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Symbol für diese Mark_ierung bei erster Benutzung erstellen"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr ""
"Eine Mail mit den ausgewählten Fotos (eventuell verkleinert) angehängt "
"erstellen"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Duplikate finden"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Datei_namen anzeigen"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr "Nur Fotos darstellen, die in den angegebenen Importen enthalten sind."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Keine Mail versenden"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "E-_Mail:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "Titel und Kommentare e_xportieren"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Geschätzte neue Größe"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Extra groß"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "F-Spot Betrachtung"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Filter nach ausgewählten Importen"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_alerie:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galerie"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:252
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Importieren"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Quelle importieren:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Unterordner einbeziehen"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Groß"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Die selbstausgewählten Bildformate verwalten"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Mittel"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Anzahl der Fotos in den ausgewählten Importen:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "An_zahl der Bilder"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "_Ordner öffnen …"
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Originalgröße (eventuell sehr große Dateigröße)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Überge_ordnete Markierung:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pause"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Einstellungen"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Vorheriges"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Reparieren"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Von der Kamera zu kopierende Fotos auswählen …"
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Eine Markierung auswählen …"
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Auswahl der Kamera, von der Dateien übertragen werden sollen"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Gewählte Kamera: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Beschränkungen der Auswahl"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Als Hintergrund_bild verwenden"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Alle Fotos anzeigen."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Seitenleiste anzeigen oder verbergen"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Werkzeugleiste anzeigen oder verbergen"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "Seiten_leiste"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Klein"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2205,40 +1996,40 @@ msgstr ""
"Geben Sie an, ob ein Bild in Originalgröße gedreht werden soll oder nicht. "
"Kleinere Größen werden automatisch gedreht."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "_Metadaten des Bilds entfernen"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Te_mp.:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Winzig"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Gesamte Originalgröße"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "Ansicht ver_größern"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "Ansicht ver_kleinern"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Ansicht vergrößern"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Ansicht verkleinern"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Helligkeit:"
@@ -2365,7 +2156,7 @@ msgstr "Werkzeugleiste verbergen"
msgid "Info"
msgstr "Info"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Bildinformationen"
@@ -2373,8 +2164,7 @@ msgstr "Bildinformationen"
msgid "Exit fullscreen"
msgstr "Vollbild verlassen"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:292
-#: ../src/SingleView.cs:101
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341 ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Diaschau"
@@ -2422,7 +2212,7 @@ msgstr "Kompatibilitätsordner"
msgid "Unknown Directory"
msgstr "Unbekannter Ordner"
-#: ../src/Imaging/ImageFile.cs:116
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Schreiben in diesem Dateiformat wird nicht unterstützt"
@@ -2565,7 +2355,7 @@ msgstr "Kategorie des Objekts"
msgid "Unknown IIM DataSet"
msgstr "Unbekannter IIM-Datensatz"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:357
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Ordner wählen"
@@ -2589,19 +2379,19 @@ msgstr "Ordner ist nicht vorhanden."
#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
-"The directory you selected \"{0}\" does not exist. Please choose a "
-"different directory"
+"The directory you selected \"{0}\" does not exist. Please choose a different "
+"directory"
msgstr ""
"Der von Ihnen gewählte Ordner »{0}« ist nicht vorhanden. Bitte wählen Sie "
"einen anderen Ordner"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Markierungen importieren"
+#| msgid "Import Tags"
+msgid "Imported Tags"
+msgstr "Importierte Markierungen"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:259 ../src/SingleView.cs:84
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Nach links drehen"
@@ -2609,7 +2399,7 @@ msgstr "Nach links drehen"
msgid "Rotate picture left"
msgstr "Bild nach links drehen"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:263 ../src/SingleView.cs:89
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Nach rechts drehen"
@@ -2625,51 +2415,51 @@ msgstr "Nächstes Bild"
msgid "Previous picture"
msgstr "Vorheriges Bild"
-#: ../src/MainWindow.cs:254
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Neue Bilder importieren"
-#: ../src/MainWindow.cs:270 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Übersicht"
-#: ../src/MainWindow.cs:274
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Viele Fotos gleichzeitig durchstöbern"
-#: ../src/MainWindow.cs:278
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Bild bearbeiten"
-#: ../src/MainWindow.cs:282
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Ein Foto anzeigen und bearbeiten"
-#: ../src/MainWindow.cs:287 ../src/SingleView.cs:96
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Vollbild"
-#: ../src/MainWindow.cs:289 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Fotos im Vollbild anzeigen"
-#: ../src/MainWindow.cs:294 ../src/SingleView.cs:103
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Fotos in einer Diaschau anzeigen"
-#: ../src/MainWindow.cs:309
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Vorheriges Foto"
-#: ../src/MainWindow.cs:314
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Nächstes Foto"
-#: ../src/MainWindow.cs:1473
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Keine Kameras erkannt."
-#: ../src/MainWindow.cs:1474
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2677,25 +2467,25 @@ msgstr ""
"F-Spot konnte keine an diesem System angeschlossene Kamera finden. "
"Vergewissern Sie sich, dass die Kamera angeschlossen und eingeschaltet ist."
-#: ../src/MainWindow.cs:1513
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Fehler beim Verbinden zur Kamera"
-#: ../src/MainWindow.cs:1514
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr ""
"Während dem Verbindungsaufbau zur Kamera wurde der Fehler »{0}« empfangen"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1800
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Die ausgewählte Markierung zusammenführen?"
msgstr[1] "Die {0} ausgewählten Markierungen zusammenführen?"
-#: ../src/MainWindow.cs:1827
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2703,77 +2493,76 @@ msgstr ""
"Diese Aktion wird die gewählten Markierungen und alle Untermarkierungen zu "
"einer einzigen Markierung zusammenführen."
-#: ../src/MainWindow.cs:1829
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "Markierungen _zusammenführen"
-#: ../src/MainWindow.cs:2034
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} von {1} Fotos"
msgstr[1] "{0} von {1} Fotos"
-#: ../src/MainWindow.cs:2036 ../src/SingleView.cs:493
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} Foto"
msgstr[1] "{0} Fotos"
-#: ../src/MainWindow.cs:2039
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} ausgewählt)"
msgstr[1] " ({0} ausgewählt)"
-#: ../src/MainWindow.cs:2120
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_OK"
-#: ../src/MainWindow.cs:2121
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Fehler beim Löschen des Bilds"
-#: ../src/MainWindow.cs:2126
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Keine Berechtigung zum Löschen der Datei:{1}{0}"
-#: ../src/MainWindow.cs:2130
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Ein Fehler des Typs {0} ist beim Löschen der Datei aufgetreten:{2}{1}"
-#: ../src/MainWindow.cs:2162
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Das ausgewählte Foto dauerhaft löschen?"
msgstr[1] "Die {0} ausgewählten Fotos dauerhaft löschen?"
-#: ../src/MainWindow.cs:2166
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
-msgid_plural ""
-"This deletes all versions of the selected photos from your drive."
+msgid_plural "This deletes all versions of the selected photos from your drive."
msgstr[0] "Dies löscht alle Versionen des gewählten Fotos vom Laufwerk."
msgstr[1] "Dies löscht alle Versionen der gewählten Fotos vom Laufwerk."
-#: ../src/MainWindow.cs:2169
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "Foto _löschen"
msgstr[1] "Fotos _löschen"
-#: ../src/MainWindow.cs:2205
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Das ausgewählte Foto aus F-Spot entfernen?"
msgstr[1] "Die {0} ausgewählten Fotos aus F-Spot entfernen?"
-#: ../src/MainWindow.cs:2210
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2783,27 +2572,27 @@ msgstr ""
"Markierungsinformationen verloren. Die Fotos bleiben jedoch auf dem Rechner "
"erhalten und können wieder in F-Spot importiert werden."
-#: ../src/MainWindow.cs:2211
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "Aus dem Katalog ent_fernen"
-#: ../src/MainWindow.cs:2274
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Die Markierung »{0}« löschen?"
-#: ../src/MainWindow.cs:2276
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Die {0} ausgewählten Markierungen löschen?"
-#: ../src/MainWindow.cs:2281
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "Foto"
msgstr[1] "Fotos"
-#: ../src/MainWindow.cs:2283
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -2815,18 +2604,18 @@ msgstr[1] ""
"Wenn eine Markierung gelöscht wird, gehen alle Verknüpfungen zu {0} {1} "
"verloren."
-#: ../src/MainWindow.cs:2288
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "Markierung _löschen"
msgstr[1] "Markierungen _löschen"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2302
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Markierung ist nicht leer"
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2835,39 +2624,39 @@ msgstr ""
"Markierungen können nicht gelöscht werden, wenn sie weitere Markierungen "
"beinhalten. Bitte löschen Sie zuerst die Markierungen unterhalb von »{0}«."
-#: ../src/MainWindow.cs:2735
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Ausgewähltes Foto nach links rotieren"
msgstr[1] "Ausgewählte Fotos nach links rotieren"
-#: ../src/MainWindow.cs:2748
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Ausgewähltes Foto nach rechts drehen"
msgstr[1] "Ausgewählte Fotos nach rechts drehen"
-#: ../src/MainWindow.cs:2759
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Gewählte Markierung _finden"
msgstr[1] "Gewählte Markierungen _finden"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Ausgewählte Markierung suchen _mit"
msgstr[1] "Ausgewählte Markierungen suchen _mit"
-#: ../src/MainWindow.cs:2804
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Neue Version erstellen?"
msgstr[1] "Neue Versionen erstellen?"
-#: ../src/MainWindow.cs:2806
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2882,7 +2671,7 @@ msgstr[1] ""
"Soll F-Spot vor dem Ausführen von {1} eine Kopie der ausgewählten Fotos "
"erstellen, um die Originale zu erhalten?"
-#: ../src/MainWindow.cs:2828
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "XCF-Version"
@@ -2906,87 +2695,93 @@ msgstr "Thema und Stichworte"
msgid "Compression"
msgstr "Art der Kompression"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Datenausrichtung"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Kameraausrichtung"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Pixel-Zusammensetzung"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Maßeinheit der Auflösung"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Belichtungsprogramm"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Messverfahren"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Belichtungsmodus"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Benutzerdefinierte Bildverarbeitung"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Komponentenkonfiguration"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Lichtquelle"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Messmethode"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Farbraum"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Weißabgleich"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Einheit der Sensorauflösung"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Dateiquellentyp"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Aufnahmeart"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Verstärkung"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Sättigung"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Schärfe"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Szenentyp"
@@ -3062,8 +2857,8 @@ msgstr ""
"Die Ausnahme »{0}« wurde empfangen. Der Name von Version »{1}« kann nicht "
"geändert werden."
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:562
-#: ../src/Widgets/InfoBox.cs:564
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Keine Bearbeitungen)"
@@ -3076,14 +2871,13 @@ msgstr "Fehler beim Bearbeiten des Fotos"
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr ""
-"Die Ausnahme »{0}« wurde empfangen. Das Bild {1} kann nicht gespeichert "
-"werden."
+"Die Ausnahme »{0}« wurde empfangen. Das Bild {1} kann nicht gespeichert werden."
#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Kommentar:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Fotos"
@@ -3165,9 +2959,9 @@ msgid_plural ""
"{0} photos could not be rotated because they are on a read only file system "
"or media such as a CDROM. Please check the permissions and try again."
msgstr[0] ""
-"Das Foto konnte nicht gedreht werden, da es sich auf einem "
-"schreibgeschützten Dateisystem oder Medium (z.B. CD-ROM) befindet. Bitte "
-"versuchen Sie es nach Überprüfung der Zugriffsrechte erneut."
+"Das Foto konnte nicht gedreht werden, da es sich auf einem schreibgeschützten "
+"Dateisystem oder Medium (z.B. CD-ROM) befindet. Bitte versuchen Sie es nach "
+"Überprüfung der Zugriffsrechte erneut."
msgstr[1] ""
"{0} Fotos konnten nicht gedreht werden, da sie sich auf einem "
"schreibgeschützten Dateisystem oder Medium (z.B. CD-ROM) befinden. Bitte "
@@ -3202,8 +2996,8 @@ msgstr "Ein Fehler ist beim Bearbeiten von »{0}« aufgetreten: {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "meine Fotos"
+msgid "My Photos"
+msgstr "Meine Fotos"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3225,23 +3019,23 @@ msgstr "Radius:"
msgid "Threshold:"
msgstr "Schwellwert:"
-#: ../src/SingleView.cs:86
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Foto nach links rotieren"
-#: ../src/SingleView.cs:91
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Foto nach rechts rotieren"
-#: ../src/SingleView.cs:128
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Ordner"
-#: ../src/SingleView.cs:354
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Öffnen"
-#: ../src/SingleView.cs:454
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Als Hintergrundbild verwenden"
@@ -3270,8 +3064,9 @@ msgid "Create New Tag..."
msgstr "Neue Markierung erstellen …"
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Ausgewählte Markierung bearbeiten …"
+#| msgid "Edit Tag"
+msgid "Edit Tag..."
+msgstr "Markierung bearbeiten …"
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3354,7 +3149,7 @@ msgid "Events"
msgstr "Ereignisse"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:408
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Keine)"
@@ -3502,16 +3297,16 @@ msgstr "Fehlerdetails"
msgid "An unhandled exception was thrown: "
msgstr "Eine unverarbeitete Ausnahme trat auf:"
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Keine"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Systemprofil"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Standardthema"
@@ -3536,7 +3331,7 @@ msgstr "Beschriftung"
msgid "Ratio"
msgstr "Bildformate"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Erneut versuchen"
@@ -3729,8 +3524,8 @@ msgid "By _Rating"
msgstr "Nach _Bewertung"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Adresse kop_ieren"
+msgid "Copy"
+msgstr "Kopieren"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3756,6 +3551,10 @@ msgstr "Sei_teneinstellungen …"
msgid "Re_fresh Thumbnail"
msgstr "Bildvorschau _aktualisieren"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "_Alles auswählen"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Alles a_bwählen"
@@ -3817,8 +3616,9 @@ msgid "_Delete Version"
msgstr "Version _löschen"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "Ausgewählte Markierung _bearbeiten …"
+#| msgid "Edit Tag"
+msgid "_Edit Tag..."
+msgstr "Markierung b_earbeiten …"
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
@@ -3916,11 +3716,11 @@ msgstr "_Unmarkierte Fotos"
msgid "_Version"
msgstr "_Version"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "F-Spot-Datenbank wird aktualisiert"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -4013,11 +3813,11 @@ msgstr "Markierungen der Fotos drucken"
msgid "Print photo comment"
msgstr "Kommentar zum Foto drucken"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Bearbeiten"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -4025,17 +3825,17 @@ msgstr ""
"Dieses Werkzeug benötigt eine aktive Auswahl. Bitte wählen Sie einen Bereich "
"des Fotos aus und versuchen Sie es danach erneut."
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Fehler beim Speichern des abgeglichenen Fotos"
msgstr[1] "Fehler beim Speichern der abgeglichenen Fotos"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
-"Received exception \"{0}\". Note that you have to develop RAW files into "
-"JPEG before you can edit them."
+"Received exception \"{0}\". Note that you have to develop RAW files into JPEG "
+"before you can edit them."
msgstr ""
"Die Ausnahme »{0}« wurde empfangen. Beachten Sie, dass RAW-Dateien vor der "
"Bearbeitung erst in JPEG-Dateien umgewandelt werden müssen."
@@ -4052,7 +3852,7 @@ msgstr "_Vertikal"
msgid "Find:"
msgstr "Suchen:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Ordner"
@@ -4064,54 +3864,58 @@ msgstr "Dateisystem"
msgid "Histogram"
msgstr "Histogramm"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Version"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Datum"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Belichtung"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Brennweite"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Dateigröße"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Bewertung"
-#: ../src/Widgets/InfoBox.cs:389 ../src/Widgets/InfoBox.cs:397
-#: ../src/Widgets/InfoBox.cs:427
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(falsches Format)"
-#: ../src/Widgets/InfoBox.cs:417 ../src/Widgets/InfoBox.cs:440
-#: ../src/Widgets/InfoBox.cs:450 ../src/Widgets/InfoBox.cs:459
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
msgid "(Unknown)"
msgstr "(Unbekannt)"
-#: ../src/Widgets/InfoBox.cs:560
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
msgstr[0] "(Eine Bearbeitung)"
msgstr[1] "({0} Bearbeitungen)"
-#: ../src/Widgets/InfoBox.cs:574
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(Fehler beim Lesen der Datei) "
-#: ../src/Widgets/InfoBox.cs:619
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} Fotos"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:639
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4120,7 +3924,7 @@ msgstr ""
"Auf {0} zwischen \n"
"{1} und {2}"
-#: ../src/Widgets/InfoBox.cs:644
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4129,61 +3933,61 @@ msgstr ""
"Zwischen {0} \n"
"und {1}"
-#: ../src/Widgets/InfoBox.cs:671
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(Mindestens eine Datei wurde nicht gefunden)"
-#: ../src/Widgets/InfoBox.cs:788
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Fotonamen anzeigen"
-#: ../src/Widgets/InfoBox.cs:797
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Datum anzeigen"
-#: ../src/Widgets/InfoBox.cs:806
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Größe anzeigen"
-#: ../src/Widgets/InfoBox.cs:815
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Belichtung anzeigen"
-#: ../src/Widgets/InfoBox.cs:824
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Brennweite anzeigen"
-#: ../src/Widgets/InfoBox.cs:833
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Kamera anzeigen"
-#: ../src/Widgets/InfoBox.cs:842
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Dateigröße anzeigen"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metadaten"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Erweiterte Metadaten"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Keine erweiterten Metadaten verfügbar"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Kein Foto ausgewählt"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "Das Foto »{0}« ist nicht vorhanden"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Keine Metadaten verfügbar"
@@ -4216,53 +4020,215 @@ msgstr "Eine Diaschau aus F-Spot anzeigen"
msgid "F-Spot photos"
msgstr "F-Spot Fotos"
-#~ msgid "<b>F-Spot tags</b>"
-#~ msgstr "<b>F-Spot-Markierungen</b>"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Ausgewählte Markierung bearbeiten …"
+
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "Ausgewählte Markierung _bearbeiten …"
+
+#~ msgid "Package"
+#~ msgstr "Paket"
+
+#~ msgid "Extension Installation"
+#~ msgstr "Erweiterungen installieren"
+
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr ""
+#~ "<b>Wählen Sie die zu installierende Erweiterung und klicken Sie auf "
+#~ "»Weiter«</b>"
+
+#~ msgid "Install from:"
+#~ msgstr "Installieren von:"
+
+#~ msgid "_Repositories..."
+#~ msgstr "_Repositories …"
+
+#~ msgid "Show all packages"
+#~ msgstr "Alle Pakete anzeigen"
+
+#~ msgid "Show new versions only"
+#~ msgstr "Nur neue Versionen anzeigen"
+
+#~ msgid "Show updates only"
+#~ msgstr "Nur Aktualisierungen anzeigen"
+
+#~ msgid "_Unselect All"
+#~ msgstr "Auswahl _rückgängig"
+
+#~ msgid "label124"
+#~ msgstr "label124"
+
+#~ msgid "Overall Progress:"
+#~ msgstr "Fortschritt insgesamt:"
+
+#~ msgid "Downloading extensions..."
+#~ msgstr "Erweiterungen werden heruntergeladen …"
+
+#~ msgid "Extension Manager"
+#~ msgstr "Erweiterungsmanager"
+
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr ""
+#~ "Es werden weitere Erweiterungen benötigt, um diesen Schritt durchzuführen."
+
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Die folgenden Erweiterungen werden installiert:"
+
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Erweiterungsverwaltung</b></big>"
+
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Die folgenden Erweiterungen sind im Moment installiert:"
+
+#~ msgid "_Install Extensions..."
+#~ msgstr "Erweiterungen _installieren …"
+
+#~ msgid "_Uninstall..."
+#~ msgstr "_Deinstallieren …"
+
+#~ msgid "Enable"
+#~ msgstr "Aktivieren"
+
+#~ msgid "Disable"
+#~ msgstr "Deaktivieren"
+
+#~ msgid "Details"
+#~ msgstr "Details"
-#~ msgid "<b>Tabblo account</b>"
-#~ msgstr "<b>Tabblo-Konto</b>"
+#~ msgid "Extension Repository Management"
+#~ msgstr "Verwaltung von Erweiterungs-Softwarequellen"
+
+#~ msgid "Add New Repository"
+#~ msgstr "Neue Softwarequelle hinzufügen"
+
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr ""
+#~ "Auswahl der Adresse der Softwarequelle, die hinzugefügt werden sollen:"
+
+#~ msgid "Register an on-line repository"
+#~ msgstr "Eine Online-Softwarequelle registrieren"
+
+#~ msgid "Url:"
+#~ msgstr "Adresse:"
+
+#~ msgid "Register a local repository"
+#~ msgstr "Eine lokale Softwarequelle registrieren"
+
+#~ msgid "Path:"
+#~ msgstr "Pfad:"
+
+#~ msgid "Browse..."
+#~ msgstr "Durchsuchen …"
+
+#~ msgid "Version:"
+#~ msgstr "Version:"
+
+#~ msgid "Author:"
+#~ msgstr "Autor:"
+
+#~ msgid "Copyright:"
+#~ msgstr "Urheberrecht:"
+
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Abhängigkeiten der Erweiterungen:"
+
+#~ msgid "All registered repositories"
+#~ msgstr "Alle registrierten Softwarequellen"
+
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Sind Sie sicher, dass Sie die Installation abbrechen wollen?"
+
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Die folgenden Pakete werden entfernt:"
+
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Es gibt weitere Erweiterungen, die von den vorherigen abhängig sind, die "
+#~ "ebenfalls entfernt werden:"
#~ msgid ""
-#~ "<small><i>F-Spot tags can help you track the export status of photos. "
-#~ "Example: Use one tag for the photos that you plan to export, and another "
-#~ "one for those already exported. Here, you can tell F-Spot to "
-#~ "automatically replace these tags as appropriate.</i></small>"
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
#~ msgstr ""
-#~ "<small><i>F-Spot-Markierungen können Ihnen dabei helfen, den Exportstatus "
-#~ "Ihrer Fotos zu verfolgen. Beispiel: Verwenden Sie eine bestimmte "
-#~ "Markierung für Fotos, die Sie exportieren wollen, und eine weitere für "
-#~ "jene Fotos, die bereits exportiert wurden. So können Sie F-Spot anweisen, "
-#~ "diese Markierungen automatisch wie gewünscht zu ersetzen.</i></small>"
+#~ "Die ausgewählten Erweiterungen können nicht installiert werden, da es "
+#~ "weitere Abhängigkeiten gibt."
-#~ msgid "Rem_ove from exported photos:"
-#~ msgstr "Aus exp_ortierten Fotos entfernen:"
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Die folgenden Pakete werden installiert:"
-#~ msgid "Select..."
-#~ msgstr "Auswählen …"
+#~ msgid " (in user directory)"
+#~ msgstr "(im Benutzerordner)"
-#~ msgid "_Attach to exported photos:"
-#~ msgstr "An exportierte Fotos _anhängen:"
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Die folgenden Pakete müssen entfernt werden:"
-#~ msgid "<b>{0}</b>."
-#~ msgstr "<b>{0}</b>."
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Die folgenden Abhängigkeiten konnten nicht erfüllt werden:"
-#~ msgid "A trust error occured while attempting to access"
-#~ msgstr "Es gab einen Vertrauensfehler beim Verbindungsaufbau"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Die Installation wurde erfolgreich durchgeführt."
-#~ msgid "Abort this session"
-#~ msgstr "Sitzung wird abgebrochen"
+#~ msgid "The installation failed!"
+#~ msgstr "Die Installation ist fehlgeschlagen!"
-#~ msgid "Always trust this site's certificate"
-#~ msgstr "Diesem Zertifikat immer vertrauen"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Die Installation wurde mit Warnungen durchgeführt."
-#~ msgid "Do you wish to:"
-#~ msgstr "Möchten Sie:"
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Die Deinstallation wurde erfolgreich durchgeführt."
-#~ msgid "Trust Error"
-#~ msgstr "Vertrauensfehler"
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Die Deinstallation ist fehlgeschlagen!"
-#~ msgid "Trust the site's certificate this once"
-#~ msgstr "Diesem Zertifikat nur dieses Mal vertrauen"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Die Deinstallation wurde mit Warnungen durchgeführt."
+
+#~ msgid "Repository"
+#~ msgstr "Software-Quelle"
+
+#~ msgid "Installation cancelled"
+#~ msgstr "Installation abgebrochen"
+
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Einige der benötigten Erweiterungen wurden nicht gefunden"
+
+#~ msgid "Installation failed"
+#~ msgstr "Installation ist fehlgeschlagen"
+
+#~ msgid "Extension"
+#~ msgstr "Erweiterung"
+
+#~ msgid "Other"
+#~ msgstr "Andere"
+
+#~ msgid "Url"
+#~ msgstr "Adresse"
+
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Ausnahme aufgetreten: {0}"
+
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Deaktivierte Erweiterungen können nicht geladen werden."
+
+#~ msgid "Loading {0} extension"
+#~ msgstr "Laden der Erweiterung {0}"
+
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Die benötigte Erweiterung »{0}« ist deaktiviert."
+
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Die benötigte Erweiterung »{0}« ist nicht installiert."
+
+#~ msgid "(provided by {0})"
+#~ msgstr "(zur Verfügung gestellt von {0})"
+
+#~ msgid "my photos"
+#~ msgstr "meine Fotos"
+
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Adresse kop_ieren"
#~ msgid "Dissolve"
#~ msgstr "Überblenden"
@@ -4344,8 +4310,7 @@ msgstr "F-Spot Fotos"
#~ "<small><i>Enable this option to store tags and descriptions inside \n"
#~ "supported image formats.</i></small>"
#~ msgstr ""
-#~ "<small><i>Aktivieren Sie diese Option, um Markierungen und "
-#~ "Beschreibungen\n"
+#~ "<small><i>Aktivieren Sie diese Option, um Markierungen und Beschreibungen\n"
#~ "im Bild selbst zu speichern, sofern das Bildformat dies unterstützt.</i></"
#~ "small>"
@@ -4431,8 +4396,8 @@ msgstr "F-Spot Fotos"
#~ msgstr "Metapixel nicht verfügbar"
#~ msgid ""
-#~ "The metapixel executable was not found in path. Please check that you "
-#~ "have it installed and that you have permissions to execute it"
+#~ "The metapixel executable was not found in path. Please check that you have "
+#~ "it installed and that you have permissions to execute it"
#~ msgstr ""
#~ "Die ausführbare Metapixel-Datei wurde nicht im Suchpfad gefunden. Bitte "
#~ "stellen Sie sicher, dass diese installiert ist und Sie über die nötigen "
@@ -4470,8 +4435,8 @@ msgstr "F-Spot Fotos"
#~ msgstr "PictureTile nicht verfügbar"
#~ msgid ""
-#~ "The picturetile.pl executable was not found in path. Please check that "
-#~ "you have it installed and that you have permissions to execute it"
+#~ "The picturetile.pl executable was not found in path. Please check that you "
+#~ "have it installed and that you have permissions to execute it"
#~ msgstr ""
#~ "Die ausführbare Datei »picturetile.pl« wurde nicht im Suchpfad gefunden. "
#~ "Bitte stellen Sie sicher, dass diese installiert ist und Sie über die "
@@ -4715,11 +4680,10 @@ msgstr "F-Spot Fotos"
#, fuzzy
#~ msgid ""
-#~ "<small><i>Enable this option if you want to allow other programs to "
-#~ "import or delete photos and tags over DBus.</i></small>"
+#~ "<small><i>Enable this option if you want to allow other programs to import "
+#~ "or delete photos and tags over DBus.</i></small>"
#~ msgstr ""
-#~ "<small><i>Aktivieren Sie diese Option, um Markierungen und "
-#~ "Beschreibungen\n"
+#~ "<small><i>Aktivieren Sie diese Option, um Markierungen und Beschreibungen\n"
#~ "im Bild selbst zu speichern, sofern das Bildformat dies unterstützt.</i></"
#~ "small>"
@@ -4789,8 +4753,8 @@ msgstr "F-Spot Fotos"
#~ "permissions are correct and try again"
#~ msgstr ""
#~ "Der Fehler »{0}« ist während der Erstellung des Verzeichnisses »{1}« "
-#~ "aufgetreten. Überprüfen Sie den Pfad und die Zugriffsrechte. Versuchen "
-#~ "Sie es danach noch einmal."
+#~ "aufgetreten. Überprüfen Sie den Pfad und die Zugriffsrechte. Versuchen Sie "
+#~ "es danach noch einmal."
#~ msgid "Select Destination"
#~ msgstr "Zielverzeichnis wählen"
diff --git a/po/el.po b/po/el.po
index 90fe3ff..f881f61 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,10 +8,10 @@
msgid ""
msgstr ""
"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&component=General\n"
-"POT-Creation-Date: 2009-04-28 08:22+0000\n"
-"PO-Revision-Date: 2009-05-11 16:59+0200\n"
-"Last-Translator: Βασίλης Κοντογιάνης vasilisk at ics.forth.gr <vasilisk at ics.forth.gr>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-27 17:54+0200\n"
+"PO-Revision-Date: 2010-03-05 18:04+0200\n"
+"Last-Translator: Kostas Papadimas <pkst at gnome.org>\n"
"Language-Team: Greek <team at gnome.gr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,358 +21,1431 @@ msgstr ""
"X-Poedit-Country: GREECE\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Έκδοση:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Συγγραφέας:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Μεταφορά εικόνων"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Πνευματικά δικαιώματα:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Μεταφορά εικόνας\"{0}\" σε CD"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Εξαρτήσεις επεκτάσεων:"
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} από {1}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Όλοι τα καταχωρημένα αποθετήρια"
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "Ολοκληρώθηκε η αποστολή φωτογραφιών"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Είστε βέβαιοι ότι θέλετε να ακυρώσετε την εγκατάσταση;"
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Η μεταφορά ολοκληρώθηκε"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Τα ακόλουθα πακέτα θα απομακρυνθούν:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "Σφάλμα κατά την μεταφορά αρχείου"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid "There are other extensions that depend on the previous ones which will also be uninstalled:"
-msgstr "Υπάρχουν κι άλλες επεκτάσεις που εξαρτώνται σε προηγούμενες οι οποίες επίσης θα απομακρυνθούν:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "Σφάλμα μεταφοράς"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid "The selected extensions can't be installed because there are dependency conflicts."
-msgstr "Οι επιλεγμένες επεκτάσεις δεν είναι δυνατό να εγκατασταθούν επειδή υπάρχουν συγκρούσεις εξαρτήσεων."
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "γίνεται αντιγραφή..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Τα ακόλουθα πακέτα θα εγκατασταθούν:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr ""
+"<b><i>Υπάρχουν κάποια προηγούμενα προγραμματισμένα αντικείμενα προς εγγραφή</"
+"i></b>"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr "(στον κατάλογο του χρήστη)"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Φωτογραφίες για εγγραφή</b>"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Τα ακόλουθα πακέτα πρέπει να απομακρυνθούν:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Αυτόματη περιστροφή"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Τα ακόλουθα πακέτα δεν ήταν δυνατό να αναλυθούν:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Δημιουργία CD"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Η εγκατάσταση έχει ολοκληρωθεί με επιτυχία."
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Μέγεθος"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Η εγκατάσταση απέτυχε!"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Μέγεθος της επιλογής προς εξαγωγή:"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Αναζήτηση προηγούμενων προγραμματισμένων αρχείων"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Η εγκατάσταση έχει ολοκληρωθεί αλλά με ειδοποιήσεις."
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Εξαγωγή"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Η απομάκρυνση έχει ολοκληρωθεί με επιτυχία."
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "_Εγγραφή μόνο αυτών των φωτογραφιών στο CD"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "Αναμονή για εξουσιοδότηση"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
+msgstr ""
+"Το F-Spot θα ξεκινήσει τώρα τον περιηγητή διαδικτύου σας ώστε να "
+"ενεργοποιήσετε τα δικαιώματα που μόλις επιλέξατε.\n"
+"\n"
+"Μόλις το Facebook σας προτρέψει να επιστρέψετε πίσω στην εφαρμογή αυτή, "
+"πατήστε \"Εντάξει\" παρακάτω."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Η απεγκατάσταση απέτυχε!"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "Πάρα πολλές εικόνες προς εξαγωγή"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Η απομάκρυνση έχει ολοκληρωθεί αλλά με ειδοποιήσεις."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+"Το Facebook επιτρέπει μόνο {0} φωτογραφίες ανά συλλογή. Παρακαλώ αλλάξτε την "
+"επιλογή σας και προσπαθήστε ξανά."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Αποθετήριο"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Γίνεται ανέβασμα των φωτογραφιών"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Η εγκατάσταση ακυρώθηκε"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "Η συλλογή πρέπει να έχει ένα όνομα"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Δεν βρέθηκαν μερικές από τις απαιτούμενες επεκτάσεις"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "Παρακαλώ ονομάστε την συλλογή σας ή επιλέξτε μια υπάρχουσα."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Η εγκατάσταση απέτυχε"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "Αποτυχία δημιουργίας καινούργιας συλλογής"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Επέκταση"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"Σφάλμα κατά την δημιουργία νέας συλλογής.\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Έκδοση"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Ανέβασμα φωτογραφίας \"{0}\" ({1} από {2})"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Σφάλμα ανεβάσματος στο Facebook: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Ανέβασμα ολοκληρώθηκε"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Επισκεφτείτε την ομάδα του F-Spot στο Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Άλλη"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Αναμονή για πιστοποίηση"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:9
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"Το F-Spot θα ξεκινήσει τώρα τον περιηγητή διαδικτύου σας ώστε να συνδεθείτε "
+"στο Facebook.\n"
+"\n"
+"Μόλις το Facebook σας προτρέψει να επιστρέψετε πίσω στην εφαρμογή αυτή, "
+"πατήστε \"Εντάξει\" παρακάτω. Το F-Spot θα αποθηκεύσει την συνεδρία σας στην "
+"κλειδοθήκη του GNOME, αν είναι δυνατό, και θα την χρησιμοποιεί σε "
+"μελλοντικές εξαγωγές προς το Facebook."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Γίνεται ταυτοποίηση..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Σφάλμα σύνδεσης στο Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr ""
+"Υπήρξε πρόβλημα κατά την είσοδο στο Facebook. Ελέγξτε τα διαπιστευτήρια σας "
+"και προσπαθήστε ξανά."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Εξουσιοδότηση συνεδρίας"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "Η συνεδρία επιτεύχθηκε, γίνεται λήψη των πληροφοριών του χρήστη..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "Η συνεδρία επιτεύχθηκε, γίνεται λήψη της λίστας φίλων..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "Η συνεδρία επιτεύχθηκε, γίνεται λήψη των πληροφοριών των φίλων..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "Η συνεδρία επιτεύχθηκε, γίνεται λήψη των συλλογών με φωτογραφίες..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} συνδέθηκε στο Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Σφάλμα σύνδεσης με το Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"Παρουσιάστηκε σφάλμα κατά την λήψη των πληροφοριών σας από το Facebook.\n"
+"\n"
+"Το Facebook ανέφερε: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Δεν είστε συνδεδεμένος."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Αυτόματη επιβεβαίωση φωτογραφιών"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Λεζάντα"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Δημιουργία νέας συλλογής"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Εξαγωγή στο Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "Σε αυτή τη φωτογραφία"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Τοποθεσία"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Αποσύνδεση"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Όνομα"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Ιστοσελίδα"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Δεν είστε συνδεδεμένος"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Δικαιώματα:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Παραμείνετε σε σύνδεση"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Χρήση υπάρχουσας συλλογής"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Ποιος είναι;"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Εξουσιοδότηση"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Υπήρξε η εξαίρεση: {0}"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"Επιστρέψτε σε αυτό το παράθυρο όταν τελειώσετε τη διεργασία εξουσιοδότησης "
+"στο {0} και κάντε κλικ με το ποντίκι σας στο κουμπί \"Ολοκλήρωση "
+"εξουσιοδότησης\" παρακάτω"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Πακέτο"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Ολοκλήρωση εξουσιοδότησης"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Εγκατάσταση επεκτάσεων"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Γίνεται σύνδεση στο {0}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Επιλέξτε τις επεκτάσεις για εγκατάσταση και κάντε κλικ στο Επόμενο</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Γίνεται έλεγχος διαπιστευτηρίων..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Εγκατάσταση από:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Καλωσήλθατε {0} είστε συνδεδεμένοι στο {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Αποθετήρια"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Είσοδος σαν διαφορετικός χρήστης"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Προβολή όλων των πακέτων"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "Χρησιμοποιήθηκε {0} από το επιτρεπόμενο μηνιαίο όριο {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Προβολή μόνο των νέων εκδόσεων"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Αδύνατη η σύνδεση"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Προβολή μόνο των ενημερώσεων"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Σε αναμονή για απάντηση του {0} από {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Α_πεπιλογή όλων"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "Ανέβασμα εικόνας \"{0}\""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:110
-msgid "Select _All"
-msgstr "Επιλογή _όλων"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Σφάλμα ανεβάσματος στο {0}: {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "ετικέτα124"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "Αδύνατη η σύνδεση."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Συνολικά πρόοδος:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"Το F-Spot δεν κατάφερε να συνδεθεί στο {0}. Βεβαιωθείτε ότι σας έχει δοθεί η "
+"πιστοποίηση χρησιμοποιώντας τη διεπαφή του περιηγητή διαδικτύου {0}."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Λήψη επεκτάσεων..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Λογαριασμός</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Διαχειριστής επεκτάσεων"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Φωτογραφίες</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Απαιτούνται πρόσθετες επεκτάσεις για την πραγματοποίηση αυτής της λειτουργίας."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Στυλ</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Θα εγκατασταθούν οι ακόλουθες επεκτάσεις:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Προβολή αδειών πρόσβασης</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Διαχειριστής επεκτάσεων</b></big>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "Εξαγωγή"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Οι ακόλουθες επεκτάσεις εγκαθίστανται άμεσα:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "Εξαγωγή _ιεραρχίας ετικετών"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "Ε_γκατάσταση επεκτάσεων..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"Το F-Spot χρειάζεται την εξουσιοδότησή σας για να ανεβάζει φωτογραφίες στο "
+"{0} λογαριασμό σας. Πιέστε το κουμπί \"Εξουσιοδότηση\" για να ανοίξετε τον "
+"περιηγητή δικτύου και να παρέχετε στο F-Spot εξουσιοδότηση. "
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "Α_πομάκρυνση..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "Παράβλεψη ετικετών με_γάλου επιπέδου"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:13
-msgid "Enable"
-msgstr "Ενεργοποίηση"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Προσωπικό"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Απενεργοποίηση"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Δημόσιο"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:799
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:543
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:694
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:177
-msgid "Error"
-msgstr "Σφάλμα"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "Αφαίρεση _μεταδεδομένων"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Ορατό στην οικογένεια"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Ορατό στους φίλους"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "_Εξαγωγή ετικετών"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "Α_λλαγή μεγέθους σε: "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr ""
+"_Προβολή φωτογραφιών στον περιηγητή μετά την ολοκλήρωση του ανεβάσματος"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "εικονοστοιχεία"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "_Φάκελο..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Επιλογή φακέλου για εξαγωγή"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "Γίνεται δημιουργία της συλλογής"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "Σφάλμα ανεβάσματος εικόνας \"{0}\" στη συλλογή:{2}{1}"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "Σφάλμα κατά την μεταφορά· Ματαίωση"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Σφάλμα: Το αρχείο υπάρχει ήδη· Ματαίωση"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "Φωτεινό"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "Σκοτεινό"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "Προηγούμενη"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Κατάλογος"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "Ετικέτες"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Επόμενη"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "Η συλλογή δημιουργήθηκε από"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "Προβολή τεχνοτροπιών"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Λεπτομέρειες"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "Απόκρυψη τεχνοτροπιών"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Ετικέτες: "
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Διαχείριση επεκτάσεων αποθετηρίου"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "Σελίδα:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Προσθήκη νέου αποθετηρίου"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Επιλέξτε την τοποθεσία του αποθετηρίου που θέλετε καταχωρήσετε:"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Προορισμός</b>"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Καταχώρηση δικτυακού αποθετηρίου"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Μέθοδος εξαγωγής</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Ιστοσελίδα:"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "Δημιουργία _συλλογής χρησιμοποιώντας το \"Original\""
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Καταχώρηση ενός τοπικού αποθετηρίου"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "Δημιουργήστε συλλογή για το _διαδίκτυο"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Διαδρομή:"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "_Περιγραφή:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Περιήγηση..."
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "Εξαγωγή _ετικετών"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "Εξαγωγή _εικονιδίων ετικετών"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Εξαγωγή φακέλου"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "Όνομα _συλλογής:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "Ά_νοιγμα προορισμού μετά την ολοκλήρωση της εξαγωγής"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Φάκελος:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "_Μόνο αποθήκευση των αρχείων"
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "_Gallery στο διαδίκτυο..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Δεν μπορεί να συνδεθεί σε Gallery για το οποίο η έκδοση είναι άγνωστη.\n"
+"Παρακαλώ ελέγξτε ότι έχετε το Remote plugin 1.0.8 ή μεταγενέστερο"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "Άκυρο URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "Το URL του Gallery δεν είναι ένα έγκυρο URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "Σφάλμα κατά την σύνδεση με το Gallery"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
#, csharp-format
-msgid "(provided by {0})"
-msgstr "(παρέχεται από το {0})"
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "Το παρακάτω σφάλμα εμφανίστηκε κατά την προσπάθεια σύνδεσης: {0}"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Δεν είναι δυνατή η φόρτωση απενεργοποιημένων επεκτάσεων."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "Ένα Gallery με αυτό το όνομα υπάρχει ήδη"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Φόρτωση επέκτασης {0}"
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+"Υπάρχει ήδη ένα Gallery με το ίδιο όνομα στις καταχωρημένες συλλογές σας. "
+"Παρακαλώ επιλέξτε ένα μοναδικό όνομα."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(Αρχικό επίπεδο)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "Μη έγκυρο όνομα Gallery"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Το όνομα της συλλογής περιλαμβάνει μη έγκυρους χαρακτήρες.\n"
+"Μόνο γράμματα, αριθμοί - και _ επιτρέπονται"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Η απαιτούμενη επέκταση '{0}' είναι απενεργοποιημένη."
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Σφάλμα κατά το ανέβασμα της φωτογραφίας \"{0}\" στο Gallery: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(Καμία συλλογή)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(Δε συνδέθηκε)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(Καμία συλλογή)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Δεν επιλέχτηκε λογαριασμός"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Συλλογή</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Gallery</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Σφάλμα κατά την σύνδεση στη συλλογή</"
+"span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "Εξαγωγή _τίτλων και σχολίων"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr ""
+"Άνοιγμα της _συλλογής στον περιηγητή μετά την ολοκλήρωση του ανεβάσματος"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Παρακαλούμε επαληθεύστε ότι οι ρυθμίσεις για τη συλλογή είναι σωστές."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "Όνομα _συλλογής:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Περιγραφή:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "Ε_ξαγωγή σε συλλογή:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "Ό_νομα Gallery:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Συλλογή:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "_Γονική συλλογή:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "_Κωδικός:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Τίτλος:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "Όνομα _χρήστη:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "Σφάλμα ανάγνωσης απόκρισης εξυπηρετητή"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Απάντηση εξυπηρετητή χωρίς το περιεχόμενο του Gallery"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "Σφάλμα κατά την δημιουργία νέας συλλογής"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Η απαιτούμενη επέκταση '{0}' δεν είναι εγκατεστημένη."
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"Εμφανίστηκε σφάλμα κατά την προσπάθεια εκτέλεσης της αιτούμενης εργασίας:\n"
+"{0} ({1})"
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "Προβολέας εικόνων F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "Προβολή εικόνων f-spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "Σφάλμα κατά την δημιουργία της συλλογής"
-#: ../f-spot-import.desktop.in.in.h:1
-#: ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "Διαχειριστής εικόνων f-spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr ""
+"Παρουσιάστηκε το ακόλουθο σφάλμα κατά την προσπάθεια δημιουργίας μιας "
+"συλλογής: {0}"
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "Εισαγωγή στο F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} Στάλθηκε"
-#: ../f-spot-import.desktop.in.in.h:3
-#: ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "Διαχειριστής εικόνων"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} από περίπου {1}"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "Οργανώστε απολαύστε και μοιραστείτε τις φωτογραφίες σας"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Σφάλμα ανεβάσματος στη συλλογή: {0}"
-#: ../libeog/image-view.c:2124
-msgid "interpolation type"
-msgstr "τύπος παρεμβολής "
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Διαθέσιμος χώρος: {0}, {1}% χρησιμοποιείται από τα {2}"
-#: ../libeog/image-view.c:2125
-msgid "the type of interpolation to use"
-msgstr "ο τύπος της παρεμβολής που θα χρησιμοποιηθεί"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"Η επιλεγμένη συλλογή έχει όριο τις {0} εικόνες,\n"
+"το οποίο θα ξεπεραστεί με την τρέχουσα επιλογή των {1} εικόνων"
-#: ../libeog/image-view.c:2131
-#: ../libeog/image-view.c:2138
-msgid "check type"
-msgstr "τύπος τετραγωνιδίων"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>Εξαγωγή PicasaWeb</b>"
-#: ../libeog/image-view.c:2132
-msgid "the type of chequering to use"
-msgstr "ο τύπος των τετραγωνιδίων για χρήση"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Ο λογαριασμός σας στο Google είναι "
+"κλειδωμένος</span>\n"
-#: ../libeog/image-view.c:2139
-msgid "the size of chequers to use"
-msgstr "το μέγεθος των τετραγωνιδίων για χρήση"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Παρακαλούμε βεβαιώστε ότι οι ρυθμίσεις για αυτήν τη συλλογή είναι\n"
+"σωστές. Εισάγετε τα γράμματα όπως εμφανίζονται στην εικόνα μέσα στο πεδίο "
+"'Captcha'.\n"
+"<i>Δεν γίνεται διάκριση πεζών από κεφαλαία</i>"
-#: ../libeog/image-view.c:2145
-msgid "dither"
-msgstr "dither"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Δημόσια συλλογή"
-#: ../libeog/image-view.c:2146
-msgid "dither type"
-msgstr "τύπος dither"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "_Τίτλος συλλογής:"
-#: ../libfspot/f-jpeg-utils.c:441
-#: ../src/RotateCommand.cs:222
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "_Αυτόματη περιστροφή"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>Εξαγωγή SmugMug</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Λογαριασμός:"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Ανέβασμα φωτογραφίας \"{0}\""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Γίνεται σύνδεση στο Tabblo"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Γίνεται εύρεση URL για ανέβασμα"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "Ολοκληρώθηκε η αποστολή φωτογραφιών"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Το ανέβασμα ολοκληρώθηκε"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Σφάλμα ανεβάσματος στο Tabblo: "
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Ετικέτες F-Spot</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Λογαριασμός Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>Οι ετικέτες του F-Spot μπορούν να σας βοηθήσουν να ελέγχετε την "
+"κατάσταση εξαγωγής των φωτογραφιών. Για παράδειγμα: χρησιμοποιήστε μια "
+"ετικέτα για τις φωτογραφίες που προτίθεστε να εξάγετε και άλλη μια για όσες "
+"έχουν εξαχθεί ήδη. Εδώ μπορείτε να ρυθμίστε το F-Spot ώστε να αντικαθιστά "
+"αυτές τις ετικέτες αυτόματα όταν χρειάζεται.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Αφαίρεση από εξαγμένες φωτογραφίες:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Επιλογή..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Επισύναψη σε εξαγμένες φωτογραφίες:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Παρουσιάστηκε σφάλμα ταυτοποίησης κατά την προσπάθεια σύνδεσης"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Εγκατάλειψη αυτής της συνεδρίας"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Εμπιστεύεστε το πιστοποιητικό του ιστότοπου πάντοτε"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Θέλετε να:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Σφάλμα πιστοποίησης"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Εμπιστευθείτε το πιστοποιητικό μόνο αυτή τη φορά"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "_Συμπιεσμένο αρχείο..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "Δεν υπάρχει διαθέσιμη επιλογή"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"Αυτό το εργαλείο απαιτεί μια ενεργή επιλογή. Παρακαλώ επιλέξτε μια ή "
+"περισσότερες εικόνες και προσπαθήστε ξανά"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Επιλογή φακέλου εξαγωγής"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Γίνεται εξαγωγή αρχείων"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Γίνεται προετοιμασία της φωτογραφίας \"{0}\""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "_Δημιουργία"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "Ό_νομα αρχείου:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Τοποθεσία:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Διαβάθμιση:"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"Προκειμένου να ανιχνευθούν πανομοιότυπα στις εικόνες που εισαγάγατε πριν την "
+"0.5.0, το F-Spot πρέπει να αναλύσει τη συλλογή των εικόνων σας. Αυτό δεν "
+"γίνεται εξ ορισμού καθώς είναι χρονοβόρο. Μπορείτε να ξεκινήσετε ή να "
+"διακόψετε τη διαδικασία με τη χρήση αυτού του διαλόγου."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+"Έχετε {0} φωτογραφίες που χρειάζονται υπολογισμό md5 και {1} εκκρεμείς "
+"εργασίες"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "Γίνεται επεξεργασία των εικόνων..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "Σταμάτησε"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "Ανίχνευση για πανομοιότυπα"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Συλλογή F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Η συλλογή ιστού φαίνεται να μην είναι διαθέσιμη"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Εμφάνιση όλων"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} φωτογραφία"
+msgstr[1] "{0} φωτογραφίες"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Τρέχουσα προβολή"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Επιλεγμένο"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Ζωντανή συλλογή ιστού"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Η συλλογή παραμένει ενεργή μέχρι να το απενεργοποιήσετε ή κλείσετε "
+"το F-Spot.\n"
+"Βεβαιωθείτε ότι οι τοπικοί θεατές έχουν πρόσβαση παρακάμπτωντας τον "
+"διαμεσολαβητή HTTP.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Όταν η συλλογή είναι ενεργή, το παραπάνω URL είναι αυτό που "
+"χρειάζεται \n"
+"να ανοίξετε σε έναν άλλο υπολογιστή για να αποκτήσετε πρόσβαση στις "
+"κοινόχρηστες φωτογραφίες.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Ενεργοποιεί και απενεργοποιεί την συλλογή ιστού"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Οι επισκέπτες επιτρέπεται να προσθέτουν ετικέτες"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Αντιγραφή URL στο πρόχειρο"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "Ζωντανή συλλογή ιστού F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL συλλογής:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Περιορισμός αριθμού κοινόχρηστων φωτογραφιών σε"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Επιλογές:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Φωτογραφίες με ετικέτα"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Επιλεγμένες φωτογραφίες"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Κοινή χρήση:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Προβολές:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "κανένα"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Συλλογή: {0}, Φωτογραφίες: {1}, Τελευταίος πελάτης: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Η συλλογή είναι ανενεργή"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Συγχώνευση βάσης δεδομένων"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Σφάλμα ανοίγματος επιλεγμένου αρχείου"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"Το αρχείο που επιλέξατε δεν είναι έγκυρο ή δεν υποστηρίζεται από τη βάση "
+"δεδομένων..\n"
+"\n"
+"Λήψη εξαίρεσης \"{0}\"."
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+"<small><i>Επιλέξτε το φάκελο της βάσης δεδομένων από την οποία θέλετε να "
+"εισάγετε</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>Επιλέξτε τι θα εισαγάγετε από την επιλεγμένη βάση δεδομένων.\n"
+"\"Νέες καρτέλες μόνο\" είναι η έξυπνη επιλογή όπου θα αποφευχθεί η "
+"επανεισαγωγή φωτογραφιών που θα μπορούσατε να είχατε εισαγάγει κατά την "
+"διάρκεια προηγούμενης εργασίας.\n"
+"\"Εισαγωγή μίας καρτέλας\" σας δίνει την δυνατότητα να επιλέξεις ποια "
+"καρτέλα θέλετε να συγχωνεύσετε.\n"
+"\"Όλα\" θα εισαγάγει όλα, δημιουργώντας πανομοιότυπα αν έχετε ήδη εισαγάγει "
+"από την βάση δεδομένων.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>Αντιγράψτε τις εικόνες τοπικά ή διατηρήστε τις εκεί που "
+"βρίσκονται. Αν επιλέξατε το δεύτερο, βεβαιωθείτε ότι αυτή η τοποθεσία θα "
+"είναι προσβάσιμη από το F-Spot.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "Μία ενιαία εισαγωγή καρτέλας"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Αντιγραφή αρχείων στον φάκελο φωτογραφιών"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Τοποθεσία βάσης δεδομένων:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Όλα"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Εισαγωγή:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "Διατήρηση των εικόνων στην αρχική τους θέση"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "Συγχώνευση άλλης συλλογής F-Spot"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "Νέες καρτέλες μόνο"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Παράβλεψη"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>Η βάση δεδομένων αναφέρεται σε αρχεία που περιέχονται στον φάκελο <b>{0}"
+"</b>.\n"
+"Παρακαλούμε επιλέξτε αυτό το φάκελο έτσι ώστε να γίνει η αντιστοίχηση.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "Ρύθμιση προστασίας οθόνης"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Όλες οι εικόνες"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Καθυστέρηση:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Προβολή:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Εικόνες με ετικέτα:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "Κάνετε το F-Spot την προφύλαξη οθόνης σας"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Ρύθμιση προστασίας οθόνης"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "Διαχείριση φωτογραφιών"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Οργανώστε, απολαύστε και μοιραστείτε τις φωτογραφίες σας με το F-Spot"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Διαχείριση φωτογραφιών"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Εισαγωγή στο F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-Spot προβολή φωτογραφιών"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Προβολή φωτογραφιών"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
msgstr "Το αρχείο δε βρέθηκε"
-#: ../libfspot/f-jpeg-utils.c:464
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr "Άγνωστος τύπος μετασχηματισμού %d"
-#: ../libfspot/f-jpeg-utils.c:472
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
msgstr "Η λειτουργία απέτυχε"
@@ -384,73 +1457,59 @@ msgstr "Προεπισκόπηση"
msgid "Path"
msgstr "Διαδρομή"
-#: ../src/CameraFileSelectionDialog.cs:80
-#: ../src/f-spot.glade.h:77
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Αρχείο"
-#: ../src/CameraFileSelectionDialog.cs:82
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1234
-msgid "Index"
-msgstr "Κατάλογος"
-
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
msgstr "Επιλογή ετικέτας"
#: ../src/CameraFileSelectionDialog.cs:138
msgid "Downloading Previews"
-msgstr "Λήψη προεπισκοπήσεων"
+msgstr "Γίνεται λήψη προεπισκοπήσεων"
#: ../src/CameraFileSelectionDialog.cs:148
#, csharp-format
msgid "Downloading Preview of {0}"
-msgstr "Λήψη προεπισκόπησης του {0}"
-
-#: ../src/CameraFileSelectionDialog.cs:199
-#: ../extensions/Exporters/CDExport/CDExport.cs:246
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
-msgid "Transferring Pictures"
-msgstr "Μεταφορά εικόνων"
+msgstr "Γίνεται λήψη προεπισκόπησης του {0}"
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
-msgstr "Αντιγραφή αρχείου {0} από {1}"
+msgstr "Γίνεται αντιγραφή αρχείου {0} από {1}"
#: ../src/CameraFileSelectionDialog.cs:235
msgid "Error transferring file"
msgstr "Σφάλμα μεταφοράς αρχείου"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Ολοκληρώθηκε η αντιγραφή αρχείων"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Η λήψη ολοκληρώθηκε"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Ολοκληρώθηκε η αντιγραφή αρχείων"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
-msgstr "Μεταφορά \"{0}\" από κάμερα"
+msgstr "Γίνεται μεταφορά \"{0}\" από φωτογραφική μηχανή"
-#: ../src/CameraSelectionDialog.cs:29
-#: ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
-msgstr "Κάμερα"
+msgstr "Φωτογραφική μηχανή"
#: ../src/CameraSelectionDialog.cs:30
msgid "Port"
msgstr "Θύρα"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
-msgstr "Δεν βρέθηκαν εικόνες που να ταιριάζουν στο {0}"
+msgstr "Δεν βρέθηκαν φωτογραφίες που να ταιριάζουν στο {0}"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -458,97 +1517,56 @@ msgid ""
"F-Spot preference dialog."
msgstr ""
"Η ετικέτα \"{0}\" δεν εφαρμόστηκε σε καμιά φωτογραφία. Προσπαθήστε να\n"
-"προσθέσετε την ετικέτα σε μερικές φωτογραφίες ή να επιλέξετε μια διαφορετική\n"
-"στο διάλογο προτιμήσεων του f-spot"
+"προσθέσετε την ετικέτα σε μερικές φωτογραφίες ή να επιλέξετε μια "
+"διαφορετική\n"
+"στο διάλογο προτιμήσεων του F-Spot."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Η αναζήτηση δεν επέστρεψε αποτελέσματα"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
"dialog."
msgstr ""
-"Η ετικέτα που αναζητεί το f-spot δεν υπάρχει. Προσπαθήστε\n"
+"Η ετικέτα που αναζητεί το F-Spot δεν υπάρχει. Προσπαθήστε\n"
"να επιλέξτε μια διαφορετική ετικέτα από το διάλογο προτιμήσεων\n"
-"του f-spot."
+"του F-Spot."
#. Note for translators: Reparented is a picture becoming a version of another one
-#: ../src/Core/Photo.cs:478
+#: ../src/Core/Photo.cs:473
msgid "Reparented"
msgstr "Reparented"
-#: ../src/Core/Photo.cs:478
+#: ../src/Core/Photo.cs:473
#, csharp-format
msgid "Reparented ({0})"
msgstr "Reparented ({0})"
-#: ../src/Core/Photo.cs:497
+#: ../src/Core/Photo.cs:492
#, csharp-format
msgid "Modified"
msgid_plural "Modified ({0})"
msgstr[0] "Τροποποιημένο"
-msgstr[1] "Τροποιημένα {0}"
+msgstr[1] "Τροποποιημένα ({0})"
-#: ../src/Core/Photo.cs:521
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Τροποποιήθηκε στο {1}"
-#: ../src/Core/Photo.cs:521
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Τροποποιήθηκε στο {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:676
-#: ../src/f-spot.glade.h:96
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
-msgstr "Αρχικό"
-
-#: ../src/DateCommands.cs:56
-msgid "Today"
-msgstr "Σήμερα"
-
-#: ../src/DateCommands.cs:58
-msgid "Yesterday"
-msgstr "Χθες"
-
-#: ../src/DateCommands.cs:60
-msgid "Last 7 days"
-msgstr "Την τελευταία εβδομάδα"
-
-#: ../src/DateCommands.cs:62
-msgid "Last 30 days"
-msgstr "Τον τελευταίο μήνα"
-
-#: ../src/DateCommands.cs:64
-msgid "Last 90 days"
-msgstr "Τις τελευταίες 90 ημέρες"
-
-#: ../src/DateCommands.cs:66
-msgid "Last 360 days"
-msgstr "Το τελευταίο έτος"
-
-#: ../src/DateCommands.cs:68
-msgid "Current Week (Mon-Sun)"
-msgstr "Την τρέχουσα εβδομάδα (Δευτ-Κυρ)"
-
-#: ../src/DateCommands.cs:70
-msgid "Previous Week (Mon-Sun)"
-msgstr "Την προηγούμενη εβδομάδα (Δευτ-Κυρ)"
-
-#: ../src/DateCommands.cs:86
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:11
-msgid "All Images"
-msgstr "Όλες οι εικόνες"
-
-#: ../src/DateCommands.cs:88
-msgid "Customized Range"
-msgstr "Προσαρμοσμένο εύρος"
+msgstr "Αρχική"
#: ../src/Editors/AutoStretchEditor.cs:17
msgid "Auto Color"
@@ -559,7 +1577,6 @@ msgid "Adjust Colors"
msgstr "Προσαρμογή χρωμάτων"
#: ../src/Editors/ColorEditor.cs:41
-#| msgid "Adjust Time"
msgid "Adjust"
msgstr "Προσαρμογή"
@@ -588,16 +1605,14 @@ msgid "Crop"
msgstr "Κοπή"
#: ../src/Editors/CropEditor.cs:73
-#| msgid "Select an area to crop"
msgid "Select the area that needs cropping."
-msgstr "Επιλέξτε περιοχή για αποκοπή"
+msgstr "Επιλέξτε περιοχή για κοπή."
#: ../src/Editors/CropEditor.cs:98
msgid "No Constraint"
msgstr "Κανένας περιορισμός"
#: ../src/Editors/CropEditor.cs:99
-#| msgid "Space all photos by"
msgid "Same as photo"
msgstr "Το ίδιο με την φωτογραφία"
@@ -611,7 +1626,7 @@ msgstr "Αποκορεσμός"
#: ../src/Editors/RedEyeEditor.cs:19
msgid "Red-eye Reduction"
-msgstr "Μείωση φαινομένου κόκκινων ματιών"
+msgstr "Μείωση κόκκινων ματιών"
#: ../src/Editors/RedEyeEditor.cs:21
msgid "Fix!"
@@ -625,17 +1640,35 @@ msgstr "Επιλέξτε τα μάτια που θέλετε να διορθώσ
msgid "Sepia Tone"
msgstr "Τόνος σέπια"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Ελαφρά εστίαση"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Ευθυγράμμιση"
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "Σφάλμα εισαγωγής"
+
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Σφάλμα κατά την εισαγωγή των {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Δεν υπάρχει τρόπος να αποθηκευτούν αρχεία του τύπου \"{0}\""
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Άγνωστο σφάλμα"
+
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Αντιγραφή _τοποθεσίας εικόνας"
+msgid "Copy Photo"
+msgstr "Αντιγραφή φωτογραφίας"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -645,20 +1678,17 @@ msgstr "Εξαγωγή σε"
msgid "Open _With"
msgstr "Άνοιγμα _με"
-#: ../src/FSpot.addin.xml.h:4
-#: ../src/f-spot.glade.h:105
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
msgstr "Α_φαίρεση ετικέτας"
-#: ../src/FSpot.addin.xml.h:5
-#: ../src/SingleView.cs:451
-#: ../src/f-spot.glade.h:107
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Περιστροφή _αριστερά"
-#: ../src/FSpot.addin.xml.h:6
-#: ../src/SingleView.cs:452
-#: ../src/f-spot.glade.h:108
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Περιστροφή _δεξιά"
@@ -666,45 +1696,464 @@ msgstr "Περιστροφή _δεξιά"
msgid "Tools"
msgstr "Εργαλεία"
-#: ../src/FSpot.addin.xml.h:8
-#: ../src/f-spot.glade.h:143
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "_Επισύναψη ετικέτας"
-#: ../src/FSpot.addin.xml.h:9
-#: ../src/f-spot.glade.h:154
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
msgstr "_Διαγραφή από το δίσκο"
-#: ../src/FSpot.addin.xml.h:10
-#: ../src/f-spot.glade.h:186
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
msgstr "_Αφαίρεση από τον κατάλογο"
-#: ../src/FileImportBackend.cs:285
-msgid "Import error"
-msgstr "Σφάλμα εισαγωγής"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:286
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr "Σφάλμα κατά την εισαγωγή των {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 εικονοστοιχεία"
-#: ../src/FileImportBackend.cs:287
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:51
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-msgid "Skip"
-msgstr "Παράβλεψη"
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 εικονοστοιχεία"
-#: ../src/Filters/ResizeFilter.cs:70
-#: ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "Δεν υπάρχει τρόπος να αποθηκευτούν αρχείο του τύπου \"{0}\""
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 εικονοστοιχεία"
-#: ../src/FormClient.cs:295
-msgid "Unhandled exception"
-msgstr "Μη διαχειριζόμενη εξαίρεση"
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 εικονοστοιχεία"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 εικονοστοιχεία"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>Διο_ρθώσεις</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Παρεμβολή εικόνας</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Μέγεθος</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Περίληψη</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Διαφανείς περιοχές</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Προβολή όλων των φωτογραφιών που έχουν εισαχθεί</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>Ισορροπία _λευκού</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr ""
+"<small><i>Ενεργοποιήστε αυτήν την επιλογή για να επιτρέπετε την παρεμβολή "
+"εστιασμένων εικόνων. Δεν θα πρέπει να το απενεργοποιήσετε για την προβολή "
+"φωτογραφιών, αλλά η απενεργοποίηση της παρεμβολής θα μπορούσε να είναι "
+"χρήσιμη για σχεδίαση εικονιδίων.</i></small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>Μπορείτε να επιλέξετε τον τρόπο προβολής διαφανών περιοχών σε "
+"εικόνες. Αυτή η επιλογή δεν μπορεί να εφαρμοστεί σε φωτογραφίες, αλλά ο "
+"καθορισμός της σαν υπόδειγμα ελέγχου ή προσαρμοσμένου χρώματα θα μπορούσε να "
+"είναι χρήσιμος κατά την προβολή εικονιδίων ή άλλων καλλιτεχνικών εργασιών με "
+"διαφανείς περιοχές.</i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "Ως _παρασκήνιο"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "Ως _προσαρμοσμένο χρώμα: "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "Ως υ_πόδειγμα ελέγχου"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Επισύναψη ετικετών:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Επισύναψη ετικέτας:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "Α_ντίθεση:"
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Δημιουργία"
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "Επιλογή φωτογραφικής μηχανής"
+
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "Αντιγραφή αρχείων στο φάκελο φωτογραφιών"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "Δημιουργία E-Mail"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr "Δημιουργία _εικονιδίου για αυτή την ετικέτα στην πρώτη χρήση"
+
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr ""
+"Δημιουργήστε ένα e-mail με συνημμένες τις επιλεγμένες φωτογραφίες (πιθανώς "
+"με προσαρμοσμένο μέγεθος)"
+
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr "Εντοπισμός πανομοιότυπων"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "Εμφάνιση ο_νομάτων αρχείων"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "Προβολή μόνο των φωτογραφιών που εισήχθηκαν σε συγκεκριμένες καρτέλες."
+
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "Να μην σταλεί κανένα E-Mail"
+
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "E-_Mail:"
+
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "Ε_ξαγωγή τίτλων και σχολίων"
+
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "Εκτιμώμενο νέο μέγεθος"
+
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "Πολύ μεγάλο"
+
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "Προβολή F-Spot"
+
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr "Φιλτράρισμα σε επιλεγμένες καρτέλες"
+
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "Συλ_λογή:"
+
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "Συλλογή"
+
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Εισαγωγή"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "Πηγή εισαγωγής:"
+
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "Εισαγωγή υποκαταλόγων"
+
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "Μεγάλο"
+
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr "Διαχείριση των προσωπικών σας επιλεγμένων αναλογιών"
+
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "Μεσαίο"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "Αριθμοί φωτογραφιών στις επιλεγμένες καρτέλες:"
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "Αριθμός εικόνων"
+
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "Άνοιγμα _φακέλου..."
+
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "Αρχικό μέγεθος (πιθανώς αρχείο πολύ μεγάλου μεγέθους)"
+
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "_Γονική ετικέτα:"
+
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "Παύση"
+
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "Προτιμήσεις"
+
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Προηγούμενο"
+
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "Διόρθωση"
+
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr ""
+"Επιλέξτε τις φωτογραφίες που θέλετε να αντιγράψετε από την φωτογραφική "
+"μηχανή..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "Επιλέξτε ετικέτα..."
+
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "Επιλέξτε την φωτογραφική μηχανή από όπου θέλετε να μεταφέρετε αρχεία"
+
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "Επιλεγμένη φωτογραφική μηχανή: "
+
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "Περιορισμοί επιλογής"
+
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "Ορισμός ως _παρασκήνιο"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "Εμφάνιση όλων των φωτογραφιών."
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "Εμφάνιση ή απόκρυψη του πλευρικού πλαισίου"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "Εμφάνιση ή απόκρυψη της εργαλειοθήκης"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "Πλευρικό _πλαίσιο"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "Μικρό"
+
+#: ../src/f-spot.glade.h:82
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"Καθορίστε αν η φωτογραφία με το αρχικό μέγεθος θα περιστρέφεται ή όχι. Αυτές "
+"με τα μικρότερα μεγέθη περιστρέφονται αυτόματα."
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "Αφαίρεση _μεταδεδομένων εικόνας"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr "Προ_σωρινό:"
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "Μικροσκοπικό"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr "Συνολικό αρχικό μέγεθος"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "_Μεγέθυνση"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "Σ_μίκρυνση"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Μεγέθυνση"
+
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Σμίκρυνση"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "_Φωτεινότητα:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_Δημιουργία E-Mail"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "Επε_ξεργασία"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "Έ_κθεση:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "_Πλήρης οθόνη"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "Συλ_λογή"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "_Βοήθεια"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "Α_πόχρωση:"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "Παρεμ_βολή της εικόνας κατά την εστίαση"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Νέο παράθυρο"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr ""
+"Ά_νοιγμα της συλλογής στον περιηγητή μετά την ολοκλήρωση του ανεβάσματος"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "Ά_νοιγμα προορισμού μετά την ολοκλήρωση της εξαγωγής"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Φωτογραφία"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "_Κορεσμός:"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "_Διαβάθμιση εικόνων όχι περισσότερο από: "
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "_Διαφάνεια"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "Α_φαίρεση μεταδεδομένων"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "Όνομα ετι_κέτας:"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "_Απόχρωση:"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "Γραμμή ερ_γαλείων"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "_Προβολή"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "Εικο_νικό σύστημα αρχείων"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "και"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"στην\n"
+"μετά την\n"
+"μεταξύ των"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
#: ../src/FullScreenView.cs:58
msgid "Hide"
@@ -718,88 +2167,36 @@ msgstr "Απόκρυψη γραμμής εργαλείων"
msgid "Info"
msgstr "Πληροφορίες"
-#: ../src/FullScreenView.cs:68
-#: ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
-msgstr "Πληροφορίες εικόνας "
+msgstr "Πληροφορίες εικόνας"
#: ../src/FullScreenView.cs:73
msgid "Exit fullscreen"
msgstr "Έξοδος από πλήρη οθόνη"
-#: ../src/FullScreenView.cs:81
-#: ../src/MainWindow.cs:319
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Διαφάνεια"
#: ../src/FullScreenView.cs:82
msgid "Start slideshow"
-msgstr "Έναρξη προβολή διαφανειών"
+msgstr "Έναρξη προβολής διαφανειών"
#: ../src/FullScreenView.cs:128
-#| msgid "Slide transition: "
msgid "Slide transition:"
msgstr "Μετάβαση διαφάνειας:"
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "Διάλυση"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "Αναστροφή"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "Κάλυψη"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "Αποκάλυψη"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "Καθαρισμός"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "Διαχωρισμός"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "Ώθηση"
-
-#: ../src/GroupSelector.cs:57
-#: ../src/GroupSelector.cs:58
+#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "Περισσότερες ημερομηνίες"
-#: ../src/GroupSelector.cs:60
-#: ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "Περισσότεροι κατάλογοι"
-
-#: ../src/GroupSelector.cs:63
-#: ../src/GroupSelector.cs:64
+#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
msgid "More"
msgstr "Περισσότερα"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "Ταξινόμηση ανά _μήνα"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "Ταξινόμηση ανά _φάκελο"
-
-#: ../src/GroupSelector.cs:523
-#: ../src/f-spot.glade.h:190
-msgid "_Reverse Order"
-msgstr "Α_ντιστροφή σειράς"
-
-#: ../src/GroupSelector.cs:529
-#: ../src/f-spot.glade.h:146
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "Κα_θαρισμός εύρους ημερομηνίας"
@@ -827,13 +2224,13 @@ msgstr "Κατάλογος InterOperability"
msgid "Unknown Directory"
msgstr "Άγνωστος κατάλογος"
-#: ../src/Imaging/ImageFile.cs:90
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Η εγγραφή σε αυτή τη μορφή αρχείου δεν υποστηρίζεται"
#: ../src/Imaging/IptcFile.cs:145
msgid "IPTC Information Interchange Model (IIM) Version number"
-msgstr "Αριθμός έκδοσης του IPTC μοντέλου ανταλλαγής πληροφοριών (ΙΙΜ)"
+msgstr "Αριθμός έκδοσης του IPTC μοντέλου ανταλλαγής πληροφοριών (IIM)"
#: ../src/Imaging/IptcFile.cs:147
msgid "OSI Destination routing information"
@@ -841,7 +2238,7 @@ msgstr "Πληροφορίες ταξινόμησης προορισμού OSI"
#: ../src/Imaging/IptcFile.cs:149
msgid "IPTC file format"
-msgstr "Μορφή αρχείου PTC"
+msgstr "Μορφή αρχείου IPTC"
#: ../src/Imaging/IptcFile.cs:151
msgid "Identifies the provider and product"
@@ -856,16 +2253,21 @@ msgid "A unique number"
msgstr "Ένας μοναδικός αριθμός"
#: ../src/Imaging/IptcFile.cs:157
-msgid "The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
-msgstr "Η προτεραιότητα διαχείρισης του φακέλου μεταξύ 1 (πιο επείγον) και 9 (λιγότερο επείγον)"
+msgid ""
+"The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
+msgstr ""
+"Η προτεραιότητα διαχείρισης του φακέλου μεταξύ 1 (πιο επείγον) και 9 "
+"(λιγότερο επείγον)"
#: ../src/Imaging/IptcFile.cs:159
msgid "The year, month and day (CCYYMMDD) the service sent the material"
-msgstr "Το έτος, ο μήνας και η ημέρα (CCYYMMDD) που η υπηρεσία έστειλε το υλικό"
+msgstr ""
+"Το έτος, ο μήνας και η ημέρα (CCYYMMDD) που η υπηρεσία έστειλε το υλικό"
#: ../src/Imaging/IptcFile.cs:161
msgid "The hour, minute and second (HHMMSS) the service sent the material"
-msgstr "Η ώρα, το λεπτό και τα δευτερόλεπτα (HHMMSS) που η υπηρεσία έστειλε το υλικό"
+msgstr ""
+"Η ώρα, το λεπτό και τα δευτερόλεπτα (HHMMSS) που η υπηρεσία έστειλε το υλικό"
#: ../src/Imaging/IptcFile.cs:163
msgid "The character set designation"
@@ -885,7 +2287,9 @@ msgstr "Αριθμός έκδοσης περιληπτικής μεθόδου σ
#: ../src/Imaging/IptcFile.cs:175
msgid "Number identifying the IIM version this application record uses"
-msgstr "Αριθμός γι α την αναγνώριση της έκδοσης του IM που χρησιμοποιεί αυτή η εφαρμογή εγγραφής"
+msgstr ""
+"Αριθμός για την αναγνώριση της έκδοσης του IIM που χρησιμοποιεί αυτή η "
+"εφαρμογή εγγραφής"
#: ../src/Imaging/IptcFile.cs:177
msgid "Object type reference"
@@ -895,8 +2299,7 @@ msgstr "Αναφορά τύπου αντικειμένου"
msgid "Object attribute reference"
msgstr "Αναφορά χαρακτηριστικών αντικειμένου"
-#: ../src/Imaging/IptcFile.cs:188
-#: ../src/Imaging/IptcFile.cs:192
+#: ../src/Imaging/IptcFile.cs:188 ../src/Imaging/IptcFile.cs:192
msgid "Object name"
msgstr "Όνομα αντικειμένου"
@@ -921,8 +2324,11 @@ msgid "Full name of the country of the focus of the content"
msgstr "Το ολόκληρο όνομα της χώρας της εστίασης του περιεχομένου"
#: ../src/Imaging/IptcFile.cs:206
-msgid "Two or three letter ISO3166 code of the country of the focus of the content"
-msgstr "Δύο από τους κώδικες κώδικες γράμματος ISO3166 της χώρας της εστίασης του περιεχομένου"
+msgid ""
+"Two or three letter ISO3166 code of the country of the focus of the content"
+msgstr ""
+"Κωδικός ISO3166 δύο ή τριών χαρακτήρων της χώρας της εστίασης του "
+"περιεχομένου"
#: ../src/Imaging/IptcFile.cs:209
msgid "Creator of the content"
@@ -937,15 +2343,20 @@ msgid "The title of the author or creator"
msgstr "Το όνομα του συγγραφέα ή του δημιουργού"
#: ../src/Imaging/IptcFile.cs:218
-msgid "The person involved in writing, editing or correcting the object data or caption/abstract"
-msgstr "Το άτομο που ασχολείται με την εγγραφή, την επεξεργασία ή τη διόρθωση των δεδομένων του αντικειμένου ή με την λεζάντα/περίληψη"
+msgid ""
+"The person involved in writing, editing or correcting the object data or "
+"caption/abstract"
+msgstr ""
+"Το άτομο που ασχολείται με την εγγραφή, την επεξεργασία ή τη διόρθωση των "
+"δεδομένων του αντικειμένου ή με την λεζάντα/περίληψη"
#: ../src/Imaging/IptcFile.cs:222
msgid "Headline of the content"
msgstr "Γραμμή επικεφαλίδας του περιεχομένου"
#: ../src/Imaging/IptcFile.cs:225
-msgid "Instructions from the creator to the receiver not covered by other fields"
+msgid ""
+"Instructions from the creator to the receiver not covered by other fields"
msgstr "Οδηγίες από το δημιουργό στον παραλήπτη που δεν καλύπτει όλα τα πεδία"
#: ../src/Imaging/IptcFile.cs:228
@@ -954,16 +2365,15 @@ msgstr "Πνευματικό είδος του αντικειμένου"
#: ../src/Imaging/IptcFile.cs:241
msgid "Unknown IIM DataSet"
-msgstr "Άγνωστη συλλογή δεδομένων ΙΙΜ"
+msgstr "Άγνωστη συλλογή δεδομένων IIM"
-#: ../src/ImportCommand.cs:47
-#: ../src/SingleView.cs:357
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Επιλογή φακέλου"
#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
-msgstr "(Δεν εντοπίσθηκαν κάμερες)"
+msgstr "(Δεν εντοπίσθηκαν φωτογραφικές μηχανές)"
#: ../src/ImportCommand.cs:404
#, csharp-format
@@ -974,31 +2384,25 @@ msgstr "Φόρτωση αρχείου {0} από {1}"
msgid "Done Loading"
msgstr "Η φόρτωση ολοκληρώθηκε"
-#: ../src/ImportCommand.cs:540
-#: ../src/MainWindow.cs:279
-#: ../src/f-spot.glade.h:82
-msgid "Import"
-msgstr "Εισαγωγή"
-
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "Ο κατάλογος δεν υπάρχει."
-#: ../src/ImportCommand.cs:671
+#: ../src/ImportCommand.cs:685
#, csharp-format
-msgid "The directory you selected \"{0}\" does not exist. Please choose a different directory"
-msgstr "Ο κατάλογος που επιλέξατε \"{0}\" δεν υπάρχει. Παρακαλώ επιλέξτε ένα διαφορετικό κατάλογο"
-
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:724
-#: ../src/ImportCommand.cs:726
-#: ../src/XmpTagsImporter.cs:88
-msgid "Import Tags"
-msgstr "Εισαγωγή ετικετών"
-
-#: ../src/ItemAction.cs:79
-#: ../src/MainWindow.cs:286
-#: ../src/SingleView.cs:86
+msgid ""
+"The directory you selected \"{0}\" does not exist. Please choose a "
+"different directory"
+msgstr ""
+"Ο κατάλογος που επιλέξατε \"{0}\" δεν υπάρχει. Παρακαλώ επιλέξτε ένα "
+"διαφορετικό κατάλογο"
+
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
+#: ../src/XmpTagsImporter.cs:89
+msgid "Imported Tags"
+msgstr "Ετικέτες από εισαγωγή"
+
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Περιστροφή αριστερά"
@@ -1006,423 +2410,396 @@ msgstr "Περιστροφή αριστερά"
msgid "Rotate picture left"
msgstr "Περιστροφή της εικόνας αριστερά"
-#: ../src/ItemAction.cs:91
-#: ../src/MainWindow.cs:290
-#: ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Περιστροφή δεξιά"
#: ../src/ItemAction.cs:92
-#| msgid "Rotate picture left"
msgid "Rotate picture right"
msgstr "Περιστροφή της εικόνας δεξιά"
-#: ../src/ItemAction.cs:102
-#: ../src/f-spot.glade.h:90
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:999
-msgid "Next"
-msgstr "Επόμ"
-
#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "Επόμενη εικόνα"
-#: ../src/ItemAction.cs:123
-#: ../src/f-spot.glade.h:103
-msgid "Previous"
-msgstr "Προηγούμενο"
-
#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "Προηγούμενη εικόνα"
-#: ../src/Loupe.cs:62
-msgid "Error saving sharpened photo"
-msgstr "Σφάλμα κατά την αποθήκευση φωτογραφίας που έχει οξυνθεί"
-
-#: ../src/Loupe.cs:63
-#: ../src/PhotoView.cs:164
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "Ελήφθη η εξαίρεση \"{0}\". Είναι αδύνατη η αποθήκευση της φωτογραφίας {1}"
-
-#: ../src/Loupe.cs:92
-msgid "Sharpen"
-msgstr "Όξυνση"
-
-#: ../src/Loupe.cs:102
-msgid "Amount:"
-msgstr "Ποσό:"
-
-#: ../src/Loupe.cs:103
-msgid "Radius:"
-msgstr "Ακτίνα:"
-
-#: ../src/Loupe.cs:104
-msgid "Threshold:"
-msgstr "Κατώφλι:"
-
-#: ../src/MainWindow.cs:281
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Εισαγωγή νέων εικόνων"
-#: ../src/MainWindow.cs:297
-#: ../src/f-spot.glade.h:49
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Περιήγηση"
-#: ../src/MainWindow.cs:301
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Περιήγηση πολλών φωτογραφιών ταυτόχρονα"
-#: ../src/MainWindow.cs:305
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Επεξεργασία εικόνας"
-#: ../src/MainWindow.cs:309
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Προβολή και επεξεργασία φωτογραφίας"
-#: ../src/MainWindow.cs:314
-#: ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Πλήρης οθόνη"
-#: ../src/MainWindow.cs:316
-#: ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Προβολή φωτογραφιών σε πλήρη οθόνη"
-#: ../src/MainWindow.cs:321
-#: ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Προβολή φωτογραφιών ως προβολή διαφανειών"
-#: ../src/MainWindow.cs:336
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Προηγούμενη φωτογραφία"
-#: ../src/MainWindow.cs:341
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Επόμενη φωτογραφία"
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/MainWindow.cs:354
-#: ../src/Widgets/Sidebar.cs:73
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1168
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1208
-#| msgid "_Tags"
-msgid "Tags"
-msgstr "Πινακίδια"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/MainWindow.cs:662
-#: ../src/UI.Dialog/AdjustTimeDialog.cs:135
-#: ../src/UI.Dialog/ProgressDialog.cs:92
-#: ../extensions/Exporters/CDExport/CDExport.cs:164
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:783
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} από {1}"
-
-#: ../src/MainWindow.cs:1682
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
-msgstr "Δεν εντοπίσθηκαν κάμερες."
+msgstr "Δεν εντοπίσθηκαν φωτογραφικές μηχανές."
-#: ../src/MainWindow.cs:1683
-msgid "F-Spot was unable to find any cameras attached to this system. Double check that the camera is connected and has power"
-msgstr "Το F-Spot δεν κατάφερε να βρει καμιά κάμερα συνδεδεμένη στο σύστημά σας. Ελέγξτε ξανά ότι η κάμερα είναι συνδεδεμένη και ότι έχει τροφοδοσία"
+#: ../src/MainWindow.cs:1519
+msgid ""
+"F-Spot was unable to find any cameras attached to this system. Double check "
+"that the camera is connected and has power"
+msgstr ""
+"Το F-Spot δεν κατάφερε να βρει καμιά φωτογραφική μηχανή συνδεδεμένη στο "
+"σύστημά σας. Ελέγξτε ξανά ότι η φωτογραφική μηχανή είναι συνδεδεμένη και ότι "
+"έχει τροφοδοσία"
-#: ../src/MainWindow.cs:1722
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
-msgstr "Σφάλμα σύνδεσης με κάμερα"
+msgstr "Σφάλμα σύνδεσης με την φωτογραφική μηχανή"
-#: ../src/MainWindow.cs:1723
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
-msgstr "Ελήφθη σφάλμα \"{0}\" κατά τη σύνδεση με την κάμερα"
+msgstr "Ελήφθη σφάλμα \"{0}\" κατά τη σύνδεση με την φωτογραφική μηχανή"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:2062
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
-msgstr[0] "Συγχώνευση της επιλεγμένης ετικέτας"
+msgstr[0] "Συγχώνευση της επιλεγμένης ετικέτας;"
msgstr[1] "Συγχώνευση των {0} επιλεγμένων ετικετών;"
-#: ../src/MainWindow.cs:2089
-msgid "This operation will merge the selected tags and any sub-tags into a single tag."
-msgstr "Αυτή η λειτουργία θα συγχωνεύσει τις επιλεγμένες ετικέτες και όλες τις ετικέτες που είναι υποσύνολά τους σε μια απλή ετικέτα."
+#: ../src/MainWindow.cs:1873
+msgid ""
+"This operation will merge the selected tags and any sub-tags into a single "
+"tag."
+msgstr ""
+"Αυτή η λειτουργία θα συγχωνεύσει τις επιλεγμένες ετικέτες και όλες τις "
+"ετικέτες που είναι υποσύνολά τους σε μια απλή ετικέτα."
-#: ../src/MainWindow.cs:2091
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "Συγ_χώνευση ετικετών"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2080
#, csharp-format
-#| msgid "Photo {0} of {1}"
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "Φωτογραφία {0} από {1}"
msgstr[1] "Φωτογραφίες {0} από {1}"
-#: ../src/MainWindow.cs:2298
-#: ../src/SingleView.cs:494
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "φωτογραφία {0}"
msgstr[1] "{0} φωτογραφίες"
-#: ../src/MainWindow.cs:2301
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " (Επιλέχτηκε το {0})"
msgstr[1] " (Επιλέχτηκαν τα {0})"
-#: ../src/MainWindow.cs:2382
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "Εν_τάξει"
-#: ../src/MainWindow.cs:2383
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Σφάλμα κατά τη διαγραφή της εικόνας"
-#: ../src/MainWindow.cs:2388
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Δεν έχετε άδεια να διαγράψετε το αρχείο:{1}{0}"
-#: ../src/MainWindow.cs:2392
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Υπήρξε ένα σφάλμα τύπου {0} κατά τη διαγραφή του αρχείου:{2}{1}"
-#: ../src/MainWindow.cs:2424
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Να διαγραφεί μόνιμα η φωτογραφία;"
msgstr[1] "Να διαγραφούν μόνιμα οι {0} φωτογραφίες;"
-#: ../src/MainWindow.cs:2428
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
-msgid_plural "This deletes all versions of the selected photos from your drive."
-msgstr[0] "Αυτό διαγράφει όλες τις εκδόσεις της επιλεγμένης φωτογραφίας από το δίσκο σας."
-msgstr[1] "Αυτό διαγράφει όλες τις εκδόσεις της επιλεγμένων φωτογραφιών από το δίσκο σας."
-
-#: ../src/MainWindow.cs:2431
+msgid_plural ""
+"This deletes all versions of the selected photos from your drive."
+msgstr[0] ""
+"Αυτό διαγράφει όλες τις εκδόσεις της επιλεγμένης φωτογραφίας από το δίσκο "
+"σας."
+msgstr[1] ""
+"Αυτό διαγράφει όλες τις εκδόσεις της επιλεγμένων φωτογραφιών από το δίσκο "
+"σας."
+
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Διαγραφή φωτογραφίας"
msgstr[1] "_Διαγραφή φωτογραφιών"
-#: ../src/MainWindow.cs:2467
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
-msgstr[0] "Διαγραφή της επιλεγμένης φωτογραφίας από το F-Spot?"
-msgstr[1] "Διαγραφή των {0} επιλεγμένων φωτογραφιών από το F-Spot?"
+msgstr[0] "Διαγραφή της επιλεγμένης φωτογραφίας από το F-Spot;"
+msgstr[1] "Διαγραφή των {0} επιλεγμένων φωτογραφιών από το F-Spot;"
-#: ../src/MainWindow.cs:2472
-msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
-msgstr "Αν αφαιρέσετε φωτογραφίες από τον κατάλογο του F-Spot όλες οι πληροφορίες των ετικετών θα χαθούν. Οι φωτογραφίες θα παραμείνουν στον υπολογιστή και θα μπορούν να εισαχθούν από το F-Spoit ξανά."
+#: ../src/MainWindow.cs:2256
+msgid ""
+"If you remove photos from the F-Spot catalog all tag information will be "
+"lost. The photos remain on your computer and can be imported into F-Spot "
+"again."
+msgstr ""
+"Αν αφαιρέσετε φωτογραφίες από τον κατάλογο του F-Spot όλες οι πληροφορίες "
+"των ετικετών θα χαθούν. Οι φωτογραφίες θα παραμείνουν στον υπολογιστή και θα "
+"μπορούν να εισαχθούν από το F-Spot ξανά."
-#: ../src/MainWindow.cs:2473
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Αφαίρεση από τον κατάλογο"
-#: ../src/MainWindow.cs:2536
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Να διαγραφεί η ετικέτα \"{0}\";"
-#: ../src/MainWindow.cs:2538
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Να διαγραφούν οι {0} επιλεγμένες ετικέτες;"
-#: ../src/MainWindow.cs:2543
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "φωτογραφία"
msgstr[1] "φωτογραφίες"
-#: ../src/MainWindow.cs:2545
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
-msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
-msgstr[0] "Αν διαγράψετε αυτήν την ετικέτα, όλες οι συσχετίσεις με τις {0} {1} θα χαθούν."
-msgstr[1] "Αν διαγράψετε αυτές τις ετικέτες, όλες οι συσχετίσεις με τις {0} {1} θα χαθούν."
-
-#: ../src/MainWindow.cs:2550
+msgid_plural ""
+"If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] ""
+"Αν διαγράψετε αυτήν την ετικέτα, όλες οι συσχετίσεις με τις {0} {1} θα "
+"χαθούν."
+msgstr[1] ""
+"Αν διαγράψετε αυτές τις ετικέτες, όλες οι συσχετίσεις με τις {0} {1} θα "
+"χαθούν."
+
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Διαγραφή ετικέτας"
msgstr[1] "_Διαγραφή ετικετών"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2564
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Η ετικέτα δεν είναι κενή"
-#: ../src/MainWindow.cs:2565
+#: ../src/MainWindow.cs:2349
#, csharp-format
-msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
-msgstr "Δεν είναι δυνατή η διαγραφή ετικετών οι οποίες περιέχουν άλλες ετικέτες. Παρακαλώ διαγράψτε πρώτα τις ετικέτες κάτω από την \"{0}\""
+msgid ""
+"Can not delete tags that have tags within them. Please delete tags under "
+"\"{0}\" first"
+msgstr ""
+"Δεν είναι δυνατή η διαγραφή ετικετών οι οποίες περιέχουν άλλες ετικέτες. "
+"Παρακαλώ διαγράψτε πρώτα τις ετικέτες κάτω από την \"{0}\""
-#: ../src/MainWindow.cs:3008
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Περιστροφή της επιλεγμένης φωτογραφίας αριστερά"
msgstr[1] "Περιστροφή των επιλεγμένων φωτογραφιών αριστερά"
-#: ../src/MainWindow.cs:3021
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Περιστροφή της επιλεγμένης φωτογραφίας δεξιά"
msgstr[1] "Περιστροφή των επιλεγμένων φωτογραφιών δεξιά"
-#: ../src/MainWindow.cs:3029
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Εύρεση επι_λεγμένης ετικέτας"
msgstr[1] "Εύρεση ε_πιλεγμένων ετικετών"
-#: ../src/MainWindow.cs:3033
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Εύρεση επιλεγμένης ετικέτας _με"
msgstr[1] "Εύρεση επιλεγμένων ετικετών _με"
-#: ../src/MainWindow.cs:3071
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Δημιουργία νέας έκδοσης;"
msgstr[1] "Δημιουργία νέων εκδόσεων;"
-#: ../src/MainWindow.cs:3073
+#: ../src/MainWindow.cs:2860
#, csharp-format
-msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
-msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
-msgstr[0] "Πριν την εκτέλεση του {1}, να δημιουργεί το f-spot νέα έκδοση της επιλεγμένης φωτογραφίας για να διατηρήσει την αρχική;"
-msgstr[1] "Πριν την εκτέλεση του {1}, να δημιουργεί το f-spot νέες εκδόσεις των επιλεγμένων φωτογραφιών για να διατηρήσει τις αρχικές;"
-
-#: ../src/MainWindow.cs:3095
-#| msgid "version"
+msgid ""
+"Before launching {1}, should F-Spot create a new version of the selected "
+"photo to preserve the original?"
+msgid_plural ""
+"Before launching {1}, should F-Spot create new versions of the selected "
+"photos to preserve the originals?"
+msgstr[0] ""
+"Πριν την εκτέλεση του {1}, να δημιουργεί το F-Spot νέα έκδοση της "
+"επιλεγμένης φωτογραφίας για να διατηρήσει την αρχική;"
+msgstr[1] ""
+"Πριν την εκτέλεση του {1}, να δημιουργεί το F-Spot νέες εκδόσεις των "
+"επιλεγμένων φωτογραφιών για να διατηρήσει τις αρχικές;"
+
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "Έκδοση XCF"
-#: ../src/MetadataStore.cs:18
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "Δημιουργός"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "Τίτλος"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "Πνευματικά δικαιώματα"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "Θέμα και λέξεις κλειδιά"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "Συμπίεση"
-#: ../src/MetadataStore.cs:24
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Επίπεδες ρυθμίσεις"
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Προσανατολισμός"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Φωτομετρική ερμηνεία"
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Μονάδα ανάλυσης"
-#: ../src/MetadataStore.cs:32
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Έκθεση προγράμματος"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Λειτουργία μέτρησης"
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Λειτουργία έκθεσης"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Αποτυπώθηκε προσαρμοσμένα"
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Ρυθμίσεις περιεχομένων"
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Ανοιχτόχρωμη πηγή"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Αισθητική μέθοδος"
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Διάστημα χρώματος"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Ισορροπία λευκού"
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Μονάδα ανάλυσης εστιακού επιπέδου"
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Τύπος πηγαίου κώδικα του αρχείου"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Τύπος σύλληψης σκηνής"
-#: ../src/MetadataStore.cs:56
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
-msgstr "Αποκτήστε τον έλεγχο"
+msgstr "Gain Control"
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Αντίθεση"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Κορεσμός"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Όξυνση"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
-msgstr "έλεγχος σκηνής"
+msgstr "Τύπος σκηνής"
#. Fixme this should really set parent menu
#. items insensitve
@@ -1453,11 +2830,12 @@ msgstr "Δεν ήταν δυνατή η δημιουργία νέας έκδοσ
#: ../src/PhotoVersionCommands.cs:111
#, csharp-format
msgid "Received exception \"{0}\". Unable to create version \"{1}\""
-msgstr "Ελήφθη η εξαίρεση \"{0}\". Ήταν αδύνατη η δημιουργία της νέας έκδοσης \"{1}\""
+msgstr ""
+"Ελήφθη η εξαίρεση \"{0}\". Ήταν αδύνατη η δημιουργία της νέας έκδοσης \"{1}\""
#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
-msgstr "Αλήθεια να γίνει διαγραφή?"
+msgstr "Είστε βέβαιος για την διαγραφή;"
#: ../src/PhotoVersionCommands.cs:139
msgid "Cancel"
@@ -1470,7 +2848,7 @@ msgstr "Διαγραφή"
#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
-msgstr "Αλήθεια να γίνει διαγραφή της έκδοσης \"{0}\";"
+msgstr "Είστε βέβαιος για την διαγραφή της έκδοσης \"{0}\";"
#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
@@ -1488,225 +2866,204 @@ msgstr "Δεν ήταν δυνατή η μετονομασία μιας έκδο
#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
-msgstr "Ελήφθη η εξαίρεση \"{0}\". Ήταν αδύνατη η μετονομασία της έκδοσης \"{1}\""
+msgstr ""
+"Ελήφθη η εξαίρεση \"{0}\". Ήταν αδύνατη η μετονομασία της έκδοσης σε \"{1}\""
-#: ../src/PhotoVersionMenu.cs:66
-#: ../src/Widgets/InfoBox.cs:549
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
-msgstr "Όχι Tags"
+msgstr "(Χωρίς τροποποιήσεις)"
-#: ../src/PhotoView.cs:163
-#: ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
-msgstr "Σφάλμα επεξεργασίας φωτογραφίας"
+msgstr "Σφάλμα κατά την επεξεργασία φωτογραφίας"
+
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr ""
+"Ελήφθη η εξαίρεση \"{0}\". Είναι αδύνατη η αποθήκευση της φωτογραφίας {1}"
-#: ../src/PhotoView.cs:301
+#: ../src/PhotoView.cs:356
msgid "Comment:"
-msgstr "Σχόλιο"
+msgstr "Σχόλιο:"
-#: ../src/Preferences.cs:148
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Φωτογραφίες"
-#: ../src/PrintOperation.cs:31
-#| msgid "<b>Import Settings</b>"
+#: ../src/PrintOperation.cs:32
msgid "Image Settings"
msgstr "Ρυθμίσεις εικόνας"
-#: ../src/QueryWidget.cs:47
+#: ../src/QueryWidget.cs:58
msgid "Find: "
-msgstr "Εύρεση:"
+msgstr "Εύρεση: "
-#: ../src/QueryWidget.cs:52
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "Φωτογραφίες χωρίς ετικέτες"
-#: ../src/QueryWidget.cs:60
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "Βαθμολογημένες φωτογραφίες"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:69
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
msgstr "Εισαγωγή καρτέλας"
-#: ../src/QueryWidget.cs:89
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "Καθαρισμός αναζήτησης"
-#: ../src/QueryWidget.cs:96
-#| msgid "Clear search"
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "Καθαρισμός αναζήτησης"
-#: ../src/QueryWidget.cs:98
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "Δεν βρέθηκαν φωτογραφίες που να ταιριάζουν"
-#: ../src/QueryWidget.cs:136
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "Απόκρυψη γραμμής α_ναζήτησης"
-#: ../src/QueryWidget.cs:142
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "Εμφάνιση γραμμής α_ναζήτησης"
-#: ../src/RotateCommand.cs:94
-#: ../src/RotateCommand.cs:109
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
msgid "Unable to rotate this type of photo"
-msgstr "Ήταν αδύνατη η περιστροφή της φωτογραφίας αυτού του τύπου"
+msgstr "Αδύνατη η περιστροφή της φωτογραφίας αυτού του τύπου"
-#: ../src/RotateCommand.cs:129
+#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
-msgstr "Ήταν αδύνατη η περιστροφή του αρχείου που είναι μόνο για ανάγνωση"
+msgstr "Αδύνατη η περιστροφή του αρχείου που είναι μόνο για ανάγνωση"
-#: ../src/RotateCommand.cs:196
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
-msgstr "Περιστροφή φωτογραφιών"
+msgstr "Γίνεται περιστροφή φωτογραφιών"
-#: ../src/RotateCommand.cs:207
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
-msgstr "Περιστροφή φωτογραφίας \"{0}\""
+msgstr "Γίνεται περιστροφή φωτογραφίας \"{0}\""
-#: ../src/RotateCommand.cs:220
+#: ../src/RotateCommand.cs:222
msgid "Directory not found"
msgstr "Δε βρέθηκε ο κατάλογος"
-#: ../src/RotateCommand.cs:240
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
-msgstr[0] "Ήταν αδύνατη η περιστροφή της φωτογραφίας"
-msgstr[1] "Ήταν αδύνατη η περιστροφή των {0} φωτογραφιών"
+msgstr[0] "Αδύνατη η περιστροφή της φωτογραφίας"
+msgstr[1] "Αδύνατη η περιστροφή των {0} φωτογραφιών"
-#: ../src/RotateCommand.cs:242
+#: ../src/RotateCommand.cs:244
#, csharp-format
-msgid "The photo could not be rotated because it is on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgid_plural "{0} photos could not be rotated because they are on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgstr[0] "Ήταν αδύνατη η περιστροφή της φωτογραφίας γιατί βρίσκεται σε σύστημα αρχείων ή μέσο μόνο για ανάγνωση, όπως ένα CDROM. Παρακαλώ ελέγξτε τα δικαιώματα και προσπαθήστε ξανά."
-msgstr[1] "Ήταν αδύνατη η περιστροφή των {0} φωτογραφιών γιατί βρίσκονται σε σύστημα αρχείων ή μέσο μόνο για ανάγνωση, όπως ένα CDROM. Παρακαλώ ελέγξτε τα δικαιώματα και προσπαθήστε ξανά."
-
-#: ../src/RotateCommand.cs:269
+msgid ""
+"The photo could not be rotated because it is on a read only file system or "
+"media such as a CDROM. Please check the permissions and try again."
+msgid_plural ""
+"{0} photos could not be rotated because they are on a read only file system "
+"or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] ""
+"Αδύνατη η περιστροφή της φωτογραφίας γιατί βρίσκεται σε σύστημα αρχείων ή "
+"μέσο μόνο για ανάγνωση, όπως ένα CDROM. Παρακαλώ ελέγξτε τα δικαιώματα και "
+"προσπαθήστε ξανά."
+msgstr[1] ""
+"Αδύνατη η περιστροφή των {0} φωτογραφιών γιατί βρίσκονται σε σύστημα αρχείων "
+"ή μέσο μόνο για ανάγνωση, όπως ένα CDROM. Παρακαλώ ελέγξτε τα δικαιώματα και "
+"προσπαθήστε ξανά."
+
+#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
msgstr "Ελήφθη σφάλμα \"{0}\" κατά την προσπάθεια περιστροφής {1}"
-#: ../src/RotateCommand.cs:274
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
msgstr "Σφάλμα κατά την περιστροφή της φωτογραφίας."
-#: ../src/SendEmail.cs:239
+#: ../src/SendEmail.cs:240
msgid "Preparing email"
-msgstr "Προετοιμασία ηλεκτρονικού ταχυδρομείου"
+msgstr "Γίνεται προετοιμασία του E-Mail"
-#: ../src/SendEmail.cs:291
+#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
-msgstr "Εξαγωγή εικόνας \"{0}\""
+msgstr "Γίνεται εξαγωγή εικόνας \"{0}\""
-#: ../src/SendEmail.cs:313
-#| msgid "Error renaming tag"
+#: ../src/SendEmail.cs:314
msgid "Error processing image"
-msgstr "Σφάλμα κατά την επεξεεργασία της εικόνας"
+msgstr "Σφάλμα κατά την επεξεργασία της εικόνας"
-#: ../src/SendEmail.cs:314
+#: ../src/SendEmail.cs:315
#, csharp-format
-#| msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgid "An error occured while processing \"{0}\": {1}"
-msgstr "Υπήρξε ένα σφάλμα τύπου κατά την επεξεργασία \"{0}\": {1}"
+msgstr "Παρουσιάστηκε σφάλμα κατά την επεξεργασία \"{0}\": {1}"
#. Send the mail :)
-#: ../src/SendEmail.cs:329
-msgid "my photos"
-msgstr "οι φωτογραφίες μου"
+#: ../src/SendEmail.cs:330
+msgid "My Photos"
+msgstr "Οι φωτογραφίες μου"
-#: ../src/SingleView.cs:88
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Σφάλμα κατά την αποθήκευση φωτογραφίας που έχει οξυνθεί"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Όξυνση"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Ποσό:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Ακτίνα:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Κατώφλι:"
+
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Περιστροφή της φωτογραφίας αριστερά"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Περιστροφή της φωτογραφίας δεξιά"
-#. Obsolete, remove after db rev4
-#: ../src/SingleView.cs:128
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:14
-#: ../src/Widgets/MetadataDisplay.cs:221
-#: ../src/Widgets/MetadataDisplay.cs:223
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Φάκελος"
-#: ../src/SingleView.cs:354
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Άνοιγμα"
-#: ../src/SingleView.cs:454
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Ορισμός ως παρασκήνιο"
-#: ../src/TagCommands.cs:91
-#: ../src/TagCommands.cs:219
-#: ../src/TagSelectionWidget.cs:512
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "Το όνομα αυτό χρησιμοποιείται ήδη"
-#: ../src/TagCommands.cs:138
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "Δημιουργία νέας ετικέτας"
-#: ../src/TagCommands.cs:139
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "Το όνομα της νέας ετικέτας:"
-#: ../src/TagCommands.cs:285
-msgid "Edit Tag"
-msgstr "Επεξεργασία ετικέτας"
-
-#: ../src/TagCommands.cs:286
-msgid "Tag Name:"
-msgstr "Όνομα ετικέτας:"
-
-#: ../src/TagCommands.cs:402
-#| msgid "Unable to log on"
-msgid "Unable to load image"
-msgstr "Αδύνατη η φόρτωση της εικόνας"
-
-#: ../src/TagCommands.cs:403
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "Αδύνατη η φόρτωση \"{0}\" σαν εικονίδιο για την ετικέτα"
-
-#: ../src/TagCommands.cs:447
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "Φωτογραφία {0} από {1}"
-
-#: ../src/TagCommands.cs:477
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "Επεξεργασία εικονιδίου για την ετικέτα {0}"
-
-#: ../src/TagCommands.cs:493
-msgid "Select Photo from file"
-msgstr "Επιλέξτε φωτογραφία από το αρχείο"
-
-#: ../src/TagCommands.cs:516
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-"\n"
-"<b>Από την φωτογραφία</b>\n"
-"Μπορείτε να χρησιμοποιήσετε μια τις φωτογραφίες της βιβλιοθήκης σας σαν εικονίδιο για αυτήν την ετικέτα.\n"
-"Παρόλα αυτά, πρώτα πρέπει να έχετε τουλάχιστον μια σχετιζόμενη φωτογραφία με αυτήν την ετικέτα. Παρακαλώ εισάγετε μια φωτογραφία σε ετικέτα ως '{0}' επιστρέψτε εδώ\n"
-"για να την χρησιμοποιήσετε σαν εικονίδιο."
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
@@ -1714,14 +3071,13 @@ msgid_plural "Find"
msgstr[0] "Αναζήτηση"
msgstr[1] "Αναζητήσεις"
-#: ../src/TagPopup.cs:36
-#: ../src/Widgets/TagMenu.cs:91
+#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
msgid "Create New Tag..."
msgstr "Δημιουργία νέας ετικέτας..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Επεξεργασία επιλεγμένης ετικέτας..."
+msgid "Edit Tag..."
+msgstr "Επεξεργασία ετικέτας"
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -1745,68 +3101,66 @@ msgstr[1] "Αφαίρεση ετικετών από την επιλογή"
msgid "Merge Tags"
msgstr "Συγχώνευση ετικετών"
-#: ../src/TagQueryWidget.cs:32
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr "Εισαγωγή φωτογραφιών με ετικέτα \"{0}\""
-#: ../src/TagQueryWidget.cs:37
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr "Εξαγωγή φωτογραφιών με ετικέτα \"{0}\""
-#: ../src/TagQueryWidget.cs:42
+#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
msgstr "Αφαίρεση από την αναζήτηση"
-#: ../src/TagQueryWidget.cs:86
+#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
msgstr[0] "Αναζήτηση _με"
msgstr[1] "Αναζητήσεις _με"
-#: ../src/TagQueryWidget.cs:112
+#: ../src/TagQueryWidget.cs:114
msgid "All"
msgstr "Όλες"
-#: ../src/TagQueryWidget.cs:147
-#: ../src/Term.cs:592
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "Όχι η {0}"
-#: ../src/TagQueryWidget.cs:277
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr "Άρπαγμα ετικετών εδώ για αναζήτηση για αυτές"
-#: ../src/TagSelectionWidget.cs:511
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "Σφάλμα κατά τη μετονομασία ετικέτας"
-#: ../src/TagStore.cs:198
+#: ../src/TagStore.cs:203
msgid "Favorites"
msgstr "Αγαπημένες"
-#: ../src/TagStore.cs:203
+#: ../src/TagStore.cs:208
msgid "Hidden"
msgstr "Κρυφές"
-#: ../src/TagStore.cs:211
+#: ../src/TagStore.cs:216
msgid "People"
msgstr "Άτομα"
-#: ../src/TagStore.cs:216
+#: ../src/TagStore.cs:221
msgid "Places"
msgstr "Τοποθεσίες"
-#: ../src/TagStore.cs:221
+#: ../src/TagStore.cs:226
msgid "Events"
msgstr "Γεγονότα"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:234
-#: ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Κανένα)"
@@ -1825,2567 +3179,1124 @@ msgstr " ή "
#. OPS The operators we support, case insensitive
#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:380
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
#: ../src/Widgets/FindBar.cs:177
-#: ../src/f-spot.glade.h:220
msgid "or"
msgstr "ή"
-#: ../src/UI.Dialog/AboutDialog.cs:70
-#| msgid "Photo Manager"
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Γίνεται ενημέρωση μικρογραφιών"
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "Γίνεται ενημέρωση φωτογραφίας \"{0}\""
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
-msgstr "Διαχειριστής εικόνων για GNOME"
+msgstr "Διαχείριση εικόνων για το GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:71
-msgid "Copyright © 2003-2008 Novell Inc."
-msgstr "Πνευματικά διακαιώματα © 2003-2008 Novell Inc."
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Πνευματικά διακαιώματα © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:94
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"Kostas Papadimas <pkst at gnome.org>\n"
"Stathis Kamperis <stathisk at med.auth.gr>\n"
"Giannis Katsampiris <giannis1_86 at hotmail.com>"
-#: ../src/UI.Dialog/AboutDialog.cs:99
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
-msgstr "Ιστοσελίδα του f-spot"
+msgstr "Ιστοσελίδα του F-Spot"
-#: ../src/UI.Dialog/AdjustTimeDialog.cs:118
-#: ../src/f-spot.glade.h:120
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
msgid "Shift all photos by {0}"
msgstr "Μετακίνηση όλων των φωτογραφιών από την ετικέτα {0}"
-#: ../src/UI.Dialog/ExceptionDialog.cs:24
-msgid "F-Spot Encountered a Fatal Error"
-msgstr "Βρέθηκε ένα κρίσιμο σφάλμα για το f-spot"
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:60
-msgid "Error Details"
-msgstr "Λεπτομέρειες σφαλμάτων"
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:104
-msgid "An unhandled exception was thrown: "
-msgstr "Εκτοξεύτηκε μια μη διαχειριζόμενη εξαίρεση:"
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:20
-msgid "Error loading database."
-msgstr "Σφάλμα κατά τη φόρτωση της βάσης δεδομένων."
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "Σήμερα"
-#: ../src/UI.Dialog/RepairDbDialog.cs:21
-#, csharp-format
-msgid "F-Spot encountered an error while loading the photo database. The old database has be moved to {0} and a new database has been created."
-msgstr "Το f-spot βρήκε ένα σφάλμα κατά τη φόρτωση της βάσης δεδομένων των φωτογραφιών. Η παλιά βάση δεδομένων έχει μετακινηθεί στο {0} και έχει δημιουργηθεί μια καινούρια βάση δεδομένων."
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "Χθες"
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
-#| msgid "label124"
-msgid "Label"
-msgstr "Επιγραφή"
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "Την τελευταία εβδομάδα"
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
-#| msgid "Rating:"
-msgid "Ratio"
-msgstr "Αναλογία"
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "Τον τελευταίο μήνα"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
-msgid "Retry"
-msgstr "Επανάληψη"
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "Τις τελευταίες 90 ημέρες"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:1
-msgid "<b>Color Management</b>"
-msgstr "<b>Διαχείριση Χρώματος</b>"
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "Το τελευταίο έτος"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:2
-msgid "<b>Import Settings</b>"
-msgstr "<b>Ρυθμίσεις εισαγωγής</b>"
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "Την τρέχουσα εβδομάδα (Δευτ-Κυρ)"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:3
-msgid "<b>Metadata</b>"
-msgstr "<b>Μεταδεδομένα</b>"
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "Την προηγούμενη εβδομάδα (Δευτ-Κυρ)"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:4
-msgid "<b>Screensaver</b>"
-msgstr "<b>Προφύλαξη οθόνης</b>"
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "Προσαρμοσμένο εύρος"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:5
-#| msgid "<b></b>"
-msgid "<b>Theming</b>"
-msgstr "<b>Θεματοποίηση</b>"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Επεξεργασία εικονιδίου για την ετικέτα {0}"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:6
-msgid "<small><i>Choose the folder where F-Spot should store newly imported photos</i></small>"
-msgstr "<small><i>Επιλέξτε το φάκελο όπου θα αποθηκεύει το f-spot τις φωτογραφίες μόλις εισάγονται</i></small>"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "Επιλέξτε φωτογραφία από το αρχείο"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:7
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
msgstr ""
-"<small><i>Ενεργοποιήστε αυτήν την επιλογή για να αποθηκεύετε ετικέτες \n"
-"και περιγραφές σε υποστηριζόμενες μορφές εικόνας</i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:9
-msgid "<small><i>While acting as a screensaver, F-Spot can display all of your images, or a small subset based on tags.</i></small>"
-msgstr "<small><i>Κατά την ενέργεια της προφύλαξης οθόνης, το f-spot μπορεί να εμφανίζει όλες τις εικόνες σας, ή ένα υποσύνολο αυτών βασισμένο στις ετικέτες</i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:10
-#| msgid ""
-#| "<small><i>Choose the folder where F-Spot should store newly imported "
-#| "photos</i></small>"
-msgid "<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
-msgstr "<small><i>Πρέπει να επανεκκινήσετε το f-spot για να φορτωθεί το νέο θέμα</i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:12
-#| msgid "Custom Rendered"
-msgid "Custom Theme"
-msgstr "Προσαρμοσμένο θέμα"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:15
-msgid "From List:"
-msgstr "Από κατάλογο:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:16
-msgid "From gtkrc File:"
-msgstr "Από αρχείο gtkrc"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:17
-msgid "Images tagged with:"
-msgstr "Εικόνες που βρίσκονται σε ετικέτες με:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:18
-msgid "Make F-Spot your screensaver"
-msgstr "Κάνετε το f-spot την προφύλαξη οθόνης σας"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:19
-#: ../src/f-spot.glade.h:102
-msgid "Preferences"
-msgstr "Προτιμήσεις"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:20
-msgid "Select A Folder"
-msgstr "Επιλέξτε φάκελο"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:21
-#| msgid "Select A Folder"
-msgid "Select A gtkrc File"
-msgstr "Επιλέξτε ένα αρχείο gtkrc"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:22
-msgid "System Theme"
-msgstr "Θέμα συστήματος"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:23
-msgid "Try to use the system display profile"
-msgstr "Προσπαθήστε να χρησιμοποιήσετε το προφίλ οθόνης του συστήματος"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:24
-msgid "Write _metadata to file"
-msgstr "Εγγραφή μεταδεδομένων σε αρχείο"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:25
-msgid "_Display:"
-msgstr "_Προβολή:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:26
-#| msgid "_Output:"
-msgid "_Print output:"
-msgstr "Εκτύπωση ε_ξόδου:"
-
-#: ../src/Updater.cs:528
-msgid "Updating F-Spot Database"
-msgstr "Ενημέρωση βάσης δεδομένων του f-spot"
-
-#: ../src/Updater.cs:529
-msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
-msgstr "Παρακαλώ περιμένετε καθώς ενημερώνεται η βάση δεδομένων της συλλογής φωτογραφιών του f-spot. Αυτό μπορεί να διαρκέσει λίγο."
-
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:35
-msgid "Unable to create temporary file"
-msgstr "Αδύνατη η δημιουργία προσωρινού αρχείου"
-
-#: ../src/Utils/GnomeUtil.cs:49
-msgid "The \"F-Spot Manual\" could not be found. Please verify that your installation has been completed successfully."
-msgstr "Δεν ήταν δυνατή η εύρεση του \"Εγχειρίδιο του f-spot\". Παρακαλώ επαληθεύστε ότι έχει ολοκληρωθεί με επιτυχία."
+"\n"
+"<b>Από την φωτογραφία</b>\n"
+"Μπορείτε να χρησιμοποιήσετε μια τις φωτογραφίες της βιβλιοθήκης σας σαν "
+"εικονίδιο για αυτήν την ετικέτα.\n"
+"Παρόλα αυτά, πρώτα πρέπει να έχετε τουλάχιστον μια σχετιζόμενη φωτογραφία με "
+"αυτήν την ετικέτα. Παρακαλώ εισάγετε μια φωτογραφία σε ετικέτα ως '{0}' "
+"επιστρέψτε εδώ\n"
+"για να την χρησιμοποιήσετε σαν εικονίδιο."
-#: ../src/Widgets/CustomPrintWidget.cs:98
-msgid "Page Setup"
-msgstr "Διαμόρφωση σελίδας"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Αδύνατη η φόρτωση της εικόνας"
-#: ../src/Widgets/CustomPrintWidget.cs:102
-#: ../src/Widgets/CustomPrintWidget.cs:106
-#: ../src/Widgets/CustomPrintWidget.cs:112
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr "Μέγεθος χαρτιού: {0} x {1} mm"
-
-#: ../src/Widgets/CustomPrintWidget.cs:109
-msgid "Set Page Size and Orientation"
-msgstr "Διαμόρφωση μεγέθους χαρτιού και προσανατολισμός"
-
-#: ../src/Widgets/CustomPrintWidget.cs:124
-#| msgid "Photo Manager"
-msgid "Photos per page"
-msgstr "Φωτογραφίες ανά σελίδα"
-
-#. ppp1.Toggled += TriggerChanged;
-#. ppp2.Toggled += TriggerChanged;
-#. ppp4.Toggled += TriggerChanged;
-#. ppp9.Toggled += TriggerChanged;
-#: ../src/Widgets/CustomPrintWidget.cs:136
-#| msgid "Reset"
-msgid "Repeat"
-msgstr "Επανάληψη"
-
-#: ../src/Widgets/CustomPrintWidget.cs:137
-#| msgid "Print crop _marks"
-msgid "Print cut marks"
-msgstr "Εκτύπωση ση_μειώσεων αποκοπής"
-
-#: ../src/Widgets/CustomPrintWidget.cs:145
-msgid "Full Page (no margin)"
-msgstr "Πλήρης σελίδα (χωρίς περιθώριο)"
-
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Widgets/CustomPrintWidget.cs:149
-#| msgid "Zoom in"
-msgid "Zoom"
-msgstr "Μεταβλητή εστίαση"
-
-#: ../src/Widgets/CustomPrintWidget.cs:150
-#| msgid "File"
-msgid "Fill"
-msgstr "Γέμισμα"
-
-#: ../src/Widgets/CustomPrintWidget.cs:151
-msgid "Scaled"
-msgstr "Διαβαθμισμένο"
-
-#: ../src/Widgets/CustomPrintWidget.cs:157
-#, fuzzy
-#| msgid "Outside _border"
-msgid "White borders"
-msgstr "Εξωτερικό περίγ_ραμμα"
-
-#: ../src/Widgets/CustomPrintWidget.cs:161
-msgid "Custom Text: "
-msgstr "Παραμετροποιημένο κείμενο: "
-
-#: ../src/Widgets/EditorPage.cs:29
-#: ../src/Widgets/Sidebar.cs:71
-#| msgid "_Edit"
-msgid "Edit"
-msgstr "Επεξεργασία"
-
-#: ../src/Widgets/EditorPage.cs:201
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:46
-msgid "No selection available"
-msgstr "Δεν υπάρχει διαθέσιμη επιλογή"
-
-#: ../src/Widgets/EditorPage.cs:202
-msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
-msgstr "Το εργαλείο απαιτεί μια ενεργή επιλογή. Παρακαλώ επιλέξτε μια περιοχή της φωτογραφίας και προσπαθήστε ξανά να χρησιμοποιήσετε τη λειτουργία"
-
-#: ../src/Widgets/EditorPage.cs:220
-#| msgid "Error saving adjusted photo"
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] "Σφάλμα κατά την αποθήκευση προσαρμοσμένης φωτογραφίας"
-msgstr[1] "Σφάλμα κατά την αποθήκευση προσαρμοσμένων φωτογραφιών"
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "Αδύνατη η φόρτωση \"{0}\" ως εικονίδιο για την ετικέτα"
-#: ../src/Widgets/EditorPage.cs:222
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
#, csharp-format
-msgid "Received exception \"{0}\". Note that you have to develop RAW files into JPEG before you can edit them."
-msgstr "Λήψη εξαίρεσης \"{0}\". Προσοχή πρέπει να αναπτύξετε αρχεία RAW σε JPEG πριν την επεξεργασία τους."
-
-#: ../src/Widgets/FindBar.cs:58
-msgid "Find:"
-msgstr "Εύρεση:"
-
-#: ../src/Widgets/FindBar.cs:177
-#: ../src/f-spot.glade.h:212
-msgid "and"
-msgstr "και"
-
-#: ../src/Widgets/InfoBox.cs:182
-#| msgid "<b>Histogram</b>"
-msgid "Histogram"
-msgstr "Ιστόγραμμα"
-
-#: ../src/Widgets/InfoBox.cs:217
-#| msgid "_Dates"
-msgid "Date"
-msgstr "Ημερομηνία"
-
-#: ../src/Widgets/InfoBox.cs:220
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:5
-#| msgid "size"
-msgid "Size"
-msgstr "Μέγεθος"
-
-#: ../src/Widgets/InfoBox.cs:223
-#| msgid "exposure"
-msgid "Exposure"
-msgstr "Έκθεση"
+msgid "Photo {0} of {1}"
+msgstr "Φωτογραφία {0} από {1}"
-#: ../src/Widgets/InfoBox.cs:227
-msgid "Focal Length"
-msgstr "Εστιακό μήκος"
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
+msgstr "Το F-Spot συνάντησε ένα κρίσιμο σφάλμα"
-#: ../src/Widgets/InfoBox.cs:233
-#| msgid "File"
-msgid "File Size"
-msgstr "Μέγεθος αρχείου"
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "Λεπτομέρειες σφαλμάτων"
-#: ../src/Widgets/InfoBox.cs:236
-#| msgid "Rating:"
-msgid "Rating"
-msgstr "Βαθμολόγηση"
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr "Παρουσιάστηκε ένα άγνωστο σφάλμα: "
-#: ../src/Widgets/InfoBox.cs:409
-#: ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442
-#: ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Άγνωστο)"
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "Κανένα"
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr "(λάθος μορφή)"
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "Προφίλ συστήματος"
-#: ../src/Widgets/InfoBox.cs:558
-msgid "(File read error)"
-msgstr "(Σφάλμα ανάγνωσης αρχείου)"
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "Προεπιλεγμένο θέμα"
-#: ../src/Widgets/InfoBox.cs:603
-#, csharp-format
-#| msgid "{0} Photo"
-#| msgid_plural "{0} Photos"
-msgid "{0} Photos"
-msgstr "{0} Φωτογραφίες"
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "Σφάλμα κατά τη φόρτωση της βάσης δεδομένων."
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:623
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
#, csharp-format
msgid ""
-"On {0} between \n"
-"{1} and {2}"
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
msgstr ""
-"Στο {0} μεταξύ \n"
-"{1} και {2}"
+"Το F-Spot συνάντησε ένα σφάλμα κατά τη φόρτωση της βάσης δεδομένων των "
+"φωτογραφιών. Η παλιά βάση δεδομένων έχει μετακινηθεί στο {0} και έχει "
+"δημιουργηθεί μια καινούρια βάση δεδομένων."
-#: ../src/Widgets/InfoBox.cs:628
-#, csharp-format
-msgid ""
-"Between {0} \n"
-"and {1}"
-msgstr ""
-"Μεταξύ {0} \n"
-"και {1}"
-
-#: ../src/Widgets/InfoBox.cs:655
-#| msgid "File not found"
-msgid "(At least one File not found)"
-msgstr "(Τουλάχιστον ένα αρχείο δε βρέθηκε)"
-
-#: ../src/Widgets/InfoBox.cs:772
-#| msgid "F-Spot Photo Manager"
-msgid "Show Photo Name"
-msgstr "Προβολή ονόματος φωτογραφίας"
-
-#: ../src/Widgets/InfoBox.cs:781
-#| msgid "Show updates only"
-msgid "Show Date"
-msgstr "Προβολή ημερομηνίας"
-
-#: ../src/Widgets/InfoBox.cs:790
-#| msgid "Photo _Size:"
-msgid "Show Size"
-msgstr "Προβολή μεγέθους"
-
-#: ../src/Widgets/InfoBox.cs:799
-#| msgid "exposure"
-msgid "Show Exposure"
-msgstr "Προβολή έκθεσης"
-
-#: ../src/Widgets/InfoBox.cs:808
-msgid "Show Focal Length"
-msgstr "Προβολή μήκους εστίασης"
-
-#: ../src/Widgets/InfoBox.cs:817
-#| msgid "Camera"
-msgid "Show Camera"
-msgstr "Προβολή κάμερας"
-
-#: ../src/Widgets/InfoBox.cs:826
-msgid "Show File Size"
-msgstr "Προβολή μεγέθους αρχείου"
-
-#: ../src/Widgets/MetadataDisplay.cs:23
-#| msgid "<b>Metadata</b>"
-msgid "Metadata"
-msgstr "Μεταδεδομένα"
-
-#: ../src/Widgets/MetadataDisplay.cs:104
-msgid "Extended Metadata"
-msgstr "Εκτεταμένα μεταδεδομένα"
-
-#: ../src/Widgets/MetadataDisplay.cs:225
-msgid "Picasaweb"
-msgstr "Δίκτυο του picasa"
-
-#: ../src/Widgets/MetadataDisplay.cs:227
-msgid "SmugMug"
-msgstr "SmugMug"
-
-#: ../src/Widgets/MetadataDisplay.cs:229
-msgid "Gallery2"
-msgstr "Συλλογή2"
-
-#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:389
-#| msgid "No metadata available"
-msgid "No Extended Metadata Available"
-msgstr "Δεν υπάρχουν εκτεταμένα μεταδεδομένα"
-
-#: ../src/Widgets/MetadataDisplay.cs:407
-msgid "No active photo"
-msgstr "Καμιά ενεργή φωτογραφία"
-
-#: ../src/Widgets/MetadataDisplay.cs:409
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "Η φωτογραφία \"{0}\" δεν υπάρχει."
-
-#: ../src/Widgets/MetadataDisplay.cs:412
-msgid "No metadata available"
-msgstr "Δεν υπάρχουν διαθέσιμα μεταδεδομένα"
-
-#: ../src/Widgets/OpenWithMenu.cs:69
-msgid "No applications available"
-msgstr "Δεν υπάρχει διαθέσιμες εφαρμογές"
-
-#: ../src/Widgets/RatingMenuItem.cs:56
-msgid "Rating:"
-msgstr "Βαθμολόγηση:"
-
-#: ../src/XmpTagsImporter.cs:89
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:6
-msgid "Location"
-msgstr "Τοποθεσία"
-
-#: ../src/XmpTagsImporter.cs:90
-msgid "Country"
-msgstr "Χώρα"
-
-#: ../src/XmpTagsImporter.cs:91
-msgid "City"
-msgstr "Πόλη"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "Επιγραφή"
-#: ../src/XmpTagsImporter.cs:92
-msgid "State"
-msgstr "Πολιτεία"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "Αναλογία"
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "Επανάληψη"
-#: ../src/f-spot.glade.h:2
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
msgid "0000:00:00 00:00:00"
msgstr "0000:00:00 00:00:00"
-#: ../src/f-spot.glade.h:3
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
msgid "00:00:00"
msgstr "00:00:00"
-#: ../src/f-spot.glade.h:4
-msgid "1 of 1"
-msgstr "1 από 1"
-
-#: ../src/f-spot.glade.h:5
-msgid "1024 px"
-msgstr "1024 εικονοστοιχεία"
-
-#: ../src/f-spot.glade.h:6
-msgid "320 px"
-msgstr "320 εικονοστοιχεία"
-
-#: ../src/f-spot.glade.h:7
-msgid "480 px"
-msgstr "480 εικονοστοιχεία"
-
-#: ../src/f-spot.glade.h:8
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
msgid "5"
msgstr "5"
-#: ../src/f-spot.glade.h:9
-msgid "640 px"
-msgstr "640 εικονοστοιχεία"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Ενέργεια</b>"
-#: ../src/f-spot.glade.h:10
-msgid "800 px"
-msgstr "800 εικονοστοιχεία"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Φωτογραφία αναφοράς</b>"
-#: ../src/f-spot.glade.h:11
-msgid "<b></b>"
-msgstr "<b></b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Προσαρμογή χρόνου"
-#: ../src/f-spot.glade.h:12
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>Λογαριασμός</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Προσαρμοσμένη ημερομηνία: "
-#: ../src/f-spot.glade.h:13
-msgid "<b>Action</b>"
-msgstr "<b>Ενέργεια</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Τρέχουσα ημερομηνία:"
-#: ../src/f-spot.glade.h:14
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>Άλμπουμ</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Διάταξη όλων των φωτογραφιών από"
-#: ../src/f-spot.glade.h:15
-msgid "<b>Co_rrections</b>"
-msgstr "<b>Διο_ρθώσεις</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "διαφορά:"
-#: ../src/f-spot.glade.h:16
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>Προορισμός</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "min. Έναρξη στο {0}"
-#: ../src/f-spot.glade.h:17
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
msgid "<b>End Date</b>"
-msgstr "<b>Τελική ημέρα</b>"
+msgstr "<b>Τελική ημερομηνία</b>"
-#: ../src/f-spot.glade.h:18
-msgid "<b>From External Photo</b>"
-msgstr "<b>Από εξωτερική φωτογραφία</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Επιλογή περιόδου</b>"
-#: ../src/f-spot.glade.h:19
-msgid "<b>From Photo</b>"
-msgstr "<b>Από φωτογραφία</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Αρχική ημερομηνία</b>"
-#: ../src/f-spot.glade.h:20
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>Συλλογή εικόνων</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Κάνετε ακύρωση, μην αλλάζετε την τρέχουσα ζώνη ώρας. "
-#: ../src/f-spot.glade.h:21
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>Παρεμβολή εικόνας</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Θα εμφανιστούν μόνο φωτογραφίες μεταξύ αυτών των ημερομηνιών."
-#: ../src/f-spot.glade.h:22
-msgid "<b>Max Rating</b>"
-msgstr "<b>Βέλτιστη βαθμολογία</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Ορισμός εύρους ημερομηνίας"
-#: ../src/f-spot.glade.h:23
-msgid "<b>Min Rating</b>"
-msgstr "<b>Ελάχιστη βαθμολογία</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#: ../src/f-spot.glade.h:24
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
-msgid "<b>Photos</b>"
-msgstr "<b>Φωτογραφίες</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Επεξεργασία ετικέτας"
-#: ../src/f-spot.glade.h:25
-msgid "<b>Predefined</b>"
-msgstr "<b>Προκαθορισμένο</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Επεξεργασία εικονιδίου"
-#: ../src/f-spot.glade.h:26
-msgid "<b>Preview</b>"
-msgstr "<b>Προεπισκόπηση</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Εικονίδιο:"
-#: ../src/f-spot.glade.h:27
-msgid "<b>Reference Photo</b>"
-msgstr "<b>Αναφορά φωτογραφίας</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Από εξωτερική φωτογραφία</b>"
-#: ../src/f-spot.glade.h:28
-msgid "<b>Select period</b>"
-msgstr "<b>Επιλογή περιόδου</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Από φωτογραφία</b>"
-#: ../src/f-spot.glade.h:29
-msgid "<b>Size</b>"
-msgstr "<b>Μέγεθος</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Προκαθορισμένα εικονίδια</b>"
-#: ../src/f-spot.glade.h:30
-msgid "<b>Start Date</b>"
-msgstr "<b>Αρχική ημέρα</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Προεπισκόπηση</b>"
-#: ../src/f-spot.glade.h:31
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>Στυλ</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Δημιουργία εικονιδίου από"
-#: ../src/f-spot.glade.h:32
-msgid "<b>Summary</b>"
-msgstr "<b>Περίληψη</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Επεξεργασία εικονιδίου ετικέτας"
-#: ../src/f-spot.glade.h:33
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>Διαφανείς περιοχές</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Καμία ει_κόνα"
-#: ../src/f-spot.glade.h:34
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>Προβολή όλων των φωτογραφιών που έχουν εισαχθεί</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "Φωτογραφία 0 από 0"
-#: ../src/f-spot.glade.h:35
-msgid "<b>_White Balance</b>"
-msgstr "<b>Ισορροπία _λευκού</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Χρωματικό προφίλ για οθόνη:"
-#: ../src/f-spot.glade.h:36
-msgid "<small></small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Χρωματικό προφίλ για εκτύπωση:"
-#: ../src/f-spot.glade.h:37
-msgid "<small><i>Enable this to allow interpolation on zoomed images. You shouldn't disable this for viewing photos, but disabling the interpolation could be usefull in icon design.</i></small>"
-msgstr "<small><i>Ενεργοποιήστε αυτήν την επιλογή για να επιτρέπετε την παρεμβολή εστιασμένων εικόνων. Δεν θα πρέπει να το απενεργοποιήσετε για την προβολή φωτογραφιών, αλλά η απενεργοποίηση της παρεμβολής θα μπορούσε να είναι χρήσιμη για σχεδίαση εικονιδίων.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "Προτιμήσεις F-Spot"
-#: ../src/f-spot.glade.h:38
-msgid "<small><i>You can choose how to display transparent parts in images. This option has no effect on photos, but setting this as check pattern or custom color could be usefull when viewing icons or other artworks with transparent parts.</i></small>"
-msgstr "<small><i>Μπορείτε να επιλέξετε τον τρόπο προβολής διαφανών περιοχών σε εικόνες. Αυτή η επιλογή δεν μπορεί να εφαρμοστεί σε φωτογραφίες, αλλά ο καθορισμός της σαν υπόδειγμα ελέγχου ή προσαρμοσμένου χρώματα θα μπορούσε να είναι χρήσιμος κατά την προβολή εικονιδίων ή άλλων καλλιτεχνικών εργασιών με διαφανείς περιοχές.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "Εμφάνιση F-Spot:"
-#: ../src/f-spot.glade.h:39
-msgid "Adjust Time"
-msgstr "Προσαρμογή χρόνου"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+"Μέσα στα αρχεία εικόνων όταν είναι δυνατόν\n"
+"<small>Θα είναι προσβάσιμα και από άλλα\n"
+"προγράμματα επεξεργασίας εικόνων.</small>"
-#: ../src/f-spot.glade.h:40
-msgid "Adjust _Time..."
-msgstr "Προσαρμογή _χρώματος..."
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Επιλέξτε φάκελο"
-#: ../src/f-spot.glade.h:41
-msgid "Adjusted date: "
-msgstr "Προσαρμοσμένη ημερομηνία:"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "Χωριστά από τα αρχεία των εικόνων"
-#: ../src/f-spot.glade.h:42
-msgid "Arrange _by"
-msgstr "Ταξινόμηση α_νά"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Αποθήκευση ετικετών και περιγραφών των φωτογραφιών:"
-#: ../src/f-spot.glade.h:43
-msgid "As _background"
-msgstr "Ως _παρασκήνιο"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "Κατά την εισαγωγή φωτογραφιών, να γίνεται αντιγραφή σε:"
-#: ../src/f-spot.glade.h:44
-msgid "As _custom color: "
-msgstr "Ως _προσαρμοσμένο χρώμα:"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>Βέλτιστη βαθμολογία</b>"
-#: ../src/f-spot.glade.h:45
-msgid "As check _pattern"
-msgstr "Ως υ_πόδειγμα ελέγχου"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>Ελάχιστη βαθμολογία</b>"
-#: ../src/f-spot.glade.h:46
-msgid "Attach Tags:"
-msgstr "Επισύναψη ετικετών:"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Καθορισμός φίλτρου βαθμολογήσεων"
-#: ../src/f-spot.glade.h:47
-msgid "Attach tag:"
-msgstr "Επισύναψη ετικέτας:"
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "Προσαρμογή ώ_ρας..."
-#: ../src/f-spot.glade.h:48
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "Αυτόματη περιστροφή"
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "Ταξινόμηση α_νά"
-#: ../src/f-spot.glade.h:50
+#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
msgstr "Ανά η_μερομηνία"
-#: ../src/f-spot.glade.h:51
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
msgstr "Από εισα_γωγή καρτέλας"
-#: ../src/f-spot.glade.h:52
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
msgstr "Από τη _βαθμολόγηση"
-#: ../src/f-spot.glade.h:53
-msgid "CD"
-msgstr "CD"
-
-#: ../src/f-spot.glade.h:54
-msgid "C_ontrast:"
-msgstr "Α_ντίθεση:"
-
-#: ../src/f-spot.glade.h:55
-msgid "Camera Selection"
-msgstr "Επιλογή κάμερας"
-
-#: ../src/f-spot.glade.h:56
-msgid "Cancel, do not change the current timeline. "
-msgstr "Κάνετε ακύρωση, μην αλλάζετε την τρέχουσα ζώνη ώρας."
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "Αντιγραφή"
-#: ../src/f-spot.glade.h:57
-msgid "Copy Locat_ion"
-msgstr "Αντιγραφή το_ποθεσίας"
-
-#: ../src/f-spot.glade.h:58
-msgid "Copy files to the Photos folder"
-msgstr "Αντιγραφή αρχείων στο φάκελος φωτογραφιών"
-
-#: ../src/f-spot.glade.h:59
-msgid "Create Mail"
-msgstr "Δημιουργία μηνύματος ηλεκτρονικού ταχυδρομείου"
-
-#: ../src/f-spot.glade.h:60
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "Δημιουργία νέας _ετικέτας..."
-#: ../src/f-spot.glade.h:61
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "Δημιουργία _νέας έκδοσης..."
-#: ../src/f-spot.glade.h:62
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr "Δημιουργήστε ένα μήνυμα ηλεκτρονικού ταχυδρομείου με συνημμένες τις επιλεγμένες φωτογραφίες (πιθανώς με προσαρμοσμένο μέγεθος) "
-
-#: ../src/f-spot.glade.h:63
-msgid "Current date:"
-msgstr "Τρέχουσα ημερομηνία:"
-
-#: ../src/f-spot.glade.h:64
-msgid "Detect duplicates"
-msgstr "Εντοπισμός διπλοτύπων"
-
-#: ../src/f-spot.glade.h:65
-msgid "Display File _Names"
-msgstr "Εμφάνιση ο_νομάτων αρχείων"
-
-#: ../src/f-spot.glade.h:66
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "Προβολή μόνο των φωτογραφιών που εισήχθηκαν σε συγκεκριμένες καρτέλες."
-
-#: ../src/f-spot.glade.h:67
-msgid "Do not send a mail"
-msgstr "Να μην σταλεί κανένα μήνυμα ηλεκτρονικού ταχυδρομείου"
-
-#: ../src/f-spot.glade.h:68
-msgid "E-_Mail:"
-msgstr "E-Mail:"
-
-#: ../src/f-spot.glade.h:69
-msgid "E_xport titles and comments"
-msgstr "Ε_ξαγωγή τίτλων και σχολίων"
-
-#: ../src/f-spot.glade.h:70
-msgid "Edit Tag Icon"
-msgstr "Επεξεργασία εικονιδίου ετικέτας"
-
-#: ../src/f-spot.glade.h:71
-msgid "Edit icon"
-msgstr "Επεξεργασία εικονιδίου"
-
-#: ../src/f-spot.glade.h:72
-msgid "Estimated new size"
-msgstr "Εκτιμώμενο νέο μέγεθος"
-
-#: ../src/f-spot.glade.h:73
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
-msgid "Export"
-msgstr "Εξαγωγή"
-
-#: ../src/f-spot.glade.h:74
-msgid "Extra large"
-msgstr "Πολύ μεγάλο"
-
-#: ../src/f-spot.glade.h:75
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:76
-msgid "F-Spot View"
-msgstr "Προβολή F-Spot"
-
-#: ../src/f-spot.glade.h:78
-msgid "Filter on selected rolls"
-msgstr "Φιλτράρισμα σε επιλεγμένες καρτέλες"
-
-#: ../src/f-spot.glade.h:79
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "Εύ_ρεση"
-#: ../src/f-spot.glade.h:80
-msgid "G_allery:"
-msgstr "Συλ_λογή:"
-
-#: ../src/f-spot.glade.h:81
-msgid "Gallery"
-msgstr "Συλλογή"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:84
-msgid "Import Source:"
-msgstr "Πηγή εισαγωγής:"
-
-#: ../src/f-spot.glade.h:85
-msgid "Include subfolders"
-msgstr "Εισαγωγή υποκαταλόγων"
-
-#: ../src/f-spot.glade.h:86
-msgid "Large"
-msgstr "Μεγάλο"
-
-#: ../src/f-spot.glade.h:87
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
msgstr "Διαχείριση ε_πεκτάσεων"
-#: ../src/f-spot.glade.h:88
-msgid "Manage your custom selection ratios"
-msgstr "Διαχείριση των προσωπικών σου επιλεγμένων αναλογιών"
-
-#: ../src/f-spot.glade.h:89
-msgid "Medium"
-msgstr "Μεσαίο"
-
-#: ../src/f-spot.glade.h:91
-msgid "No _image"
-msgstr "Καμία ει_κόνα"
-
-#: ../src/f-spot.glade.h:92
-#| msgid "Number of photos in selected rolls :"
-msgid "Number of photos in selected rolls:"
-msgstr "Αριθμοί φωτογραφιών στις επιλεγμένες καρτέλες:"
-
-#: ../src/f-spot.glade.h:93
-msgid "Number of pictures"
-msgstr "Αριθμός εικόνων"
-
-#: ../src/f-spot.glade.h:94
-msgid "Only photos taken within these dates will be displayed."
-msgstr "Θα εμφανιστούν μόνο φωτογραφίες μεταξύ αυτών των ημερομηνιών."
-
-#: ../src/f-spot.glade.h:95
-msgid "Open _Folder..."
-msgstr "Άνοιγμα _φακέλου..."
-
-#: ../src/f-spot.glade.h:97
-msgid "Original size (possible very large file size)"
-msgstr "Αρχικό μέγεθος (πιθανώς αρχείο πολύ μεγάλου μεγέθους)"
-
-#: ../src/f-spot.glade.h:98
-msgid "P_arent Tag:"
-msgstr "_Γονική ετικέτα:"
-
-#: ../src/f-spot.glade.h:99
+#: ../src/ui/main_window.ui.h:13
msgid "Page Set_up..."
-msgstr "Διαμόρφωση σελίδας..."
+msgstr "_Διαμόρφωση σελίδας..."
-#: ../src/f-spot.glade.h:100
-msgid "Pause"
-msgstr "Παύση"
-
-#: ../src/f-spot.glade.h:101
-msgid "Photo 0 of 0"
-msgstr "Φωτογραφία 0 από 0"
-
-#: ../src/f-spot.glade.h:104
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
msgstr "Α_νανέωση μικρογραφίας"
-#: ../src/f-spot.glade.h:106
-msgid "Repair"
-msgstr "Διόρθωση"
-
-#: ../src/f-spot.glade.h:109
-msgid "Select Photos to Copy From Camera..."
-msgstr "Επιλέξτε τις φωτογραφίες που θέλετε να αντιγράψετε από την κάμερα..."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Επιλογή ό_λων"
-#: ../src/f-spot.glade.h:111
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Επιλογή _κανενός"
-#: ../src/f-spot.glade.h:112
-msgid "Select a Tag..."
-msgstr "Επιλέξτε ετικέτα..."
-
-#: ../src/f-spot.glade.h:113
-msgid "Select the camera from which you want to transfer files"
-msgstr "Επιλέξτε την κάμερα από όπου θέλετε να μεταφέρετε αρχεία"
-
-#: ../src/f-spot.glade.h:114
-msgid "Selected Camera: "
-msgstr "Επιλεγμένη κάμερα:"
-
-#: ../src/f-spot.glade.h:115
-#| msgid "No Constraint"
-msgid "Selection Constraints"
-msgstr "Περιορισμοί επιλογής"
-
-#: ../src/f-spot.glade.h:116
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
-msgstr "Αποστολή μέσω _μηνύματος ηλεκτρονικού ταχυδρομείου..."
+msgstr "Αποστολή μέσω E-_Mail..."
-#: ../src/f-spot.glade.h:117
-msgid "Set Rating Filter"
-msgstr "Καθορισμός φίλτρου βαθμολογήσεων"
-
-#: ../src/f-spot.glade.h:118
-msgid "Set as _Background"
-msgstr "Ορισμός ως _παρασκήνιο"
-
-#: ../src/f-spot.glade.h:119
-msgid "Set date range"
-msgstr "Ορισμός εύρους ημερομηνίας"
-
-#: ../src/f-spot.glade.h:121
-msgid "Show all photos."
-msgstr "Εμφάνιση όλων των φωτογραφιών."
-
-#: ../src/f-spot.glade.h:122
-msgid "Show or hide the side pane"
-msgstr "Εμφάνιση ή απόκρυψη του πλευρικού πλαισίου"
-
-#: ../src/f-spot.glade.h:123
-msgid "Show or hide the toolbar"
-msgstr "Εμφάνιση ή απόκρυψη της εργαλειοθήκης"
-
-#: ../src/f-spot.glade.h:124
-msgid "Side _pane"
-msgstr "Πλευρικό _πλαίσιο"
-
-#: ../src/f-spot.glade.h:125
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "Πλευρική _στήλη"
-#: ../src/f-spot.glade.h:126
-msgid "Small"
-msgstr "Μικρό"
-
-#: ../src/f-spot.glade.h:127
-msgid "Space all photos by"
-msgstr "Διάταξη όλων των φωτογραφιών από"
-
-#: ../src/f-spot.glade.h:128
-msgid "Specify if an original size picture should be rotated or not. Smaller sizes are automatically rotated."
-msgstr "Καθορίστε αν η φωτογραφία με το αρχικό μέγεθος θα περιστρέφεται ή όχι.Αυτές με τα μικρότερα μεγέθη περιστρέφονται αυτόματα."
-
-#: ../src/f-spot.glade.h:129
-msgid "Strip image _metadata"
-msgstr "Αφαίρεση _μεταδεδομένων εικόνας"
-
-#: ../src/f-spot.glade.h:130
+#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
msgstr "Ε_τικέτες"
-#: ../src/f-spot.glade.h:131
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1180
-msgid "Tags: "
-msgstr "Ετικέτες:"
-
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:133
-msgid "Te_mp:"
-msgstr "Προ_σωρινό:"
-
-#: ../src/f-spot.glade.h:134
+#: ../src/ui/main_window.ui.h:25
msgid "Thumbnail _elements"
msgstr "_Στοιχεία μικρογραφιών"
-#: ../src/f-spot.glade.h:135
-msgid "Tiny"
-msgstr "Μικροσκοπικό"
-
-#: ../src/f-spot.glade.h:136
+#: ../src/ui/main_window.ui.h:26
msgid "Too_lbar"
msgstr "Γραμμή ερ_γαλείων"
-#: ../src/f-spot.glade.h:137
-msgid "Total original size"
-msgstr "Συνολικό αρχικό μέγεθος"
-
-#: ../src/f-spot.glade.h:138
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "Προβολή"
-#: ../src/f-spot.glade.h:139
-msgid "Zoom _in"
-msgstr "_Μεγέθυνση"
-
-#: ../src/f-spot.glade.h:140
-msgid "Zoom _out"
-msgstr "Σ_μίκρυνση"
-
-#: ../src/f-spot.glade.h:141
-msgid "Zoom in"
-msgstr "Μεγέθυνση"
-
-#: ../src/f-spot.glade.h:142
-msgid "Zoom out"
-msgstr "Σμίκρυνση"
-
-#: ../src/f-spot.glade.h:144
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
msgstr "Ε_πισύναψη ετικέτας στην επιλογή"
-#: ../src/f-spot.glade.h:145
-msgid "_Brightness:"
-msgstr "_Φωτεινότητα:"
-
-#: ../src/f-spot.glade.h:147
+#: ../src/ui/main_window.ui.h:35
msgid "_Clear Rating Filter"
msgstr "Κα_θαρισμός φίλτρου βαθμολόγησης"
-#: ../src/f-spot.glade.h:148
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
msgstr "Κα_θαρισμός φίλτρου καρτελών"
-#: ../src/f-spot.glade.h:149
+#: ../src/ui/main_window.ui.h:38
msgid "_Components"
msgstr "_Στοιχεία"
-#: ../src/f-spot.glade.h:150
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
msgstr "_Περιεχόμενα"
-#: ../src/f-spot.glade.h:151
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-msgid "_Create"
-msgstr "_Δημιουργία"
-
-#: ../src/f-spot.glade.h:152
-msgid "_Create Mail"
-msgstr "_Δημιουργία μηνύματος ηλεκτρονικού ταχυδρομείου"
-
-#: ../src/f-spot.glade.h:153
+#: ../src/ui/main_window.ui.h:40
msgid "_Dates"
-msgstr "Η_μερομηνίες:"
+msgstr "Η_μερομηνίες"
-#: ../src/f-spot.glade.h:155
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
msgstr "_Διαγραφή επιλεγμένης ετικέτας"
-#: ../src/f-spot.glade.h:156
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
msgstr "_Διαγραφή έκδοσης"
-#: ../src/f-spot.glade.h:157
-msgid "_Edit"
-msgstr "Επε_ξεργασία"
-
-#: ../src/f-spot.glade.h:158
-msgid "_Edit Selected Tag..."
-msgstr "_Επεξεργασία επιλεγμένης ετικέτας"
-
-#: ../src/f-spot.glade.h:159
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export"
-msgstr "_Εξαγωγή"
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "Επε_ξεργασία ετικέτας..."
-#: ../src/f-spot.glade.h:160
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "_Εξαγωγή ετικετών"
-
-#: ../src/f-spot.glade.h:161
+#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
msgstr "Εξα_γωγή σε"
-#: ../src/f-spot.glade.h:162
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-msgid "_Export to Album:"
-msgstr "Ε_ξαγωγή σε άλμπουμ:"
-
-#: ../src/f-spot.glade.h:163
-#| msgid "exposure"
-msgid "_Exposure:"
-msgstr "_Έκθεση"
-
-#: ../src/f-spot.glade.h:164
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
msgstr "Α_φαίρεση ταινίας"
-#: ../src/f-spot.glade.h:165
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:166
-msgid "_Folder"
-msgstr "_Φάκελος"
-
-#: ../src/f-spot.glade.h:167
-msgid "_Fullscreen"
-msgstr "_Πλήρης Οθόνη"
-
-#: ../src/f-spot.glade.h:168
-msgid "_Gallery"
-msgstr "Συλ_λογή"
-
-#: ../src/f-spot.glade.h:169
-msgid "_Help"
-msgstr "_Βοήθεια"
-
-#: ../src/f-spot.glade.h:170
+#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
msgstr "Από_κρυψη"
-#: ../src/f-spot.glade.h:171
-msgid "_Hue:"
-msgstr "Α_πόχρωση:"
-
-#: ../src/f-spot.glade.h:172
-msgid "_Icon:"
-msgstr "_Εικονίδιο:"
-
-#: ../src/f-spot.glade.h:173
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
msgstr "Ει_σαγωγή..."
-#: ../src/f-spot.glade.h:174
-msgid "_Interpolate image on zoom"
-msgstr "Παρεμ_βολή της εικόνας κατά την εστίαση"
-
-#: ../src/f-spot.glade.h:175
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
msgstr "_Μεγάλο"
-#: ../src/f-spot.glade.h:176
+#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
msgstr "_Τελευταία εισαγωγή καρτέλας"
-#: ../src/f-spot.glade.h:177
+#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
-msgstr ""
+msgstr "_Μεγεθυντικός φακός"
-#: ../src/f-spot.glade.h:178
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
msgstr "_Μεσαίο"
-#: ../src/f-spot.glade.h:179
-msgid "_Month"
-msgstr "_Μήνας"
-
-#: ../src/f-spot.glade.h:180
-msgid "_New Window"
-msgstr "_Νέο παράθυρο"
-
-#: ../src/f-spot.glade.h:181
-msgid "_Open album in browser when done uploading"
-msgstr "Άνοι_γμα του άλμπουμ στον περιηγητή μετά την ολοκλήρωση του ανεβάσματος"
-
-#: ../src/f-spot.glade.h:182
-msgid "_Open destination when done exporting"
-msgstr "Ά_νοιγμα προορισμού μετά την ολοκλήρωση της εξαγωγής"
-
-#: ../src/f-spot.glade.h:183
-#| msgid "Photos"
-msgid "_Photo"
-msgstr "_Φωτογραφία"
-
-#: ../src/f-spot.glade.h:184
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
msgstr "Τε_ρματισμός"
-#: ../src/f-spot.glade.h:185
+#: ../src/ui/main_window.ui.h:58
msgid "_Ratings"
msgstr "_Βαθμολογίες"
-#: ../src/f-spot.glade.h:187
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
msgstr "Α_φαίρεση ετικέτας από την επιλογή"
-#: ../src/f-spot.glade.h:188
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
msgstr "_Μετονομασία έκδοσης"
-#: ../src/f-spot.glade.h:189
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-msgid "_Resize to: "
-msgstr "Α_λλαγή μεγέθους σε:"
-
-#: ../src/f-spot.glade.h:191
-msgid "_Saturation:"
-msgstr "_Κορεσμός:"
-
-#: ../src/f-spot.glade.h:192
-msgid "_Scale photos to no larger than: "
-msgstr "_Διαβάθμιση εικόνων όχι περισσότερο από:"
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "Α_ντιστροφή σειράς"
-#: ../src/f-spot.glade.h:193
+#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
msgstr "Ε_πιλέξτε την εισαγωγή καρτελών..."
-#: ../src/f-spot.glade.h:194
+#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
msgstr "Ορισμός εύρους η_μερομηνίας..."
-#: ../src/f-spot.glade.h:195
+#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
msgstr "Ορισμός φίλτρου _βαθμολόγησης..."
-#: ../src/f-spot.glade.h:196
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "Ό_ξυνση..."
-#: ../src/f-spot.glade.h:197
-msgid "_Slideshow"
-msgstr "_Διαφάνεια"
-
-#: ../src/f-spot.glade.h:198
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
msgstr "_Μικρό"
-#: ../src/f-spot.glade.h:199
-msgid "_Strip metadata"
-msgstr "Α_φαίρεση μεταδεδομένων"
-
-#: ../src/f-spot.glade.h:200
+#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
msgstr "Εικονίδια ετι_κέτας"
-#: ../src/f-spot.glade.h:201
-msgid "_Tag Name:"
-msgstr "Όνομα ετι_κέτας:"
-
-#: ../src/f-spot.glade.h:202
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
msgstr "_Ετικέτες"
-#: ../src/f-spot.glade.h:203
+#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
msgstr "_Ζώνη ώρας"
-#: ../src/f-spot.glade.h:204
-#| msgid "Tiny"
-msgid "_Tint:"
-msgstr "_Απόχρωση"
-
-#: ../src/f-spot.glade.h:205
-msgid "_Toolbar"
-msgstr "Γραμμή ερ_γαλείων"
-
-#: ../src/f-spot.glade.h:206
+#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
msgstr "Ερ_γαλεία"
-#: ../src/f-spot.glade.h:207
-msgid "_URI:"
-msgstr "_URI:"
-
-#: ../src/f-spot.glade.h:208
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
msgstr "Φωτογραφίες _χωρίς ετικέτα"
-#: ../src/f-spot.glade.h:209
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
msgstr "Έ_κδοση"
-#: ../src/f-spot.glade.h:210
-msgid "_View"
-msgstr "_Προβολή"
-
-#: ../src/f-spot.glade.h:211
-msgid "_Virtual Filesystem"
-msgstr "Εικο_νικό σύστημα αρχείων"
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "Γίνεται ενημέρωση της βάσης δεδομένων του F-Spot"
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:214
+#: ../src/Updater.cs:623
msgid ""
-"at\n"
-"after\n"
-"between"
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
msgstr ""
-"στην\n"
-"μετά την\n"
-"μεταξύ των"
-
-#: ../src/f-spot.glade.h:217
-msgid "difference:"
-msgstr "διαφορά:"
-
-#: ../src/f-spot.glade.h:218
-msgid "img_000.jpg"
-msgstr "img_000.jpg"
-
-#: ../src/f-spot.glade.h:219
-msgid "min. Starting at {0}"
-msgstr "min. Έναρξη στο {0}"
-
-#: ../src/f-spot.glade.h:221
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
-msgid "pixels"
-msgstr "εικονοστοιχεία"
-
-#: ../src/f-spot.glade.h:222
-msgid "x"
-msgstr "x"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "Προβολή διαφανειών από το f-spot"
+"Παρακαλούμε περιμένετε καθώς ενημερώνεται η βάση δεδομένων των συλλογών του "
+"F-Spot. Αυτό μπορεί να διαρκέσει κάποιο χρόνο."
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "φωτογραφίες του f-spot"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "Αδύνατη η δημιουργία προσωρινού αρχείου"
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_CD..."
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Διαμόρφωση σελίδας"
-#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
#, csharp-format
-#| msgid "Transferring Pictures"
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "Μεταφορά εικόνας\"{0}\" σε CD"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:177
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:551
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:702
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
-msgid "Done Sending Photos"
-msgstr "Ολοκληρώθηκε η αποστολή φωτογραφιών"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
-#| msgid "Upload Complete"
-msgid "Transfer Complete"
-msgstr "Η μεταφορά ολοκληρώθηκε"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:186
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
-#| msgid "Error transferring file"
-msgid "Error While Transferring"
-msgstr "Σφάλμα κατά την μεταφορά αρχείου"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:193
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
-#| msgid "Error transferring file"
-msgid "Error Transferring"
-msgstr "Σφάλμα μεταφοράς"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:206
-msgid "copying..."
-msgstr "Αντιγραφή..."
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr "<b><i>Υπάρχουν κάποια προηγούμενα προγραμματισμένα αντικείμενα προς εγγραφή</i></b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:2
-#| msgid "<b>Photos</b>"
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>Φωτογραφίες για εγγραφή</b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:4
-#| msgid "_Create"
-msgid "Create CD"
-msgstr "_Δημιουργία CD"
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Μέγεθος χαρτιού: {0} x {1} mm"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:6
-#| msgid "No photos for the selection"
-msgid "Size of the exported selection:"
-msgstr "Μέγεθος της εξαγώμενης επιλογής:"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "Διαμόρφωση μεγέθους χαρτιού και προσανατολισμός"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr "_Αναζήτηση προηγούμενων προγραμματισμένων αρχείων"
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Φωτογραφίες ανά σελίδα"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:8
-msgid "_Write only these photos to CD"
-msgstr "_Εγγραφή μόνο αυτών των φωτογραφιών στο CD"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Επανάληψη"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Εκτύπωση σημείων κοπής"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr..."
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "Διάταξη φωτογραφιών"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-#, fuzzy
-#| msgid "_Import..."
-msgid "_Zooomr..."
-msgstr "Ει_σαγωγή..."
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "Πλήρης σελίδα (χωρίς περιθώριο)"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "Εξουδιοδότηση"
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Μεταβλητή εστίαση"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
-msgid "Return to this window after you have finished the authorization process on {0} and click the \"Complete Authorization\" button below"
-msgstr "Επιστρέψτε σε αυτό το παράθυρο όταν τελειώσετε τη διεργασία εξουσιοδότησης στο {0} και κάντε κλικ με το ποντίκι σας στο κουμπί \"Ολοκλήρωση εξουσιοδότησης\" παρακάτω"
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Γέμισμα"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "Ολοκλήρωση εξουσιοδότησης"
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Διαβαθμισμένο"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "Σύνδεση στο {0}"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "Λευκό περίγραμμα"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr "Έλεγχος διαπιστευτηρίων..."
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Παραμετροποιημένο κείμενο"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "Καλωσήλθατε {0} είστε συνδεδεμένοι στο {1}"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Πληροφορίες φωτογραφιών"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "Είσοδος σαν διαφορετικός χρήστης"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "Εκτύπωση ονόματος αρχείου"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "Χρησιμοποιήθηκε {0} από το επιτρεπόμενο μηνιαίο όριο {1}"
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "Εκτύπωση ημερομηνίας φωτογραφίας"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "Αδύνατη η σύνδεση"
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "Εκτύπωση ώρας φωτογραφίας"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "Σε αναμονή για απάντηση του {0} από {1}"
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "Εκτύπωση ετικετών φωτογραφίας"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:779
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "Ανέβασμα εικόνας \"{0}\""
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "Εκτύπωση σχολίων φωτογραφίας"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "Σφάλμα ανεβάσματος στο {0}: {1}"
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "Επεξεργασία"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:810
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:553
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
-msgid "Upload Complete"
-msgstr "Ανέβασμα ολοκληρώθηκε"
+#: ../src/Widgets/EditorPage.cs:198
+msgid ""
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
+msgstr ""
+"Το εργαλείο απαιτεί μια ενεργή επιλογή. Παρακαλώ επιλέξτε μια περιοχή της "
+"φωτογραφίας και προσπαθήστε ξανά να χρησιμοποιήσετε τη λειτουργία"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-msgid "Unable to log on."
-msgstr "Αδύνατη η σύνδεση."
+#: ../src/Widgets/EditorPage.cs:216
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Σφάλμα κατά την αποθήκευση προσαρμοσμένης φωτογραφίας"
+msgstr[1] "Σφάλμα κατά την αποθήκευση προσαρμοσμένων φωτογραφιών"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
-msgid "F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."
-msgstr "Το f-spot δεν κατάφερε να συνδεθεί στο {0}. Βεβαιωθείτε ότι σας έχει δοθεί η πιστοποίηση χρησιμοποιώντας τη διεπαφή του περιηγητή διαδικτύου {0}."
+msgid ""
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
+msgstr ""
+"Λήψη εξαίρεσης \"{0}\". Προσοχή, πρέπει να αναπτύξετε αρχεία RAW σε JPEG "
+"πριν την επεξεργασία τους."
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:732
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:477
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:598
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
-msgid "Uploading Pictures"
-msgstr "Ανέβασμα εικόνων"
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Οριζόντια"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>Προβολή αδειών πρόσβασης</b>"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "_Κάθετα"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "Εξαγωγή ιεραρχίας ε_τικετών"
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Εύρεση:"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
-msgid "F-Spot needs your authorization in order to upload photos to your {0} account. Press the \"Authorize\" button to open a web browser and give F-Spot the authorization. "
-msgstr "Το F-Spot χρειάζεται την εξουσιοδότησή σας για να ανεβάζει φωτογραφίες στο {0} λογαριασμό σας. Πιέστε το κουμπί \"Εξουσιοδότηση\" για να ανοίξετε τον περιηγητή δικτύου και να παρέχετε στο f-spot εξουσιοδότηση."
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "Φάκελοι"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "Παράβλεψη ετικετών με_γάλου επιπέδου"
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Σύστημα αρχείων"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "Προσωπικό"
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Ιστόγραμμα"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "Δημόσιο"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Έκδοση"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "Αφαίρεση _μεταδεδομένων"
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Ημερομηνία"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "Ορατό στην οικογένεια"
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Έκθεση"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "Ορατό στους φίλους"
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "Εστιακό μήκος"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-msgid "_View photos in browser when done uploading"
-msgstr "_Προβολή φωτογραφιών στον περιηγητή μετά την ολοκλήρωση του ανεβάσματος"
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Μέγεθος αρχείου"
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-#| msgid "Folder"
-msgid "F_older..."
-msgstr "Φ_άκελος..."
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Βαθμολόγηση"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
-#| msgid "Select A Folder"
-msgid "Select Export Folder"
-msgstr "Επιλογή φακέλου για εξαγωγή"
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(λάθος μορφή)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
-#| msgid "Gallery"
-msgid "Building Gallery"
-msgstr "Χτήσιμο συλλογής φωτογραφιών"
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Άγνωστο)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
-#| msgid "Error Uploading To Gallery: {0}"
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "Σφάλμα ανεβάσματος εικόνας \"{0}\" στη συλλογή φωτογραφιών:{2}{1}"
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(Μία τροποποίηση)"
+msgstr[1] "({0} τροποποιήσεις)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
-#| msgid "Error transferring file"
-msgid "Error: Error while transferring; Aborting"
-msgstr "Σφάλμα κατά την μεταφορά· Ματαίωση"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
-msgid "Error: File Already Exists; Aborting"
-msgstr "Σφάλμα: Το αρχείο υπάρχει ήδη· Ματαίωση"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:810
-msgid "Light"
-msgstr "Φωτεινό"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:811
-msgid "Dark"
-msgstr "Σκοτεινό"
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:991
-#, fuzzy
-#| msgid "Preview"
-msgid "Prev"
-msgstr "Προεπισκόπηση"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1103
-#| msgid "PhotoWall generated!"
-msgid "Gallery generated by"
-msgstr "Η συλλογή φωτογραφιών δημιουργήθηκε από"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1143
-msgid "Show Styles"
-msgstr "Προβολή τεχνοτροπιών"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1144
-msgid "Hide Styles"
-msgstr "Απόκρυψη τεχνοτροπιών"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1311
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1444
-#| msgid "_Pages"
-msgid "Page:"
-msgstr "Σελίδα:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-#| msgid "<b>Exposure</b>"
-msgid "<b>Export Method</b>"
-msgstr "<b>Μέθοδος εξαγωγής</b>"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr ""
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr "Δημιουργήστε αυτόνομη _συλλογή φωτογραφιών στο διαδίκτυο"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-#| msgid "_Description:"
-msgid "D_escription:"
-msgstr "_Περιγραφή:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
-#, fuzzy
-#| msgid "_Export tags"
-msgid "Export _tags"
-msgstr "_Εξαγωγή ετικετών"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
-#, fuzzy
-#| msgid "_Export tags"
-msgid "Export tag _icons"
-msgstr "_Εξαγωγή ετικετών"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-#| msgid "Export"
-msgid "Folder Export"
-msgstr "Εξαγωγή φακέλου"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-#| msgid "G_allery:"
-msgid "G_allery Name:"
-msgstr "Όνομα Συλ_λογής:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
-#| msgid "_Open destination when done exporting"
-msgid "Open _destination when done exporting"
-msgstr "Ά_νοιγμα προορισμού μετά την ολοκλήρωση της εξαγωγής"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-#| msgid "_Folder"
-msgid "_Folder:"
-msgstr "_Φάκελος:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-msgid "_Save the files only"
-msgstr "_Μόνο αποθήκευση των αρχείων"
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(Σφάλμα ανάγνωσης αρχείου)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-#, fuzzy
-#| msgid "_Gallery"
-msgid "Web _Gallery..."
-msgstr "Συλ_λογή"
+#: ../src/Widgets/InfoBox.cs:620
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0} Φωτογραφίες"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
+#, csharp-format
msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
+"On {0} between \n"
+"{1} and {2}"
msgstr ""
-"Δεν μπορεί να συνδεθεί σε συλλογή φωτογραφιών για την οποία η έκδοση είναι άγνωστη.\n"
-"Παρακαλώ ελέγξτε ότι έχετε το Remote plugin 1.0.8 ή μεταγενέστερο"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:393
-msgid "Invalid URL"
-msgstr "Άκυρο URL"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:394
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "Η εισαγωγή URL της συλλογής φωτογραφιών δεν είναι έγκυρη"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:404
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:431
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:442
-#| msgid "Error connecting to camera"
-msgid "Error while connecting to Gallery"
-msgstr "Σφάλμα κατά την σύνδεση με την συλλογή φωτογραφιών"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:405
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:432
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:443
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "Το παρακάτω σφάλμα εμφανίστηκε κατά την προσπάθεια σύνδεσης: {0}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:419
-msgid "A Gallery with this name already exists"
-msgstr "Η συλλογή φωτογραφιών με αυτό το όνομα υπάρχει ήδη"
+"Στο {0} μεταξύ \n"
+"{1} και {2}"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:420
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
-msgid "There is already a Gallery with the same name in your registered Galleries. Please choose a unique name."
-msgstr "Υπάρχει ήδη μία συλλογή φωτογραφιών με το ίδιο όνομα στις καταχωρημένες σου συλλογές. Παρακαλώ επιλέξτε ένα μοναδικό όνομα."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:530
-msgid "(TopLevel)"
-msgstr "(Αρχικό επίπεδο)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:592
-msgid "Invalid Gallery name"
-msgstr "Άκυρο όνομα συλλογής φωτογραφιών"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:593
msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
+"Between {0} \n"
+"and {1}"
msgstr ""
-"Το όνομα της συλλογής φωτογραφιών περιλαμβάνει μη έγκυρους χαρακτήρες.\n"
-"Μόνο γράμματα, αριθμοί - και _ επιτρέπονται"
+"Μεταξύ {0} \n"
+"και {1}"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:798
-#, fuzzy, csharp-format
-#| msgid "Error Uploading To Gallery: {0}"
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Σφάλμα ανεβάσματος στη συλλογή: {0}"
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(Τουλάχιστον ένα αρχείο δε βρέθηκε)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:826
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:725
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
-msgid "(No Gallery)"
-msgstr "(Καμία συλλογή)"
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Προβολή ονόματος φωτογραφίας"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:918
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:848
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(Not Connected)"
-msgstr "(Δε συνδέθηκε)"
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Προβολή ημερομηνίας"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:919
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
-msgid "(No Albums)"
-msgstr "(Κανένα άλμπουμ)"
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Προβολή μεγέθους"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:971
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:914
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
-msgid "No account selected"
-msgstr "Δεν επιλέχτηκε λογαριασμός"
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Προβολή έκθεσης"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr "<span weight='bold' size='larger'>Σφάλμα κατά την σύνδεση στη συλλογή φωτογραφιών</span>\n"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "Προβολή μήκους εστίασης"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-#, fuzzy
-#| msgid "E_xport titles and comments"
-msgid "Export _titles and comments"
-msgstr "Ε_ξαγωγή τίτλων και σχολίων"
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Προβολή φωτογραφικής μηχανής"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "Άνοιγμα του άλ_μπουμ στον περιηγητή μετά την ολοκλήρωση του ανεβάσματος"
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Προβολή μεγέθους αρχείου"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "Παρακαλώ επαληθεύστε ότι οι ρυθμίσεις για τη συλλογή φωτογραφιών είναι σωστές."
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "Μεταδεδομένα"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-#| msgid "_URI:"
-msgid "U_RL:"
-msgstr "U_RL:"
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "Εκτεταμένα μεταδεδομένα"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-#| msgid "_Album Title:"
-msgid "_Album Name:"
-msgstr "Όνομα _λευκώματος:"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "Δεν υπάρχουν εκτεταμένα μεταδεδομένα"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "_Περιγραφή:"
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "Καμιά ενεργή φωτογραφία"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-#| msgid "_Gallery"
-msgid "_Gallery Name:"
-msgstr "Όνομα συλ_λογής φωτογραφιών"
+#: ../src/Widgets/MetadataDisplay.cs:414
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "Η φωτογραφία \"{0}\" δεν υπάρχει"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-#| msgid "_Gallery"
-msgid "_Gallery:"
-msgstr "Συλ_λογή φωτογραφιών"
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "Δεν υπάρχουν διαθέσιμα μεταδεδομένα"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-#, fuzzy
-#| msgid "_Export to Album:"
-msgid "_Parent Album:"
-msgstr "Ε_ξαγωγή σε άλμπουμ:"
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Δεν υπάρχει διαθέσιμες εφαρμογές"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
-msgid "_Password:"
-msgstr "_Κωδικός:"
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "Βαθμολόγηση:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-#, fuzzy
-#| msgid "Title"
-msgid "_Title:"
-msgstr "Τίτλος"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Χώρα"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-msgid "_Username:"
-msgstr "Όνομα _χρήστη:"
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "Πόλη"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr "Σφάλμα ανάγνωσης απόκρισης εξυπηρετητή"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Πολιτεία"
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
-msgstr "Απάντηση εξυπηρετητή χωρίς περιεχόμενο συλλογής"
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Προβολή διαφανειών από το F-Spot"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
-#| msgid "Error while rotating photo."
-msgid "Error while creating new album"
-msgstr "Σφάλμα κατά την δημιουργία νέου λευκώματος"
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "Φωτογραφίες του F-Spot"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to perform the requested operation:\n"
-"{0} ({1})"
-msgstr ""
-"Εμφανίστηκε σφάλμα κατά την προσπάθεια εκτέλεσης της αιτούμενης εργασίας:\n"
-"{0} ({1})"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Επεξεργασία επιλεγμένης ετικέτας..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
-msgstr "F_acebook..."
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Επεξεργασία επιλεγμένης ετικέτας..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:257
-msgid "Too many images to export"
-msgstr "Πάρα πολλές εικόνες προς εξαγωγή"
+#~ msgid "my photos"
+#~ msgstr "οι φωτογραφίες μου"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:257
-msgid "Facebook only permits 60 photographs per album. Please refine your selection and try again."
-msgstr "Το Facebook επιτρέπει μόνο 60 φωτογραφίες ανά λεύκωμα. Παρακαλώ βελτιώστε την επιλογή σας και προσπαθήστε ξανά."
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Αντιγραφή το_ποθεσίας"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:367
-msgid "You are not logged in."
-msgstr "Δεν είστε συνδεμένος"
+#~ msgid "Author:"
+#~ msgstr "Συγγραφέας:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:322
-msgid "Waiting for authentication"
-msgstr "Αναμονή για πιστοποίηση"
+#~ msgid "Copyright:"
+#~ msgstr "Πνευματικά δικαιώματα:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:322
-msgid "F-Spot will now launch your browser so that you can log into Facebook. Turn on the \"Save my login information\" checkbox on Facebook and F-Spot will log into Facebook automatically from now on."
-msgstr ""
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Εξαρτήσεις επεκτάσεων:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:328
-#| msgid "Error connecting to camera"
-msgid "Error logging into Facebook"
-msgstr "Σφάλμα σύνδεσης στο Facebook"
+#~ msgid "All registered repositories"
+#~ msgstr "Όλοι τα καταχωρημένα αποθετήρια"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:328
-msgid "There was a problem logging into Facebook. Check your credentials and try again."
-msgstr "Υπήρξε πρόβλημα κατά την είσοδο στο Facebook. Ελέγξτε τα διαπιστευτήρια σας και προσπαθήστε ξανά."
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Είστε βέβαιοι ότι θέλετε να ακυρώσετε την εγκατάσταση;"
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:341
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr "{0} {1} συνδέθηκε στο Facebook"
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Τα ακόλουθα πακέτα θα απομακρυνθούν:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:491
-msgid "Album must have a name"
-msgstr "Το λεύκωμα πρέπει να έχει όνομα"
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Υπάρχουν κι άλλες επεκτάσεις που εξαρτώνται σε προηγούμενες οι οποίες "
+#~ "επίσης θα απομακρυνθούν:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:491
-msgid "Please name your album or choose an existing album."
-msgstr "Παρακαλώ ονομάστε το λεύκωμα σας ή επιλέξτε ένα υπάρχων."
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Οι επιλεγμένες επεκτάσεις δεν είναι δυνατό να εγκατασταθούν επειδή "
+#~ "υπάρχουν συγκρούσεις εξαρτήσεων."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:504
-msgid "Creating a new album failed"
-msgstr "Αποτυχία δημιουργίας καινούργιου λευκώματος"
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Τα ακόλουθα πακέτα θα εγκατασταθούν:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:504
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
-"Σφάλμα κατά την δημιουργία νέου λευκώματος.\n"
-"\n"
-"{0}"
+#~ msgid " (in user directory)"
+#~ msgstr "(στον κατάλογο του χρήστη)"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:528
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:661
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "Ανέβασμα εικόνας \"{0}\" ({1} of {2})"
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Τα ακόλουθα πακέτα πρέπει να απομακρυνθούν:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:542
-#, csharp-format
-#| msgid "Error Uploading To Gallery: {0}"
-msgid "Error Uploading To Facebook: {0}"
-msgstr "Σφάλμα ανεβάσματος στο Facebook: {0}"
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Τα ακόλουθα πακέτα δεν ήταν δυνατό να αναλυθούν:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:1
-#| msgid "C_aption:"
-msgid "Caption"
-msgstr "Λεζάντα"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Η εγκατάσταση έχει ολοκληρωθεί με επιτυχία."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:2
-#| msgid "Create New Tag"
-msgid "Create a new album"
-msgstr "Δημιουργία νέoy λευκώματος"
+#~ msgid "The installation failed!"
+#~ msgstr "Η εγκατάσταση απέτυχε!"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:3
-#| msgid "_Description:"
-msgid "Description"
-msgstr "Περιγραφή"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Η εγκατάσταση έχει ολοκληρωθεί αλλά με ειδοποιήσεις."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:4
-#| msgid "Export to"
-msgid "Export to Facebook"
-msgstr "Εξαγωγή στο Facebook"
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Η απομάκρυνση έχει ολοκληρωθεί με επιτυχία."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:5
-#| msgid "No active photo"
-msgid "In this photo"
-msgstr "Σε αυτή τη φωτογραφία"
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Η απεγκατάσταση απέτυχε!"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:7
-#| msgid "Location"
-msgid "Login"
-msgstr "Σύνδεση"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Η απομάκρυνση έχει ολοκληρωθεί αλλά με ειδοποιήσεις."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:8
-msgid "Logout"
-msgstr "Αποσύνδεση"
+#~ msgid "Repository"
+#~ msgstr "Αποθετήριο"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:10
-msgid "This is who I am"
-msgstr "Αυτό είναι ποιος είμαι"
+#~ msgid "Installation cancelled"
+#~ msgstr "Η εγκατάσταση ακυρώθηκε"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:11
-msgid "Use an existing album"
-msgstr "Χρήση υπάρχοντος λευκώματος"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Δεν βρέθηκαν μερικές από τις απαιτούμενες επεκτάσεις"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:12
-msgid "Who is this?"
-msgstr "Ποιοε έιναι;"
+#~ msgid "Installation failed"
+#~ msgstr "Η εγκατάσταση απέτυχε"
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-#| msgid "Compression"
-msgid "Compressed fil_e..."
-msgstr "ΣυμπίΣυμπιεσμένο αρχεί_ο"
+#~ msgid "Extension"
+#~ msgstr "Επέκταση"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-msgid "This tool requires an active selection. Please select one or more pictures and try again"
-msgstr "Αυτό το εργαλείο απαιτεί μια ενεργή επιλογή. Παρακαλώ επιλέξτε μια ή περισσότερες εικόνες και προσπαθήστε ξανά"
+#~ msgid "Other"
+#~ msgstr "Άλλη"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:63
-#| msgid "Select A Folder"
-msgid "Select export folder"
-msgstr "Επιλογή φακέλου εξαγωγής"
+#~ msgid "Url"
+#~ msgstr "Ιστοσελίδα"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:101
-#| msgid "Operation failed"
-msgid "Exporting files"
-msgstr "Γίνεται εξαγωγή αρχείων"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Υπήρξε η εξαίρεση: {0}"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:107
-#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "Προετοιμασία της φωτογραφίας \"{0}\""
+#~ msgid "Package"
+#~ msgstr "Πακέτο"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-#| msgid "New name:"
-msgid "_File name:"
-msgstr "_Όνομα αρχείου:"
+#~ msgid "Extension Installation"
+#~ msgstr "Εγκατάσταση επεκτάσεων"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-#| msgid "Location"
-msgid "_Location:"
-msgstr "_Τοποθεσία:"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr ""
+#~ "<b>Επιλέξτε τις επεκτάσεις για εγκατάσταση και κάντε κλικ στο Επόμενο</b>"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
-#| msgid "G_allery:"
-msgid "_Scale:"
-msgstr "_Διαβάθμιση:"
+#~ msgid "Install from:"
+#~ msgstr "Εγκατάσταση από:"
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-#| msgid "Merge Tags"
-msgid "Merge Db"
-msgstr "Συγχώνευση βάσης δεδομένων"
+#~ msgid "_Repositories..."
+#~ msgstr "_Αποθετήρια"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
-#| msgid "Merge the selected tag"
-#| msgid_plural "Merge the {0} selected tags?"
-msgid "Error opening the selected file"
-msgstr "Σφάλμα ανοίγματος επιλεγμένου αρχείου"
+#~ msgid "Show all packages"
+#~ msgstr "Προβολή όλων των πακέτων"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
-#, csharp-format
-msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-"Το αρχείο που επιλέξατε δεν είναι έγκυρο ή δεν υποστηρίζεται από τη βάση δεδομένων..\n"
-"\n"
-"Λήψη εξαίρεσης \"{0}\"."
+#~ msgid "Show new versions only"
+#~ msgstr "Προβολή μόνο των νέων εκδόσεων"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-#| msgid ""
-#| "<small><i>Choose the folder where F-Spot should store newly imported "
-#| "photos</i></small>"
-msgid "<small><i>Choose the location of the database you want to import from</i></small>"
-msgstr "<small><i>Επιλέξτε το φάκελο της βάσης δεδομένων που θέλετε να εισάγετε</i></small>"
+#~ msgid "Show updates only"
+#~ msgstr "Προβολή μόνο των ενημερώσεων"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already imported from that database.</i></small>"
-msgstr ""
-"<small><i>Επιλέξτε τι θα εισαγάγετε απότην επιλεγμένη βδ.\n"
-"\"Νέες καρτέλες μόνο\" είναι η έξυπνη επιλογή όπου θα αποφευχθεί η επανεισαγωγή φωτογραφιών που θα μπορούσατε να είχατε εισαγάγει κατά την διάρκεια προηγούμενης εργασίας.\n"
-"\"Εισαγωγή μίας καρτέλας\" σου δίνει την δυνατότητα να επιλέξεις ποια καρτέλα θέλεις να συγχωνεύσεις.\n"
-"\"Όλα\" θα εισαγάγει όλα, δημιοθργόντας διπλότυπα αν έχετε ήδη εισαγάγει από την βάση δεδομένων.</i></small>"
+#~ msgid "_Unselect All"
+#~ msgstr "Α_πεπιλογή όλων"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
-msgid "<small><i>Copy the images locally or keep them where they are. If you chose the later, be sure that this location will stay accessible from f-spot.</i></small>"
-msgstr "<small><i>Αντιγράψτε τις εικόνες τοπικά ή διατηρήστε τις εκεί που βρίσκονται. Αν επιλέξατε το δεύτερο, σιγουρευτείται ότι αυτή η τοποθεσία θα είναι προσβάσιμη από το f-spot.</i></small>"
+#~ msgid "label124"
+#~ msgstr "ετικέτα124"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
-#| msgid "_Select Import Rolls..."
-msgid "A Single Import Roll"
-msgstr "Μία ενιαία εισαγωγή καρτέλας"
+#~ msgid "Overall Progress:"
+#~ msgstr "Συνολικά πρόοδος:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
-#| msgid "Copy files to the Photos folder"
-msgid "Copy images to photos folder"
-msgstr "Αντιγραφή αρχείων στο φάκελος φωτογραφιών"
+#~ msgid "Downloading extensions..."
+#~ msgstr "Λήψη επεκτάσεων..."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-#| msgid "Location"
-msgid "Database Location:"
-msgstr "Τοποθεσία βάσης δεδομένων:"
+#~ msgid "Extension Manager"
+#~ msgstr "Διαχειριστής επεκτάσεων"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr "Όλα"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr ""
+#~ "Απαιτούνται πρόσθετες επεκτάσεις για την πραγματοποίηση αυτής της "
+#~ "λειτουργίας."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-#| msgid "Import"
-msgid "Import:"
-msgstr "Εισαγωγή:"
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Θα εγκατασταθούν οι ακόλουθες επεκτάσεις:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr "Διατήρηση των εικόνων στην σρχική τους θέση"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Διαχειριστής επεκτάσεων</b></big>"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another f-spot collection"
-msgstr "Συγχώνευση άλλης συλλογής f-spot"
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Οι ακόλουθες επεκτάσεις εγκαθίστανται άμεσα:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr "Νέες καρτέλες μόνο"
+#~ msgid "_Install Extensions..."
+#~ msgstr "Ε_γκατάσταση επεκτάσεων..."
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-"<big>Η βάση δεδομένων αναφέρεται σε αρχεία που περιέχονται στο <b>{0}</b> φάκελο.\n"
-"Παρακλώ επιλέξτε αυτό το φάκελο έτσι ώστε να μπορώ να κάνω τη χαρτογράφηση.</big>"
+#~ msgid "_Uninstall..."
+#~ msgstr "Α_πομάκρυνση..."
-#: ../extensions/Tools/HashJob/HashJob.cs:53
-msgid "In order to detect duplicates on pictures you imported before 0.5.0, F-Spot needs to analyze your image collection. This is not done by default as it's time consuming. You can Start or Pause this update process using this dialog."
-msgstr "Προκειμένου να ανιχνευθούν διπλότυπα στις εικόνες που εισαγάγατε πριν την 0.5., το F-Spot πρέπει να αναλύσει την συλλογή των εικόνων σας. Αυτό δεν γίνεται εξ ορισμού καθώς είναι χρονοβόρο. Μπορείτε να ξεκινήσετε ή να διακόψετε τη διαδικασία με τη χρήση αυτού του διαλόγου."
+#~ msgid "Enable"
+#~ msgstr "Ενεργοποίηση"
-#: ../extensions/Tools/HashJob/HashJob.cs:102
-#| msgid "Processing \"{0}\""
-msgid "Processing images..."
-msgstr "Γίνεται επεξεργασία των εικόνων..."
+#~ msgid "Disable"
+#~ msgstr "Απενεργοποίηση"
-#: ../extensions/Tools/HashJob/HashJob.cs:108
-msgid "Stopped"
-msgstr "Σταμάτησε"
+#~ msgid "Details"
+#~ msgstr "Λεπτομέρειες"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb..."
+#~ msgid "Extension Repository Management"
+#~ msgstr "Διαχείριση επεκτάσεων αποθετηρίου"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
-#| msgid "Error while rotating photo."
-msgid "Error while creating Album"
-msgstr "Σφάλμα κατά την δημιουργία λευκώματος"
+#~ msgid "Add New Repository"
+#~ msgstr "Προσθήκη νέου αποθετηρίου"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid "The following error was encountered while attempting to create an album: {0}"
-msgstr "Το ακόλουθο σφάλμα βρέθηκε κατά την προσπάθεια σημιουργίας ενός λευκώματος: {0}"
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Επιλέξτε την τοποθεσία του αποθετηρίου που θέλετε καταχωρήσετε:"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:621
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} Στάλθηκε"
+#~ msgid "Register an on-line repository"
+#~ msgstr "Καταχώρηση δικτυακού αποθετηρίου"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:623
-#, csharp-format
-#| msgid "{0} of {1}"
-msgid "{0} of approx. {1}"
-msgstr "{0} από περίπου {1}"
+#~ msgid "Url:"
+#~ msgstr "Ιστοσελίδα:"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:692
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "Σφάλμα ανεβάσματος στη συλλογή: {0}"
+#~ msgid "Register a local repository"
+#~ msgstr "Καταχώρηση ενός τοπικού αποθετηρίου"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:776
-#, csharp-format
-msgid "Available space: {0}, {1}% used out of {2}"
-msgstr "Διαθέσιμος χώρος: {0}, {1}% χρησιμοποιείται από τα {2}"
+#~ msgid "Path:"
+#~ msgstr "Διαδρομή:"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:890
-#, csharp-format
-msgid ""
-"The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images"
-msgstr ""
-"Το επιλεγμένο λεύκωμα έχει όριο τις {0} εικονες, \n"
-"το οποίο θα ξεπεραστεί με την τρέχουσα επιλογή των {1} εικόνων"
+#~ msgid "Browse..."
+#~ msgstr "Περιήγηση..."
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-#| msgid "<b>SmugMug Export</b>"
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>Εξαγωγή PicasaWeb</b>"
+#~ msgid "(provided by {0})"
+#~ msgstr "(παρέχεται από το {0})"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr "<span weight='bold' size='larger'>Ο λογαριασμός σας στο Google είναι κλειδωμένος</span>\n"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Δεν είναι δυνατή η φόρτωση απενεργοποιημένων επεκτάσεων."
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
+#~ msgid "Loading {0} extension"
+#~ msgstr "Φόρτωση επέκτασης {0}"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "Δημόσιο άλμπουμ"
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Η απαιτούμενη επέκταση '{0}' είναι απενεργοποιημένη."
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "Τίτλος ά_λμπουμ:"
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Η απαιτούμενη επέκταση '{0}' δεν είναι εγκατεστημένη."
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
-#| msgid "Autorotate"
-msgid "_Autorotate"
-msgstr "Αυτοπεριστροφή"
+#~ msgid "interpolation type"
+#~ msgstr "τύπος παρεμβολής "
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-#, fuzzy
-#| msgid "captcha_url"
-msgid "_Captcha:"
-msgstr "captcha_url"
+#~ msgid "the type of interpolation to use"
+#~ msgstr "ο τύπος της παρεμβολής που θα χρησιμοποιηθεί"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>Εξαγωγή SmugMug</b>"
+#~ msgid "check type"
+#~ msgstr "τύπος τετραγωνιδίων"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "_Λογαριασμός:"
+#~ msgid "the type of chequering to use"
+#~ msgstr "ο τύπος των τετραγωνιδίων για χρήση"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug..."
+#~ msgid "the size of chequers to use"
+#~ msgstr "το μέγεθος των τετραγωνιδίων για χρήση"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:126
-#, csharp-format
-#| msgid "Rotating photo \"{0}\""
-msgid "Uploading photo \"{0}\""
-msgstr "Ανέβασμα φωτογραφίας \"{0}\""
+#~ msgid "dither"
+#~ msgstr "dither"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:181
-#| msgid "Logging into {0}"
-msgid "Logging into Tabblo"
-msgstr "Σύνδεση στο Tabblo"
+#~ msgid "dither type"
+#~ msgstr "τύπος dither"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:241
-msgid "Obtaining URL for upload"
-msgstr "Εύρεση URL για ανέβασμα"
+#~ msgid "Dissolve"
+#~ msgstr "Διάλυση"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr "_Tabblo..."
+#~ msgid "Flip"
+#~ msgstr "Αναστροφή"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:166
-#| msgid "Done Sending Photos"
-msgid "Done sending photos"
-msgstr "Ολοκληρώθηκε η αποστολή φωτογραφιών"
+#~ msgid "Cover"
+#~ msgstr "Κάλυψη"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:168
-#| msgid "Upload Complete"
-msgid "Upload complete"
-msgstr "Ανέβασμα ολοκληρώθηκε"
+#~ msgid "Reveal"
+#~ msgstr "Αποκάλυψη"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:174
-#| msgid "Error Uploading To Gallery: {0}"
-msgid "Error uploading to Tabblo: "
-msgstr "Σφάλμα ανεβάσματος στο Tabblo: "
+#~ msgid "Wipe"
+#~ msgstr "Καθαρισμός"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
-#| msgid "<b>Account</b>"
-msgid "<b>Tabblo account</b>"
-msgstr "<b>Λογαριασμός Tabblo</b>"
+#~ msgid "Split"
+#~ msgstr "Διαχωρισμός"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
-#| msgid "<b></b>"
-msgid "<b>{0}</b>."
-msgstr "<b>{0}</b>"
+#~ msgid "Push"
+#~ msgstr "Ώθηση"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
-#| msgid "Received error \"{0}\" while attempting to rotate {1}"
-msgid "A trust error occured while attempting to access"
-msgstr "Ελήφθη σφάλμα κατά την προσπάθεια πρόσβασης"
+#~ msgid "More directories"
+#~ msgstr "Περισσότεροι κατάλογοι"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
-msgid "Abort this session"
-msgstr "Ματαίωση της συνεδρίας"
+#~ msgid "Arrange by _Month"
+#~ msgstr "Ταξινόμηση ανά _μήνα"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
-msgid "Always trust this site's certificate"
-msgstr "Πιστοποιητικό για έμπιστη ιστοσελίδα"
+#~ msgid "Arrange by _Folder"
+#~ msgstr "Ταξινόμηση ανά _φάκελο"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
-msgid "Do you wish to:"
-msgstr "Επιθυμείτε να:"
+#~ msgid "Tag Name:"
+#~ msgstr "Όνομα ετικέτας:"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
-#| msgid "Error"
-msgid "Trust Error"
-msgstr "Σφάλμα εμπιστοσύνης"
+#~ msgid "<b>Color Management</b>"
+#~ msgstr "<b>Διαχείριση Χρώματος</b>"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
-msgid "Trust the site's certificate this once"
-msgstr "Πιστοποιητικό μίας φοράς για έμπιστη ιστοσελίδα"
-
-#: ../extensions/Editors/BlackoutEditor/BlackoutEditor.cs:18
-msgid "Blackout"
-msgstr "Συσκότιση"
-
-#: ../extensions/Editors/BlackoutEditor/BlackoutEditor.cs:26
-msgid "Select the area that you want blacked out."
-msgstr "Επιλέξτε την περιοχή που επιθυμείτε για συσκότιση."
-
-#: ../extensions/Editors/PixelateEditor/PixelateEditor.cs:18
-#| msgid "Private"
-msgid "Pixelate"
-msgstr "Εικονοστοιχειοποίηση"
-
-#: ../extensions/Editors/PixelateEditor/PixelateEditor.cs:26
-#| msgid "Select the camera from which you want to transfer files"
-msgid "Select the area that you want pixelated."
-msgstr "Επιλέξτε την περιοχή που θέλετε να εικονοστοιχειοποιημένη."
-
-#~ msgid "Create p_hotomosaic"
-#~ msgstr "Δημιουργία μω_σαϊκού φωτογραφίας"
-#~ msgid "Metapixel not available"
-#~ msgstr "Δεν υπάρχει διαθέσιμο μετα-εικονοστοιχείο"
-#~ msgid ""
-#~ "The metapixel executable was not found in path. Please check that you "
-#~ "have it installed and that you have permissions to execute it"
-#~ msgstr ""
-#~ "Το εκτελέσιμο του μετα-εικονοστοιχείου δεν βρέθηκε στο μονοπάτι. Παρακαλώ "
-#~ "βεβαιωθείτε ότι το έχετε εγκατεστημένο και ότι έχετε την άδεια να το "
-#~ "εκτελέσετε"
-#~ msgid "The tags selected provided no pictures. Please select different tags"
-#~ msgstr ""
-#~ "Οι επιλεγμένες ετικέτες δεν περιέχουν εικόνες. Παρακαλώ επιλέξτε "
-#~ "διαφορετικές ετικέτες"
-#~ msgid "Creating miniatures"
-#~ msgstr "Δημιουργία μινιατούρων"
-#~ msgid "Creating photomosaics"
-#~ msgstr "Δημιουργία μωσαϊκού φωτογραφίας"
-#~ msgid "PhotoMosaics generated!"
-#~ msgstr "Το μωσαϊκό φωτογραφιών δημιουργήθηκε!"
-#~ msgid "PhotoMosaic"
-#~ msgid_plural "PhotoMosaic ({0})"
-#~ msgstr[0] "Μωσαϊκό φωτογραφιών"
-#~ msgstr[1] "Μωσαϊκά φωτογραφιών ({0})"
-#~ msgid "<b>Generate miniatures from</b>"
-#~ msgstr "<b>Δημιουργία μινιατούρων από</b>"
-#~ msgid ""
-#~ "Generate the miniatures from a selection of tags. No tags mean ALL "
-#~ "pictures"
-#~ msgstr ""
-#~ "Δημιουργήστε τις μινιατούρες από μια επιλογή των ετικετών. Χωρίς "
-#~ "μινιατούρες σημαίνει ΟΛΕΣ οι φωτογραφίες"
-#~ msgid "MetaPixel photomosaics"
-#~ msgstr "Μωσαϊκά φωτογραφιών με μετα-εικονοστοιχεία"
-#~ msgid "Miniatures _size"
-#~ msgstr "Μέ_γεθος μινιατούρων"
-#~ msgid "Miniatures can be generated from the current main view"
-#~ msgstr ""
-#~ "Οι μινιατούρες μπορούν να δημιουργηθούν από την τρέχουσα κύρια εμφάνιση"
-#~ msgid "Size of the miniatures composing the mosaic"
-#~ msgstr "Το μέγεθος των μινιατούρων κατά τη σύνθεση του μωσαϊκού"
-#~ msgid "_Current query"
-#~ msgstr "Τ_ρέχον ερώτημα"
-#~ msgid "url"
-#~ msgstr "ιστοσελίδα"
-#~ msgid "token"
-#~ msgstr "αναγνωριστικό"
-#~ msgid "Create photo_wall"
-#~ msgstr "_Δημιουργία τείχους_φωτογραφίας"
-#~ msgid "PictureTile not available"
-#~ msgstr "Δεν υπάρχει διαθέσιμη παράθεση εικόνας"
-#~ msgid ""
-#~ "The picturetile.pl executable was not found in path. Please check that "
-#~ "you have it installed and that you have permissions to execute it"
-#~ msgstr ""
-#~ "Το εκτελέσιμο αρχείο picturetile.pl δεν βρέθηκε στο μονοπάτι. Παρακαλώ "
-#~ "βεβαιωθείτε ότι είναι εγκατεστημένο και ότι έχετε την άδεια να το "
-#~ "εκτελέσετε"
-#~ msgid "Preparing selected pictures"
-#~ msgstr "Προετοιμασία επιλεγμένων εικόνων"
-#~ msgid ""
-#~ "Your photo wall have been generated and imported in F-Spot. Select the "
-#~ "last roll to see it"
-#~ msgstr ""
-#~ "Το τείχος της φωτογραφίας σας έχει δημιουργηθεί και εισαχθεί στο f-spot. "
-#~ "Επιλέξτε το τελευταίο τύλιγμα για να το δείτε"
-#~ msgid "Error importing photowall"
-#~ msgstr "Σφάλμα κατά την εισαγωγή τείχους φωτογραφίας"
-#~ msgid ""
-#~ "An error occurred while importing the newly generated photowall to F-Spot"
-#~ msgstr ""
-#~ "Υπήρξε ένα σφάλμα κατά την εισαγωγή του τείχους φωτογραφιών που μόλις "
-#~ "δημιουργήθηκε στο f-spot"
-#~ msgid "%"
-#~ msgstr "%"
-#~ msgid "Background _color"
-#~ msgstr "Χρώμα φόντου"
-#~ msgid "Can be negative. It will overlap images"
-#~ msgstr "Μπορεί να είναι και αρνητικό. Θα επικαλύψει τις εικόνες"
-#~ msgid ""
-#~ "Check this if your images are all of the same size and you will have a "
-#~ "more regular grid"
-#~ msgstr ""
-#~ "Ελέγξτε αν οι εικόνες έχουν όλες το ίδιο μέγεθος και ότι έχετε το πιο "
-#~ "κανονικό πλέγμα"
-#~ msgid "Choose how many destination images you want to generate"
-#~ msgstr "Επιλέξτε πόσες εικόνες θέλετε να δημιουργήσετε στον προορισμό"
-#~ msgid "Destination picture max _size"
-#~ msgstr "Μέ_γιστο μέγεθος προορισμού φωτογραφίας"
-#~ msgid ""
-#~ "For more information please visit PictureTile website\n"
-#~ "http://www.jwz.org/picturetile/"
-#~ msgstr ""
-#~ "Για περισσότερες πληροφορίες παρακαλώ επισκεφτείτε την ιστοσελίδα "
-#~ "παράθεσης εικόνων http://www.jwz.org/picturetile/"
-#~ msgid "Jpeg _quality"
-#~ msgstr "_Ποιότητα εικόνας τύπου jpeg"
-#~ msgid "Output type"
-#~ msgstr "Τύπος εξόδου"
-#~ msgid "Photo wall generator"
-#~ msgstr "Δημιουργός τείχους φωτογραφιών"
-#~ msgid "PictureTile for F-Spot"
-#~ msgstr "Παράθεση φωτογραφιών για το f-spot"
-#~ msgid "Spa_cing between images"
-#~ msgstr "_Διάστημα μεταξύ εικόνων"
-#~ msgid "This operation is going to TAKE VERY LONG TIME!"
-#~ msgstr "Αυτή η λειτουργία πρόκειται να διαρκέσει κάποιο χρόνο!"
-#~ msgid "_Jpeg"
-#~ msgstr "_Jpeg"
-#~ msgid "_Scale images"
-#~ msgstr "_Διαβάθμιση εικόνων"
-#~ msgid "_Tiff"
-#~ msgstr "_Tiff"
-#~ msgid "_Uniform images"
-#~ msgstr "Ο_μοιο-μορφοποίηση εικόνων "
-#~ msgid "No image loaded."
-#~ msgstr "Δεν έχει φορτωθεί εικόνα."
-#~ msgid "Can't save non local files."
-#~ msgstr "Αδύνατη η αποθήκευση μη τοπικών αρχείων."
-#~ msgid "Unsupported image type for saving."
-#~ msgstr "Μη υποστηριζόμενος τύπος εικόνας για αποθήκευση."
-#~ msgid "Apply"
-#~ msgstr "Εφαρμογή"
-#~ msgid "name"
-#~ msgstr "όνομα"
-#~ msgid "date"
-#~ msgstr "ημερομηνία"
-#~ msgid "Metadata Browser"
-#~ msgstr "Περιηγητής μεταδεδομένων"
-#~ msgid "Exported Locations"
-#~ msgstr "Τοποθεσίες που έχουν εξαχθεί"
-#~ msgid "Automatically adjust the colors"
-#~ msgstr "Αυτόματη προσαρμογή των χρωμάτων"
-#~ msgid "Apply straightening"
-#~ msgstr "Εφαρμογή ευθυγράμμισης"
-#~ msgid "Apply straightening to image"
-#~ msgstr "Εφαρμογή ευθυγράμμισης στην εικόνα"
-#~ msgid "Adjust the angle of the image to straighten the horizon"
-#~ msgstr "Προσαρμογή της γωνίας της εικόνας ώστε να ευθυγραμμίζεται οριζόντια"
-#~ msgid "Create a soft focus visual effect"
-#~ msgstr "Δημιουργία οπτικού εφέ ελαφράς εστίασης"
-#~ msgid " out of {0}"
-#~ msgstr "από {0}"
-#~ msgid "Crop photo to selected area"
-#~ msgstr "Αποκοπή εικόνας στην επιλεγμένη περιοχή"
-#~ msgid "Remove redeye from selected area"
-#~ msgstr "Αφαίρεση κόκκινων ματιών από την επιλεγμένη περιοχή"
-#~ msgid "Select an area to remove redeye"
-#~ msgstr "Επιλέξτε περιοχή για αφαίρεση κόκκινων ματιών"
-#~ msgid "Constrain the aspect ratio of the selection"
-#~ msgstr "Περιορισμός της αναλογίας οθόνης της επιλογής"
-#~ msgid "Reduce Red-Eye"
-#~ msgstr "Κόκκινο"
-#~ msgid "Adjust the photo colors"
-#~ msgstr "Προσαρμογή των χρωμάτων της φωτογραφίας"
-#~ msgid "Convert the photo to black and white"
-#~ msgstr "Μετατροπή της εικόνας σε ασπρόμαυρη"
-#~ msgid "Convert the photo to sepia tones"
-#~ msgstr "Μετατροπή της εικόνας σε τόνους σέπια"
-#~ msgid "<b>Color Temperature</b>"
-#~ msgstr "<b>Θερμοκρασία χρώματος</b>"
-#~ msgid "<b>Histo_gram</b>"
-#~ msgstr "<b>Ιστό_γραμμα</b>"
-#~ msgid "<b>Interoperability</b>"
-#~ msgstr "<b>Δυνατότητα παρεμβολής</b>"
-#~ msgid "<b>Photograph Layout</b>"
-#~ msgstr "<b>Διάταξη φωτογραφίας</b>"
-#~ msgid "<b>Printer Details</b>"
-#~ msgstr "<b>Λεπτομέρειες εκτυπωτή</b>"
-#~ msgid "<small> </small>"
-#~ msgstr "<small> </small>"
-#~ msgid ""
-#~ "<small><i>Enable this option if you want to allow other programs to "
-#~ "import or delete photos and tags over DBus.</i></small>"
-#~ msgstr ""
-#~ "<small><i>Ενεργοποιήστε αυτήν την επιλογή αν θέλετε να επιτρέπετε σε άλλα "
-#~ "προγράμματα να εισάγουν ή να διαγράφουν φωτογραφίες και ετικέτες στο DBus."
-#~ "</i></small>"
-#~ msgid "<small>C_ontrast:</small>"
-#~ msgstr "<small>Α_ντίθεση:</small>"
-#~ msgid "<small>Te_mp:</small>"
-#~ msgstr "<small>Θερ_μ::</small>"
-#~ msgid "<small>_Brightness:</small>"
-#~ msgstr "<small>_Φωτεινότητα:</small>"
-#~ msgid "<small>_Exposure:</small>"
-#~ msgstr "<small>Έκ_θεση:</small>"
-#~ msgid "<small>_Hue:</small>"
-#~ msgstr "<small>Από_χρωση</small>"
-#~ msgid "<small>_Saturation:</small>"
-#~ msgstr "<small>_Κορεσμός:</small>"
-#~ msgid "<small>_Tint:</small>"
-#~ msgstr "<small>_Τόνος:</small>"
-#~ msgid "Ad_just Color..."
-#~ msgstr "Προ_σαρμογή χρώματος..."
-#~ msgid "Adjust Color"
-#~ msgstr "Προσαρμογή χρώματος"
-#~ msgid "Allow other programs to manipulate F-Spot"
-#~ msgstr "Να επιτρέπεται σε άλλα προγράμματα να διαχειρίζονται το f-spot"
-#~ msgid "Co_nfigure"
-#~ msgstr "_Ρύθμιση"
-#~ msgid "Crop photo to _fit"
-#~ msgstr "Αποκοπή φωτογραφίας ώστε να _ταιριάζει"
-#~ msgid ""
-#~ "From Screen\n"
-#~ "Standard RGB"
-#~ msgstr ""
-#~ "Από οθόνη\n"
-#~ "Κανονικό RGB"
-#~ msgid ""
-#~ "Full Page\n"
-#~ "Standard - 4x6"
-#~ msgstr ""
-#~ "Πλήρης σελίδα\n"
-#~ "Κανονικό - 4x6"
-#~ msgid ""
-#~ "Hairline\n"
-#~ "0.25\"\n"
-#~ "0.5\"\n"
-#~ "1\"\n"
-#~ msgstr ""
-#~ "Hairline\n"
-#~ "0.25\"\n"
-#~ "0.5\"\n"
-#~ "1\"\n"
-#~ msgid "N_umber of Copies:"
-#~ msgstr "Α_ριθμός αντιγράφων:"
-#~ msgid ""
-#~ "None\n"
-#~ "Title\n"
-#~ "Filename\n"
-#~ "Date\n"
-#~ "Photo Details"
-#~ msgstr ""
-#~ "Κανένα\n"
-#~ "Τίτλος\n"
-#~ "Όνομα αρχείου\n"
-#~ "Ημέρα\n"
-#~ "Λεπτομέρειες φωτογραφίας"
-#~ msgid "P_hoto Source:"
-#~ msgstr "Πηγή _φωτογραφίας:"
-#~ msgid "Page 1 of 3"
-#~ msgstr "Σελίδα 1 από 3"
-#~ msgid "Print"
-#~ msgstr "Εκτύπωση"
-#~ msgid ""
-#~ "Selection\n"
-#~ "Gallery\n"
-#~ "Viewport"
-#~ msgstr ""
-#~ "Επιλογή\n"
-#~ "Συλλογή\n"
-#~ "Πεδίο προβολής"
-#~ msgid "So_urce Temp"
-#~ msgstr "Προσωρινός πη_γαίος κώδικας"
-#~ msgid ""
-#~ "Standard RGB\n"
-#~ "Image Profile\n"
-#~ "Custom\n"
-#~ msgstr ""
-#~ "Κανονικό RGB\n"
-#~ "Προφίλ εικόνας\n"
-#~ "Προσαρμογή\n"
-#~ msgid "Will print using: US Letter size on Generic Postscript"
-#~ msgstr ""
-#~ "Κατά την εκτύπωση χρησιμοποιήστε: Μέγεθος γράμματος US στο generic "
-#~ "postscript"
-#~ msgid "_Border:"
-#~ msgstr "Περίγ_ραμμα:"
-#~ msgid "_Destination Temp"
-#~ msgstr "Προσωρινός φάκελος π_ροορισμού:"
-#~ msgid "_File"
-#~ msgstr "Αρ_χείο"
-#~ msgid "_Metadata Browser"
-#~ msgstr "Περιηγητής _μεταδεδομένων"
+#~ msgid "<b>Metadata</b>"
+#~ msgstr "<b>Μεταδεδομένα</b>"
+#~ msgid "<b>Screensaver</b>"
+#~ msgstr "<b>Προφύλαξη οθόνης</b>"
diff --git a/po/es.po b/po/es.po
index 1b5cb51..3504bb4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,21 +7,22 @@
# Sergio Rubio <sergio.rubio at hispalinux.es>, 2004.
# Francisco Javier F. Serrador <serrador at cvs.gnome.org>, 2004, 2005, 2006.
# Antonio Ognio <gnrfan at gnrfan.orf>, 2004.
-# Jorge González <jorgegonz at svn.gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009.
+# Jorge González <jorgegonz at svn.gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
+#
msgid ""
msgstr ""
"Project-Id-Version: f-spot.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-"
"spot&component=General\n"
-"POT-Creation-Date: 2009-10-13 20:41+0000\n"
-"PO-Revision-Date: 2009-10-17 11:23+0200\n"
+"POT-Creation-Date: 2010-05-13 20:28+0000\n"
+"PO-Revision-Date: 2010-05-14 17:49+0200\n"
"Last-Translator: Jorge González <jorgegonz at svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
msgid "_CD..."
@@ -43,7 +44,7 @@ msgstr "Transfiriendo fotografía «{0}» al CD"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
@@ -100,7 +101,7 @@ msgid "Create CD"
msgstr "Crear CD"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Tamaño"
@@ -118,6 +119,7 @@ msgstr "_Examinar los archivos anteriormente programados"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Exportar"
@@ -154,9 +156,6 @@ msgstr "Demasiadas imágenes para exportar"
#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
#, csharp-format
-#| msgid ""
-#| "Facebook only permits 60 photographs per album. Please refine your "
-#| "selection and try again."
msgid ""
"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
@@ -214,7 +213,6 @@ msgstr "Error al subir a Facebook: {0}"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Error"
@@ -226,6 +224,10 @@ msgstr "Error"
msgid "Upload Complete"
msgstr "Carga completada"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Visitar el grupo de F-Spot en Facebook"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "Esperando la autenticación"
@@ -344,8 +346,7 @@ msgid "Logout"
msgstr "Finalizar sesión"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Nombre"
@@ -467,6 +468,7 @@ msgstr "<b>Cuenta</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Fotografías</b>"
@@ -488,7 +490,8 @@ msgstr "<b>Permisos de visionado</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exportar"
@@ -584,58 +587,58 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Error: El archivo ya existe; abortando"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Luminoso"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Oscuro"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Anterior"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Índice"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Etiquetas"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Siguiente"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galería generada por"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Mostrar estilos"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Ocultar estilos"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Etiquetas: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Página:"
@@ -853,6 +856,7 @@ msgstr "Álbum pa_dre:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "Contrase_ña:"
@@ -863,6 +867,7 @@ msgstr "_Título:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Usuario:"
@@ -1012,12 +1017,72 @@ msgstr "Carga completada"
msgid "Error uploading to Tabblo: "
msgstr "Error al subir a Tabblo: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Etiquetas de F-Spot</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Cuenta en Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>Las etiquetas de F-Spot le ayudan a exportar el estado de las "
+"fotos. Por ejemplo: use una etiqueta para las fotos que piensa exportar, y "
+"otra para las que ya ha exportado. Aquí puede decirle a F-Spot que reemplace "
+"automáticamente esas etiquetas de forma apropiada.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Qitar de las fotos exportadas:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Seleccionar…"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Añadir a las fotos exportadas:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Ocurrió un error al intentar acceder"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Abortar esta sesión"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Confiar siempre en el certificado de este sitio"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Querría:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Error de confianza"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Confiar en el certificado del sitio esta vez"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Archivo co_mprimido…"
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "No hay ninguna selección disponible"
@@ -1043,7 +1108,6 @@ msgid "Preparing photo \"{0}\""
msgstr "Preparando foto «{0}»"
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "_Crear"
@@ -1091,8 +1155,8 @@ msgid "Stopped"
msgstr "Detenido"
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Buscar duplicados"
+msgid "Check for Duplicates..."
+msgstr "Buscar duplicados…"
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
msgid "F-Spot Gallery"
@@ -1287,7 +1351,7 @@ msgid "New Rolls Only"
msgstr "Sólo carretes nuevos"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:55
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Saltar"
@@ -1347,306 +1411,223 @@ msgstr "Organice, diviértase y comparta sus fotografías"
msgid "Photo Manager"
msgstr "Gestor de fotografías"
-#: ../f-spot-import.desktop.in.in.h:3
-msgid "Import into F-Spot"
-msgstr "Importar en F-Spot"
-
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "F-Spot Photo Viewer"
-msgstr "Visor de fotos F-Spot"
-
-#: ../f-spot-view.desktop.in.in.h:3
-msgid "Photo Viewer"
-msgstr "Visor de fotos"
-
-#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
-msgid "File not found"
-msgstr "No se encontró el archivo"
-
-#: ../lib/libfspot/f-jpeg-utils.c:464
-#, c-format
-msgid "Unknown transform type %d"
-msgstr "Tipo de transformación desconocida %d"
-
-#: ../lib/libfspot/f-jpeg-utils.c:472
-msgid "Operation failed"
-msgstr "Falló la operación"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paquete"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Instalación de extensiones"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Seleccione las extensiones para instalar y pulse Siguiente</b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Instalar desde:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Repositorios…"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Mostrar todos los paquetes"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Mostrar sólo las nuevas versiones"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Mostrar sólo las actualizaciones"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "_Deseleccionar todo"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "etiqueta124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Progreso general:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Descargando extensiones…"
+#: ../f-spot.schemas.in.h:1
+msgid "Display of transparent parts."
+msgstr ""
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Gestor de extensiones"
+#: ../f-spot.schemas.in.h:2
+msgid "Enable this to allow interpolation on zoomed images."
+msgstr "Activar esto para permitir interpolación en imágenes ampliadas."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Se necesitan extensiones adicionales para realizar esta operación."
+#: ../f-spot.schemas.in.h:3
+msgid "Height of the import dialog."
+msgstr "Altura del diálogo de importación."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Se instalarán las siguientes extensiones:"
+#: ../f-spot.schemas.in.h:4
+msgid "Height of the main window."
+msgstr "Altura de la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Gestor de extensiones</b></big>"
+#: ../f-spot.schemas.in.h:5
+msgid "Height of the photo viewer window."
+msgstr "Altura de la ventana del visor de fotos."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Actualmente están instaladas las siguientes extensiones:"
+#: ../f-spot.schemas.in.h:6
+msgid ""
+"If the 'transparency' option is set, the color specified in this option will "
+"be used as the transparent color when viewing images."
+msgstr ""
+"Si la opción «transparency» está activada el color especificado en esta "
+"opción se usará como el color transparente al ver imágenes."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Instalar extensiones…"
+#: ../f-spot.schemas.in.h:7
+msgid "Interpolate image on zoom."
+msgstr "Interpolar imagen al ampliar."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Desinstalar…"
+#: ../f-spot.schemas.in.h:8
+msgid "Maximize the main window."
+msgstr "Maximizar la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Activar"
+#: ../f-spot.schemas.in.h:9
+msgid "Maximize the photo viewer window."
+msgstr "Maximizar la ventana de visión de foto."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Desactivar"
+#: ../f-spot.schemas.in.h:10
+msgid "Path to custom gtkrc for theming F-Spot."
+msgstr "Ruta al gtkrc personalizado para el tema de F-Spot."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Detalles"
+#: ../f-spot.schemas.in.h:11
+msgid "Show dates in the thumbnail view."
+msgstr "Mostrar las fechas en la vista de miniaturas."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Gestión del repositorio de extensiones"
+#: ../f-spot.schemas.in.h:12
+msgid "Show ratings in the thumbnail view."
+msgstr "Mostrar las puntuaciones en la vista de miniaturas."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Añadir nuevo repositorio"
+#: ../f-spot.schemas.in.h:13
+msgid "Show tags in the thumbnail view."
+msgstr "Mostrar las etiquetas en la vista de miniaturas."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Seleccionar la ubicación del repositorio que quiere registrar:"
+#: ../f-spot.schemas.in.h:14
+msgid "Show the filename in the viewer window."
+msgstr "Mostrar el nombre de archivo en la vista de miniaturas."
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Registrar un repositorio en línea"
+#: ../f-spot.schemas.in.h:15
+msgid "Show the filmstrip in the main window."
+msgstr "Mostrar la tira de imágenes en la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
+#: ../f-spot.schemas.in.h:16
+msgid "Show the sidebar in the main window."
+msgstr "Mostrar la barra lateral en la ventana principal."
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Registrar un repositorio local"
+#: ../f-spot.schemas.in.h:17
+msgid "Show the timeline in the main window."
+msgstr "Mostrar la línea de tiempo en la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Ruta:"
+#: ../f-spot.schemas.in.h:18
+msgid "Show the toolbar in the main window."
+msgstr "Mostrar la barra de herramientas en la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Examinar…"
+#: ../f-spot.schemas.in.h:19
+msgid "Show the toolbar in the photo viewer window."
+msgstr "Mostrar la barra de herramientas en la ventana del visor de fotos."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Versión:"
+#: ../f-spot.schemas.in.h:20
+msgid "Size of the tag icons shown in the sidebar."
+msgstr "Tamaño de los iconos de etiquetas mostrados en la barra lateral."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Autor:"
+#: ../f-spot.schemas.in.h:21
+msgid "The X position to use for the main window."
+msgstr "La posición X que usar para la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Copyright:"
+#: ../f-spot.schemas.in.h:22
+msgid "The X position to use for the photo viewer window."
+msgstr "La posición X que usar para la ventana del visor de fotos."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Dependencias de las extensiones:"
+#: ../f-spot.schemas.in.h:23
+msgid "The Y position to use for the main window."
+msgstr "La posición Y que usar para la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Todos los repositorios registrados"
+#: ../f-spot.schemas.in.h:24
+msgid "The Y position to use for the photo viewer window."
+msgstr "La posición Y que usar para la ventana del visor de fotos."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "¿Está seguro de que quiere cancelar la instalación?"
+#: ../f-spot.schemas.in.h:25
+msgid "The color to use for transparent parts."
+msgstr "El color que usar para las partes transparentes."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Se desinstalarán los siguientes paquetes:"
+#: ../f-spot.schemas.in.h:26
+msgid "The height dimension to use for the import dialog."
+msgstr "La dimensión de la altura que usar para el diálogo de importación."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
+#: ../f-spot.schemas.in.h:27
+msgid "The height dimension to use for the main window."
msgstr ""
-"Existen otras extensiones que dependen de las anteriores que también se "
-"desinstalarán:"
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
+#: ../f-spot.schemas.in.h:28
+msgid "The height dimension to use for the photo viewer window."
msgstr ""
-"Las extensiones seleccionadas no se pueden instalar porque existen "
-"conflictos de dependencias."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Se instalarán los siguientes paquetes:"
+#: ../f-spot.schemas.in.h:29
+msgid "The orientation of the filmstrip, if shown."
+msgstr ""
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (en la carpeta del usuario)"
+#: ../f-spot.schemas.in.h:30
+msgid "The orientation of the filmstrip."
+msgstr ""
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Se necesitan instalar los siguientes paquetes:"
+#: ../f-spot.schemas.in.h:31
+msgid "The size (width) of the sidebar in the main window."
+msgstr "El tamaño (anchura) de la barra lateral en la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "No se pudieron resolver las siguientes dependencias:"
+#: ../f-spot.schemas.in.h:32
+msgid "The size of the sidebar in the main window."
+msgstr "El tamaño de la barra lateral en la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "La instalación se completó satisfactoriamente."
+#: ../f-spot.schemas.in.h:33
+msgid "The width dimension to use for the import dialog."
+msgstr "La dimensión de la anchura que usar para el diálogo de importación."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Falló la instalación."
+#: ../f-spot.schemas.in.h:34
+msgid "The width dimension to use for the main window."
+msgstr "La dimensión de la anchura que usar para la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "La instalación se completó con avisos."
+#: ../f-spot.schemas.in.h:35
+msgid "The width dimension to use for the photo viewer window."
+msgstr ""
+"La dimensión de la anchura que usar para la ventana del visor de fotos."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "La desinstalación se completó satisfactoriamente."
+#: ../f-spot.schemas.in.h:36
+msgid "Use the current photo's filename as the viewer window's title."
+msgstr ""
+"Usar el nombre de la foto actual como el título de la ventana del visor."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Falló la desinstalación."
+#: ../f-spot.schemas.in.h:37
+msgid "Width of the import dialog."
+msgstr "Anchura del diálogo de importación."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "La desinstalación se completó con avisos."
+#: ../f-spot.schemas.in.h:38
+msgid "Width of the main window."
+msgstr "Anchura de la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Repositorio"
+#: ../f-spot.schemas.in.h:39
+msgid "Width of the photo viewer window."
+msgstr "Anchura de la ventana del visor de fotos."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Instalación cancelada"
+#: ../f-spot.schemas.in.h:40
+msgid "Width of the preview image pane in the import dialog."
+msgstr "Anchura del panel de vista previa en el diálogo de importación."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "No se encontraron algunas de las extensiones requeridas"
+#: ../f-spot.schemas.in.h:41
+msgid "X position of the main window."
+msgstr "Posición X de la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Falló la instalación"
+#: ../f-spot.schemas.in.h:42
+msgid "X position of the photo viewer window."
+msgstr "Posición X de la ventana del visor de fotos."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Extensión"
+#: ../f-spot.schemas.in.h:43
+msgid "Y position of the main window."
+msgstr "Posición Y de la ventana principal."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Versión"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Otro"
+#: ../f-spot.schemas.in.h:44
+msgid "Y position of the photo viewer window."
+msgstr "Posición Y de la ventana del visor de fotos."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
+#: ../f-spot.schemas.in.h:45
+msgid ""
+"You can choose how to display transparent parts in images. This option has "
+"no effect on photos but setting this value to CHECK_PATTERN or CUSTOM_COLOR "
+"could be useful when viewing icons or other artwork with transparent parts."
+msgstr ""
+"Puede elegir cómo mostrar partes transparentes en las imágenes. Esta opción "
+"no tiene efecto en las fotos, pero establecer esto como un patrón de cuadros "
+"o color personalizado puede ser útil al ver iconos u otros trabajos "
+"artísticos con partes transparentes."
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Ocurrió una excepción: {0}"
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Importar en F-Spot"
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "No se pueden cargar las extensiones deshabilitadas."
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "Visor de fotos F-Spot"
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Cargando la extensión {0}"
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Visor de fotos"
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "La extensión requerida «{0}» está deshabilitada."
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
+msgid "File not found"
+msgstr "No se encontró el archivo"
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "La extensión requerida «{0}» no está instalada."
+#: ../lib/libfspot/f-jpeg-utils.c:464
+#, c-format
+msgid "Unknown transform type %d"
+msgstr "Tipo de transformación desconocida %d"
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(proporcionado por {0})"
+#: ../lib/libfspot/f-jpeg-utils.c:472
+msgid "Operation failed"
+msgstr "Falló la operación"
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
@@ -1656,7 +1637,7 @@ msgstr "Previsualizar"
msgid "Path"
msgstr "Ruta"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Archivo"
@@ -1695,7 +1676,7 @@ msgstr "Finalizó la copia de los archivos"
msgid "Transferring \"{0}\" from camera"
msgstr "Transfiriendo «{0}» desde la cámara"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Cámara"
@@ -1703,12 +1684,12 @@ msgstr "Cámara"
msgid "Port"
msgstr "Puerto"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "No se encontraron fotos coincidentes con {0}"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1719,11 +1700,11 @@ msgstr ""
"la etiqueta a algunas fotos o seleccionar una etiqueta distinta\n"
"en el diálogo de preferencias de F-Spot."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "La búsqueda no devolvió ningún resultado"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1762,7 +1743,7 @@ msgstr "Modificada en {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Original"
@@ -1838,19 +1819,19 @@ msgstr "Seleccionar los ojos que quiere arreglar."
msgid "Sepia Tone"
msgstr "Tono sepia"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Foco suave"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Enderezar"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Error al importar"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Error al importar {0}{2}{2}{1}"
@@ -1865,8 +1846,8 @@ msgid "Unhandled exception"
msgstr "Excepción no manipulada"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Copiar l_ugar de la foto"
+msgid "Copy Photo"
+msgstr "Copiar foto"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1880,13 +1861,13 @@ msgstr "Abrir _con"
msgid "Rem_ove Tag"
msgstr "Q_uitar etiqueta"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:451 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Rotar a la _izquierda"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:452 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Rotar a la _derecha"
@@ -1900,7 +1881,7 @@ msgstr "_Adjuntar etiqueta"
#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
-msgstr "_Borrar de la unidad"
+msgstr "_Eliminar de la unidad"
#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
@@ -2013,183 +1994,187 @@ msgid "C_ontrast:"
msgstr "C_ontraste:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "C_rear"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Seleccionar la cámara"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Copiar archivos a la carpeta Photos"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Crear correo"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Crear _icono para esta etiqueta al usarla por primera vez"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr ""
"Crea un correo-e con las fotos seleccionadas (posiblemente redimensionadas) "
"adjuntas"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Detectar duplicados"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Mostrar _nombres de archivo"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr ""
"Mostrar sólo aquellas fotos que se importaron en carretes especificados."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "No enviar un correo"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "_Correo-e:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "_Exportar títulos y comentarios"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Tamaño nuevo estimado"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Enorme"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "Vista F-Spot"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Filtrar en los carretes seleccionados"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "_Galería:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galería"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Importar"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Origen de la importación:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Incluir subcarpetas"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Grande"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Gestionar sus tasas de selección personalizadas"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Medio"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Número de fotografías en los carretes seleccionados:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Número de imágenes"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Abrir _carpeta…"
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Tamaño original (tamaño de archivo posiblemente muy grande)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Etiqueta _madre:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pausar"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Preferencias"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Anterior"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Reparar"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Seleccionar las fotos para copiar desde la cámara…"
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Seleccionar una etiqueta…"
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Seleccione la cámara desde la que desea transferir archivos"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Cámara seleccionada: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Selección de restricciones"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Establecer como _fondo de pantalla"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Mostrar todas las fotos."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Mostrar u ocultar el panel lateral"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Mostrar u ocultar la barra de herramientas"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "_Panel lateral"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Pequeño"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2197,40 +2182,40 @@ msgstr ""
"Especifique su un tamaño original de imagen debe rotarse o no. Los tamaños "
"pequeños se rotan automáticamente."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Recorta los _metadatos de la imagen"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Te_mperatura:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Diminuto"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Tamaño total original"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "_Ampliar"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "_Reducir"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Ampliar"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Reducir"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Brillo:"
@@ -2357,7 +2342,7 @@ msgstr "Ocultar barra de herramientas"
msgid "Info"
msgstr "Información"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Información de la imagen"
@@ -2365,8 +2350,8 @@ msgstr "Información de la imagen"
msgid "Exit fullscreen"
msgstr "Salir de pantalla completa"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:101
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Diapositivas"
@@ -2414,7 +2399,7 @@ msgstr "Carpeta de interoperatibilidad"
msgid "Unknown Directory"
msgstr "Carpeta desconocida"
-#: ../src/Imaging/ImageFile.cs:116
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "No se soporta la escritura en este formato de archivo"
@@ -2553,7 +2538,7 @@ msgstr "Género intelectual del objeto"
msgid "Unknown IIM DataSet"
msgstr "Conjunto de datos IIM desconocido"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:357
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Seleccionar la carpeta"
@@ -2583,13 +2568,12 @@ msgstr ""
"La carpeta seleccionada «{0}» no existe. Por favor, elija una carpeta "
"distinta"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Importar etiquetas"
+msgid "Imported Tags"
+msgstr "Etiquetas importadas"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:84
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Rotar a la izquierda"
@@ -2597,7 +2581,7 @@ msgstr "Rotar a la izquierda"
msgid "Rotate picture left"
msgstr "Rotar la fotografía a la izquierda"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:89
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Rotar a la derecha"
@@ -2613,51 +2597,51 @@ msgstr "Siguiente fotografía"
msgid "Previous picture"
msgstr "Anterior fotografía"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importar imágenes nuevas"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Examinar"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Examinar varias fotos simultáneamente"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Editar imagen"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Ver y editar una foto"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:96
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Pantalla completa"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Ver fotos en pantalla completa"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:103
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Ver fotos como diapositivas"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Foto anterior"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Siguiente foto"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "No se detectó ninguna cámara."
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2665,24 +2649,24 @@ msgstr ""
"F-Spot fue incapaz de detectar ninguna cámara conectada en este equipo. "
"Compruebe que la cámara está conectada y tiene alimentación"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Error al conectar con la cámara"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Se recibió el error «{0}» al conectar con la cámara"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Combinar la etiqueta seleccionada"
msgstr[1] "¿Combinar las {0} etiquetas seleccionadas?"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2690,80 +2674,81 @@ msgstr ""
"Esta operación combinará las etiquetas seleccionadas y cualquier subetiqueta "
"en una sola etiqueta."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Combinar etiquetas"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "Fotografía {0} de {1}"
msgstr[1] "Fotografía {0} de {1}"
-#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:493
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} foto"
msgstr[1] "{0} fotos"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} seleccionada)"
msgstr[1] " ({0} seleccionadas)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Aceptar"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
-msgstr "Error al borrar la fotografía"
+msgstr "Error al eliminar la fotografía"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
-msgstr "No tiene permisos para borrar el archivo: {1}{0}"
+msgstr "No tiene permisos para eliminar el archivo: {1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
-msgstr "Ocurrió un error del tipo {0} al borrar el archivo: {2}{1}"
+msgstr "Ocurrió un error del tipo {0} al eliminar el archivo: {2}{1}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
-msgstr[0] "¿Borrar permanentemente la fotografía seleccionada?"
-msgstr[1] "¿Borrar permanentemente las {0} fotografías seleccionadas?"
+msgstr[0] "¿Eliminar permanentemente la fotografía seleccionada?"
+msgstr[1] "¿Eliminar permanentemente las {0} fotografías seleccionadas?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
msgstr[0] ""
-"Esto borrará de su unidad todas las versiones de la fotografía seleccionada."
+"Esto eliminará de su unidad todas las versiones de la fotografía "
+"seleccionada."
msgstr[1] ""
-"Esto borrará de su unidad todas las versiones de las fotografías "
+"Esto eliminará de su unidad todas las versiones de las fotografías "
"seleccionadas."
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
-msgstr[0] "_Borrar la fotografía"
-msgstr[1] "_Borrar las fotografías"
+msgstr[0] "_Eliminar la fotografía"
+msgstr[1] "_Eliminar las fotografías"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "¿Quitar la fotografía seleccionada de F-Spot?"
msgstr[1] "¿Quitar las {0} fotografías seleccionadas de F-Spot?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2773,27 +2758,27 @@ msgstr ""
"etiquetas se perderá. Las fotos seguirán en su equipo y podrá volverlas a "
"importar de nuevo en F-Spot."
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Quitar del catálogo"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
-msgstr "¿Borrar etiqueta {0}?"
+msgstr "¿Eliminar etiqueta {0}?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
-msgstr "¿Borrar las {0} etiquetas seleccionadas?"
+msgstr "¿Eliminar las {0} etiquetas seleccionadas?"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "foto"
msgstr[1] "fotos"
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -2801,59 +2786,59 @@ msgid_plural ""
msgstr[0] "Si borra esta etiqueta se perderá la asociación {0} {1}."
msgstr[1] "Si borra estas etiquetas se perderá la asociación {0} {1}."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
-msgstr[0] "_Borrar etiqueta"
-msgstr[1] "_Borrar etiquetas"
+msgstr[0] "_Eliminar etiqueta"
+msgstr[1] "_Eliminar etiquetas"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "La etiqueta no está vacía"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
"\"{0}\" first"
msgstr ""
-"No se pueden borrar etiquetas que tengan etiquetas dentro de ellas. Borre "
+"No se pueden eliminar etiquetas que tengan etiquetas dentro de ellas. Borre "
"antes las etiquetas de «{0}»"
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Rotar la fotografía seleccionada a la izquierda"
msgstr[1] "Rotar las fotografías seleccionadas a la izquierda"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Rotar la fotografía seleccionada a la derecha"
msgstr[1] "Rotar las fotografías seleccionadas a la derecha"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Encontrar la etiqueta _seleccionada"
msgstr[1] "Encontrar las etiquetas _seleccionadas"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Encontrar la etiqueta seleccionada c_on"
msgstr[1] "Encontrar las etiquetas seleccionadas c_on"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "¿Crear una nueva versión?"
msgstr[1] "¿Crear nuevas versiones?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2868,7 +2853,7 @@ msgstr[1] ""
"Antes de lanzar {1}, ¿debe F-Spot crear versiones nuevas de las fotos "
"seleccionadas para preservar los originales?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "Versión XCF"
@@ -2892,87 +2877,93 @@ msgstr "Asunto y palabras clave"
msgid "Compression"
msgstr "Compresión"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Configuración planar"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientación"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Interpretación fotométrica"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Unidad de resolución"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Programa de exposición"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Modo de medida"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Modo de exposición"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Renderizado personalizado"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Configuración de componentes"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Fuente de luz"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Método de sensibilidad"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Espacio de color"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Balance de blancos"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Unidad de resolución del plano focal"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Tipo de origen de archivo"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Tipo de captura de la escena"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Control de ganancia"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Contraste"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Saturación"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Enfoque"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Tipo de escena"
@@ -3009,7 +3000,7 @@ msgstr "Se recibió la excepción «{0}». No es posible crear la versión «{1}
#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
-msgstr "¿Realmente desea borrarlo?"
+msgstr "¿Realmente desea eliminarlo?"
#: ../src/PhotoVersionCommands.cs:139
msgid "Cancel"
@@ -3017,21 +3008,21 @@ msgstr "Cancelar"
#: ../src/PhotoVersionCommands.cs:140
msgid "Delete"
-msgstr "Borrar"
+msgstr "Eliminar"
#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
-msgstr "¿Borrar la versión «{0}»?"
+msgstr "¿Eliminar la versión «{0}»?"
#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
-msgstr "No se pudo borrar una versión"
+msgstr "No se pudo eliminar una versión"
#: ../src/PhotoVersionCommands.cs:155
#, csharp-format
msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
-msgstr "Se recibió la excepción «{0}». No es posible borrar la versión «{1}»"
+msgstr "Se recibió la excepción «{0}». No es posible eliminar la versión «{1}»"
#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
@@ -3043,8 +3034,8 @@ msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr ""
"Se recibió la excepción «{0}». No es posible renombrar la versión a «{1}»"
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:562
-#: ../src/Widgets/InfoBox.cs:564
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(No hay modificaciones)"
@@ -3058,11 +3049,11 @@ msgstr "Error al editar la foto"
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "Se recibió la excepción «{0}». No es posible guardar la imagen {1}"
-#: ../src/PhotoView.cs:356
+#: ../src/PhotoView.cs:357
msgid "Comment:"
msgstr "Comentario:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Fotos"
@@ -3179,8 +3170,8 @@ msgstr "Ocurrió un error al procesar «{0}»: {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "mis fotos"
+msgid "My Photos"
+msgstr "Mis fotos"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3202,23 +3193,23 @@ msgstr "Radio:"
msgid "Threshold:"
msgstr "Umbral:"
-#: ../src/SingleView.cs:86
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Rotar la fotografía a la izquierda"
-#: ../src/SingleView.cs:91
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Rotar la fotografía a la derecha"
-#: ../src/SingleView.cs:128
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Carpeta"
-#: ../src/SingleView.cs:354
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Abrir"
-#: ../src/SingleView.cs:454
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Establecer como fondo"
@@ -3247,14 +3238,14 @@ msgid "Create New Tag..."
msgstr "Crear una etiqueta…"
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Editar la etiqueta seleccionada…"
+msgid "Edit Tag..."
+msgstr "Editar etiqueta…"
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
msgid_plural "Delete Tags"
-msgstr[0] "Borrar etiqueta"
-msgstr[1] "Borrar etiquetas"
+msgstr[0] "Eliminar etiqueta"
+msgstr[1] "Eliminar etiquetas"
#: ../src/TagPopup.cs:52
msgid "Attach Tag to Selection"
@@ -3331,7 +3322,7 @@ msgid "Events"
msgstr "Acontecimientos"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:408
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Ninguno)"
@@ -3374,7 +3365,7 @@ msgstr "Copyright © 2003-2009 Novell Inc."
#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
-msgstr "Jorge González <jorgegonz at svn.gnome.org>, 2004-2009"
+msgstr "Jorge González <jorgegonz at svn.gnome.org>, 2004-2010"
#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
@@ -3474,16 +3465,16 @@ msgstr "Detalles del error"
msgid "An unhandled exception was thrown: "
msgstr "Se produjo una excepción no tratada: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Ninguno"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Perfil del sistema"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Tema estándar"
@@ -3508,7 +3499,7 @@ msgstr "Etiqueta"
msgid "Ratio"
msgstr "Puntuación"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Reintentar"
@@ -3701,8 +3692,8 @@ msgid "By _Rating"
msgstr "Por _puntuación"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Copiar _lugar"
+msgid "Copy"
+msgstr "Copiar"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3718,7 +3709,7 @@ msgstr "_Buscar"
#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
-msgstr "Gestionar _extensiones"
+msgstr "Gestionar e_xtensiones"
#: ../src/ui/main_window.ui.h:13
msgid "Page Set_up..."
@@ -3728,6 +3719,10 @@ msgstr "Con_figuración de página…"
msgid "Re_fresh Thumbnail"
msgstr "Act_ualizar miniaturas"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Seleccionar _todo"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Seleccionar _nada"
@@ -3782,15 +3777,15 @@ msgstr "_Fechas"
#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
-msgstr "_Borrar la etiqueta seleccionada"
+msgstr "_Eliminar la etiqueta seleccionada"
#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
-msgstr "_Borrar la versión"
+msgstr "_Eliminar la versión"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Editar la etiqueta seleccionada…"
+msgid "_Edit Tag..."
+msgstr "_Editar etiqueta…"
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
@@ -3888,11 +3883,11 @@ msgstr "Fotos _sin etiqueta"
msgid "_Version"
msgstr "_Versión"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "Actualizando base de datos F-Spot"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -3985,11 +3980,11 @@ msgstr "Imprimir las etiquetas de la foto"
msgid "Print photo comment"
msgstr "Imprimir el comentario de la foto"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Editar"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -3997,13 +3992,13 @@ msgstr ""
"Ésta herramienta requiere una selección activa. Seleccione una región de la "
"foto e intente la operación de nuevo."
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Error al guardar la foto ajustada"
msgstr[1] "Error al guardar las fotos ajustadas"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
@@ -4024,7 +4019,7 @@ msgstr "_Vertical"
msgid "Find:"
msgstr "Buscar:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Carpetas"
@@ -4036,54 +4031,58 @@ msgstr "Sistema de archivos"
msgid "Histogram"
msgstr "Histograma"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Versión"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Fecha"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Exposición"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Longitud focal"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Tamaño del archivo"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Puntuación"
-#: ../src/Widgets/InfoBox.cs:389 ../src/Widgets/InfoBox.cs:397
-#: ../src/Widgets/InfoBox.cs:427
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(formato incorrecto)"
-#: ../src/Widgets/InfoBox.cs:417 ../src/Widgets/InfoBox.cs:440
-#: ../src/Widgets/InfoBox.cs:450 ../src/Widgets/InfoBox.cs:459
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
msgid "(Unknown)"
msgstr "(Desconocido)"
-#: ../src/Widgets/InfoBox.cs:560
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
msgstr[0] "(Una edición)"
msgstr[1] "({0} ediciones)"
-#: ../src/Widgets/InfoBox.cs:574
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(Error al leer el archivo)"
-#: ../src/Widgets/InfoBox.cs:619
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} Fotos"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:639
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4092,7 +4091,7 @@ msgstr ""
"En {0} entre\n"
"{1} y {2}"
-#: ../src/Widgets/InfoBox.cs:644
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4101,61 +4100,61 @@ msgstr ""
"Entre {0} \n"
"y {1}"
-#: ../src/Widgets/InfoBox.cs:671
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(Al menos no se encontró un archivo)"
-#: ../src/Widgets/InfoBox.cs:788
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Mostrar el nombre de la foto"
-#: ../src/Widgets/InfoBox.cs:797
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Mostrar la fecha"
-#: ../src/Widgets/InfoBox.cs:806
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Mostrar el tamaño"
-#: ../src/Widgets/InfoBox.cs:815
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Mostrar la exposición"
-#: ../src/Widgets/InfoBox.cs:824
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Mostrar la longitud focal"
-#: ../src/Widgets/InfoBox.cs:833
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Mostrar la cámara"
-#: ../src/Widgets/InfoBox.cs:842
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Mostrar el tamaño del archivo"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metadatos"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Metadatos extendidos"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "No hay metadatos adicionales disponibles"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "No hay una foto activa"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "La fotografía «{0}» no existe"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "No hay metadatos disponibles"
@@ -4188,73 +4187,232 @@ msgstr "Mostrar una exhibición de fotos desde F-Spot"
msgid "F-Spot photos"
msgstr "Fotos de F-Spot"
-#~ msgid "Dissolve"
-#~ msgstr "Disolver"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Editar la etiqueta seleccionada…"
-#~ msgid "Flip"
-#~ msgstr "Voltear"
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Editar la etiqueta seleccionada…"
-#~ msgid "Cover"
-#~ msgstr "Cubrir"
+#~ msgid "my photos"
+#~ msgstr "mis fotos"
-#~ msgid "Reveal"
-#~ msgstr "Revelar"
+#~ msgid "Package"
+#~ msgstr "Paquete"
-#~ msgid "Wipe"
-#~ msgstr "Limpiar"
+#~ msgid "Extension Installation"
+#~ msgstr "Instalación de extensiones"
-#~ msgid "Split"
-#~ msgstr "Partir"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Seleccione las extensiones para instalar y pulse Siguiente</b>"
-#~ msgid "Push"
-#~ msgstr "Empujar"
+#~ msgid "Install from:"
+#~ msgstr "Instalar desde:"
+
+#~ msgid "_Repositories..."
+#~ msgstr "_Repositorios…"
+
+#~ msgid "Show all packages"
+#~ msgstr "Mostrar todos los paquetes"
+
+#~ msgid "Show new versions only"
+#~ msgstr "Mostrar sólo las nuevas versiones"
+
+#~ msgid "Show updates only"
+#~ msgstr "Mostrar sólo las actualizaciones"
+
+#~ msgid "_Unselect All"
+#~ msgstr "_Deseleccionar todo"
+
+#~ msgid "label124"
+#~ msgstr "etiqueta124"
+
+#~ msgid "Overall Progress:"
+#~ msgstr "Progreso general:"
+
+#~ msgid "Downloading extensions..."
+#~ msgstr "Descargando extensiones…"
+
+#~ msgid "Extension Manager"
+#~ msgstr "Gestor de extensiones"
+
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "Se necesitan extensiones adicionales para realizar esta operación."
+
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Se instalarán las siguientes extensiones:"
+
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Gestor de extensiones</b></big>"
+
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Actualmente están instaladas las siguientes extensiones:"
-#~ msgid "<b>F-Spot tags</b>"
-#~ msgstr "<b>Etiquetas de F-Spot</b>"
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Instalar extensiones…"
-#~ msgid "<b>Tabblo account</b>"
-#~ msgstr "<b>Cuenta en Tabblo</b>"
+#~ msgid "_Uninstall..."
+#~ msgstr "_Desinstalar…"
+
+#~ msgid "Enable"
+#~ msgstr "Activar"
+
+#~ msgid "Disable"
+#~ msgstr "Desactivar"
+
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "Extension Repository Management"
+#~ msgstr "Gestión del repositorio de extensiones"
+
+#~ msgid "Add New Repository"
+#~ msgstr "Añadir nuevo repositorio"
+
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Seleccionar la ubicación del repositorio que quiere registrar:"
+
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registrar un repositorio en línea"
+
+#~ msgid "Url:"
+#~ msgstr "Url:"
+
+#~ msgid "Register a local repository"
+#~ msgstr "Registrar un repositorio local"
+
+#~ msgid "Path:"
+#~ msgstr "Ruta:"
+
+#~ msgid "Browse..."
+#~ msgstr "Examinar…"
+
+#~ msgid "Version:"
+#~ msgstr "Versión:"
+
+#~ msgid "Author:"
+#~ msgstr "Autor:"
+
+#~ msgid "Copyright:"
+#~ msgstr "Copyright:"
+
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Dependencias de las extensiones:"
+
+#~ msgid "All registered repositories"
+#~ msgstr "Todos los repositorios registrados"
+
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "¿Está seguro de que quiere cancelar la instalación?"
+
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Se desinstalarán los siguientes paquetes:"
#~ msgid ""
-#~ "<small><i>F-Spot tags can help you track the export status of photos. "
-#~ "Example: Use one tag for the photos that you plan to export, and another "
-#~ "one for those already exported. Here, you can tell F-Spot to "
-#~ "automatically replace these tags as appropriate.</i></small>"
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
#~ msgstr ""
-#~ "<small><i>Las etiquetas de F-Spot le ayudan a exportar el estado de las "
-#~ "fotos. Por ejemplo: use una etiqueta para las fotos que piensa exportar, "
-#~ "y otra para las que ya ha exportado. Aquí puede decirle a F-Spot que "
-#~ "reemplace automáticamente esas etiquetas de forma apropiada.</i></small>"
+#~ "Existen otras extensiones que dependen de las anteriores que también se "
+#~ "desinstalarán:"
-#~ msgid "Rem_ove from exported photos:"
-#~ msgstr "_Qitar de las fotos exportadas:"
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Las extensiones seleccionadas no se pueden instalar porque existen "
+#~ "conflictos de dependencias."
+
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Se instalarán los siguientes paquetes:"
+
+#~ msgid " (in user directory)"
+#~ msgstr " (en la carpeta del usuario)"
+
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Se necesitan instalar los siguientes paquetes:"
+
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "No se pudieron resolver las siguientes dependencias:"
+
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "La instalación se completó satisfactoriamente."
+
+#~ msgid "The installation failed!"
+#~ msgstr "Falló la instalación."
+
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "La instalación se completó con avisos."
+
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "La desinstalación se completó satisfactoriamente."
+
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Falló la desinstalación."
-#~ msgid "Select..."
-#~ msgstr "Seleccionar…"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "La desinstalación se completó con avisos."
-#~ msgid "_Attach to exported photos:"
-#~ msgstr "_Añadir a las fotos exportadas:"
+#~ msgid "Repository"
+#~ msgstr "Repositorio"
-#~ msgid "<b>{0}</b>."
-#~ msgstr "<b>{0}</b>."
+#~ msgid "Installation cancelled"
+#~ msgstr "Instalación cancelada"
-#~ msgid "A trust error occured while attempting to access"
-#~ msgstr "Ocurrió un error al intentar acceder"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "No se encontraron algunas de las extensiones requeridas"
-#~ msgid "Abort this session"
-#~ msgstr "Abortar esta sesión"
+#~ msgid "Installation failed"
+#~ msgstr "Falló la instalación"
-#~ msgid "Always trust this site's certificate"
-#~ msgstr "Confiar siempre en el certificado de este sitio"
+#~ msgid "Extension"
+#~ msgstr "Extensión"
-#~ msgid "Do you wish to:"
-#~ msgstr "Querría:"
+#~ msgid "Other"
+#~ msgstr "Otro"
-#~ msgid "Trust Error"
-#~ msgstr "Error de confianza"
+#~ msgid "Url"
+#~ msgstr "Url"
-#~ msgid "Trust the site's certificate this once"
-#~ msgstr "Confiar en el certificado del sitio esta vez"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Ocurrió una excepción: {0}"
+
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "No se pueden cargar las extensiones deshabilitadas."
+
+#~ msgid "Loading {0} extension"
+#~ msgstr "Cargando la extensión {0}"
+
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "La extensión requerida «{0}» está deshabilitada."
+
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "La extensión requerida «{0}» no está instalada."
+
+#~ msgid "(provided by {0})"
+#~ msgstr "(proporcionado por {0})"
+
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Copiar _lugar"
+
+#~ msgid "Dissolve"
+#~ msgstr "Disolver"
+
+#~ msgid "Flip"
+#~ msgstr "Voltear"
+
+#~ msgid "Cover"
+#~ msgstr "Cubrir"
+
+#~ msgid "Reveal"
+#~ msgstr "Revelar"
+
+#~ msgid "Wipe"
+#~ msgstr "Limpiar"
+
+#~ msgid "Split"
+#~ msgstr "Partir"
+
+#~ msgid "Push"
+#~ msgstr "Empujar"
#~ msgid "Tag Name:"
#~ msgstr "Nombre de la etiqueta:"
diff --git a/po/et.po b/po/et.po
index 2c0ef2d..78f6d54 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,15 +4,15 @@
# Copyright (C) 2005 Free Software Foundation, Inc.
# This file is distributed under the same license as the F-Spot package.
#
-# Priit Laes <amd at store20.com>, 2005, 2007.
-# Mattias Põldaru <mahfiaz at gmail.com>, 2007-2009.
+# Priit Laes <amd store20 com>, 2005, 2007.
+# Mattias Põldaru <mahfiaz gmail com>, 2007-2010.
msgid ""
msgstr ""
"Project-Id-Version: F-Spot\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-"
"spot&component=General\n"
-"POT-Creation-Date: 2009-07-30 12:10+0000\n"
-"PO-Revision-Date: 2009-08-01 19:42+0300\n"
+"POT-Creation-Date: 2010-03-18 10:29+0000\n"
+"PO-Revision-Date: 2010-03-22 08:07+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian <gnome-et at linux.ee>\n"
"MIME-Version: 1.0\n"
@@ -50,6 +50,33 @@ msgstr "Edastamise viga"
msgid "copying..."
msgstr "kopeerimine..."
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>Kirjutamise järjekorras ootavad mõned eelnevad elemendid</i></b>"
+
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Fotod, mida kirjutada</b>"
+
+msgid "Autorotate"
+msgstr "Pildid pööratakse automaatselt"
+
+msgid "Create CD"
+msgstr "Loo CD"
+
+msgid "Size"
+msgstr "Suurus"
+
+msgid "Size of the exported selection:"
+msgstr "Eksportimise valiku suurus:"
+
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Eelnevalt järjestatud failide lehitsemine"
+
+msgid "_Export"
+msgstr "_Eksportimine"
+
+msgid "_Write only these photos to CD"
+msgstr "_Kirjuta plaadile ainult need fotod"
+
msgid "F_acebook..."
msgstr "F_acebook..."
@@ -71,11 +98,12 @@ msgstr ""
msgid "Too many images to export"
msgstr "Eksportimiseks on liiga palju pilte"
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"Facebook võimaldab ainult 60 fotot albumi kohta. Muuda piltide valikut ja "
+"Facebook võimaldab ainult {0} fotot albumi kohta. Muuda piltide valikut ja "
"proovi uuesti."
msgid "Uploading Pictures"
@@ -114,6 +142,9 @@ msgstr "Viga"
msgid "Upload Complete"
msgstr "Üleslaadimine lõpetatud"
+msgid "Visit F-Spot group on Facebook"
+msgstr "Külasta F-Spoti gruppi Facebookis"
+
msgid "Waiting for authentication"
msgstr "Autentimise järel ootamine"
@@ -178,6 +209,51 @@ msgstr ""
msgid "You are not logged in."
msgstr "Sa ei ole sisse logitud."
+msgid "Auto-confirm Photos"
+msgstr "Fotode automaat-kinnitus"
+
+msgid "Caption"
+msgstr "Allkiri"
+
+msgid "Create a new album"
+msgstr "Uue albumi loomine"
+
+msgid "Description"
+msgstr "Kirjeldus"
+
+msgid "Export to Facebook"
+msgstr "Ekspordi Facebooki"
+
+msgid "In this photo"
+msgstr "Sellel fotol"
+
+msgid "Location"
+msgstr "Asukoht"
+
+msgid "Login"
+msgstr "Sisselogimine"
+
+msgid "Logout"
+msgstr "Logi välja"
+
+msgid "Name"
+msgstr "Nimi"
+
+msgid "Not logged in"
+msgstr "Pole sisse logitud"
+
+msgid "Permissions:"
+msgstr "Õigused:"
+
+msgid "Stay Connected"
+msgstr "Hoitakse ühendatuna"
+
+msgid "Use an existing album"
+msgstr "Olemasoleva albumi kasutamine"
+
+msgid "Who is this?"
+msgstr "Kes see on?"
+
msgid "_23hq..."
msgstr "_23hq..."
@@ -290,9 +366,6 @@ msgstr "Nähtav perele"
msgid "Visible to Friends"
msgstr "Nähtav sõpradele"
-msgid "_Export"
-msgstr "_Eksportimine"
-
msgid "_Export tags"
msgstr "_Märksõnad eksporditakse"
@@ -369,9 +442,6 @@ msgstr "<b>Sihtkaust</b>"
msgid "<b>Export Method</b>"
msgstr "<b>Eksportimise meetod</b>"
-msgid "Autorotate"
-msgstr "Automaatne pildi pööramine"
-
msgid "Create _gallery using \"Original\""
msgstr "_Luuakse \"Original\" galerii"
@@ -639,40 +709,40 @@ msgid ""
"for those already exported. Here, you can tell F-Spot to automatically "
"replace these tags as appropriate.</i></small>"
msgstr ""
-"<small><i>F-Spoti märksõnad aitavad sul jälgida fotode eksportimist. Näiteks "
-"võid kasutada ühte märksõna fotodel, mida plaanid eksportida, ning teist "
-"fotodel, mis on juba eksporditud. Siin saab määrata, et F-Spot ise asendaks "
-"need märksõnad vastavalt.</i></small>"
+"<small><i>F-Spoti märksõnade abil on võimalik jälgida fotode eksportimist. "
+"Näiteks võid kasutada ühte märksõna eksportimiseks mõeldud fotodel ja teist "
+"juba eksporditutel. Siin saab määrata, kuidas F-Spot neid märksõnu asendama "
+"peab.</i></small>"
msgid "Rem_ove from exported photos:"
-msgstr "Eksporditud fotodelt _eemaldatakse:"
+msgstr "_Eemalda eksporditud fotodelt:"
msgid "Select..."
-msgstr "Vali..."
+msgstr "Valimine..."
msgid "_Attach to exported photos:"
-msgstr "Eksporditud fotodele _lisatakse:"
+msgstr "_Ǜhenda eksporditud fotodega:"
msgid "<b>{0}</b>."
msgstr "<b>{0}</b>."
msgid "A trust error occured while attempting to access"
-msgstr "Ühenduse loomist takistas usalduse puudumine"
+msgstr "Ligipääsu üritamisel esines usaldamatus"
msgid "Abort this session"
msgstr "Katkesta see sessioon"
msgid "Always trust this site's certificate"
-msgstr "Alati usalda selle lehekülje sertifikaati"
+msgstr "Alati usaldada selle saidi sertifikaati"
msgid "Do you wish to:"
-msgstr "Kas sa tahad:"
+msgstr "Kas sa soovid:"
msgid "Trust Error"
msgstr "Usalduse puudumine"
msgid "Trust the site's certificate this once"
-msgstr "Usalda sel korral selle lehekülje sertifikaati"
+msgstr "Sel korral usaldada selle saidi sertifikaati"
msgid "Compressed fil_e..."
msgstr "Tihendatud _fail..."
@@ -719,12 +789,107 @@ msgstr ""
"selleks kulub aega. Siit dialoogist saab uuendamisprotsessi käivitada ja "
"pausida."
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr "Praegu ootavad {0} fotot md5 kalkulatsiooni, ootel on {1} tööd"
+
+msgid "_Close"
+msgstr "_Sulge"
+
msgid "Processing images..."
msgstr "Piltide töötlemine..."
msgid "Stopped"
msgstr "Peatatud"
+msgid "Check for Duplicates..."
+msgstr "Duplikaatide otsimine..."
+
+msgid "F-Spot Gallery"
+msgstr "F-Spoti galerii"
+
+msgid "The web gallery seems to be offline now"
+msgstr "Tundub, et veebigalerii pole võrku ühendatud"
+
+msgid "Show All"
+msgstr "Näita kõiki"
+
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} foto"
+msgstr[1] "{0} fotot"
+
+msgid "Current View"
+msgstr "Praegune vaade"
+
+msgid "Selected"
+msgstr "Valitud"
+
+msgid "Live Web Gallery"
+msgstr "Otsegalerii võrgus"
+
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Galerii on aktiivne, kuni sa F-Spoti sulged või galerii "
+"deaktiveerid.\n"
+"Veendu, et kohalikud vaatajad pääseksid sellele HTTP-proksita ligi.</i></"
+"small>"
+
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Kui galerii on aktiivne, siis ülalasuvalt aadressilt \n"
+"pääseb jagatud fotodele teisest arvutist ligi.</i></small>"
+
+msgid "Activates and deactivates the web gallery"
+msgstr "Veebigalerii lubamine ja keelamine"
+
+msgid "Allow viewers to add tags"
+msgstr "Vaatajatel on lubatud märksõnu lisada"
+
+msgid "Copy URL to clipboard"
+msgstr "URL-i kopeerimine lõikepuhvrisse"
+
+#, fuzzy
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spoti otsegalerii võrgus"
+
+msgid "Gallery URL:"
+msgstr "Galerii URL:"
+
+msgid "Limit number of shared photos to"
+msgstr "Jagatud fotode arvu piirang"
+
+msgid "Options:"
+msgstr "Valikud:"
+
+msgid "Photos with a Tag"
+msgstr "Märksõnaga fotod"
+
+msgid "Selected Photos"
+msgstr "Valitud fotod"
+
+msgid "Share:"
+msgstr "Jaga:"
+
+msgid "Views:"
+msgstr "Vaadatud:"
+
+msgid "none"
+msgstr "pole"
+
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galerii: {0}, Fotosid: {1}, Viimane klient: {3}"
+
+msgid "Gallery is inactive"
+msgstr "Galerii pole aktiivne"
+
msgid "Merge Db"
msgstr "Andmebaasi liitmine"
@@ -806,6 +971,30 @@ msgstr ""
"<big>Andmebaas viitab failidele kataloogis <b>{0}</b>.\n"
"Palun vali see kataloog, et kirjed saaks sellega seostada.</big>"
+msgid "Configure Screensaver"
+msgstr "Ekraanisäästja seadistamine"
+
+msgid "All Images"
+msgstr "Kõik pildid"
+
+msgid "Delay:"
+msgstr "Viivitus:"
+
+msgid "Display:"
+msgstr "Kuva:"
+
+msgid "Images tagged with:"
+msgstr "Pildid märksõnadega:"
+
+msgid "Make F-Spot my screensaver"
+msgstr "Tee F-Spotist minu ekraanisäästja"
+
+msgid "Screensaver Configuration"
+msgstr "Ekraanisäästja seadistus"
+
+msgid "F-Spot"
+msgstr "F-Spot"
+
msgid "F-Spot Photo Manager"
msgstr "F-Spot fotoalbum"
@@ -834,213 +1023,6 @@ msgstr "Tundmatu muutmise tüüp %d"
msgid "Operation failed"
msgstr "Tegevus nurjus"
-msgid "Package"
-msgstr "Pakk"
-
-msgid "Extension Installation"
-msgstr "Lisade paigaldamine"
-
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Vali, millised lisad paigaldada ja klõpsa nupul edasi</b>"
-
-msgid "Install from:"
-msgstr "Lisade asukoht:"
-
-msgid "_Repositories..."
-msgstr "_Hoidlad..."
-
-msgid "Show all packages"
-msgstr "Näidatakse kõiki pakke"
-
-msgid "Show new versions only"
-msgstr "Näidatakse ainult uusi versioone"
-
-msgid "Show updates only"
-msgstr "Näidatakse ainult uuendusi"
-
-msgid "_Unselect All"
-msgstr "_Eemalda valik"
-
-msgid "Select _All"
-msgstr "Vali _kõik"
-
-msgid "label124"
-msgstr "label124"
-
-msgid "Overall Progress:"
-msgstr "Üldine edenemine:"
-
-msgid "Downloading extensions..."
-msgstr "Lisade allalaadimine..."
-
-msgid "Extension Manager"
-msgstr "Lisade haldaja"
-
-msgid "Additional extensions are required to perform this operation."
-msgstr "Tegevuse sooritamiseks on vaja veel lisasid."
-
-msgid "The following extensions will be installed:"
-msgstr "Paigaldatakse järgnevad lisad:"
-
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Lisade haldaja</b></big>"
-
-msgid "The following extensions are currently installed:"
-msgstr "Hetkel on paigaldatud järgnevad lisad:"
-
-msgid "_Install Extensions..."
-msgstr "Lisade _paigaldamine..."
-
-msgid "_Uninstall..."
-msgstr "_Eemaldamine..."
-
-msgid "Enable"
-msgstr "Luba"
-
-msgid "Disable"
-msgstr "Keela"
-
-msgid "Details"
-msgstr "Üksikasjad"
-
-msgid "Extension Repository Management"
-msgstr "Lisade hoidlate haldamine"
-
-msgid "Add New Repository"
-msgstr "Lisa uus hoidla"
-
-msgid "Select the location of the repository you want to register:"
-msgstr "Vali registreeritava hoidla asukoht: "
-
-#. Container child vbox89.Gtk.Box+BoxChild
-msgid "Register an on-line repository"
-msgstr "Registreeri internetihoidla"
-
-msgid "Url:"
-msgstr "Url:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-msgid "Register a local repository"
-msgstr "Registreeri kohalik hoidla"
-
-msgid "Path:"
-msgstr "Asukoht:"
-
-msgid "Browse..."
-msgstr "Sirvi..."
-
-msgid "Version:"
-msgstr "Versioon:"
-
-msgid "Author:"
-msgstr "Autor:"
-
-msgid "Copyright:"
-msgstr "Autoriõigus:"
-
-msgid "Extension Dependencies:"
-msgstr "Lisa sõltuvused:"
-
-msgid "All registered repositories"
-msgstr "Kõik registreeritud hoidlad"
-
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Kas sa oled kindel, et tahad paigaldamise katkestada?"
-
-msgid "The following packages will be uninstalled:"
-msgstr "Järgnevad pakid eemaldatakse:"
-
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"Eemaldatakse ka need pakid, mis sõltusid eemaldamisele määratud pakkidest:"
-
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr "Valitud lisasid pole võimalik sõltuvusprobleemide tõttu paigaldada."
-
-msgid "The following packages will be installed:"
-msgstr "Paigaldatakse järgnevad pakid:"
-
-msgid " (in user directory)"
-msgstr " (kasutaja kaustas)"
-
-msgid "The following packages need to be uninstalled:"
-msgstr "Järgnevad pakid tuleb eemaldada:"
-
-msgid "The following dependencies could not be resolved:"
-msgstr "Järgnevaid sõltuvusi ei suudetud lahendada:"
-
-msgid "The installation has been successfully completed."
-msgstr "Paigaldamine lõpetati edukalt."
-
-msgid "The installation failed!"
-msgstr "Paigaldamine nurjus!"
-
-msgid "The installation has completed with warnings."
-msgstr "Paigaldamine lõpetati, esines hoiatusi."
-
-msgid "The uninstallation has been successfully completed."
-msgstr "Eemaldamine lõpetati edukalt."
-
-msgid "The uninstallation failed!"
-msgstr "Eemaldamine nurjus!"
-
-msgid "The uninstallation has completed with warnings."
-msgstr "Eemaldamine lõpetati, esines hoiatusi."
-
-msgid "Repository"
-msgstr "Hoidla"
-
-msgid "Installation cancelled"
-msgstr "Paigaldamine katkestati"
-
-msgid "Some of the required extensions were not found"
-msgstr "Mõnda nõutud lisadest ei leitud"
-
-msgid "Installation failed"
-msgstr "Paigaldamine nurjus"
-
-msgid "Extension"
-msgstr "Lisa"
-
-msgid "Version"
-msgstr "Versioon"
-
-msgid "Other"
-msgstr "Teised"
-
-msgid "Name"
-msgstr "Nimi"
-
-msgid "Url"
-msgstr "Url"
-
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Erandlik olukord: {0}"
-
-msgid "Disabled extensions can't be loaded."
-msgstr "Keelatud lisasid pole võimalik laadida."
-
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Lisa {0} laadimine"
-
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Nõutud lisa '{0}' on keelatud."
-
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Nõutud lisa '{0}' ei ole paigaldatud."
-
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(edastas {0})"
-
msgid "Preview"
msgstr "Eelvaade"
@@ -1067,12 +1049,12 @@ msgstr "Faili kopeerimine {0} {1}-st"
msgid "Error transferring file"
msgstr "Faili edastamine nurjus"
-msgid "Done Copying Files"
-msgstr "Failide kopeerimine lõpetatud"
-
msgid "Download Complete"
msgstr "Allalaadimine lõpetatud"
+msgid "Done Copying Files"
+msgstr "Failide kopeerimine lõpetatud"
+
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "\"{0}\" tõmbamine kaamerast"
@@ -1209,8 +1191,8 @@ msgstr "Ei ole võimalust salvestada \"{0}\" tüüpi faile"
msgid "Unhandled exception"
msgstr "Käsitsematu erandolukord"
-msgid "Copy Photo Locat_ion"
-msgstr "Kopeeri foto _asukoht"
+msgid "Copy Photo"
+msgstr "Foto kopeerimine"
msgid "Export to"
msgstr "Ekspordi kuhu"
@@ -1266,12 +1248,6 @@ msgstr "<b>_Parandused</b>"
msgid "<b>Image Interpolation</b>"
msgstr "<b>Pildi interpoleerimine</b>"
-msgid "<b>Max Rating</b>"
-msgstr "<b>Suurim hinnang</b>"
-
-msgid "<b>Min Rating</b>"
-msgstr "<b>Vähim hinnang</b>"
-
msgid "<b>Size</b>"
msgstr "<b>Suurus</b>"
@@ -1328,6 +1304,9 @@ msgstr "CD"
msgid "C_ontrast:"
msgstr "_Kontrastsus:"
+msgid "C_reate"
+msgstr "_Loo"
+
msgid "Camera Selection"
msgstr "Kaamera valik"
@@ -1440,9 +1419,6 @@ msgstr "Valitud kaamera:"
msgid "Selection Constraints"
msgstr "Valiku määrang"
-msgid "Set Rating Filter"
-msgstr "Hinnangufiltri määramine"
-
msgid "Set as _Background"
msgstr "Määra _taustapildiks"
@@ -1605,27 +1581,6 @@ msgstr "Alusta slaidiesitlust"
msgid "Slide transition:"
msgstr "Slaidide vahetus:"
-msgid "Dissolve"
-msgstr "Hajutamine"
-
-msgid "Flip"
-msgstr "Pööramine"
-
-msgid "Cover"
-msgstr "Katmine"
-
-msgid "Reveal"
-msgstr "Avamine"
-
-msgid "Wipe"
-msgstr "Pühkimine"
-
-msgid "Split"
-msgstr "Poolitamine"
-
-msgid "Push"
-msgstr "Lükkamine"
-
msgid "More dates"
msgstr "Rohkem kuupäevi"
@@ -1782,8 +1737,7 @@ msgid ""
"different directory"
msgstr "Sinu märgitud kausta \"{0}\" ei eksisteeri. Palun vali teine kaust"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-msgid "Import Tags"
+msgid "Imported Tags"
msgstr "Importimise märksõnad"
msgid "Rotate Left"
@@ -2034,6 +1988,10 @@ msgstr "Teema ja märksõnad"
msgid "Compression"
msgstr "Tihendamine"
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
msgid "Planar Configuration"
msgstr "Tasandi sätted"
@@ -2082,6 +2040,8 @@ msgstr "Failiallika tüüp"
msgid "Scene Capture Type"
msgstr "Stseeni püüdmise tüüp"
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
msgid "Gain Control"
msgstr "Tundlikkus"
@@ -2254,8 +2214,8 @@ msgid "An error occured while processing \"{0}\": {1}"
msgstr "\"{0}\" töötlemisel esines viga: {1}"
#. Send the mail :)
-msgid "my photos"
-msgstr "minu fotod"
+msgid "My Photos"
+msgstr "Minu fotod"
msgid "Error saving sharpened photo"
msgstr "Viga teravustatud foto salvestamisel"
@@ -2305,8 +2265,8 @@ msgstr[1] "Otsi"
msgid "Create New Tag..."
msgstr "Loo uus märksõna..."
-msgid "Edit Selected Tag..."
-msgstr "Muuda valitud märksõna..."
+msgid "Edit Tag..."
+msgstr "Märksõna muutmine..."
msgid "Delete Tag"
msgid_plural "Delete Tags"
@@ -2405,8 +2365,8 @@ msgstr "Autoriõigus © 2003-2009 Novell Inc."
msgid "translator-credits"
msgstr ""
-"Priit Laes <amd at store20.com>, 2005, 2007-2008\n"
-"Mattias Põldaru <mahfiaz at gmail.com>, 2007-2009."
+"Priit Laes <amd store20 com>, 2005, 2007-2008\n"
+"Mattias Põldaru <mahfiaz gmail com>, 2007-2010."
msgid "F-Spot Website"
msgstr "F-Spoti veebileht"
@@ -2439,9 +2399,6 @@ msgstr "Praegune nädal (E-P)"
msgid "Previous Week (Mon-Sun)"
msgstr "Eelmine nädal (E-P)"
-msgid "All Images"
-msgstr "Kõik pildid"
-
msgid "Customized Range"
msgstr "Muu vahemik"
@@ -2516,6 +2473,294 @@ msgstr "Suhe"
msgid "Retry"
msgstr "Proovi uuesti"
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
+
+msgid "00:00:00"
+msgstr "00:00:00"
+
+msgid "5"
+msgstr "5"
+
+msgid "<b>Action</b>"
+msgstr "<b>Tegevus</b>"
+
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Näidisfoto</b>"
+
+msgid "Adjust Time"
+msgstr "Aja kohendamine"
+
+msgid "Adjusted date: "
+msgstr "Kohandatud kuupäev:"
+
+msgid "Current date:"
+msgstr "Tänane kuupäev:"
+
+msgid "Space all photos by"
+msgstr "Kõikide fotode vahe"
+
+msgid "difference:"
+msgstr "erinevus:"
+
+#, fuzzy
+msgid "min. Starting at {0}"
+msgstr "algus vähemalt {0}"
+
+msgid "<b>End Date</b>"
+msgstr "<b>Lõpu aeg</b>"
+
+msgid "<b>Select period</b>"
+msgstr "<b>Perioodi valimine</b>"
+
+msgid "<b>Start Date</b>"
+msgstr "<b>Alguse kuupäev</b>"
+
+msgid "Cancel, do not change the current timeline. "
+msgstr "Loobu, ära muuda praegust ajajoont."
+
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Kuvatakse ainult nende kuupäevade vahele jäävad fotod."
+
+msgid "Set date range"
+msgstr "Ajavahemiku määramine"
+
+msgid "<small></small>"
+msgstr "<small></small>"
+
+msgid "Edit Tag"
+msgstr "Märksõna muutmine"
+
+msgid "Edit icon"
+msgstr "Ikooni muutmine"
+
+msgid "_Icon:"
+msgstr "_Ikoon:"
+
+msgid "<b>From External Photo</b>"
+msgstr "<b>Välisest fotost</b>"
+
+msgid "<b>From Photo</b>"
+msgstr "<b>Fotost</b>"
+
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Eeldefineeritud ikoonid</b>"
+
+msgid "<b>Preview</b>"
+msgstr "<b>Eelvaade</b>"
+
+msgid "Design icon from"
+msgstr "Tee ikoon järgnevatest"
+
+msgid "Edit Tag Icon"
+msgstr "Märksõna ikooni muutmine"
+
+msgid "No _image"
+msgstr "Ilma _pildita"
+
+msgid "Photo 0 of 0"
+msgstr "{0} foto {1}-st"
+
+msgid "Color profile for display:"
+msgstr "Kuvamise värviprofiil:"
+
+msgid "Color profile for printing:"
+msgstr "Printimise värviprofiil:"
+
+msgid "F-Spot Preferences"
+msgstr "F-Spoti eelistused"
+
+msgid "F-Spot appearance:"
+msgstr "F-Spoti välimus:"
+
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+"Võimalusel pildifailides\n"
+"<small>Teeb need ka teiste pildirakendustega kasutatavaks.</small>"
+
+msgid "Select A Folder"
+msgstr "Kataloogi valimine"
+
+msgid "Separately from the image files"
+msgstr "Pildifailidest lahus"
+
+msgid "Store tags and descriptions for photos:"
+msgstr "Fotode märksõnad ja kirjeldused salvestatakse:"
+
+msgid "When importing photos, copy them to:"
+msgstr "Fotode importimisel kopeeritakse need kausta:"
+
+msgid "<b>Max Rating</b>"
+msgstr "<b>Suurim hinnang</b>"
+
+msgid "<b>Min Rating</b>"
+msgstr "<b>Vähim hinnang</b>"
+
+msgid "Set Rating Filter"
+msgstr "Hinnangufiltri määramine"
+
+msgid "Adjust _Time..."
+msgstr "Kohenda _aega..."
+
+msgid "Arrange _by"
+msgstr "Järjestamise _alus"
+
+msgid "By _Date"
+msgstr "_Kuupäeva järgi"
+
+msgid "By _Import Roll"
+msgstr "_Imporditud rulli järgi"
+
+msgid "By _Rating"
+msgstr "_Hinnangu järgi"
+
+msgid "Copy"
+msgstr "Kopeeri"
+
+msgid "Create New _Tag..."
+msgstr "Loo uus _märksõna..."
+
+msgid "Create _New Version..."
+msgstr "Loo _uus versioon..."
+
+msgid "Fin_d"
+msgstr "_Otsi"
+
+msgid "Manage _Extensions"
+msgstr "_Laienduste haldamine"
+
+msgid "Page Set_up..."
+msgstr "Lehekülje _sätted..."
+
+msgid "Re_fresh Thumbnail"
+msgstr "_Värskenda pisipilti"
+
+msgid "Select _All"
+msgstr "Vali _kõik"
+
+msgid "Select _None"
+msgstr "Tühista _valik"
+
+msgid "Send by _Mail..."
+msgstr "Saada _meiliga..."
+
+msgid "Side_bar"
+msgstr "_Külgriba"
+
+msgid "T_ags"
+msgstr "_Märksõnad"
+
+#, fuzzy
+msgid "Thumbnail _elements"
+msgstr "Pisipiltide _elemendid"
+
+msgid "Too_lbar"
+msgstr "_Tööriistariba"
+
+msgid "View"
+msgstr "_Vaade"
+
+msgid "_Attach Tag to Selection"
+msgstr "Ü_henda valik märksõnaga"
+
+msgid "_Clear Rating Filter"
+msgstr "_Puhasta hinnangufilter"
+
+msgid "_Clear Roll Filter"
+msgstr "_Eemalda rullifilter"
+
+msgid "_Components"
+msgstr "_Komponendid"
+
+msgid "_Contents"
+msgstr "_Sisukord"
+
+msgid "_Dates"
+msgstr "_Kuupäevad"
+
+msgid "_Delete Selected Tag"
+msgstr "_Kustuta valitud märksõna"
+
+msgid "_Delete Version"
+msgstr "_Kustuta versioon"
+
+msgid "_Edit Tag..."
+msgstr "Märksõna _muutmine..."
+
+msgid "_Export to"
+msgstr "_Ekspordi kuhu"
+
+msgid "_Filmstrip"
+msgstr "_Filmirida"
+
+msgid "_Hidden"
+msgstr "_Varjatud"
+
+msgid "_Import..."
+msgstr "_Importimine..."
+
+msgid "_Large"
+msgstr "_Suur"
+
+msgid "_Last Import Roll"
+msgstr "_Viimati imporditud rull"
+
+msgid "_Loupe"
+msgstr "_Luup"
+
+msgid "_Medium"
+msgstr "_Keskmine"
+
+msgid "_Quit"
+msgstr "_Lõpeta"
+
+msgid "_Ratings"
+msgstr "_Hinnangud"
+
+msgid "_Remove Tag From Selection"
+msgstr "_Eemalda valikust märksõna"
+
+msgid "_Rename Version"
+msgstr "_Nimeta versioon ümber"
+
+msgid "_Reverse Order"
+msgstr "_Pööratud järjekord"
+
+msgid "_Select Import Rolls..."
+msgstr "_Impordirullide valimine..."
+
+msgid "_Set Date Range..."
+msgstr "_Ajavahemiku määramine..."
+
+msgid "_Set Rating filter..."
+msgstr "_Hinnagufiltri määramine..."
+
+msgid "_Sharpen..."
+msgstr "_Teravustamine..."
+
+msgid "_Small"
+msgstr "_Väike"
+
+msgid "_Tag Icons"
+msgstr "_Märksõnade ikoonid"
+
+msgid "_Tags"
+msgstr "_Märksõnad"
+
+msgid "_Timeline"
+msgstr "_Ajajoon"
+
+msgid "_Tools"
+msgstr "_Tööriistad"
+
+msgid "_Untagged Photos"
+msgstr "_Märksõnadeta fotod"
+
+msgid "_Version"
+msgstr "_Versioon"
+
msgid "Updating F-Spot Database"
msgstr "F-Spoti andmebaasi uuendamine"
@@ -2567,8 +2812,8 @@ msgstr "Skaleeritud"
msgid "White borders"
msgstr "Valged äärised"
-msgid "Custom Text: "
-msgstr "Muu tekst:"
+msgid "Custom Text"
+msgstr "Muu tekst"
msgid "Photos infos"
msgstr "Fotode andmed"
@@ -2629,12 +2874,12 @@ msgstr "Failisüsteem"
msgid "Histogram"
msgstr "Histogramm"
+msgid "Version"
+msgstr "Versioon"
+
msgid "Date"
msgstr "Kuupäev"
-msgid "Size"
-msgstr "Suurus"
-
msgid "Exposure"
msgstr "Säriaeg"
@@ -2647,12 +2892,18 @@ msgstr "Faili suurus"
msgid "Rating"
msgstr "Hinnang"
-msgid "(Unknown)"
-msgstr "(Tundmatu)"
-
msgid "(wrong format)"
msgstr "(vale vorming)"
+msgid "(Unknown)"
+msgstr "(Teadmata)"
+
+#, csharp-format
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(üks muutmine)"
+msgstr[1] "({0} muutmist)"
+
msgid "(File read error)"
msgstr "(Viga faili lugemisel)"
@@ -2727,9 +2978,6 @@ msgstr "Rakendusi pole saadaval"
msgid "Rating:"
msgstr "Hinnang:"
-msgid "Location"
-msgstr "Asukoht"
-
msgid "Country"
msgstr "Riik"
diff --git a/po/eu.po b/po/eu.po
index dfe0405..c70b317 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,14 +5,14 @@
#
#
# Mikel Olasagasti <hey_neken at mundurat.net>, 2004.
-# Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>, 2005, 2006, 2008, 2009.
+# Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>, 2005, 2006, 2008, 2009, 2010.
# Iñaki Larrañaga Murgoitio <dooteo at zundan.com>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 14:54+0200\n"
-"PO-Revision-Date: 2009-09-16 15:04+0200\n"
+"POT-Creation-Date: 2010-03-18 11:26+0100\n"
+"PO-Revision-Date: 2010-03-18 11:34+0100\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>\n"
"Language-Team: Basque <itzulpena at euskalgnu.org>\n"
"MIME-Version: 1.0\n"
@@ -42,14 +42,14 @@ msgstr "\"{0}\" argazkia CDra transferitzen"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} / {1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
@@ -98,7 +98,7 @@ msgid "Create CD"
msgstr "Sortu CDa"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Tamaina"
@@ -116,6 +116,7 @@ msgstr "_Arakatu aurrez planifikatutako fitxategiak"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Esportatu"
@@ -146,19 +147,20 @@ msgstr ""
"Behin Facebook-ek aplikazio honetara itzultzeko adierazten dizunean, egin "
"klik azpiko \"Ados\" botoian."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
msgstr "Irudi gehiegi esportatzeko"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"Facebook-ek gehienez 60 argazki onartzen ditu albumeko. Findu hautapena eta "
+"Facebook-ek gehienez {0} argazki onartzen ditu albumeko. Findu hautapena eta "
"saiatu berriro."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -166,19 +168,19 @@ msgstr ""
msgid "Uploading Pictures"
msgstr "Argazkiak igotzen"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "Albumak izena eduki behar du"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
msgstr "Eman izen bat albumari edo aukeratu lehendik ere dagoen album bat."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "Huts egin du album berria sortzean"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -189,30 +191,29 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
msgstr "\"{0}\" argazkia igotzen ({1} / {2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
msgstr "Errorea Facebook-era igotzean: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Errorea"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
@@ -220,6 +221,10 @@ msgstr "Errorea"
msgid "Upload Complete"
msgstr "Igotzea osatu da"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Bisitatu F-Spot taldea Facebook-en"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "Autentifikazioaren zai"
@@ -339,8 +344,7 @@ msgid "Logout"
msgstr "Saio-amaiera"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Izena"
@@ -462,6 +466,7 @@ msgstr "<b>Kontua</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Argazkiak</b>"
@@ -483,7 +488,8 @@ msgstr "<b>Ikusi baimenak</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Esportatu"
@@ -579,58 +585,58 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Errorea: fitxategia badago lehendik ere. Abortatzen"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Argia"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Iluna"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Aur."
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Indizea"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Etiketak"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Hurrengoa"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galeriaren sortzailea: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Erakutsi estiloak"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Ezkutatu estiloak"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Etiketak: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Orrialdea:"
@@ -847,6 +853,7 @@ msgstr "_Album gurasoa:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Pasahitza:"
@@ -857,6 +864,7 @@ msgstr "_Titulua:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Erabiltzaile-izena:"
@@ -1005,12 +1013,72 @@ msgstr "Igotzea osatu da"
msgid "Error uploading to Tabblo: "
msgstr "Errorea Tabblo-ra igotzean: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>'F-Spot'-en etiketak</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo-ko kontua</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>F-Spot aplikazioko etiketek argazkien esportatze-egoeraren jarraipena "
+"egiten lagunduko dizute. Adibidez: erabili etiketa bat esportatzeko asmoa dituzun "
+"argazkientzako, eta beste bat jadanik esportatuta daudenentzako. Horrela, "
+"behar den neurrian etiketa horiek automatikoki ordezteko esan dezaiokezu F-Spot-i.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Kendu esportatutako argazkietatik:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Hautatu..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Erantsi esportatutako argazkiei:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Fidagarritasunaren errorea gertatu da sarbidetzen saiatzean"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Bertan behera utzi saio hau"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Beti fidatu gune honetako ziurtagiriaz"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Nahi duzu:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Fidagarritasun-errorea"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Fidatu gune honetako ziurtagiriaz oraingoan"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Konprimitutako _fitxategia..."
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Ez dago hautapenik erabilgarri"
@@ -1036,7 +1104,6 @@ msgid "Preparing photo \"{0}\""
msgstr "\"{0}\" argazkia prestatzen"
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "_Sortu"
@@ -1081,8 +1148,8 @@ msgid "Stopped"
msgstr "Geldituta"
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Hash-a bikoiztuentzako"
+msgid "Check for Duplicates..."
+msgstr "Bilatu _bikoiztuak..."
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
msgid "F-Spot Gallery"
@@ -1275,7 +1342,7 @@ msgid "New Rolls Only"
msgstr "Erroilu berriak soilik"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:51
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Saltatu"
@@ -1318,26 +1385,31 @@ msgid "Screensaver Configuration"
msgstr "Pantaila-babeslearen konfigurazioa"
#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
msgid "F-Spot Photo Manager"
msgstr "F-Spot argazki-kudeatzailea"
-#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot.desktop.in.in.h:3
msgid "Organize, enjoy, and share your photos"
msgstr "Antolatu, ikusi eta partekatu zure argazkiak"
-#: ../f-spot.desktop.in.in.h:3 ../f-spot-import.desktop.in.in.h:3
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
msgid "Photo Manager"
msgstr "Argazki-kudeatzailea"
-#: ../f-spot-import.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:3
msgid "Import into F-Spot"
msgstr "Inportatu 'F-Spot'-era"
-#: ../f-spot-view.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:2
msgid "F-Spot Photo Viewer"
msgstr "F-Spot argazki-ikustailea"
-#: ../f-spot-view.desktop.in.in.h:2
+#: ../f-spot-view.desktop.in.in.h:3
msgid "Photo Viewer"
msgstr "Argazki-ikustailea"
@@ -1354,278 +1426,6 @@ msgstr "%d transformazio mota ezezaguna"
msgid "Operation failed"
msgstr "Eragiketak huts egin du"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paketea"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Hedapenen instalazioa"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Hautatu hedapenak instalatzeko eta egin klik 'Hurrengoa' botoian</b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Instalatu hemendik:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Biltegiak..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Erakutsi pakete guztiak"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Erakutsi bertsio berriak soilik"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Erakutsi eguneraketak soilik"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "_Desautatu denak"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Hautatu _dena"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "etiketa124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Progresio orokorra:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Hedapenak deskargatzen..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Hedapen-kudeatzailea"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Hedapen gehigarriak behar dira eragiketa hau lantzeko."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Honako hedapenak instalatuko dira:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Hedapen-kudeatzailea</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Honako hedapenak unean instalatuta daude:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Instalatu hedapenak..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Desinstalatu..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Gaitu"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Desgaitu"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Xehetasunak"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Hedapenen biltegien kudeatzailea"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Gehitu biltegi berria"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Hautatu biltegiaren helbidea erregistratzeko:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Erregistratu lineako biltegia"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "URLa:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Erregistratu biltegi lokala"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Bide-izena:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Arakatu..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Bertsioa:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Egilea:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Copyright-a:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Hedapenen mendekotasunak:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Erregistratutako biltegi guztiak"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Ziur zaude instalazioa bertan behera utzi nahi duzula?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Honako paketeak desinstalatuko dira:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr "Beste hedapen batzuk aurrekoen mende daude (desinstalatuko direnak):"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr "Hautatutako hedapenak ezin dira instalatu mendekotasun gatazkak daudelako."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Honako paketeak instalatuko dira:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (erabiltzailearen direktorioan)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Honako paketeak desinstalatu egin behar dira:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Honako mendekotasunak ezin dira ebatzi:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Instalazioa ongi burutu da."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Instalazioak huts egin du!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Instalazioa abisuekin burutu da."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Desinstalazioa ongi burutu da."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Desinstalazioak huts egin du!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Desinstalazioa abisuekin burutu da."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Biltegia"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Instalazioa bertan behera utzi da"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Beharrezko hedapen batzuk ez dira aurkitu"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Instalazioak huts egin du"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Hedapena"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Bertsioa"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Bestelakoa"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "URLa"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Salbuespena gertatu da: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Desgaitutako hedapenak ezin dira kargatu."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Hedapena kargatzen: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Beharrezko '{0}' hedapena desgaituta dago."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Beharrezko '{0}' hedapena ez dago instalatua."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "({0}(e)k hornitua)"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Aurrebista"
@@ -1634,7 +1434,7 @@ msgstr "Aurrebista"
msgid "Path"
msgstr "Bide-izena"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Fitxategia"
@@ -1661,19 +1461,19 @@ msgid "Error transferring file"
msgstr "Errorea fitxategia transferitzean"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Fitxategiak kopiatzea amaituta"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Deskarga osatu da"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Fitxategiak kopiatzea amaituta"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "Kameratik \"{0}\" transferitzen"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Kamera"
@@ -1681,12 +1481,12 @@ msgstr "Kamera"
msgid "Port"
msgstr "Ataka"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Ez da {0}(r)ekin bat datorren argazkirik aurkitu"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1697,11 +1497,11 @@ msgstr ""
"argazki batzuei gehitzen edo F-Spot aplikazioaren hobespenen \n"
"elkarrizketa-koadroan bestelako etiketa hautatzen."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Bilaketak ez du emaitzik aurkitu"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1728,19 +1528,19 @@ msgid_plural "Modified ({0})"
msgstr[0] "Aldatuta"
msgstr[1] "Aldatuta ({0})"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "{1}-(e)n aldatuta"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "{1}-(e)n aldatuta ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:666 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Jatorrizkoa"
@@ -1816,19 +1616,19 @@ msgstr "Hautatu finkatzea nahi dituzun begiak."
msgid "Sepia Tone"
msgstr "Sepia tonoa"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Laino artistikoa"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Zuzen jarri"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Errorea inportatzean"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Errorea {0} {2} {2} {1} inportatzean"
@@ -1843,8 +1643,8 @@ msgid "Unhandled exception"
msgstr "Kudeatu gabeko salbuespena"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Kopiatu argazkiaren _kokapena"
+msgid "Copy Photo"
+msgstr "Kopiatu argazkia"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1858,13 +1658,13 @@ msgstr "Ireki _honekin"
msgid "Rem_ove Tag"
msgstr "Ken_du etiketa"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:453 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Biratu e_zkerrera"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:454 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Biratu e_skuinera"
@@ -1991,180 +1791,184 @@ msgid "C_ontrast:"
msgstr "_Kontrastea:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Sortu"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Kamera hautapena"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Kopiatu fitxategiak argazkien karpetara"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Sortu mezua"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Sortu _ikonoa etiketa honentzako aurreneko aldiz erabiltzean"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr "Sortu mezua hautatutako argazkiak (tamainaz alda daitezke) erantsita"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Detektatu bikoiztutakoak"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Erakutsi fitxategi-_izenak"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr "Erakutsi erroilu zehatz batetik inportatutako argazkiak soilik."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Ez bidali mezua"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "_Helb.Elek:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "Esportatu tituluak eta iruzkinak"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Aurrikusitako tamaina berria"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Oso handia"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "F-Spot ikuspegia"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Iragazi hautatutako erroiluetan"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_aleria:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galeria"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Inportatu"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Inportatzeko iturburua:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Sartu azpikarpetak"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Handia"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Kudeatu zure hautapen-erlazio pertsonalizatuak"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Tartekoa"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Argazki kopurua hautatutako erroiluetan:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Argazki-kopurua"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Ireki _karpeta..."
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Jatorrizko tamaina (baliteke fitxategi-tamaina oso handia izatea)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Etiketa _gurasoa:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pausarazi"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Hobespenak"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Aurrekoa"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Konpondu"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Hautatu argazkiak kameratik kopiatzeko..."
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Hautatu etiketa..."
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Hautatu kamera, bertatik fitxategiak transferitzeko."
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Hautatutako kamera: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Hautapenaren murriztapena"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Ezarri _atzeko plano gisa"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Erakutsi argazki guztiak."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Erakutsi edo ezkutatu albo-panela"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Erakutsi edo ezkutatu tresna-barra"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "Albo-panela"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Txikia"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2172,40 +1976,40 @@ msgstr ""
"Zehaztu jatorrizko tamainen argazkiak biratuko diren edo ez. Tamaina "
"txikiagoak automatikoki biratuko dira."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Kendu irudiaren _metadatuak"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "_Tenperatura:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Txikitxoa"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Jatorrizko guztirako tamaina"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "Zooma _handiagotu"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "Zooma _txikiagotu"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Zooma handiagotu"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Zooma txikiagotu"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Distira:"
@@ -2332,7 +2136,7 @@ msgstr "Ezkutatu tresna-barra"
msgid "Info"
msgstr "Informazioa"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Irudiaren informazioa"
@@ -2340,8 +2144,8 @@ msgstr "Irudiaren informazioa"
msgid "Exit fullscreen"
msgstr "Irten pantaila osotik"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Diapositiba erakusketa"
@@ -2389,7 +2193,7 @@ msgstr "InterOperability direktorioa"
msgid "Unknown Directory"
msgstr "Direktorio ezezaguna"
-#: ../src/Imaging/ImageFile.cs:116
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Ez dago onartuta fitxategi-formatu honetan idaztea"
@@ -2521,7 +2325,7 @@ msgstr "Objektuaren genero intelektuala"
msgid "Unknown IIM DataSet"
msgstr "IIM datu-multzo ezezaguna"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:359
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Hautatu karpeta"
@@ -2549,13 +2353,12 @@ msgid ""
"different directory"
msgstr "Hautatutako \"{0} direktorioa ez da existitzen. Aukeratu beste direktorio bat"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
+msgid "Imported Tags"
msgstr "Inportatu etiketak"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:86
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Biratu ezkerrera"
@@ -2563,7 +2366,7 @@ msgstr "Biratu ezkerrera"
msgid "Rotate picture left"
msgstr "Biratu argazkia ezkerrera"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Biratu eskuinera"
@@ -2579,51 +2382,51 @@ msgstr "Hurrengo argazkia"
msgid "Previous picture"
msgstr "Aurreko argazkia"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Inportatu irudi berriak"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Arakatu"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Arakatu hainbat argazki aldi berean"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Editatu irudia"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Ikusi eta editatu argazkia"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Pantaila osoa"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Ikusi argazkiak pantaila osoan"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Ikus argazkiak diapositiba-aurkezpenean"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Aurreko argazkia"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Hurrengo argazkia"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Ez da kamerarik detektatu."
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2631,24 +2434,24 @@ msgstr ""
"F-Spot ez da gai izan sistemara konektatutako kamera aurkitzeko. Egiaztatu "
"kamera konektatuta eta piztuta dagoela"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Errorea kamerarekin konektatzean"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "\"{0}\" errorea jaso da kamerarekin konektatzean"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Batu hautatutako etiketa"
msgstr[1] "Batu hautatutako {0} etiketak?"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2656,57 +2459,57 @@ msgstr ""
"Eragiketa honek hautatutako etiketak eta edozein azpi-etiketa batu egingo "
"ditu etiketa bakarrean."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Batu etiketak"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} / {1} argazkia"
msgstr[1] "{0} / {1} argazkia"
-#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:495
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "Argazki {0}"
msgstr[1] "{0} argazki"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} hautatuta)"
msgstr[1] " ({0} hautatuta)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Ados"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Errorea argazkia ezabatzean"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Ez dago baimenik fitxategia ezabatzeko: {1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "{0} motako errorea gertatu da fitxategia ezabatzean: {2}{1}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Ezabatu hautatutako argazkiak betirako?"
msgstr[1] "Ezabatu hautatutako {0} argazki betirako?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural "This deletes all versions of the selected photos from your drive."
msgstr[0] ""
@@ -2714,20 +2517,20 @@ msgstr[0] ""
"ditu."
msgstr[1] "Honek hautatutako argazkien bertsio guztiak zure euskarritik ezabatuko ditu."
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Ezabatu argazkia"
msgstr[1] "_Ezabatu argazkiak"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Ezabatu hautatutako argazkia F-Spot-etik?"
msgstr[1] "Ezabatu hautatutako {0} argazki F-Spot-etik?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2737,45 +2540,45 @@ msgstr ""
"galduko da. Argazkiak ordenagailuan egoten jarraituko dute, eta F-Spot-era "
"berriro inportatzeko aukera egongo da."
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Kendu katalogotik"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Ezabatu \"{0}\" etiketa?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Ezabatu hautatutako {0} etiketak?"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "argazkia"
msgstr[1] "argazkiak"
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
msgstr[0] "Etiketa hau ezabatuz gero, {0} {1} esleipena ere galduko da."
msgstr[1] "Etiketa hauek ezabatuz gero, {0} {1} esleipena ere galduko da."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Ezabatu etiketa"
msgstr[1] "_Ezabatu etiketak"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Etiketa ez dago hutsik"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2784,39 +2587,39 @@ msgstr ""
"Ezin dira etiketak dituzten etiketak ezabatu . Aurrenik ezabatu {0} pean "
"dauden etiketak"
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Biratu hautatutako argazkia ezkerrera"
msgstr[1] "Biratu hautatutako argazkiak ezkerrera"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Biratu hautatutako argazkia eskuinera"
msgstr[1] "Biratu hautatutako argazkiak eskuinera"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Bilatu _hautatutako etiketa"
msgstr[1] "Bilatu _hautatutako etiketak"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Bilatu hautatutako etiketa _honekin"
msgstr[1] "Bilatu hautatutako etiketak _honekin"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Sortu bertsio berria?"
msgstr[1] "Sortu bertsio berriak?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2831,7 +2634,7 @@ msgstr[1] ""
"{1} abiarazi aurretik, F-Spot aplikazioak hautatutako argazkien bertsio "
"berria sortu behar al du (jatorrizkoa babesteko)?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "XCF bertsioa"
@@ -2855,87 +2658,93 @@ msgstr "Gaia eta gakoak"
msgid "Compression"
msgstr "Konpresioa"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Planar konfigurazioa"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientazioa"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Argi-neurketaren interpretazioa"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Bereizmenaren unitatea"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Esposizio programa"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Neurtze modua"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Esposizio modua"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Errendatze pertsonalizatua"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Osagaien konfigurazioa"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Argiaren iturburua"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Sentikortasun-metodoa"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Kolore-espazioa"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Zuri-balantzea"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Fokuaren planoko bereizmen-unitatea"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Fitxategi-iturburu mota"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Eszenaren kaptura mota"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Irabazi-kontrola"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrastea"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Saturazioa"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Zorroztasuna"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Eszena mota"
@@ -3005,26 +2814,26 @@ msgstr "Ezin izan da bertsioa izenez aldatu"
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "\"{0}\" salbuespena jaso da. Ezin izan da {1} bertsioa izenez aldatu"
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:554
-#: ../src/Widgets/InfoBox.cs:556
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(aldaketarik gabe)"
-#: ../src/PhotoView.cs:169 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Errorea argazkia editatzean"
-#: ../src/PhotoView.cs:170 ../src/Sharpener.cs:73
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "\"{0}\" salbuespena jaso da. Ezin izan da {1} argazkia gorde"
-#: ../src/PhotoView.cs:359
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Iruzkina:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Argazkiak"
@@ -3143,8 +2952,8 @@ msgstr "Errorea gertatu da \"{0}\" prozesatzean: {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "nire argazkiak"
+msgid "My Photos"
+msgstr "Nire argazkiak"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3166,23 +2975,23 @@ msgstr "Erradioa:"
msgid "Threshold:"
msgstr "Atalasea:"
-#: ../src/SingleView.cs:88
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Biratu argazkia ezkerrera"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Biratu argazkia eskuinera"
-#: ../src/SingleView.cs:130
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Karpeta"
-#: ../src/SingleView.cs:356
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Ireki"
-#: ../src/SingleView.cs:456
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Ezarri atzeko plano gisa"
@@ -3211,8 +3020,8 @@ msgid "Create New Tag..."
msgstr "Sortu etiketa berria..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Editatu hautatutako etiketa..."
+msgid "Edit Tag..."
+msgstr "Editatu etiketa..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3295,7 +3104,7 @@ msgid "Events"
msgstr "Gertaerak"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(bat ere ez)"
@@ -3328,21 +3137,21 @@ msgstr "Koadro txikiak eguneratzen"
msgid "Updating picture \"{0}\""
msgstr "\"{0}\" argazkia eguneratzen"
-#: ../src/UI.Dialog/AboutDialog.cs:71
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "GNOMEren argazki-kudeatzailea"
-#: ../src/UI.Dialog/AboutDialog.cs:72
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Copyright-a © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:95
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"Mikel Olasagasti <hey_neken at mundurat.net>\n"
"Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>"
-#: ../src/UI.Dialog/AboutDialog.cs:100
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "'F-Spot'-en web gunea"
@@ -3440,16 +3249,16 @@ msgstr "Errorearen xehetasunak"
msgid "An unhandled exception was thrown: "
msgstr "Kudeatu gabeko salbuespena gertatu da: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Bat ere ez"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Sistemaren profila"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Gai estandarra"
@@ -3474,7 +3283,7 @@ msgstr "Etiketa"
msgid "Ratio"
msgstr "Erlazioa"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Saiatu berriro"
@@ -3667,8 +3476,8 @@ msgid "By _Rating"
msgstr "_Puntuazioaren arabera"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Kopiatu _kokapena"
+msgid "Copy"
+msgstr "Kopiatu"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3678,10 +3487,6 @@ msgstr "Sortu _etiketa berria..."
msgid "Create _New Version..."
msgstr "Sortu _bertsio berria..."
-#: ../src/ui/main_window.ui.h:10
-msgid "F-Spot"
-msgstr "F-Spot"
-
#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "Bila_tu"
@@ -3698,6 +3503,10 @@ msgstr "_Prestatu orrialdea..."
msgid "Re_fresh Thumbnail"
msgstr "_Freskatu koadro txikiak"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Hautatu _dena"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Hautatu _bat ere ez"
@@ -3759,8 +3568,8 @@ msgid "_Delete Version"
msgstr "_Ezabatu bertsioa"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Editatu hautatutako etiketa..."
+msgid "_Edit Tag..."
+msgstr "_Editatu etiketa..."
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
@@ -3858,11 +3667,11 @@ msgstr "_Etiketarik gabeko argazkiak"
msgid "_Version"
msgstr "_Bertsioa"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "F-Spot datu-basea eguneratzen"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -3955,11 +3764,11 @@ msgstr "Inprimatu argazkiaren etiketak"
msgid "Print photo comment"
msgstr "Inprimatu argazkiaren iruzkinak"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Editatu"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -3967,13 +3776,13 @@ msgstr ""
"Tresna honek hautapena aktibo egotea eskatzen du. Hautatu argazkiko area bat "
"eta saiatu eragiketarekin berriro"
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Errorea doitutako argazkia gordetzean"
msgstr[1] "Errorea doitutako argazkiak gordetzean"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
@@ -3994,7 +3803,7 @@ msgstr "_Bertikala"
msgid "Find:"
msgstr "Bilatu:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Karpetak"
@@ -4006,53 +3815,58 @@ msgstr "Fitxategi-sistema"
msgid "Histogram"
msgstr "Histograma"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Bertsioa"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Data"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Esposizioa"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Foku-luzera"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Fitxategi-tamaina"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Puntuazioa"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Ezezaguna)"
-
-#: ../src/Widgets/InfoBox.cs:419
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(okerreko formatua)"
-#: ../src/Widgets/InfoBox.cs:552
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Ezezaguna)"
+
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
msgstr[0] "(edizio bat)"
msgstr[1] "({0} edizio)"
-#: ../src/Widgets/InfoBox.cs:566
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(errorea fitxategia irakurtzean)"
-#: ../src/Widgets/InfoBox.cs:611
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} argazki"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:631
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4061,7 +3875,7 @@ msgstr ""
"{0}:\n"
"{1} eta {2} bitartean"
-#: ../src/Widgets/InfoBox.cs:636
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4070,61 +3884,61 @@ msgstr ""
"{0} eta\n"
"{1} bitartean"
-#: ../src/Widgets/InfoBox.cs:663
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(gutxienez fitxategi bat ez da aurkitu)"
-#: ../src/Widgets/InfoBox.cs:780
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Erakutsi argazkiaren izena"
-#: ../src/Widgets/InfoBox.cs:789
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Erakutsi data"
-#: ../src/Widgets/InfoBox.cs:798
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Erakutsi tamaina"
-#: ../src/Widgets/InfoBox.cs:807
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Erakutsi esposizioa"
-#: ../src/Widgets/InfoBox.cs:816
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Erakutsi foku-luzera"
-#: ../src/Widgets/InfoBox.cs:825
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Erakutsi kamera"
-#: ../src/Widgets/InfoBox.cs:834
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Erakutsi fitxategi-tamaina"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Meta-datuak"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Metadatu hedatuak"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Ez dago hedatutako metadaturik eskuragarri"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Ez dago argazki aktiborik"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "\"{0}\" argazkia ez da existitzen"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Ez dago metadaturik eskuragarri"
diff --git a/po/fi.po b/po/fi.po
index 1109e39..3c1ea6e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,24 +2,22 @@
# Copyright (C) 2005-2008 Ilkka Tuohela, Timo Jyrinki.
# This file is distributed under the same license as the f-spot package.
# Ilkka Tuohela <hile at iki.fi>, 2005-2007.
-# Timo Jyrinki <timo.jyrinki at iki.fi> 2008-2009.
+# Timo Jyrinki <timo.jyrinki at iki.fi> 2008-2010.
# Tommi Vainikainen <thv at iki.fi>, 2009.
-# Jiri Grönroos <jiri.gronroos at iki.fi>, 2009.
+# Jiri Grönroos <jiri.gronroos at iki.fi>, 2009-2010.
#
msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-08 12:43+0300\n"
-"PO-Revision-Date: 2009-10-08 12:43+0300\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos at iki.fi>, 2009.\n"
+"POT-Creation-Date: 2010-04-01 10:05+0300\n"
+"PO-Revision-Date: 2010-04-01 10:05+0300\n"
+"Last-Translator: Timo Jyrinki <timo.jyrinki at iki.fi>\n"
"Language-Team: Finnish <gnome-fi-laatu at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-08 06:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
msgid "_CD..."
@@ -41,14 +39,14 @@ msgstr "Siirretään kuvaa \"{0}\" CD:lle"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
msgstr "{0}/{1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
@@ -98,7 +96,7 @@ msgid "Create CD"
msgstr "Luo CD"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Koko"
@@ -116,6 +114,7 @@ msgstr "S_elaa aiemmin ajastettuja tiedostoja"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Vie"
@@ -145,19 +144,20 @@ msgstr ""
"\n"
"Kun Facebook ohjaa sinut takaisin tähän sovellukseen, napsauta ”OK” alla."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
msgstr "Liian monta vietävää kuvaa"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"Facebook sallii vain 60 valokuvaa kussakin albumissa. Tarkenna valintaasi ja "
-"yritä uudestaan."
+"Facebook sallii korkeintaan {0} kuvaa per albumi. Määritä valintasi "
+"uudelleen ja koeta uudelleen."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -165,19 +165,19 @@ msgstr ""
msgid "Uploading Pictures"
msgstr "Viedään kuvia"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "Albumilla täytyy olla nimi"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
-msgstr "Anna albumin nimi tai valitse olemassaoleva albumi."
+msgstr "Anna albumin nimi tai valitse olemassa oleva albumi."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "Uuden albumin luonti epäonnistui"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -188,30 +188,29 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
msgstr "Viedään kuvaa \"{0}\" ({1}/{2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
-msgstr "Virhe vietäessä facebookiin: {0}"
+msgstr "Virhe vietäessä Facebookiin: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Virhe"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
@@ -219,6 +218,10 @@ msgstr "Virhe"
msgid "Upload Complete"
msgstr "Kuvien vienti valmis"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Vieraile F-Spot-ryhmän Facebook-sivulla"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "Odotetaan tunnistautumista"
@@ -300,7 +303,7 @@ msgstr "Et ole kirjautunut sisään."
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
msgid "Auto-confirm Photos"
-msgstr ""
+msgstr "Vahvista kuvien lisääminen automaattisesti"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
msgid "Caption"
@@ -336,26 +339,25 @@ msgid "Logout"
msgstr "Kirjaudu ulos"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Nimi"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
msgid "Not logged in"
-msgstr ""
+msgstr "Et ole kirjautunut sisään"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
msgid "Permissions:"
-msgstr ""
+msgstr "Oikeudet:"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
msgid "Stay Connected"
-msgstr ""
+msgstr "Pidä yhteys auki"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
msgid "Use an existing album"
-msgstr "Käytä olemassaolevaa albumia"
+msgstr "Käytä olemassa olevaa albumia"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
msgid "Who is this?"
@@ -459,6 +461,7 @@ msgstr "<b>Tili</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Valokuvat</b>"
@@ -480,7 +483,8 @@ msgstr "<b>Kuvien katseluoikeudet</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Vie"
@@ -499,7 +503,7 @@ msgstr ""
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
msgid "Ignore _top level tags"
-msgstr "Jätä huomiotta ylimmän _tason luokitukset"
+msgstr "Jätä huomiotta ylimmän _tason tunnisteet"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
msgid "Private"
@@ -572,61 +576,61 @@ msgstr "Virhe: Virhe siirrettäessä, keskeytetään"
#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
msgid "Error: File Already Exists; Aborting"
-msgstr "Virh: Tiedosto on jo olemassa, keskeytetään"
+msgstr "Virhe: Tiedosto on jo olemassa, keskeytetään"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Vaalea"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Tumma"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Edellinen"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Indeksi"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
-msgstr "Luokitukset"
+msgstr "Tunnisteet"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Seuraava"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Valokuvakokoelman loi"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Näytä tyylit"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Piilota tyylit"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Tunnisteet: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Sivu:"
@@ -826,7 +830,7 @@ msgstr "_Kuvaus:"
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
#: ../src/f-spot.glade.h:97
msgid "_Export to Album:"
-msgstr "Vi_e albumiiin:"
+msgstr "Vi_e albumiin:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
msgid "_Gallery Name:"
@@ -839,11 +843,12 @@ msgstr "_Galleria:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
msgid "_Parent Album:"
-msgstr "_Ylemmän tason album:"
+msgstr "_Ylemmän tason albumi:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Salasana:"
@@ -854,6 +859,7 @@ msgstr "_Otsikko"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Käyttäjätunnus:"
@@ -897,7 +903,7 @@ msgstr "Seuraava virhe tapahtui yritettäessä luoda albumia: {0}"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
#, csharp-format
msgid "{0} Sent"
-msgstr "{0} kähetetty"
+msgstr "{0} lähetetty"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
#, csharp-format
@@ -1002,12 +1008,73 @@ msgstr "Vienti valmistui"
msgid "Error uploading to Tabblo: "
msgstr "Virhe vietäessä Tabbloon: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot-tunnisteet</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo-tili</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>F-Spot-tunnisteet voivat olla avuksi kuvien tuontivaiheessa. "
+"Esimerkki: Käytä yhtä tunnistetta kuville, jotka olet aikeissa tuoda "
+"koneelle, ja toista tunnistetta kuville, jotka olet jo tuonut koneelle. "
+"Tässä kohdassa voit määrittää F-Spotin automaattisesti muuttamaan "
+"tunnisteita, kun kuvat on tuotu.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Poista viedyistä kuvista"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Valitse..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Liitä vietyihin kuviin"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Tapahtui luottamusvirhe yritettäessä yhteyttä"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Keskeytä tämä istunto"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Luota tämän sivuston varmenteeseen aina"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Haluatko:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Luottamusvirhe"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Luota sivuston varmenteeseen tämän kerran"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Pakattu _tiedosto..."
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Valintaa ei ole saatavilla"
@@ -1033,7 +1100,6 @@ msgid "Preparing photo \"{0}\""
msgstr "Valmistellaan kuvaa \"{0}\""
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "_Luo"
@@ -1068,7 +1134,7 @@ msgstr "{0} kuvaasi täytyy analysoida, odottavia tehtäviä on {1} kappaletta"
#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
msgid "_Close"
-msgstr ""
+msgstr "_Sulje"
#: ../extensions/Tools/HashJob/HashJob.cs:102
msgid "Processing images..."
@@ -1079,8 +1145,8 @@ msgid "Stopped"
msgstr "Pysäytetty"
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Etsi tuplakuvat"
+msgid "Check for Duplicates..."
+msgstr "Tarkistaa, onko kaksoiskappaleita..."
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
#, fuzzy
@@ -1159,7 +1225,7 @@ msgstr ""
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
#, fuzzy
msgid "Options:"
-msgstr "_Otsikko:"
+msgstr "Otsikko"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
#, fuzzy
@@ -1280,7 +1346,7 @@ msgid "New Rolls Only"
msgstr "Vain uudet filmirullat"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:55
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Ohita"
@@ -1304,11 +1370,11 @@ msgstr "Kaikki kuvat"
#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
msgid "Delay:"
-msgstr ""
+msgstr "Viive:"
#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
msgid "Display:"
-msgstr ""
+msgstr "Näytä:"
#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
msgid "Images tagged with:"
@@ -1364,282 +1430,6 @@ msgstr "Tuntematon muunnoksen tyyppi %d"
msgid "Operation failed"
msgstr "Toiminto epäonnistui"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paketti"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Lisäosien asennus"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Valitse asennettavat lisäosat ja napsauta Seuraava</b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Asenna lähteestä:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Pakettivarastot..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Näytä kaikki paketit"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Näytä vain uudet versiot"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Näytä vain päivitykset"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Peru _valinnat"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Valitse k_aikki"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Yleinen kehitys:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Noudetaan lisäosia..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Lisäosien hallinta"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Tämän toiminnan suorittaminen vaatii lisäosia."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Seuraavat lisäosat asennetaan:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Lisäosien hallinta</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Seuraavat lisäosat ovat tällä hetkellä asennettuina:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Asenna lisäosia..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Peru asennus..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Ota käyttöön"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Poista käytöstä"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Yksityiskohdat"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Lisäosien pakettivarastojen hallinta"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Lisää uusi pakettivarasto"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Valitse rekisteröitävän pakettivaraston sijainti:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Rekisteröi pakettivarasto verkosta"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Rekisteröi paikallinen pakettivarasto"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Polku:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Selaa..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Versio:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Tekijä:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Tekijänoikeudet:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Lisäosan riippuvuudet:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Kaikki rekisteröidyt pakettivarastot"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Oletko varma että haluat keskeyttää asennuksen?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Seuraavat paketit poistetaan:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"Löytyi muita lisäosia, jotka riippuvat aikaisemmista ja jotka täytyy myös "
-"poistaa:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr ""
-"Valittuja liitännäisiä ei voi asentaa, koska riipppuvuuksissa on "
-"ristiriitaisuuksia."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Seuraavat paketit asennetaan:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (käyttäjän hakemistossa)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Seuraavat paketit täytyy poistaa:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Seuraavia riippuvuuksia ei voitu selvittää:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Asennus valmistui onnistuneesti."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Asennus epäonnistui!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Asennus valmistui onnistuneesti, mutta varoituksin."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Pakettien poisto valmistui onnistuneesti."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Poistaminen epäonnistui!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Pakettien poisto valmistui onnistuneesti, mutta varoituksin."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Pakettivarasto"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Asennus peruttiin"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Joitain vaadituista lisäosista ei löytynyt"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Asennus epäonnistui"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Lisäosa"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Versio"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Muu"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Tapahtui poikkeus: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Käytöstä poistettuja lisäosia ei voi ladata."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Ladataan {0}-lisäosa"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Vaadittu lisäosa \"{0}\" on poistettu käytöstä."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Vaadittua lisäosaa \"{0}\" ei ole asennettu."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(tarjoaa {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Esikatselu"
@@ -1648,7 +1438,7 @@ msgstr "Esikatselu"
msgid "Path"
msgstr "Polku"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Tiedosto"
@@ -1663,7 +1453,7 @@ msgstr "Haetaan esikatseluita"
#: ../src/CameraFileSelectionDialog.cs:148
#, csharp-format
msgid "Downloading Preview of {0}"
-msgstr "Haetaan esikatelu kuvasta {0}"
+msgstr "Haetaan esikatselu kuvasta {0}"
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
@@ -1687,7 +1477,7 @@ msgstr "Tiedostot kopioitu"
msgid "Transferring \"{0}\" from camera"
msgstr "Siirretään \"{0}\" kamerasta"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Kamera"
@@ -1695,27 +1485,27 @@ msgstr "Kamera"
msgid "Port"
msgstr "Portti"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Hakua {0} vastaavia valokuvia ei löydy"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
"the tag to some photos or selecting a different tag in the\n"
"F-Spot preference dialog."
msgstr ""
-"Tunniste \"{0}\" ei liityä mihinkään valokuvaan. Lisää tunniste\n"
+"Tunniste \"{0}\" ei liity mihinkään valokuvaan. Lisää tunniste\n"
"joihinkin valokuviin tai valitse toinen tunniste F-Spotin\n"
"asetusvalikosta."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Haku ei palauttanut tuloksia"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1753,7 +1543,7 @@ msgstr "Muokattu {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Alkuperäinen"
@@ -1829,19 +1619,19 @@ msgstr "Valitse korjattavat silmät."
msgid "Sepia Tone"
msgstr "Sepia-väritys"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Pehmytpiirto"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Suorista"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Virhe tuotaessa"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Virhe tuotaessa {0}{2}{2}{1}"
@@ -1856,8 +1646,9 @@ msgid "Unhandled exception"
msgstr "Käsittelemätön poikkeus"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Kopioi valokuvan s_ijainti"
+#, fuzzy
+msgid "Copy Photo"
+msgstr "Valokuvani"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1871,13 +1662,13 @@ msgstr "Avaa _sovelluksella"
msgid "Rem_ove Tag"
msgstr "P_oista tunniste"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:451 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Kierrä _vasemmalle"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:452 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Kierrä _oikealle"
@@ -2004,182 +1795,186 @@ msgid "C_ontrast:"
msgstr "K_ontrasti:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Luo"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Kameran valinta"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Kopioi tiedostot valokuvakansioon"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Luo sähköposti"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Luo _kuvake tälle tunnisteelle ensimmäistä kertaa käytettäessä"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr ""
"Luo sähköpostiviesti, johon valitut kuvat on liitetty (koko voi olla "
"muutettu)"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Tunnista kaksoiskappaleet"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Näytä tiedosto_nimet"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr "Näytä vain kuvat, jotka tuotiin annetuilta filmirullilta."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Älä lähetä sähköpostia"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "_Sähköposti:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "Vi_e otsikot ja kommentit"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Arvioitu uusi koko"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Hyvin suuri"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "F-Spot-näkymä"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Suodata valittujen filmirullien mukaan"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_alleria:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galleria"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Tuo"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Tuonnin lähde:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Tuo myös alikansiot"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Suuri"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
-msgstr "Halitse omia valintasuhteitasi"
+msgstr "Hallitse omia valintakuvasuhteitasi"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Keskikoko"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Valokuvien lukumäärä valituissa filmirullissa:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Kuvien lukumäärä"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Avaa _kansio..."
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Alkuperäinen koko (mahdollisesti hyvin suuri tiedosto)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Y_lemmän tason tunniste:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pysäytä"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Asetukset"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Edellinen"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Korjaa"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Valitse kamerasta kopioitavat valokuvat..."
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Valitse tunniste..."
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Valitse kamera, josta haluat tuoda kuvia"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Valittu kamera: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Valinnan rajoitukset"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Aseta _taustakuvaksi"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Näytä kaikki valokuvat."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Näytä tai piilota sivupaneeli"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Näytä tai piilota työkalupalkki"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "Sivu_paneeli"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Pieni"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2187,40 +1982,40 @@ msgstr ""
"Käännetäänkö alkuperäisen koon kuva vai ei. Pienemmät koot käännetään "
"automaattisesti."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Poista _metadata valokuvasta"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "_Lämpö:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Hyvin pieni"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Alkuperäinen koko kaikkiaan"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "Lä_hennä"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "L_oitonna"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Lähennä"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Loitonna"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Kirkkaus:"
@@ -2347,7 +2142,7 @@ msgstr "Piilota työkalupalkki"
msgid "Info"
msgstr "Tietoja"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Tietoja kuvasta"
@@ -2355,8 +2150,8 @@ msgstr "Tietoja kuvasta"
msgid "Exit fullscreen"
msgstr "Poistu kokoruututilasta"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:101
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Diaesitys"
@@ -2390,7 +2185,7 @@ msgstr "Pienoiskuvien hakemisto"
#: ../src/Imaging/Exif.cs:232
msgid "Exif Directory"
-msgstr "Exit-hakemisto"
+msgstr "Exif-hakemisto"
#: ../src/Imaging/Exif.cs:234
msgid "GPS Directory"
@@ -2404,7 +2199,7 @@ msgstr "Yhteensopivuushakemisto"
msgid "Unknown Directory"
msgstr "Tuntematon hakemisto"
-#: ../src/Imaging/ImageFile.cs:116
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Tähän kuvamuotoon kirjoittaminen ei ole tuettu"
@@ -2450,7 +2245,7 @@ msgstr ""
#: ../src/Imaging/IptcFile.cs:163
msgid "The character set designation"
-msgstr "Käytety merkistö"
+msgstr "Käytetty merkistö"
#: ../src/Imaging/IptcFile.cs:165
msgid "External globally unique object identifier"
@@ -2545,7 +2340,7 @@ msgstr "Kohteen tyylilaji"
msgid "Unknown IIM DataSet"
msgstr "Tuntematon IIM-tietojoukko"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:357
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Valitse kansio"
@@ -2573,13 +2368,13 @@ msgid ""
"different directory"
msgstr "Valitsemasi kansio \"{0}\" ei ole olemassa. Valitse toinen kansio"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
+#, fuzzy
+msgid "Imported Tags"
msgstr "Tuo tunnisteet"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:84
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Kierrä vasemmalle"
@@ -2587,7 +2382,7 @@ msgstr "Kierrä vasemmalle"
msgid "Rotate picture left"
msgstr "Kierrä kuvaa vasemmalle"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:89
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Kierrä oikealle"
@@ -2603,51 +2398,51 @@ msgstr "Seuraava kuva"
msgid "Previous picture"
msgstr "Edellinen kuva"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Tuo uudet kuvat"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Selaa"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Selaa useita kuvia samaan aikaan"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Muokkaa kuvaa"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Näytä ja muokkaa kuvaa"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:96
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Kokoruutu"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Näytä kuvia kokoruututilassa"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:103
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Näytä kuvia diaesityksenä"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Edellinen valokuva"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Seuraava valokuva"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Kameroita ei löytynyt."
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2655,102 +2450,102 @@ msgstr ""
"F-Spot ei löytänyt järjestelmään liitettyjä kameroita. Tarkista uudestaan, "
"että kamera on liitetty ja on päällä"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Virhe yhdistettäessä kameraan"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Saatiin virhe \"{0}\" otettaessa yhteyttä kameraan"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Yhdistä valittu tunniste"
msgstr[1] "Yhdistä {0} valittua tunnistetta?"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
msgstr ""
-"Tämä toiminto yhdistää valitut tunnisteett ja niiden alitunnisteet yhdeksi "
+"Tämä toiminto yhdistää valitut tunnisteet ja niiden alitunnisteet yhdeksi "
"tunnisteeksi."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Yhdistä tunnisteet"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} valokuva / {1}"
msgstr[1] "{0} valokuvaa / {1}"
-#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:493
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} valokuva"
msgstr[1] "{0} valokuvaa"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} valittu)"
msgstr[1] " ({0} valittu)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Ok"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Virhe poistettaessa kuvaa"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Oikeudet eivät riitä tiedoston poistamiseen:{1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Tiedostoa poistettaessa tapahtui virhe tyyppiä {0}:{2}{1}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Poista valittu kuva pysyvästi?"
msgstr[1] "Poista valitut {0} kuvaa pysyvästi?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
msgstr[0] "Tämä poistaa valitun kuvan kaikki versiot kovalevyltäsi."
msgstr[1] "Tämä poistaa valittujen kuvien kaikki versiot kovalevyltäsi."
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Poista kuva"
msgstr[1] "_Poista kuvat"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Poista valittu kuva F-Spotista?"
msgstr[1] "Poista valitut {0} kuvaa F-Spotista?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2760,27 +2555,27 @@ msgstr ""
"tunnisteiden tiedot menetetään. Valokuvat säilyvät tietokoneellasi ja ne "
"voidaan tuoda F-Spotiin uudestaan."
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Poista luettelosta"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Poistetaanko tunniste \"{0}\"?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Poista {0} valittua tunnistetta?"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "valokuva"
msgstr[1] "valokuvat"
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -2788,18 +2583,18 @@ msgid_plural ""
msgstr[0] "Jos poistat tunnisteen, menetetään assosiaatiot: {0} {1}."
msgstr[1] "Jos poistat tunnisteet, menetetään assosiaatiot: {0} {1}."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Poista tunniste"
msgstr[1] "_Poista tunnisteet"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Tunniste ei ole tyhjä"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2808,39 +2603,39 @@ msgstr ""
"Tunnisteita ei voi poistaa, jos ne sisältävät muita tunnisteita. Poista "
"kohteen \"{0}\" sisällä olevat tunnisteet ensin"
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Kierrä valittua kuvaa vasemmalle"
msgstr[1] "Kierrä valittuja kuvia vasemmalle"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Kierrä valittua kuvaa oikealle"
msgstr[1] "Kierrä valittuja kuvia oikealle"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Etsi valittu tunni_ste"
msgstr[1] "Etsi valitut tunni_steet"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Etsi valittu tunniste _käyttäen"
msgstr[1] "Etsi valitut tunnisteet _käyttäen"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Luo uusi versio?"
msgstr[1] "Luo uudet versiot?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2855,7 +2650,7 @@ msgstr[1] ""
"Haluatko F-Spotin luovan ennen {1} käynnistystä kuvista uudet versiot siten, "
"että alkuperäiskuvat säilytetään?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "XCF-versio"
@@ -2879,87 +2674,93 @@ msgstr "Aihe ja avainsanat"
msgid "Compression"
msgstr "Pakkaus"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Tason määrittely"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Suunta"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Fotometrinen tulkinta"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
-msgstr "Tarkkuden yksikkö"
+msgstr "Tarkkuuden yksikkö"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Valotusohjelma"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Mittaustila"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Valotustila"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Oma esitysmäärittely"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Komponenttien määrittely"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Valaistuslähde"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Kartoitusmenetelmä"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Väriavaruus"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Valkotasapaino"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Polttotason kuvatarkkuuden yksikkö"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Tiedoston lähteen tyyppi"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Näkymän tallennustyyppi"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Signaalivahvistuksen ohjaus"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrasti"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Värikylläisyys"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Terävyys"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Paikan tyyppi"
@@ -3029,8 +2830,8 @@ msgstr "Versiota ei voitu nimetä uudelleen"
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Saatiin poikkeus \"{0}\". Versiota \"{1}\" ei voitu nimetä uudelleen"
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:562
-#: ../src/Widgets/InfoBox.cs:564
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Ei muokkauksia)"
@@ -3048,7 +2849,7 @@ msgstr "Saatiin poikkeus \"{0}\". Kuvaa {1} ei voi tallentaa"
msgid "Comment:"
msgstr "Kommentti:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Valokuvat"
@@ -3167,8 +2968,8 @@ msgstr "Virhe käsiteltäessä \"{0}\": {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "valokuvat"
+msgid "My Photos"
+msgstr "Valokuvani"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3190,23 +2991,23 @@ msgstr "Säde:"
msgid "Threshold:"
msgstr "Kynnysarvo:"
-#: ../src/SingleView.cs:86
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Kierrä kuvaa vasemmalle"
-#: ../src/SingleView.cs:91
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Kierrä kuvaa oikealle"
-#: ../src/SingleView.cs:128
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Kansio"
-#: ../src/SingleView.cs:354
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Avaa"
-#: ../src/SingleView.cs:454
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Aseta taustakuvaksi"
@@ -3235,8 +3036,8 @@ msgid "Create New Tag..."
msgstr "Luo uusi tunniste..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Muokkaa valittua tunnistetta..."
+msgid "Edit Tag..."
+msgstr "Muokaa tunnistetta..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3319,7 +3120,7 @@ msgid "Events"
msgstr "Tapahtumat"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:408
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Ei mitään)"
@@ -3370,13 +3171,12 @@ msgstr ""
"\n"
"Launchpad Contributions:\n"
" Antti Ruonakoski https://launchpad.net/~anttimr\n"
+" Christian Hellberg https://launchpad.net/~christian-hellberg\n"
" Elias Julkunen https://launchpad.net/~eliasj\n"
-" Ilkka Tuohela https://launchpad.net/~hile\n"
" Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
-" Timo Jyrinki https://launchpad.net/~timo-jyrinki\n"
-" Timo Jyrinki https://launchpad.net/~timo-jyrinki-iki\n"
-" Tommi Vainikainen https://launchpad.net/~thv\n"
-" Toni Palonen https://launchpad.net/~tonipalonen"
+" Jussi Aalto https://launchpad.net/~jtaalto\n"
+" Tomi Juntunen https://launchpad.net/~tojuntu\n"
+" Tommi Vainikainen https://launchpad.net/~thv"
#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
@@ -3476,16 +3276,16 @@ msgstr "Virheen yksityiskohdat"
msgid "An unhandled exception was thrown: "
msgstr "Tapahtui käsittelemätön poikkeus: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Ei mitään"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Järjestelmän profiili"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Standardi teema"
@@ -3510,7 +3310,7 @@ msgstr "Otsake"
msgid "Ratio"
msgstr "Suhde"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Yritä uudestaan"
@@ -3616,7 +3416,7 @@ msgstr "<b>Esikatselu</b>"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
msgid "Design icon from"
-msgstr ""
+msgstr "Suunnittele kuvake"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
msgid "Edit Tag Icon"
@@ -3651,6 +3451,8 @@ msgid ""
"Inside the image files when possible\n"
"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
+"Kuvatiedostoon kun mahdollista\n"
+"<small>Muut kuvankäsittelyohjelmat voivat lukea luokituksia.</small>"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
msgid "Select A Folder"
@@ -3701,8 +3503,9 @@ msgid "By _Rating"
msgstr "A_rvioinnin mukaan"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Kopioi _sijainti"
+#, fuzzy
+msgid "Copy"
+msgstr "Rajaa"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3728,6 +3531,10 @@ msgstr "Sivun _asetukset..."
msgid "Re_fresh Thumbnail"
msgstr "_Päivitä pienoiskuva"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Valitse k_aikki"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Älä valitse _mitään"
@@ -3789,8 +3596,9 @@ msgid "_Delete Version"
msgstr "_Poista versio"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Muokkaa valittua tunnistetta..."
+#, fuzzy
+msgid "_Edit Tag..."
+msgstr "Muokaa tunnistetta..."
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
@@ -3866,11 +3674,11 @@ msgstr "_Pieni"
#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
-msgstr "Luoki_tusten kuvakkeet"
+msgstr "_Tunnisteiden kuvakkeet"
#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
-msgstr "_Luokitukset"
+msgstr "Tunn_isteet"
#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
@@ -3888,11 +3696,11 @@ msgstr "Luokittelemattomat kuvat"
msgid "_Version"
msgstr "_Versio"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "Päivitetään F-Spotin tietokantaa"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -3985,11 +3793,11 @@ msgstr "Tulosta valokuvan tagit"
msgid "Print photo comment"
msgstr "Tulosta valokuvan kommentti"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Muokkaa"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -3997,13 +3805,13 @@ msgstr ""
"Työkalu vaatii aktiivisen valinnan. Valitse haluttu alue kuvasta ja yritä "
"uudestaan"
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Virhe tallennettaessa säädettyä kuvaa"
msgstr[1] "Virhe tallennettaessa säädettyjä kuvia"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
@@ -4024,7 +3832,7 @@ msgstr "_Pysty"
msgid "Find:"
msgstr "Etsi:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Kansiot"
@@ -4036,54 +3844,58 @@ msgstr "Tiedostojärjestelmä"
msgid "Histogram"
msgstr "Histogrammi"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Versio"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Päiväys"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Valotus"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Polttoväli"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Tiedoston koko"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Arvostelu"
-#: ../src/Widgets/InfoBox.cs:389 ../src/Widgets/InfoBox.cs:397
-#: ../src/Widgets/InfoBox.cs:427
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(väärä muoto)"
-#: ../src/Widgets/InfoBox.cs:417 ../src/Widgets/InfoBox.cs:440
-#: ../src/Widgets/InfoBox.cs:450 ../src/Widgets/InfoBox.cs:459
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
msgid "(Unknown)"
msgstr "(Tuntematon)"
-#: ../src/Widgets/InfoBox.cs:560
-#, csharp-format
+#: ../src/Widgets/InfoBox.cs:561
+#, fuzzy, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
-msgstr[0] "(yksi muokkaus)"
-msgstr[1] "({0} muokkausta)"
+msgstr[0] "(Ei muokkauksia)"
+msgstr[1] "(Ei muokkauksia)"
-#: ../src/Widgets/InfoBox.cs:574
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(Tiedoston lukuvirhe)"
-#: ../src/Widgets/InfoBox.cs:619
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} valokuvaa"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:639
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4092,7 +3904,7 @@ msgstr ""
"{0} kellonaikojen \n"
"{1} ja {2} välillä"
-#: ../src/Widgets/InfoBox.cs:644
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4101,61 +3913,61 @@ msgstr ""
"Välillä {0} \n"
"ja {1}"
-#: ../src/Widgets/InfoBox.cs:671
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(Ainakaan yhtä tiedostoa ei löydy)"
-#: ../src/Widgets/InfoBox.cs:788
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Näytä valokuvan nimi"
-#: ../src/Widgets/InfoBox.cs:797
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Näytä päiväys"
-#: ../src/Widgets/InfoBox.cs:806
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Näytä koko"
-#: ../src/Widgets/InfoBox.cs:815
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Näytä valotus"
-#: ../src/Widgets/InfoBox.cs:824
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Näytä polttoväli"
-#: ../src/Widgets/InfoBox.cs:833
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Näytä kamera"
-#: ../src/Widgets/InfoBox.cs:842
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Näytä tiedoston koko"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metatiedot"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Laajennettu metatieto"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Metatietoja ei ole saatavilla"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Ei valittua valokuvaa"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "Valokuvaa \"{0}\" ei ole olemassa"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Metatietoja ei ole saatavilla"
@@ -4188,312 +4000,252 @@ msgstr "Näytä diaesitys F-Spotista"
msgid "F-Spot photos"
msgstr "F-Spot-valokuvat"
-#~ msgid "<b>F-Spot tags</b>"
-#~ msgstr "<b>F-Spot-tunnisteet</b>"
+#~ msgid "Package"
+#~ msgstr "Paketti"
-#~ msgid "<b>Tabblo account</b>"
-#~ msgstr "<b>Tabblo-tili</b>"
+#~ msgid "Extension Installation"
+#~ msgstr "Lisäosien asennus"
-#~ msgid ""
-#~ "<small><i>F-Spot tags can help you track the export status of photos. "
-#~ "Example: Use one tag for the photos that you plan to export, and another "
-#~ "one for those already exported. Here, you can tell F-Spot to "
-#~ "automatically replace these tags as appropriate.</i></small>"
-#~ msgstr ""
-#~ "<small><i>F-Spot-tunnisteet voivat olla avuksi kuvien tuontivaiheessa. "
-#~ "Esimerkki: Käytä yhtä tunnistetta kuville, jotka olet aikeissa tuoda "
-#~ "koneelle, ja toista tunnistetta kuville, jotka olet jo tuonut koneelle. "
-#~ "Tässä kohdassa voit määrittää F-Spotin automaattisesti muuttamaan "
-#~ "tunnisteita, kun kuvat on tuotu.</i></small>"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Valitse asennettavat lisäosat ja napsauta Seuraava</b>"
-#~ msgid "<b>{0}</b>."
-#~ msgstr "<b>{0}</b>"
+#~ msgid "Install from:"
+#~ msgstr "Asenna lähteestä:"
-#~ msgid "A trust error occured while attempting to access"
-#~ msgstr "Tapahtui luottamusvirhe yritettäessä yhteyttä"
+#~ msgid "_Repositories..."
+#~ msgstr "_Pakettivarastot..."
-#~ msgid "Abort this session"
-#~ msgstr "Keskeytä tämä istunto"
+#~ msgid "Show all packages"
+#~ msgstr "Näytä kaikki paketit"
-#~ msgid "Always trust this site's certificate"
-#~ msgstr "Luota tämän sivuston varmenteeseen aina"
+#~ msgid "Show new versions only"
+#~ msgstr "Näytä vain uudet versiot"
-#~ msgid "Do you wish to:"
-#~ msgstr "Haluatko:"
+#~ msgid "Show updates only"
+#~ msgstr "Näytä vain päivitykset"
-#~ msgid "Trust Error"
-#~ msgstr "Luottamusvirhe"
+#~ msgid "_Unselect All"
+#~ msgstr "Peru _valinnat"
-#~ msgid "Trust the site's certificate this once"
-#~ msgstr "Luota sivuston varmenteeseen tämän kerran"
+#~ msgid "label124"
+#~ msgstr "label124"
-#~ msgid "Choose destination directory"
-#~ msgstr "Valitse kohdekansio"
+#~ msgid "Overall Progress:"
+#~ msgstr "Yleinen kehitys:"
-#~ msgid "Target location:\t"
-#~ msgstr "Kohdesijainti:\t"
+#~ msgid "Downloading extensions..."
+#~ msgstr "Noudetaan lisäosia..."
-#~ msgid "Available space:"
-#~ msgstr "Vapaa tila:"
+#~ msgid "Extension Manager"
+#~ msgstr "Lisäosien hallinta"
-#~ msgid "This is who I am"
-#~ msgstr "Minä olen tässä"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "Tämän toiminnan suorittaminen vaatii lisäosia."
-#~ msgid ""
-#~ "F-Spot will now launch your browser so that you can log into Facebook. "
-#~ "Turn on the \"Save my login information\" checkbox on Facebook and F-Spot "
-#~ "will log into Facebook automatically from now on."
-#~ msgstr ""
-#~ "F-spot käynnistää nyt selaimesi, jotta voit kirjautua facebookiin. Laita "
-#~ "\"Save my login information\" valinta päälle, jolloin F-spot voi "
-#~ "kirjautua facebookiin tästä lähtien automaattisesti."
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Seuraavat lisäosat asennetaan:"
-#~ msgid "Try to use the system display profile"
-#~ msgstr "Yritä käyttää järjestelmän näyttöprofiilia"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Lisäosien hallinta</b></big>"
-#~ msgid "From gtkrc File:"
-#~ msgstr "gtkrc-tiedostosta:"
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Seuraavat lisäosat ovat tällä hetkellä asennettuina:"
-#~ msgid "Print..."
-#~ msgstr "Tulosta..."
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Asenna lisäosia..."
-#~ msgid "Select A gtkrc File"
-#~ msgstr "Valitse gtkrc-tiedosto"
+#~ msgid "_Uninstall..."
+#~ msgstr "_Peru asennus..."
-#~ msgid "Custom Theme"
-#~ msgstr "Oma teema"
-
-#~ msgid ""
-#~ "<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
-#~ msgstr ""
-#~ "<small><i>F-Spot tulee käynnistää uudelleen uuden teeman lataamiseksi.</"
-#~ "i></small>"
-
-#~ msgid "<b>Theming</b>"
-#~ msgstr "<b>Teemoitus</b>"
-
-#~ msgid "Cover"
-#~ msgstr "Peitä"
-
-#~ msgid "P_hoto Source:"
-#~ msgstr "_Valokuvan lähde:"
-
-#~ msgid "<b>Import Settings</b>"
-#~ msgstr "<b>Tuo asetukset</b>"
-
-#~ msgid ""
-#~ "The \"F-Spot Manual\" could not be found. Please verify that your "
-#~ "installation has been completed successfully."
-#~ msgstr ""
-#~ "F-Spotin ohjetta ei löydy. Tarkista että ohjelma on asennettu kokonaan."
+#~ msgid "Enable"
+#~ msgstr "Ota käyttöön"
-#~ msgid "check type"
-#~ msgstr "tarkista tyyppi"
+#~ msgid "Disable"
+#~ msgstr "Poista käytöstä"
-#~ msgid "Arrange by _Folder"
-#~ msgstr "Järjestä k_ansion mukaan"
+#~ msgid "Details"
+#~ msgstr "Yksityiskohdat"
-#~ msgid "Write _metadata to file"
-#~ msgstr "Kirjoita _metatiedot tiedostoon"
+#~ msgid "Extension Repository Management"
+#~ msgstr "Lisäosien pakettivarastojen hallinta"
-#~ msgid "Reveal"
-#~ msgstr "Paljasta"
+#~ msgid "Add New Repository"
+#~ msgstr "Lisää uusi pakettivarasto"
-#~ msgid "<b>Screensaver</b>"
-#~ msgstr "<b>Näytönsäästäjä</b>"
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Valitse rekisteröitävän pakettivaraston sijainti:"
-#~ msgid "the type of chequering to use"
-#~ msgstr "käytettävän ruudutuksen tyyppi"
+#~ msgid "Register an on-line repository"
+#~ msgstr "Rekisteröi pakettivarasto verkosta"
-#~ msgid "No image loaded."
-#~ msgstr "Ei ladattua kuvaa."
+#~ msgid "Url:"
+#~ msgstr "Url:"
-#~ msgid "interpolation type"
-#~ msgstr "interpoloinnin tyyppi"
+#~ msgid "Register a local repository"
+#~ msgstr "Rekisteröi paikallinen pakettivarasto"
-#~ msgid "Flip"
-#~ msgstr "Peilaa"
+#~ msgid "Path:"
+#~ msgstr "Polku:"
-#~ msgid "Dissolve"
-#~ msgstr "Ristikuva"
+#~ msgid "Browse..."
+#~ msgstr "Selaa..."
-#~ msgid "Co_nfigure"
-#~ msgstr "_Määrittele"
+#~ msgid "Version:"
+#~ msgstr "Versio:"
-#~ msgid "<b>Printer Details</b>"
-#~ msgstr "<b>Tulostimen yksityiskohdat</b>"
+#~ msgid "Author:"
+#~ msgstr "Tekijä:"
-#~ msgid "Push"
-#~ msgstr "Työnnä"
+#~ msgid "Copyright:"
+#~ msgstr "Tekijänoikeudet:"
-#~ msgid "Arrange by _Month"
-#~ msgstr "Järjestä _kuukauden mukaan"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Lisäosan riippuvuudet:"
-#~ msgid "SmugMug"
-#~ msgstr "SmugMug"
+#~ msgid "All registered repositories"
+#~ msgstr "Kaikki rekisteröidyt pakettivarastot"
-#~ msgid "the size of chequers to use"
-#~ msgstr "käytettävien ruutujen koko"
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Oletko varma että haluat keskeyttää asennuksen?"
-#~ msgid "Print crop _marks"
-#~ msgstr "Tulosta rajaus_merkit"
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Seuraavat paketit poistetaan:"
#~ msgid ""
-#~ "Selection\n"
-#~ "Gallery\n"
-#~ "Viewport"
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
#~ msgstr ""
-#~ "Valinta\n"
-#~ "Galleria\n"
-#~ "Näkymä"
-
-#~ msgid "<b>Predefined</b>"
-#~ msgstr "<b>Esimääritelty</b>"
+#~ "Löytyi muita lisäosia, jotka riippuvat aikaisemmista ja jotka täytyy myös "
+#~ "poistaa:"
#~ msgid ""
-#~ "Full Page\n"
-#~ "Standard - 4x6"
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
#~ msgstr ""
-#~ "Koko sivu\n"
-#~ "Normaali - 4x6"
+#~ "Valittuja liitännäisiä ei voi asentaa, koska riippuvuuksissa on "
+#~ "ristiriitaisuuksia."
-#~ msgid "_Border:"
-#~ msgstr "_Reuna:"
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Seuraavat paketit asennetaan:"
-#~ msgid "<b>Color Management</b>"
-#~ msgstr "<b>Värien hallinta</b>"
+#~ msgid " (in user directory)"
+#~ msgstr " (käyttäjän hakemistossa)"
-#~ msgid "the type of interpolation to use"
-#~ msgstr "interpoloinnin tyyppi"
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Seuraavat paketit täytyy poistaa:"
-#~ msgid "Page 1 of 3"
-#~ msgstr "Sivu 1/3"
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Seuraavia riippuvuuksia ei voitu selvittää:"
-#~ msgid "Tag Name:"
-#~ msgstr "Luokituksen nimi:"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Asennus valmistui onnistuneesti."
-#~ msgid ""
-#~ "<small><i>Enable this option to store tags and descriptions inside \n"
-#~ "supported image formats.</i></small>"
-#~ msgstr ""
-#~ "<small><i>Valitse tämä vaihtoehto, jos haluat tallentaa luokituksia ja\n"
-#~ "kuvauksia tuetun muotoisiin kuviin.</i></small>"
+#~ msgid "The installation failed!"
+#~ msgstr "Asennus epäonnistui!"
-#~ msgid "<b>Photograph Layout</b>"
-#~ msgstr "<b>Valokuvan asettelu</b>"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Asennus valmistui onnistuneesti, mutta varoituksin."
-#~ msgid ""
-#~ "<small><i>While acting as a screensaver, F-Spot can display all of your "
-#~ "images, or a small subset based on tags.</i></small>"
-#~ msgstr ""
-#~ "<small><i>Toimiessaaan näytönsäästäjänä F-Spot voi näyttää kaikkia "
-#~ "kuviasi tai vain osaa, perustuen luokituksiin.</i></small>"
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Pakettien poisto valmistui onnistuneesti."
-#~ msgid "More directories"
-#~ msgstr "Lisää hakemistoja"
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Poistaminen epäonnistui!"
-#~ msgid "Can't save non local files."
-#~ msgstr "Verkosta ladattuja kuvia ei voida tallentaa."
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Pakettien poisto valmistui onnistuneesti, mutta varoituksin."
-#~ msgid "Split"
-#~ msgstr "Jaa"
+#~ msgid "Repository"
+#~ msgstr "Pakettivarasto"
-#~ msgid "<b>Metadata</b>"
-#~ msgstr "<b>Metatiedot</b>"
+#~ msgid "Installation cancelled"
+#~ msgstr "Asennus peruttiin"
-#~ msgid "Wipe"
-#~ msgstr "Pyyhi"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Joitain vaadituista lisäosista ei löytynyt"
-#~ msgid "img_000.jpg"
-#~ msgstr "kuva_000.jpg"
+#~ msgid "Installation failed"
+#~ msgstr "Asennus epäonnistui"
-#~ msgid "dither"
-#~ msgstr "sekoiteväritys"
+#~ msgid "Extension"
+#~ msgstr "Lisäosa"
-#~ msgid ""
-#~ "Hairline\n"
-#~ "0.25\"\n"
-#~ "0.5\"\n"
-#~ "1\"\n"
-#~ msgstr ""
-#~ "Hiuksenohut\n"
-#~ "0.25\"\n"
-#~ "0.5\"\n"
-#~ "1\"\n"
+#~ msgid "Other"
+#~ msgstr "Muu"
-#~ msgid "_Display:"
-#~ msgstr "_Näytä:"
+#~ msgid "Url"
+#~ msgstr "Url"
-#~ msgid "Picasaweb"
-#~ msgstr "Picasaweb"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Tapahtui poikkeus: {0}"
-#~ msgid "N_umber of Copies:"
-#~ msgstr "Kopioiden _lukumäärä:"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Käytöstä poistettuja lisäosia ei voi ladata."
-#~ msgid "Unsupported image type for saving."
-#~ msgstr "Tuntematon tiedostotyyppi tallennettaessa."
+#~ msgid "Loading {0} extension"
+#~ msgstr "Ladataan {0}-lisäosa"
-#~ msgid ""
-#~ "None\n"
-#~ "Title\n"
-#~ "Filename\n"
-#~ "Date\n"
-#~ "Photo Details"
-#~ msgstr ""
-#~ "Ei mitään\n"
-#~ "Otsikko\n"
-#~ "Tiedostonimi\n"
-#~ "Päiväys\n"
-#~ "Valokuvan yksityiskohdat"
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Vaadittu lisäosa \"{0}\" on poistettu käytöstä."
-#~ msgid "1 of 1"
-#~ msgstr "1 - 1"
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Vaadittua lisäosaa \"{0}\" ei ole asennettu."
-#~ msgid "Will print using: US Letter size on Generic Postscript"
-#~ msgstr "Tulostetaan käyttäen: US-letter tai yleinen Postscript"
+#~ msgid "(provided by {0})"
+#~ msgstr "(tarjoaa {0})"
-#~ msgid "dither type"
-#~ msgstr "sekoitevärityksen tyyppi"
+#~ msgid "Copy Photo Locat_ion"
+#~ msgstr "Kopioi valokuvan s_ijainti"
-#~ msgid "Photo _Size:"
-#~ msgstr "Valokuvan _koko:"
-
-#~ msgid "_Folder"
-#~ msgstr "_Kansio"
+#~ msgid "Choose destination directory"
+#~ msgstr "Valitse kohdekansio"
-#~ msgid "Make F-Spot your screensaver"
-#~ msgstr "Käytä F-Spotin näytönsäästäjänä"
+#~ msgid "Target location:\t"
+#~ msgstr "Kohdesijainti:\t"
-#~ msgid "Gallery2"
-#~ msgstr "Galleria2"
+#~ msgid "Save changes to image: {0} before closing?"
+#~ msgid_plural ""
+#~ "Save changes to images:\n"
+#~ "{0}\n"
+#~ "before closing?"
+#~ msgstr[0] "Tallennetaanko muutokset kuvaan: {0} ennen sulkemista?"
+#~ msgstr[1] ""
+#~ "Tallennetaanko muutokset kuviin:\n"
+#~ "{0}\n"
+#~ "ennen sulkemista?"
-#~ msgid "_Month"
-#~ msgstr "_Kuukausi"
+#~ msgid ""
+#~ "If you don't save, the changes you have made to this image will be "
+#~ "permanently lost"
+#~ msgid_plural ""
+#~ "If you don't save, the changes you have made to these images will be "
+#~ "permanently lost"
+#~ msgstr[0] "Jos et tallenna, kuvaan tehdyt muutokset jätetään huomioimatta"
+#~ msgstr[1] ""
+#~ "Jos et tallenna, näihin kuviin tehdyt muutokset jätetään huomioimatta"
-#~ msgid "Crop photo to _fit"
-#~ msgstr "Rajaa kuva _mahtumaan"
+#~ msgid "Discard changes"
+#~ msgstr "Hylkää muutokset"
-#~ msgid ""
-#~ "<small><i>Choose the folder where F-Spot should store newly imported "
-#~ "photos</i></small>"
-#~ msgstr ""
-#~ "<small><i>Valitse kansio, johon F-Spot tallentaa tuodut valokuvat</i></"
-#~ "small>"
+#~ msgid "Continue editing"
+#~ msgstr "Jatka muokkaamista"
-#~ msgid "From List:"
-#~ msgstr "luettelosta:"
+#~ msgid "Save"
+#~ msgid_plural "Save all"
+#~ msgstr[0] "Tallenna"
+#~ msgstr[1] "Tallenna kaikki"
-#~ msgid "_Print output:"
-#~ msgstr "_Tulosteiden ulkoasu:"
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Kopioi _sijainti"
-#~ msgid "Blackout"
-#~ msgstr "Pimennys"
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Muokkaa valittua tunnistetta..."
-#~ msgid "Select the area that you want blacked out."
-#~ msgstr "Valitse alue jonka haluat pimentää"
+#~ msgid "my photos"
+#~ msgstr "valokuvat"
-#~ msgid "Pixelate"
-#~ msgstr "Pikselöi"
+#~ msgid "Hash for Duplicates"
+#~ msgstr "Etsi tuplakuvat"
-#~ msgid "Select the area that you want pixelated."
-#~ msgstr "Valitse alue jonka haluat pikselöidä"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Muokkaa valittua tunnistetta..."
diff --git a/po/fr.po b/po/fr.po
index d9b5c31..7308dc4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,6 +2,7 @@
# Copyright (C) 2004-2009 the GNOME Foundation
# This file is distributed under the same licence as the f-spot package.
#
+#
# Vincent Moreau <vmoreau at orange.fr>, 2004, 2005.
# Vincent Carriere <carriere_vincent at yahoo.fr>, 2005.
# Axel Peju <pejuaxel at gmail.com>, 2006.
@@ -10,16 +11,15 @@
# Stephane Delcroix <stephane at delcroix.org>, 2007.
# Stéphane Raimbault <stephane.raimbault at gmail.com>, 2007-2008.
# Jonathan Ernst <jonathan at ernstfamily.ch>, 2006-2007.
-# Bruno Brouard <annoa.b at gmail.com>, 2008-2009.
-#
+# Bruno Brouard <annoa.b at gmail.com>, 2008-2010.
msgid ""
msgstr ""
"Project-Id-Version: f-spot HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-"
"spot&component=General\n"
-"POT-Creation-Date: 2009-09-28 18:52+0000\n"
-"PO-Revision-Date: 2009-10-05 20:16+0200\n"
-"Last-Translator: Claude Paroz <claude at 2xlibre.net>\n"
+"POT-Creation-Date: 2010-03-05 17:48+0000\n"
+"PO-Revision-Date: 2010-03-04 15:13+0100\n"
+"Last-Translator: Bruno Brouard <annoa.b at gmail.com>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +46,14 @@ msgstr "Transfert de l'image « {0} » sur CD"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} sur {1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
@@ -102,7 +102,7 @@ msgid "Create CD"
msgstr "Créer le CD"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Taille"
@@ -120,6 +120,7 @@ msgstr "_Parcourir les fichiers précédemment planifiés"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Exporter"
@@ -150,19 +151,20 @@ msgstr ""
"Lorsque Facebook vous indique de revenir à cette application, cliquez sur "
"« Valider » ci-dessous."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
msgstr "Trop d'images à exporter"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"Facebook n'autorise que 60 photographies par album. Veuillez affiner votre "
+"Facebook n'autorise que {0} photographies par album. Veuillez affiner votre "
"sélection et essayez à nouveau."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -170,19 +172,19 @@ msgstr ""
msgid "Uploading Pictures"
msgstr "Envoi des images"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "Les albums doivent porter un nom"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
msgstr "Veuillez donner un nom à votre album ou choisissez un album existant."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "La création d'un nouvel album a échoué"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -193,30 +195,29 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
msgstr "Envoi de l'image « {0} » ({1} sur {2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
msgstr "Une erreur est survenue lors de l'envoi vers Facebook : {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Erreur"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
@@ -224,6 +225,10 @@ msgstr "Erreur"
msgid "Upload Complete"
msgstr "Envoi terminé"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Visitez le groupe F-Spot sur Facebook"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "Attente d'authentification"
@@ -240,9 +245,9 @@ msgstr ""
"sur Facebook.\n"
"\n"
"Lorsque Facebook vous indique de revenir à cette application, cliquez sur "
-"« Valider » ci-dessous. F-Spot placera votre session dans un cache "
-"gnome-keyring, si possible, et l'utilisera à nouveau pour de futures "
-"exportations Facebook."
+"« Valider » ci-dessous. F-Spot placera votre session dans un cache gnome-"
+"keyring, si possible, et l'utilisera à nouveau pour de futures exportations "
+"Facebook."
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
msgid "Authenticating..."
@@ -344,8 +349,7 @@ msgid "Logout"
msgstr "Déconnexion"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Nom"
@@ -467,6 +471,7 @@ msgstr "<b>Compte</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Photos</b>"
@@ -488,7 +493,8 @@ msgstr "<b>Afficher les permissions</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exporter"
@@ -520,7 +526,7 @@ msgstr "Public"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
msgid "Strip _metadata"
-msgstr "Enlever les _metadonnées"
+msgstr "Enlever les _métadonnées"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
msgid "Visible to Family"
@@ -585,59 +591,59 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Erreur car le fichier existe déjà ; abandon."
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Lumineux"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Sombre"
# Je ne vois pas l'intérêt de cette abréviation ! SRA
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Préc."
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Index"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Étiquettes"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Suivante"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galerie générée par"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Afficher les styles"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Masquer les styles"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Étiquettes : "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Page :"
@@ -857,6 +863,7 @@ msgstr "Album _parent :"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "Mot de _passe :"
@@ -867,6 +874,7 @@ msgstr "_Titre :"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Identifiant :"
@@ -1018,12 +1026,73 @@ msgstr "Envoi terminé"
msgid "Error uploading to Tabblo: "
msgstr "Une erreur est survenue lors de l'envoi vers Tabblo :"
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Étiquettes F-Spot</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Compte Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>Les étiquettes de F-Spot peuvent vous aider à avoir un suivi du "
+"statut d'exportation des photos. Exemple : utilisez une étiquette pour les "
+"photos que vous avez l'intention d'exporter et une autre pour celles déjà "
+"exportées. Ici, vous pouvez dire à F-Spot de remplacer automatiquement ces "
+"étiquettes de manière correcte.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "Ô_ter aux photos exportées :"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Sélectionner..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Attacher aux photos exportées :"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Un problème de confiance s'est produit lors de l'accès"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Annuler cette session"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Toujours faire confiance au certificat de ce site"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Voulez-vous :"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Problème de confiance"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Faire confiance au certificat de ce site cette fois-ci"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Fichi_er compressé..."
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Aucune sélection disponible"
@@ -1049,7 +1118,6 @@ msgid "Preparing photo \"{0}\""
msgstr "Préparation de la photo « {0} »"
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "_Créer"
@@ -1097,8 +1165,8 @@ msgid "Stopped"
msgstr "Interrompu"
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Élimination des doublons"
+msgid "Check for Duplicates..."
+msgstr "Vérification des doublons..."
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
msgid "F-Spot Gallery"
@@ -1137,16 +1205,19 @@ msgid ""
"<small><i>The gallery stays active until you either deactivate it or close\n"
"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
msgstr ""
-"<small><i>La galerie reste active jusqu'à ce que vous la désactiviez ou que vous\n"
-"fermiez F-Spot. Assurez-vous que les utilisateurs locaux y accèdent sans passer\n"
-"par le mandataire HTTP.</i></small>"
+"<small><i>La galerie reste active jusqu'à ce que vous la désactiviez ou que "
+"vous\n"
+"fermiez F-Spot. Assurez-vous que les utilisateurs locaux y accèdent sans "
+"passer\n"
+"par le mandataire HTTP.</i></small>"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
msgid ""
"<small><i>When the gallery is active, above is the URL you need to open \n"
"on another computer to access the shared photos.</i></small>"
msgstr ""
-"<small><i>Lorsque la galerie est active, vous voyez ci-dessus l'URL nécessaire\n"
+"<small><i>Lorsque la galerie est active, vous voyez ci-dessus l'URL "
+"nécessaire\n"
"pour accéder aux photos partagées depuis un autre ordinateur.</i></small>"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
@@ -1200,7 +1271,7 @@ msgstr "aucun"
#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
#, csharp-format
msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
-msgstr " Galerie : {0}, photos : {1}, dernier client : {3}"
+msgstr " Galerie : {0}, photos : {1}, dernier client : {3}"
#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
msgid "Gallery is inactive"
@@ -1295,7 +1366,7 @@ msgid "New Rolls Only"
msgstr "Nouvelles séries uniquement"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:55
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Ignorer"
@@ -1381,285 +1452,6 @@ msgstr "Type de transformation inconnu %d"
msgid "Operation failed"
msgstr "L'opération a échoué"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paquet"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Installation d'extension"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr ""
-"<b>Sélectionnez les extensions à installer et cliquez sur « Suivant »</b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Installer depuis :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Dépôts..."
-
-# Liste d'actions
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Afficher tous les paquets"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Afficher uniquement les nouvelles versions"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Afficher uniquement les mises à jour"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "To_ut désélectionner"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "_Tout sélectionner"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Progression d'ensemble :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Téléchargement des extensions..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Gestionnaire d'extensions"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr ""
-"Des extensions supplémentaires sont requises pour effectuer cette opération."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Les extensions suivantes seront installées :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Gestionnaire d'extensions</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Les extensions suivantes sont actuellement installées :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Installer des extensions..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Désinstaller..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Activer"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Désactiver"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Détails"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Gestionnaire des dépôts d'extensions"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Ajouter un nouveau dépôt"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Sélectionnez l'emplacement du dépôt que vous voulez enregistrer :"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Enregistrer un dépôt en ligne"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "URL :"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Enregistrer un dépôt local"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Chemin :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Parcourir..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Version :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Auteur :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Copyright :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Dépendances de l'extension :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Tous les dépôts enregistrés"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Voulez-vous vraiment annuler l'installation ?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Les paquets suivants seront désinstallés :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"Des extensions supplémentaires, dépendantes des précédentes, seront aussi "
-"désinstallées :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr ""
-"Les extensions sélectionnées ne peuvent êtres installées en raison de "
-"conflits de dépendance."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Les paquets suivants seront installés :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (dans le répertoire utilisateur)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Les paquets suivants nécessitent d'être désinstallés :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Les dépendances suivantes ne peuvent être résolues :"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "L'installation s'est déroulée avec succès."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "L'installation a échoué."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "L'installation s'est déroulée avec des avertissements."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "La désinstallation s'est déroulée avec succès."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "La désinstallation a échoué."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "La désinstallation s'est déroulée avec des avertissements."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Dépôt"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "L'installation a été annulée"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Certaines extensions requises n'ont pas été trouvées"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "L'installation a échoué"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Extension"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Version"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Autre"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "URL"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Une exception a été levée : {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Les extensions désactivées ne peuvent être chargées."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Chargement de l'extension {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "L'extension requise « {0} » est désactivée."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "L'extension requise « {0} » n'est pas installée."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(fourni par {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Aperçu"
@@ -1668,7 +1460,7 @@ msgstr "Aperçu"
msgid "Path"
msgstr "Chemin"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Fichier"
@@ -1707,7 +1499,7 @@ msgstr "Copie des fichiers terminée"
msgid "Transferring \"{0}\" from camera"
msgstr "Transfert de l'image « {0} » depuis l'appareil photo"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Appareil photo"
@@ -1715,12 +1507,12 @@ msgstr "Appareil photo"
msgid "Port"
msgstr "Port"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Aucune photo correspondant à {0} n'a été trouvée"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1732,11 +1524,11 @@ msgstr ""
"sélectionner une étiquette différente dans la boîte de\n"
"dialogue des préférences de F-Spot."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Aucun résultat"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1775,7 +1567,7 @@ msgstr "Modifiée dans {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Original"
@@ -1851,19 +1643,19 @@ msgstr "Sélectionnez les yeux que vous souhaitez corriger."
msgid "Sepia Tone"
msgstr "Effet sépia"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Flou artistique"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Redressement"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Erreur d'importation"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Erreur lors de l'importation de {0}{2}{2}{1}"
@@ -1878,8 +1670,8 @@ msgid "Unhandled exception"
msgstr "Exception non gérée"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Copier l'emp_lacement de la photo"
+msgid "Copy Photo"
+msgstr "Copier la photo"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1893,13 +1685,13 @@ msgstr "Ouvrir _avec"
msgid "Rem_ove Tag"
msgstr "_Enlever l'étiquette"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:451 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Rotation à _gauche"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:452 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Rotation à _droite"
@@ -2027,186 +1819,190 @@ msgid "C_ontrast:"
msgstr "C_ontraste :"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "C_réer"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Sélection de l'appareil photo"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Copier les fichiers vers le dossier Photos"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Créer un courriel"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Créer une _icône pour cette étiquette au premier usage"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr ""
"Crée un courriel avec les photos sélectionnées (éventuellement "
"redimensionnées) en pièces jointes"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Détecter les doublons"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Afficher les _noms de fichier"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr ""
"Affiche uniquement les photos qui ont été importées dans les séries "
"indiquées."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Ne pas envoyer un courriel"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "_Courriel :"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "E_xporter les titres et les commentaires"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Nouvelle taille (estimation)"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Extra large"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "Affichage F-Spot"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Filtre sur les séries sélectionnées"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_alerie :"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galerie"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Importer"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Source d'importation :"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Inclure les sous-dossiers"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Grand"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Gère votre sélection de ratios personnalisés"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Moyen"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Nombre de photos dans les séries sélectionnées :"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Nombre d'images"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Ouvrir un _dossier..."
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Taille originale (très grande taille de fichier possible)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Étiquette _parente :"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pause"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Préférences"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Précédente"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Réparer"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Sélectionner les photos à copier depuis l'appareil photo..."
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Sélectionner une étiquette..."
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr ""
"Sélectionnez l'appareil photo depuis lequel vous voulez rapatrier les "
"fichiers"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Appareil photo sélectionné : "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Sélection des contraintes"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "_Utiliser comme fond d'écran"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Afficher toutes les photos."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Affiche ou masque le panneau latéral"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Affiche ou masque la barre d'outils"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "_Panneau latéral"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Petit"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2214,40 +2010,40 @@ msgstr ""
"Indique si les images originales seront pivotées ou pas. Les images de "
"petites tailles sont automatiquement pivotées."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Enlever les _métadonnées de l'image"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Te_mp :"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Très petit"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Taille totale des originaux"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "Zoom a_vant"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "Zoom a_rrière"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Zoom avant"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Zoom arrière"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Luminosité :"
@@ -2374,7 +2170,7 @@ msgstr "Masquer la barre d'outils"
msgid "Info"
msgstr "Informations"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Informations sur l'image"
@@ -2382,8 +2178,8 @@ msgstr "Informations sur l'image"
msgid "Exit fullscreen"
msgstr "Quitter le mode plein écran"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:101
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Diaporama"
@@ -2431,7 +2227,7 @@ msgstr "Données d'interopérabilité"
msgid "Unknown Directory"
msgstr "Données inconnues"
-#: ../src/Imaging/ImageFile.cs:116
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "L'écriture dans ce format de fichier n'est pas prise en charge"
@@ -2574,7 +2370,7 @@ msgstr "Catégorie intellectuel de l'objet"
msgid "Unknown IIM DataSet"
msgstr "Jeu de données IIM inconnu"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:357
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Sélectionner un dossier"
@@ -2604,13 +2400,12 @@ msgstr ""
"Le répertoire sélectionné « {0} » n'existe pas. Veuillez choisir un "
"répertoire différent"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Étiquettes d'importation"
+msgid "Imported Tags"
+msgstr "Étiquettes importées"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:84
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Rotation à gauche"
@@ -2618,7 +2413,7 @@ msgstr "Rotation à gauche"
msgid "Rotate picture left"
msgstr "Fait pivoter la photo vers la gauche"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:89
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Rotation à droite"
@@ -2634,51 +2429,51 @@ msgstr "Photo suivante"
msgid "Previous picture"
msgstr "Photo précédente"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importe de nouvelles images"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Parcourir"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Parcourt de nombreuses photos simultanément"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Modifier l'image"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Affiche et modifie une photo"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:96
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Plein écran"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Affiche les photos en plein écran"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:103
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Affiche les photos dans un diaporama"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Photo précédente"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Photo suivante"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Aucun appareil photo détecté."
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2686,24 +2481,24 @@ msgstr ""
"F-Spot n'a pas pu trouver d'appareil photo connecté à ce système. Veuillez "
"vérifier que l'appareil photo est connecté et sous tension"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Erreur lors de la connexion de l'appareil photo"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Erreur « {0} » reçue lors de la connexion de l'appareil photo"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Fusionner l'étiquette sélectionnée"
msgstr[1] "Fusionner les {0} étiquettes sélectionnées ?"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2711,59 +2506,59 @@ msgstr ""
"Cette opération fusionnera les étiquettes sélectionnées et toutes leurs sous-"
"étiquettes en une seule étiquette."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Fusionner les étiquettes"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} photo sur {1}"
msgstr[1] "{0} photos sur {1}"
-#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:493
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} photo"
msgstr[1] "{0} photos"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} sélectionnée)"
msgstr[1] " ({0} sélectionnées)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Valider"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Erreur lors de la suppression de la photo"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Vous n'avez pas les droits pour supprimer le fichier : {1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr ""
"Une erreur du type {0} s'est produite lors de la suppression du fichier : {2}"
"{1}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Supprimer définitivement la photo sélectionnée ?"
msgstr[1] "Supprimer définitivement les {0} photos sélectionnées ?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
@@ -2774,20 +2569,20 @@ msgstr[1] ""
"Cela supprimera de votre disque dur toutes les versions des photos "
"sélectionnées."
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Supprimer la photo"
msgstr[1] "_Supprimer les photos"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Enlever la photo sélectionnée de F-Spot ?"
msgstr[1] "Enlever les {0} photos sélectionnées de F-Spot ?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2797,27 +2592,27 @@ msgstr ""
"avec des étiquettes seront perdues. Les photos resteront sur votre "
"ordinateur et pourront être importées à nouveau dans F-Spot."
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Enlever du catalogue"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Supprimer l'étiquette « {0} » ?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Supprimer les {0} étiquettes sélectionnées ?"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "photo"
msgstr[1] "photos"
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -2827,18 +2622,18 @@ msgstr[0] ""
msgstr[1] ""
"Si vous supprimez ces étiquettes, l'association avec {0} {1} sera perdue."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "Su_pprimer l'étiquette"
msgstr[1] "Su_pprimer les étiquettes"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "L'étiquette n'est pas vide"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2847,39 +2642,39 @@ msgstr ""
"Impossible de supprimer les étiquettes qui contiennent d'autres étiquettes. "
"Veuillez d'abord supprimer les étiquettes « {0} »"
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Faire pivoter la photo sélectionnée vers la gauche"
msgstr[1] "Faire pivoter les photos sélectionnées vers la gauche"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Faire pivoter la photo sélectionnée vers la droite"
msgstr[1] "Faire pivoter les photos sélectionnées vers la droite"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Trouver l'étiquette choi_sie"
msgstr[1] "Trouver les étiquettes choi_sies"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Trouver l'étiquette a_vec"
msgstr[1] "Trouver les étiquettes a_vec"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Créer une nouvelle version ?"
msgstr[1] "Créer des nouvelles versions ?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2894,7 +2689,7 @@ msgstr[1] ""
"Avant de lancer « {1} », F-Spot doit-il créer une nouvelle version des photos "
"sélectionnées pour préserver les originaux ?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "Version de XCF"
@@ -2918,87 +2713,93 @@ msgstr "Sujet et mots clés"
msgid "Compression"
msgstr "Compression"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Configuration du plan"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientation"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Interprétation photométrique"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Unité de résolution"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Programme d'exposition"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Mode de mesure"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Mode d'exposition"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Traitement d'image personnalisé"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Configuration des composants"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Source lumineuse"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Méthode de détection"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Espace colorimétrique"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Balance des blancs"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Unité de résolution de plan focal"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Type de source de fichier"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Type de capture de scène"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Contrôle du gain"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Contraste"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Saturation"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Netteté"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Type de scène"
@@ -3068,8 +2869,8 @@ msgstr "Impossible de renommer une version"
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Exception « {0} » reçue. Impossible de renommer la version en « {1} »"
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:562
-#: ../src/Widgets/InfoBox.cs:564
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(aucune modification)"
@@ -3087,7 +2888,7 @@ msgstr "Exception « {0} » reçue. Impossible d'enregistrer la photo {1}"
msgid "Comment:"
msgstr "Commentaire :"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Photos"
@@ -3170,7 +2971,7 @@ msgid_plural ""
"or media such as a CDROM. Please check the permissions and try again."
msgstr[0] ""
"La photo n'a pas pu être pivotée car elle est sur un système de fichiers en "
-"lecture seule ou sur un support de type CDROM. Veuillez vérifier les "
+"lecture seule ou sur un support de type CDROM. Veuillez vérifier les "
"permissions et essayez à nouveau."
msgstr[1] ""
"Les {0} photos n'ont pas pu être pivotées car elles sont sur un système de "
@@ -3206,8 +3007,8 @@ msgstr "Une erreur s'est produite lors du traitement de « {0} » : {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "mes photos"
+msgid "My Photos"
+msgstr "Mes photos"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3229,23 +3030,23 @@ msgstr "Rayon :"
msgid "Threshold:"
msgstr "Seuil :"
-#: ../src/SingleView.cs:86
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Pivoter la photo vers la gauche"
-#: ../src/SingleView.cs:91
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Pivoter la photo vers la droite"
-#: ../src/SingleView.cs:128
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Dossier"
-#: ../src/SingleView.cs:354
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Ouvrir"
-#: ../src/SingleView.cs:454
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Utiliser comme fond d'écran"
@@ -3274,8 +3075,8 @@ msgid "Create New Tag..."
msgstr "Créer une nouvelle étiquette..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Modifier l'étiquette sélectionnée..."
+msgid "Edit Tag..."
+msgstr "Modifier l'étiquette..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3358,7 +3159,7 @@ msgid "Events"
msgstr "Événements"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:408
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(aucun)"
@@ -3513,16 +3314,16 @@ msgstr "Détails de l'erreur"
msgid "An unhandled exception was thrown: "
msgstr "Une exception non gérée a été levée : "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Aucun"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Profil du système"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Thème standard"
@@ -3548,7 +3349,7 @@ msgstr "Libellé"
msgid "Ratio"
msgstr "Ratio"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Réessayer"
@@ -3691,8 +3492,8 @@ msgid ""
"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
"Dans les fichiers image si possible\n"
-"<small>Cela les rend accessible à partir d'un autre programme d'édition d'images."
-"</small>"
+"<small>Cela les rend accessible à partir d'un autre programme d'édition "
+"d'images.</small>"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
msgid "Select A Folder"
@@ -3743,8 +3544,8 @@ msgid "By _Rating"
msgstr "Par _note"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Copier l'_emplacement"
+msgid "Copy"
+msgstr "Copier"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3770,6 +3571,10 @@ msgstr "Mise en _page..."
msgid "Re_fresh Thumbnail"
msgstr "Actualiser la _vignette"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "_Tout sélectionner"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "_Ne rien sélectionner"
@@ -3831,8 +3636,8 @@ msgid "_Delete Version"
msgstr "_Supprimer la version"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Modifier l'étiquette sélectionnée..."
+msgid "_Edit Tag..."
+msgstr "Modifier l'éti_quette..."
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
@@ -3930,11 +3735,11 @@ msgstr "Photos sans étiq_uette"
msgid "_Version"
msgstr "_Version"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "Mise à jour de la base de données F-Spot"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -4027,11 +3832,11 @@ msgstr "Imprimer les étiquettes de la photo"
msgid "Print photo comment"
msgstr "Imprimer les commentaires de la photo"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Modifier"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -4039,13 +3844,13 @@ msgstr ""
"Cet outil requiert une sélection active. Veuillez choisir une zone de la "
"photo et recommencer l'opération"
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Erreur lors de l'enregistrement de la photo ajustée"
msgstr[1] "Erreur lors de l'enregistrement des photos ajustées"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
@@ -4066,7 +3871,7 @@ msgstr "_Vertical"
msgid "Find:"
msgstr "Rechercher :"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Dossiers"
@@ -4078,54 +3883,58 @@ msgstr "Système de fichiers"
msgid "Histogram"
msgstr "Histogramme"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Version"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Date"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Exposition"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Distance focale"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Taille du fichier"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Notation"
-#: ../src/Widgets/InfoBox.cs:389 ../src/Widgets/InfoBox.cs:397
-#: ../src/Widgets/InfoBox.cs:427
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(mauvais format)"
-#: ../src/Widgets/InfoBox.cs:417 ../src/Widgets/InfoBox.cs:440
-#: ../src/Widgets/InfoBox.cs:450 ../src/Widgets/InfoBox.cs:459
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
msgid "(Unknown)"
msgstr "(inconnu)"
-#: ../src/Widgets/InfoBox.cs:560
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
msgstr[0] "(Une modification)"
msgstr[1] "({0} modifications)"
-#: ../src/Widgets/InfoBox.cs:574
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(erreur de lecture de fichier)"
-#: ../src/Widgets/InfoBox.cs:619
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} photos"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:639
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4134,7 +3943,7 @@ msgstr ""
"Sur {0} entre \n"
"{1} et {2}"
-#: ../src/Widgets/InfoBox.cs:644
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4143,61 +3952,61 @@ msgstr ""
"Entre {0} \n"
"et {1}"
-#: ../src/Widgets/InfoBox.cs:671
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(au moins un fichier non trouvé)"
-#: ../src/Widgets/InfoBox.cs:788
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Afficher le nom de la photo"
-#: ../src/Widgets/InfoBox.cs:797
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Afficher la date"
-#: ../src/Widgets/InfoBox.cs:806
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Afficher la taille"
-#: ../src/Widgets/InfoBox.cs:815
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Afficher l'exposition"
-#: ../src/Widgets/InfoBox.cs:824
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Afficher la distance focale"
-#: ../src/Widgets/InfoBox.cs:833
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Afficher l'appareil photo"
-#: ../src/Widgets/InfoBox.cs:842
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Afficher la taille du fichier"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Métadonnées"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Métadonnées étendues"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Aucune métadonnée étendue disponible"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Aucune photo active"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "La photo « {0} » n'existe pas"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Aucune métadonnée disponible"
@@ -4229,3 +4038,213 @@ msgstr "Affiche un diaporama depuis F-Spot"
#: ../tools/f-spot-screensaver.desktop.in.h:2
msgid "F-Spot photos"
msgstr "Photos F-Spot"
+
+#~ msgid "Package"
+#~ msgstr "Paquet"
+
+#~ msgid "Extension Installation"
+#~ msgstr "Installation d'extension"
+
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr ""
+#~ "<b>Sélectionnez les extensions à installer et cliquez sur « Suivant »</b>"
+
+#~ msgid "Install from:"
+#~ msgstr "Installer depuis :"
+
+#~ msgid "_Repositories..."
+#~ msgstr "_Dépôts..."
+
+# Liste d'actions
+#~ msgid "Show all packages"
+#~ msgstr "Afficher tous les paquets"
+
+#~ msgid "Show new versions only"
+#~ msgstr "Afficher uniquement les nouvelles versions"
+
+#~ msgid "Show updates only"
+#~ msgstr "Afficher uniquement les mises à jour"
+
+#~ msgid "_Unselect All"
+#~ msgstr "To_ut désélectionner"
+
+#~ msgid "label124"
+#~ msgstr "label124"
+
+#~ msgid "Overall Progress:"
+#~ msgstr "Progression d'ensemble :"
+
+#~ msgid "Downloading extensions..."
+#~ msgstr "Téléchargement des extensions..."
+
+#~ msgid "Extension Manager"
+#~ msgstr "Gestionnaire d'extensions"
+
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr ""
+#~ "Des extensions supplémentaires sont requises pour effectuer cette "
+#~ "opération."
+
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Les extensions suivantes seront installées :"
+
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Gestionnaire d'extensions</b></big>"
+
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Les extensions suivantes sont actuellement installées :"
+
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Installer des extensions..."
+
+#~ msgid "_Uninstall..."
+#~ msgstr "_Désinstaller..."
+
+#~ msgid "Enable"
+#~ msgstr "Activer"
+
+#~ msgid "Disable"
+#~ msgstr "Désactiver"
+
+#~ msgid "Details"
+#~ msgstr "Détails"
+
+#~ msgid "Extension Repository Management"
+#~ msgstr "Gestionnaire des dépôts d'extensions"
+
+#~ msgid "Add New Repository"
+#~ msgstr "Ajouter un nouveau dépôt"
+
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Sélectionnez l'emplacement du dépôt que vous voulez enregistrer :"
+
+#~ msgid "Register an on-line repository"
+#~ msgstr "Enregistrer un dépôt en ligne"
+
+#~ msgid "Url:"
+#~ msgstr "URL :"
+
+#~ msgid "Register a local repository"
+#~ msgstr "Enregistrer un dépôt local"
+
+#~ msgid "Path:"
+#~ msgstr "Chemin :"
+
+#~ msgid "Browse..."
+#~ msgstr "Parcourir..."
+
+#~ msgid "Version:"
+#~ msgstr "Version :"
+
+#~ msgid "Author:"
+#~ msgstr "Auteur :"
+
+#~ msgid "Copyright:"
+#~ msgstr "Copyright :"
+
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Dépendances de l'extension :"
+
+#~ msgid "All registered repositories"
+#~ msgstr "Tous les dépôts enregistrés"
+
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Voulez-vous vraiment annuler l'installation ?"
+
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Les paquets suivants seront désinstallés :"
+
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Des extensions supplémentaires, dépendantes des précédentes, seront aussi "
+#~ "désinstallées :"
+
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Les extensions sélectionnées ne peuvent êtres installées en raison de "
+#~ "conflits de dépendance."
+
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Les paquets suivants seront installés :"
+
+#~ msgid " (in user directory)"
+#~ msgstr " (dans le répertoire utilisateur)"
+
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Les paquets suivants nécessitent d'être désinstallés :"
+
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Les dépendances suivantes ne peuvent être résolues :"
+
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "L'installation s'est déroulée avec succès."
+
+#~ msgid "The installation failed!"
+#~ msgstr "L'installation a échoué."
+
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "L'installation s'est déroulée avec des avertissements."
+
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "La désinstallation s'est déroulée avec succès."
+
+#~ msgid "The uninstallation failed!"
+#~ msgstr "La désinstallation a échoué."
+
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "La désinstallation s'est déroulée avec des avertissements."
+
+#~ msgid "Repository"
+#~ msgstr "Dépôt"
+
+#~ msgid "Installation cancelled"
+#~ msgstr "L'installation a été annulée"
+
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Certaines extensions requises n'ont pas été trouvées"
+
+#~ msgid "Installation failed"
+#~ msgstr "L'installation a échoué"
+
+#~ msgid "Extension"
+#~ msgstr "Extension"
+
+#~ msgid "Other"
+#~ msgstr "Autre"
+
+#~ msgid "Url"
+#~ msgstr "URL"
+
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Une exception a été levée : {0}"
+
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Les extensions désactivées ne peuvent être chargées."
+
+#~ msgid "Loading {0} extension"
+#~ msgstr "Chargement de l'extension {0}"
+
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "L'extension requise « {0} » est désactivée."
+
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "L'extension requise « {0} » n'est pas installée."
+
+#~ msgid "(provided by {0})"
+#~ msgstr "(fourni par {0})"
+
+#~ msgid "my photos"
+#~ msgstr "mes photos"
+
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Modifier l'étiquette sélectionnée..."
+
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Copier l'_emplacement"
+
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Modifier l'étiquette sélectionnée..."
diff --git a/po/hu.po b/po/hu.po
index 35aca24..8b62cea 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,15 +1,15 @@
# Hungarian translation of F-Spot
# This file is distributed under the same license as the F-Spot package.
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
#
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010.
# Kalman Kemenczy <kkemenczy at novell dot com>, 2006.
msgid ""
msgstr ""
"Project-Id-Version: f-spot master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&component=General\n"
-"POT-Creation-Date: 2009-09-15 09:41+0000\n"
-"PO-Revision-Date: 2009-10-01 17:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-24 13:20+0100\n"
+"PO-Revision-Date: 2010-03-24 13:20+0100\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"
@@ -38,14 +38,14 @@ msgstr "„{0}” kép átvitele CD-re"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
msgstr "{0}/{1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
@@ -78,7 +78,6 @@ msgid "<b><i>There is some previously scheduled items to write</i></b>"
msgstr "<b><i>Korábban írásra ütemezett elemek</i></b>"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
-#| msgid "<b>Photos</b>"
msgid "<b>Photos to Burn</b>"
msgstr "<b>Kiírandó fényképek</b>"
@@ -91,12 +90,11 @@ msgid "Autorotate"
msgstr "Automatikus forgatás"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
-#| msgid "_Create"
msgid "Create CD"
msgstr "CD létrehozása"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Méret"
@@ -106,7 +104,7 @@ msgstr "Az exportált kijelölés mérete:"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
msgid "_Browse Previously Scheduled Files"
-msgstr "_Korábban beütemezett fájlok böngészése"
+msgstr "K_orábban ütemezett fájlok tallózása"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
@@ -114,13 +112,14 @@ msgstr "_Korábban beütemezett fájlok böngészése"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Exportálás"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
msgid "_Write only these photos to CD"
-msgstr "_Csak ezen fényképek írása CD-re"
+msgstr "_Csak ezen fényképek CD-re írása"
#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
msgid "F_acebook..."
@@ -144,19 +143,20 @@ msgstr ""
"Miután a Facebook visszairányította ehhez az alkalmazáshoz, kattintson az "
"„OK” gombra."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
msgstr "Túl sok exportálandó kép"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"A Facebook albumonként csak 60 fényképet engedélyez. Finomítsa a "
-"kiválasztást és próbálja újra."
+"A Facebook albumonként csak {0} fényképet engedélyez. Finomítsa a "
+"kiválasztást, és próbálja újra."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -164,19 +164,19 @@ msgstr ""
msgid "Uploading Pictures"
msgstr "Képek feltöltése"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "Az albumnak nevet kell adni"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
msgstr "Nevezze el az albumát vagy válasszon meglévő albumot."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "Az új album létrehozása meghiúsult"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -187,30 +187,29 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
msgstr "„{0}” kép feltöltése ({1}. / {2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
msgstr "Hiba a Facebookba való feltöltés közben: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Hiba"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
@@ -218,6 +217,10 @@ msgstr "Hiba"
msgid "Upload Complete"
msgstr "Feltöltés befejezve"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Keresse fel az F-Spot csoportot a Facebookon"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "Várakozás hitelesítésre"
@@ -302,27 +305,22 @@ msgid "Auto-confirm Photos"
msgstr "Fényképek automatikus elfogadása"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
-#| msgid "Ratio"
msgid "Caption"
msgstr "Felirat"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
-#| msgid "Creating a new album failed"
msgid "Create a new album"
msgstr "Új album létrehozása"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
-#| msgid "D_escription:"
msgid "Description"
msgstr "Leírás"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
-#| msgid "Error logging into Facebook"
msgid "Export to Facebook"
msgstr "Exportálás Facebookba"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
-#| msgid "No active photo"
msgid "In this photo"
msgstr "A fényképen"
@@ -332,7 +330,6 @@ msgid "Location"
msgstr "Hely"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
-#| msgid "Location"
msgid "Login"
msgstr "Bejelentkezés"
@@ -341,23 +338,19 @@ msgid "Logout"
msgstr "Kijelentkezés"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Név"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
-#| msgid "You are not logged in."
msgid "Not logged in"
msgstr "Nincs bejelentkezve"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
-#| msgid "Version:"
msgid "Permissions:"
msgstr "Jogosultságok:"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
-#| msgid "(Not Connected)"
msgid "Stay Connected"
msgstr "Maradjon kapcsolódva"
@@ -468,6 +461,7 @@ msgstr "<b>Felhasználói fiók</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Fényképek</b>"
@@ -489,7 +483,8 @@ msgstr "<b>Jogosultságok megtekintése</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exportálás"
@@ -585,58 +580,58 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Hiba: A fájl már létezik, megszakítás"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Világos"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Sötét"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Előző"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Index"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Címkék"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Következő"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "A galériát létrehozta:"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Stílusok megjelenítése"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Stílusok elrejtése"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Címkék: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Oldal:"
@@ -853,6 +848,7 @@ msgstr "S_zülőalbum:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Jelszó:"
@@ -863,6 +859,7 @@ msgstr "_Cím:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Felhasználónév:"
@@ -1011,12 +1008,73 @@ msgstr "Feltöltés befejezve"
msgid "Error uploading to Tabblo: "
msgstr "Hiba a Tabbloba való feltöltés közben: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot címkék</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo fiók</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>Az F-Spot címkék segítik a fényképek exportálási állapotának "
+"követését. Például: használja az egyik címkét az exportálni tervezett "
+"fotókon, egy másikat pedig a már exportáltakra. Itt megadhatja, hogy az F-"
+"Spot automatikusan cserélje le ezeket a címkéket, az állapottól függően.</"
+"i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Eltávolítandó az exportált fényképekről:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Kijelölés…"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "Az exportált fényképekhez _csatolandó:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Megbízhatósági hiba az elérési kísérletkor"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Megszakítom a munkamenetet"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Mindig megbízom ezen oldal tanúsítványában"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Mit szeretne tenni:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Megbízhatósági hiba"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Ez alkalommal megbízom az oldal tanúsítványában"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "_Tömörített fájl…"
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Nem áll rendelkezésre kijelölés"
@@ -1042,7 +1100,6 @@ msgid "Preparing photo \"{0}\""
msgstr "„{0}” fénykép előkészítése"
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "_Létrehozás"
@@ -1087,11 +1144,10 @@ msgid "Stopped"
msgstr "Leállítva"
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Duplikátumok keresése"
+msgid "Check for Duplicates..."
+msgstr "Duplikátumok keresése…"
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
-#| msgid "(No Gallery)"
msgid "F-Spot Gallery"
msgstr "F-Spot galéria"
@@ -1100,14 +1156,11 @@ msgid "The web gallery seems to be offline now"
msgstr "A webes galéria elérhetetlennek tűnik"
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
-#| msgid "Show Styles"
msgid "Show All"
msgstr "Összes megjelenítése"
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
#, csharp-format
-#| msgid "{0} Photo"
-#| msgid_plural "{0} Photos"
msgid "{0} photo"
msgid_plural "{0} photos"
msgstr[0] "{0} fénykép"
@@ -1119,12 +1172,10 @@ msgid "Current View"
msgstr "Jelenlegi nézet"
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
-#| msgid "Delete"
msgid "Selected"
msgstr "Kiválasztva"
#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
-#| msgid "Web _Gallery..."
msgid "Live Web Gallery"
msgstr "Élő webes galéria…"
@@ -1133,8 +1184,10 @@ msgid ""
"<small><i>The gallery stays active until you either deactivate it or close\n"
"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
msgstr ""
-"<small><i>A galéria aktív marad, amíg nem kapcsolja ki vagy nem zárja be az F-Spotot.\n"
-"Győződjön meg róla, hogy a helyi nézők a HTTP proxy megkerülésével érik el.</i></small>"
+"<small><i>A galéria aktív marad, amíg nem kapcsolja ki vagy nem zárja be az "
+"F-Spotot.\n"
+"Győződjön meg róla, hogy a helyi nézők a HTTP proxy megkerülésével érik el.</"
+"i></small>"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
msgid ""
@@ -1161,7 +1214,6 @@ msgid "F-Spot Live Web Gallery"
msgstr "F-Spot élő webes galéria"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
-#| msgid "_Gallery:"
msgid "Gallery URL:"
msgstr "Galéria URL:"
@@ -1174,28 +1226,22 @@ msgid "Options:"
msgstr "Beállítások:"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
-#| msgid "Photos per page"
msgid "Photos with a Tag"
msgstr "Fénykép adott címkével"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
-#| msgid "_Delete photo"
-#| msgid_plural "_Delete photos"
msgid "Selected Photos"
msgstr "Kiválasztott fényképek"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
-#| msgid "Sharpen"
msgid "Share:"
msgstr "Megosztás:"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
-#| msgid "_View"
msgid "Views:"
msgstr "Nézetek:"
#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
-#| msgid "None"
msgid "none"
msgstr "nincs"
@@ -1205,7 +1251,6 @@ msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
msgstr " Galéria: {0}, fényképek: {1}, utolsó kliens: {3}"
#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
-#| msgid "Gallery generated by"
msgid "Gallery is inactive"
msgstr "A galéria inaktív"
@@ -1297,7 +1342,7 @@ msgid "New Rolls Only"
msgstr "Csak az új körök"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:51
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Kihagyás"
@@ -1336,31 +1381,35 @@ msgid "Make F-Spot my screensaver"
msgstr "Az F-Spot legyen a képernyővédő"
#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
-#| msgid "Planar Configuration"
msgid "Screensaver Configuration"
msgstr "Képernyővédő beállítása"
#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
msgid "F-Spot Photo Manager"
msgstr "F-Spot fotókezelő"
-#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot.desktop.in.in.h:3
msgid "Organize, enjoy, and share your photos"
msgstr "Fényképek rendszerezése, megjelenítése és megosztása"
-#: ../f-spot.desktop.in.in.h:3 ../f-spot-import.desktop.in.in.h:3
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
msgid "Photo Manager"
msgstr "Fényképkezelő"
-#: ../f-spot-import.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:3
msgid "Import into F-Spot"
msgstr "Importálás az F-Spotba"
-#: ../f-spot-view.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:2
msgid "F-Spot Photo Viewer"
msgstr "F-Spot fotómegjelenítő"
-#: ../f-spot-view.desktop.in.in.h:2
+#: ../f-spot-view.desktop.in.in.h:3
msgid "Photo Viewer"
msgstr "Fotómegjelenítő"
@@ -1377,282 +1426,6 @@ msgstr "Ismeretlen átalakítási típus: %d"
msgid "Operation failed"
msgstr "A művelet sikertelen"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Csomag"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Kiterjesztés telepítése"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr ""
-"<b>Válassza ki a telepítendő kiterjesztéseket és kattintson a Tovább gombra</"
-"b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Telepítés innen:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Tárolók…"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Minden csomag megjelenítése"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Csak új verziók megjelenítése"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Csak frissítések megjelenítése"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Kijelölések _megszüntetése"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Min_dent kijelöl"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Teljes folyamat:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Kiterjesztések letöltése…"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Kiterjesztéskezelő"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "A művelet végrehajtásához további bővítmények szükségesek."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "A következő kiterjesztések kerülnek telepítésre:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Kiterjesztéskezelő</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Jelenleg a következő kiterjesztések vannak telepítve:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "Kiterjesztések _telepítése…"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Eltávolítás…"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Engedélyezés"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Tiltás"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Részletek"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Kiterjesztéstároló kezelése"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Új tároló felvétele"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Válassza ki a regisztrálni kívánt tároló helyét:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Online tároló regisztrálása"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Helyi tároló regisztrálása"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Útvonal:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Tallózás…"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Verzió:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Szerző:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Kiterjesztés függőségei:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Minden regisztrált tároló"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Biztosan meg kívánja szakítani a telepítést?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "A következő csomagok kerülnek eltávolításra:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"Más kiterjesztések függenek az előzőktől, amelyek szintén el lesznek "
-"távolítva:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr "A kiválasztott kiterjesztések függőségi problémák miatt nem telepíthetők."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "A következő csomagok kerülnek telepítésre:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (a felhasználói könyvtárban)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "A következő csomagokat kell eltávolítani:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "A következő függőségek nem oldhatók fel:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "A telepítés sikeresen befejeződött."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "A telepítés meghiúsult!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "A telepítés figyelmeztetésekkel sikeresen befejeződött."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Az eltávolítás figyelmeztetésekkel sikeresen befejeződött."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Az eltávolítás meghiúsult!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Az eltávolítás figyelmeztetésekkel sikeresen befejeződött."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Tároló"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "A telepítés megszakítva"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Néhány szükséges kiterjesztés nem található"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "A telepítés meghiúsult"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Kiterjesztés"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Verzió"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Egyéb"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Kivétel történt: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "A letiltott kiterjesztések nem tölthetők be."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "{0} kiterjesztés betöltése"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "A szükséges „{0}” kiterjesztés le van tiltva."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "A szükséges „{0}” kiterjesztés nincs telepítve."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(biztosítja: {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Előnézet"
@@ -1661,7 +1434,7 @@ msgstr "Előnézet"
msgid "Path"
msgstr "Elérési út"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Fájl"
@@ -1688,19 +1461,19 @@ msgid "Error transferring file"
msgstr "Hiba a fájl átvitele közben"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Fájlok másolása kész"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Letöltés befejezve"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Fájlok másolása kész"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "„{0}” átvitele a fényképezőgéptől"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Fényképezőgép"
@@ -1708,12 +1481,12 @@ msgstr "Fényképezőgép"
msgid "Port"
msgstr "Port"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Nem találhatóak a következőre illeszkedő fényképek: {0}"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1724,11 +1497,11 @@ msgstr ""
"hozzáadni a címkét néhány fényképhez, vagy válasszon másik címkét az\n"
"F-Spot beállításablakában."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "A keresés nem adott vissza eredményeket"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1755,19 +1528,19 @@ msgid_plural "Modified ({0})"
msgstr[0] "Módosított"
msgstr[1] "Módosított ({0})"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Módosítva ekkor: {1}"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Módosítva ekkor: {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:666 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Eredeti"
@@ -1843,19 +1616,19 @@ msgstr "Válassza ki a javítandó szemeket."
msgid "Sepia Tone"
msgstr "Tintaárnyalat"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Lágy fókusz"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Kiegyenesítés"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Importálási hiba"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Hiba a(z) {0}{2}{2}{1} importálása során"
@@ -1870,8 +1643,8 @@ msgid "Unhandled exception"
msgstr "Kezeletlen kivétel történt"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Fénykép _helyének másolása"
+msgid "Copy Photo"
+msgstr "Fénykép másolása"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1885,13 +1658,13 @@ msgstr "Megnyitás _ezzel"
msgid "Rem_ove Tag"
msgstr "Cí_mke törlése"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:453 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Forgatás b_alra"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:454 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Forgatás j_obbra"
@@ -2018,180 +1791,184 @@ msgid "C_ontrast:"
msgstr "_Kontraszt:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Létrehozás"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Válasszon fényképezőgépet"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Fájlok másolása a Fényképek mappába"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Levél létrehozása"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "I_kon létrehozása címkéhez annak első használatakor"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr "Levél létrehozása, csatolva a kijelölt (esetleg átméretezett) fényképeket"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Másolatok felismerése"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "_Fájlnevek megjelenítése"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr "Csak az adott körökben importált fényképek megjelenítése."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Nincs levélküldés"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "E-_mail:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "Címek és _megjegyzések exportálása"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Becsült új méret"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Extra nagy"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "F-Spot nézet"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Szűrés kiválasztott körök alapján"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_aléria:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galéria"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Importálás"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Importálás forrása:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Alkönyvtárakkal együtt"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Nagy"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Egyéni kiválasztási arányok kezelése"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Közepes"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Fényképek száma a kijelölt körökben:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Képek száma"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Ma_ppa megnyitása…"
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Eredeti méret (előfordulhat nagyon nagy fájlméret)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Szülőcí_mke:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Szünet"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Beállítások"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Előző"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Javítás"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Válassza ki a fényképezőgépről másolandó fényképeket…"
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Válasszon ki egy címkét…"
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Válassza ki a fényképezőgépet, amelyről át akarja vinni a fájlokat"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Kijelölt fényképezőgép: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Kiválasztási megszorítások"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Beállítás _háttérként"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Minden fénykép megjelenítése."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Az oldalsáv mutatása vagy rejtése"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Az eszköztár mutatása vagy rejtése"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "_Oldalsáv"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Kicsi"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2199,40 +1976,40 @@ msgstr ""
"Adja meg, hogy az eredeti méretű képeket kell-e forgatni. A kisebb méretek "
"automatikusan forgatásra kerülnek."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Kép _metaadatainak eltávolítása"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Hő_m:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Apró"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Teljes eredeti méret"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "_Nagyítás"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "_Kicsinyítés"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Nagyítás"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Kicsinyítés"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Fényesség:"
@@ -2359,7 +2136,7 @@ msgstr "Eszköztár elrejtése"
msgid "Info"
msgstr "Információk"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Képinformációk"
@@ -2367,8 +2144,8 @@ msgstr "Képinformációk"
msgid "Exit fullscreen"
msgstr "Kilépés a teljes képernyőből"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Diavetítés"
@@ -2416,7 +2193,7 @@ msgstr "Interoperabilitás könyvtár"
msgid "Unknown Directory"
msgstr "Ismeretlen könyvtár"
-#: ../src/Imaging/ImageFile.cs:113
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Az írás nem támogatott ebbe a fájlformátumba"
@@ -2550,7 +2327,7 @@ msgstr "Az objektum szellemi kategóriája"
msgid "Unknown IIM DataSet"
msgstr "Ismeretlen IIM adathalmaz"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:359
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Mappa kiválasztása"
@@ -2578,13 +2355,12 @@ msgid ""
"different directory"
msgstr "Az Ön által kijelölt „{0}” könyvtár nem létezik. Válasszon másik könyvtárat"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
+msgid "Imported Tags"
msgstr "Importált címkék"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:86
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Forgatás balra"
@@ -2592,7 +2368,7 @@ msgstr "Forgatás balra"
msgid "Rotate picture left"
msgstr "Kép forgatása balra"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Forgatás jobbra"
@@ -2608,51 +2384,51 @@ msgstr "Következő kép"
msgid "Previous picture"
msgstr "Előző kép"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Új képek importálása"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Tallózás"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Több fénykép párhuzamos böngészése"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Kép szerkesztése"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Fénykép megjelenítése és szerkesztése"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Teljes képernyő"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Képek megjelenítése teljes képernyőn"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Fényképek megjelenítése diavetítésként"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Előző fénykép"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Következő fénykép"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Nem érzékeltem fényképezőgépet."
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2661,24 +2437,24 @@ msgstr ""
"fényképezőgépet sem. Ellenőrizze, hogy a fényképezőgép csatlakoztatva van-e "
"és be van-e kapcsolva"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Hiba a fényképezőgéphez való kapcsolódás közben"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
-msgstr "„{0}” hiba következett be a fényképezőgéphez való kapcsolódás közben"
+msgstr "„{0}” hiba következett be a fényképezőgéphez való kapcsolódás közben"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Összefésüli a kijelölt címkét?"
msgstr[1] "Összefésüli a kijelölt {0} címkét?"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2686,126 +2462,126 @@ msgstr ""
"Ez a művelet egy kivételével az összes kiválasztott címkét és alcímkét "
"egyetlen címkébe fésüli össze."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Címkék összefésülése"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0}/{1} fénykép"
msgstr[1] "{0}/{1} fénykép"
-#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:495
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} fénykép"
msgstr[1] "{0} fénykép"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} kiválasztva)"
msgstr[1] " ({0} kiválasztva)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Ok"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Hiba a kép törlése közben"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Nincs jogosultsága a következő fájl törléséhez: {1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "{0} típusú hiba történt a következő fájl törlése közben: {2}{1}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Véglegesen törli a kijelölt fényképet?"
msgstr[1] "Véglegesen törli a kijelölt {0} fényképet?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural "This deletes all versions of the selected photos from your drive."
msgstr[0] "Ez a kijelölt fénykép összes verzióját törli a merevlemezéről."
msgstr[1] "Ez a kijelölt fényképek összes verzióját törli a merevlemezéről."
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Fénykép törlése"
msgstr[1] "_Fénykép törlése"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Eltávolítja a kijelölt fényképet az F-Spotból?"
msgstr[1] "Eltávolítja a kijelölt {0} fényképet az F-Spotból?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
"again."
msgstr ""
-"Ha eltávolítja a fényképet az F-Spot katalógusból, minden címkeinformáció "
+"Ha eltávolítja a fényképet az F-Spot katalógusból, minden címkeinformáció "
"elvész. A fényképek megmaradnak a számítógépén és később újra importálhatóak "
"lesznek az F-Spotba."
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Eltávolítás a katalógusból"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Törli a(z) „{0}” címkét?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Törli a(z) {0} kijelölt címkét?"
# fixme: string surgery alert!
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "fényképpel"
msgstr[1] "fényképpel"
# fixme: string surgery alert!
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
msgstr[0] "Ha törli a címkét, akkor annak kapcsolata elvész {0} {1}."
msgstr[1] "Ha törli a címkét, akkor annak kapcsolata elvész {0} {1}."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Címke törlése"
msgstr[1] "_Címkék törlése"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "A címke nem üres"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2814,39 +2590,39 @@ msgstr ""
"Nem lehet címkéket tartalmazó címkéket törölni. Először törölje a(z) „{0}” "
"alatti címkéket"
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "A kijelölt fénykép forgatása balra"
msgstr[1] "A kijelölt fényképek forgatása balra"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "A kijelölt fénykép forgatása jobbra"
msgstr[1] "A kijelölt fénykép forgatása jobbra"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Kijelölt _címke keresése"
msgstr[1] "Kijelölt _címkék keresése"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Kijelölt címke _keresése ezzel"
msgstr[1] "Kijelölt címkék _keresése ezzel"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Létrehoz egy új verziót?"
msgstr[1] "Létrehoz új verziókat?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2861,7 +2637,7 @@ msgstr[1] ""
"A(z) {1} indítása előtt a F-Spot létrehozzon-e új változatokat a kijelölt "
"fényképekből az eredetik megőrzése érdekében?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "XCF verzió"
@@ -2885,87 +2661,93 @@ msgstr "Tárgy és kulcsszavak"
msgid "Compression"
msgstr "Tömörítés"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Síkbeli beállítás"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Tájolás"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Fotometrikus értelmezés"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Felbontási egység"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Expozíciós program"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Mérési mód"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Expozíció módja"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Egyénileg megjelenített"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Összetevők beállítása"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Fényforrás"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Érzékelési módszer"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Színtér"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Fehéregyensúly"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Gyújtóponti sík felbontásegysége"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Fájlforrás típusa"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Jelenet felvételének típusa"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Vezérlés erősítése"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontraszt"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Telítettség"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Élesség"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Jelenet típusa"
@@ -3035,26 +2817,26 @@ msgstr "Nem nevezhető át egy verzió"
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "„{0}” kivétel következett be. A verzió nem nevezhető át erre: „{1}”"
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:554
-#: ../src/Widgets/InfoBox.cs:556
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(nincs módosítás)"
-#: ../src/PhotoView.cs:169 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Hiba a fénykép szerkesztése közben"
-#: ../src/PhotoView.cs:170 ../src/Sharpener.cs:73
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "„{0}” kivétel következett be. A(z) {1} kép nem menthető"
-#: ../src/PhotoView.cs:359
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Megjegyzés:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Fényképek"
@@ -3173,8 +2955,8 @@ msgstr "Hiba történt a(z) „{0}” feldolgozásakor: {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "fényképeim"
+msgid "My Photos"
+msgstr "Fényképeim"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3196,23 +2978,23 @@ msgstr "Sugár:"
msgid "Threshold:"
msgstr "Küszöb:"
-#: ../src/SingleView.cs:88
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Fénykép forgatása balra"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Fénykép forgatása jobbra"
-#: ../src/SingleView.cs:130
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Mappa"
-#: ../src/SingleView.cs:356
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Megnyitás"
-#: ../src/SingleView.cs:456
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Beállítás háttérként"
@@ -3241,8 +3023,8 @@ msgid "Create New Tag..."
msgstr "Új címke létrehozása…"
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Kijelölt címke szerkesztése…"
+msgid "Edit Tag..."
+msgstr "Címke szerkesztése…"
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3325,7 +3107,7 @@ msgid "Events"
msgstr "Események"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Nincs)"
@@ -3358,19 +3140,21 @@ msgstr "Bélyegképek frissítése"
msgid "Updating picture \"{0}\""
msgstr "„{0}” kép frissítése"
-#: ../src/UI.Dialog/AboutDialog.cs:71
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Fényképkezelő a GNOME-hoz"
-#: ../src/UI.Dialog/AboutDialog.cs:72
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:95
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
-msgstr "Kelemen Gábor <kelemeng at gnome.hu>"
+msgstr ""
+"Kelemen Gábor <kelemeng at gnome dot hu>Kéménczy Kálmán <kkemenczy at novell "
+"dot com>"
-#: ../src/UI.Dialog/AboutDialog.cs:100
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "F-Spot honlap"
@@ -3468,16 +3252,16 @@ msgstr "Hiba részletei"
msgid "An unhandled exception was thrown: "
msgstr "Kezeletlen kivétel történt: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Nincs"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Rendszerprofil"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Szabványos téma"
@@ -3503,7 +3287,7 @@ msgstr "Címke"
msgid "Ratio"
msgstr "Arány"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Újra"
@@ -3520,17 +3304,14 @@ msgid "5"
msgstr "5"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
-#| msgid "<b>Account</b>"
msgid "<b>Action</b>"
msgstr "<b>Művelet</b>"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
-#| msgid "<b>Photos</b>"
msgid "<b>Reference Photo</b>"
msgstr "<b>Referencia-fénykép</b>"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
-#| msgid "Adjust"
msgid "Adjust Time"
msgstr "Idő beállítása"
@@ -3539,37 +3320,30 @@ msgid "Adjusted date: "
msgstr "Módosított dátum: "
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
-#| msgid "More dates"
msgid "Current date:"
msgstr "Jelenlegi dátum:"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
-#| msgid "Shift all photos by {0}"
msgid "Space all photos by"
msgstr "Minden fénykép kitöltése ennyivel:"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
-#| msgid "Preferences"
msgid "difference:"
msgstr "különbség:"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
-#| msgid "Rotating photo \"{0}\""
msgid "min. Starting at {0}"
msgstr "perc. Kezdve a következőnél: {0}"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
-#| msgid "<b>Style</b>"
msgid "<b>End Date</b>"
msgstr "<b>Befejező dátum</b>"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
-#| msgid "<b>Style</b>"
msgid "<b>Select period</b>"
msgstr "<b>Válasszon időszakot</b>"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
-#| msgid "<b>Style</b>"
msgid "<b>Start Date</b>"
msgstr "<b>Kezdődátum</b>"
@@ -3582,7 +3356,6 @@ msgid "Only photos taken within these dates will be displayed."
msgstr "Csak az ezen dátumok között készített fényképek kerülnek megjelenítésre."
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
-#| msgid "_Clear Date Range"
msgid "Set date range"
msgstr "Dátumtartomány beállítása"
@@ -3591,37 +3364,30 @@ msgid "<small></small>"
msgstr "<small></small>"
#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
-#| msgid "Edit Image"
msgid "Edit Tag"
msgstr "Címke szerkesztése"
#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
-#| msgid "Edit"
msgid "Edit icon"
msgstr "Ikon szerkesztése"
#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
-#| msgid "_Account:"
msgid "_Icon:"
msgstr "_Ikon:"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
-#| msgid "<b>Photos</b>"
msgid "<b>From External Photo</b>"
msgstr "<b>Külső fényképből</b>"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
-#| msgid "<b>Photos</b>"
msgid "<b>From Photo</b>"
msgstr "<b>Ezen fényképből</b>"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
-#| msgid "<b>Destination</b>"
msgid "<b>Predefined icons</b>"
msgstr "<b>Előre megadott ikonok</b>"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
-#| msgid "<b>Size</b>"
msgid "<b>Preview</b>"
msgstr "<b>Előnézet</b>"
@@ -3630,7 +3396,6 @@ msgid "Design icon from"
msgstr "Ikon tervezése ebből"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
-#| msgid "Edit Image"
msgid "Edit Tag Icon"
msgstr "Címke ikonjának szerkesztése"
@@ -3639,7 +3404,6 @@ msgid "No _image"
msgstr "Nincs _kép"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
-#| msgid "Photo {0} of {1}"
msgid "Photo 0 of 0"
msgstr "0/0 fénykép"
@@ -3652,7 +3416,6 @@ msgid "Color profile for printing:"
msgstr "Színprofil nyomtatáshoz:"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
-#| msgid "Preferences"
msgid "F-Spot Preferences"
msgstr "F-Spot beállításai"
@@ -3669,7 +3432,6 @@ msgstr ""
"<small>Elérhetővé teszi más képszerkesztő programoknak.</small>"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
-#| msgid "Select Folder"
msgid "Select A Folder"
msgstr "Válasszon ki egy mappát"
@@ -3686,12 +3448,10 @@ msgid "When importing photos, copy them to:"
msgstr "Fényképek importálásakor másolás ide:"
#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
-#| msgid "<b>Destination</b>"
msgid "<b>Max Rating</b>"
msgstr "<b>Legjobb értékelés</b>"
#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
-#| msgid "<b>Destination</b>"
msgid "<b>Min Rating</b>"
msgstr "<b>Leggyengébb értékelés</b>"
@@ -3708,53 +3468,38 @@ msgid "Arrange _by"
msgstr "_Rendezés szempontja"
#: ../src/ui/main_window.ui.h:4
-#| msgid "Date"
msgid "By _Date"
msgstr "_Dátum szerint"
#: ../src/ui/main_window.ui.h:5
-#| msgid "Import roll"
msgid "By _Import Roll"
msgstr "_Importálási kör szerint"
#: ../src/ui/main_window.ui.h:6
-#| msgid "Rating"
msgid "By _Rating"
msgstr "É_rtékelés szerint"
#: ../src/ui/main_window.ui.h:7
-#| msgid "Copy Photo Locat_ion"
-msgid "Copy Locat_ion"
-msgstr "_Hely másolása"
+msgid "Copy"
+msgstr "Másolás"
#: ../src/ui/main_window.ui.h:8
-#| msgid "Create New Tag..."
msgid "Create New _Tag..."
msgstr "Új _címke létrehozása…"
#: ../src/ui/main_window.ui.h:9
-#| msgid "Create New Version"
msgid "Create _New Version..."
msgstr "Ú_j verzió létrehozása…"
-#: ../src/ui/main_window.ui.h:10
-#| msgid "F-Spot View"
-msgid "F-Spot"
-msgstr "F-Spot"
-
#: ../src/ui/main_window.ui.h:11
-#| msgid "Find"
-#| msgid_plural "Find"
msgid "Fin_d"
msgstr "Kere_sés"
#: ../src/ui/main_window.ui.h:12
-#| msgid "Extension"
msgid "Manage _Extensions"
msgstr "_Kiterjesztések kezelése"
#: ../src/ui/main_window.ui.h:13
-#| msgid "Page Setup"
msgid "Page Set_up..."
msgstr "_Oldalbeállítás…"
@@ -3762,8 +3507,11 @@ msgstr "_Oldalbeállítás…"
msgid "Re_fresh Thumbnail"
msgstr "Bél_yegkép frissítése"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Min_dent kijelöl"
+
#: ../src/ui/main_window.ui.h:19
-#| msgid "Select Folder"
msgid "Select _None"
msgstr "Kijelölés megszü_ntetése"
@@ -3772,38 +3520,30 @@ msgid "Send by _Mail..."
msgstr "Küldés e-_mailben…"
#: ../src/ui/main_window.ui.h:22
-#| msgid "Side _pane"
msgid "Side_bar"
msgstr "_Oldalsáv"
#: ../src/ui/main_window.ui.h:23
-#| msgid "Tags"
msgid "T_ags"
msgstr "_Címkék"
#: ../src/ui/main_window.ui.h:25
-#| msgid "Thumbnail Directory"
msgid "Thumbnail _elements"
msgstr "Bélyegké_pek"
#: ../src/ui/main_window.ui.h:26
-#| msgid "_Toolbar"
msgid "Too_lbar"
msgstr "_Eszköztár"
#: ../src/ui/main_window.ui.h:27
-#| msgid "_View"
msgid "View"
msgstr "Nézet"
#: ../src/ui/main_window.ui.h:33
-#| msgid "Attach Tag to Selection"
-#| msgid_plural "Attach Tags to Selection"
msgid "_Attach Tag to Selection"
msgstr "Cí_mke csatolása a kijelöléshez"
#: ../src/ui/main_window.ui.h:35
-#| msgid "_Clear Date Range"
msgid "_Clear Rating Filter"
msgstr "Értékelési s_zűrő törlése"
@@ -3812,7 +3552,6 @@ msgid "_Clear Roll Filter"
msgstr "_Körszűrő törlése"
#: ../src/ui/main_window.ui.h:38
-#| msgid "Comment:"
msgid "_Components"
msgstr "Öss_zetevők"
@@ -3821,28 +3560,22 @@ msgid "_Contents"
msgstr "_Tartalom"
#: ../src/ui/main_window.ui.h:40
-#| msgid "Date"
msgid "_Dates"
msgstr "_Dátumok"
#: ../src/ui/main_window.ui.h:42
-#| msgid "Merge the selected tag"
-#| msgid_plural "Merge the {0} selected tags?"
msgid "_Delete Selected Tag"
msgstr "Kijelölt címke _törlése"
#: ../src/ui/main_window.ui.h:43
-#| msgid "Rename Version"
msgid "_Delete Version"
msgstr "Verzió _törlése"
#: ../src/ui/main_window.ui.h:45
-#| msgid "Edit Selected Tag..."
-msgid "_Edit Selected Tag..."
-msgstr "Kijelölt címke s_zerkesztése…"
+msgid "_Edit Tag..."
+msgstr "_Címke szerkesztése…"
#: ../src/ui/main_window.ui.h:46
-#| msgid "Export to"
msgid "_Export to"
msgstr "E_xportálás"
@@ -3851,22 +3584,18 @@ msgid "_Filmstrip"
msgstr "_Filmtekercs"
#: ../src/ui/main_window.ui.h:50
-#| msgid "Hidden"
msgid "_Hidden"
msgstr "_Rejtett"
#: ../src/ui/main_window.ui.h:51
-#| msgid "Import"
msgid "_Import..."
msgstr "_Importálás…"
#: ../src/ui/main_window.ui.h:52
-#| msgid "Large"
msgid "_Large"
msgstr "_Nagy"
#: ../src/ui/main_window.ui.h:53
-#| msgid "Import roll"
msgid "_Last Import Roll"
msgstr "_Utolsó importálási kör"
@@ -3875,28 +3604,22 @@ msgid "_Loupe"
msgstr "_Nagyító"
#: ../src/ui/main_window.ui.h:55
-#| msgid "Medium"
msgid "_Medium"
msgstr "_Közepes"
#: ../src/ui/main_window.ui.h:57
-#| msgid "_Edit"
msgid "_Quit"
msgstr "_Kilépés"
#: ../src/ui/main_window.ui.h:58
-#| msgid "Rating"
msgid "_Ratings"
msgstr "Ér_tékelések"
#: ../src/ui/main_window.ui.h:60
-#| msgid "Remove Tag From Selection"
-#| msgid_plural "Remove Tags From Selection"
msgid "_Remove Tag From Selection"
msgstr "Címke _eltávolítása a kijelölésből"
#: ../src/ui/main_window.ui.h:61
-#| msgid "Rename Version"
msgid "_Rename Version"
msgstr "Verzió átneve_zése"
@@ -3905,12 +3628,10 @@ msgid "_Reverse Order"
msgstr "S_orrend megfordítása"
#: ../src/ui/main_window.ui.h:63
-#| msgid "A Single Import Roll"
msgid "_Select Import Rolls..."
msgstr "_Válasszon importálási köröket…"
#: ../src/ui/main_window.ui.h:64
-#| msgid "_Clear Date Range"
msgid "_Set Date Range..."
msgstr "_Dátumtartomány beállítása…"
@@ -3919,12 +3640,10 @@ msgid "_Set Rating filter..."
msgstr "Érté_kelési szűrő beállítása…"
#: ../src/ui/main_window.ui.h:66
-#| msgid "Sharpen"
msgid "_Sharpen..."
msgstr "Éle_sítés…"
#: ../src/ui/main_window.ui.h:68
-#| msgid "Small"
msgid "_Small"
msgstr "Ki_csi"
@@ -3933,35 +3652,30 @@ msgid "_Tag Icons"
msgstr "_Címkeikonok"
#: ../src/ui/main_window.ui.h:70
-#| msgid "Tags"
msgid "_Tags"
msgstr "_Címkék"
#: ../src/ui/main_window.ui.h:71
-#| msgid "_Title:"
msgid "_Timeline"
msgstr "_Idővonal"
#: ../src/ui/main_window.ui.h:72
-#| msgid "Tools"
msgid "_Tools"
msgstr "_Eszközök"
#: ../src/ui/main_window.ui.h:73
-#| msgid "Untagged photos"
msgid "_Untagged Photos"
msgstr "_Címkézetlen fényképek"
#: ../src/ui/main_window.ui.h:74
-#| msgid "Version"
msgid "_Version"
msgstr "_Verzió"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "Az F-Spot adatbázisának frissítése"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -4054,11 +3768,11 @@ msgstr "Fénykép címkéinek nyomtatása"
msgid "Print photo comment"
msgstr "Fénykép megjegyzésének nyomtatása"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Szerkesztés"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -4066,13 +3780,13 @@ msgstr ""
"Ez az eszköz aktív kijelölést igényel. Jelölje ki a fénykép egy területét és "
"próbálja újra a műveletet."
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Hiba a módosított fénykép mentése közben"
msgstr[1] "Hiba a módosított fényképek mentése közben"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
@@ -4093,7 +3807,7 @@ msgstr "_Függőleges"
msgid "Find:"
msgstr "Keresés:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Mappák"
@@ -4105,53 +3819,58 @@ msgstr "Fájlrendszer"
msgid "Histogram"
msgstr "Hisztogram"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Verzió"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Dátum"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Expozíció"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Fokális hossz"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Fájlméret"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Értékelés"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Ismeretlen)"
-
-#: ../src/Widgets/InfoBox.cs:419
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(hibás formátum)"
-#: ../src/Widgets/InfoBox.cs:552
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Ismeretlen)"
+
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
msgstr[0] "(egy módosítás)"
msgstr[1] "({0} módosítás)"
-#: ../src/Widgets/InfoBox.cs:566
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(Fájlolvasási hiba)"
-#: ../src/Widgets/InfoBox.cs:611
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} fénykép"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:631
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4160,7 +3879,7 @@ msgstr ""
"{0} napon,\n"
"{1} és {2} között"
-#: ../src/Widgets/InfoBox.cs:636
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4169,61 +3888,61 @@ msgstr ""
"{0} és {1}\n"
"között"
-#: ../src/Widgets/InfoBox.cs:663
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(Legalább egy fájl nem található)"
-#: ../src/Widgets/InfoBox.cs:780
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Fotónév megjelenítése"
-#: ../src/Widgets/InfoBox.cs:789
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Dátum megjelenítése"
-#: ../src/Widgets/InfoBox.cs:798
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Méret megjelenítése"
-#: ../src/Widgets/InfoBox.cs:807
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Expozíció megjelenítése"
-#: ../src/Widgets/InfoBox.cs:816
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Fokális hossz megjelenítése"
-#: ../src/Widgets/InfoBox.cs:825
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Fényképezőgép megjelenítése"
-#: ../src/Widgets/InfoBox.cs:834
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Fájlméret megjelenítése"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metaadatok"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Kiterjesztett metaadatok"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Nem érhetőek el bővített metaadatok"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Nincs aktív fénykép"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "A(z) „{0}” fénykép nem létezik"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Nem érhetőek el metaadatok"
diff --git a/po/it.po b/po/it.po
index 7abb0ef..c3072a8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: F-Spot 0.6.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-08-25 13:44+0200\n"
-"PO-Revision-Date: 2009-08-25 13:47+0100\n"
+"PO-Revision-Date: 2010-01-30 00:43+0100\n"
"Last-Translator: Lorenzo Milesi <maxxer at yetopen.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -1194,7 +1194,7 @@ msgstr "Configurazione salvaschermo"
#: ../f-spot.desktop.in.in.h:1
#: ../f-spot-import.desktop.in.in.h:1
msgid "F-Spot Photo Manager"
-msgstr "F-Spot - Gestore di fotografie"
+msgstr "Gestore di fotografie F-spot"
#: ../f-spot.desktop.in.in.h:2
msgid "Organize, enjoy, and share your photos"
@@ -1211,7 +1211,7 @@ msgstr "Importa in F-Spot"
#: ../f-spot-view.desktop.in.in.h:1
msgid "F-Spot Photo Viewer"
-msgstr "F-Spot - Visualizzatore di fotografie"
+msgstr "Visualizzatore di fotografie F-Spot"
#: ../f-spot-view.desktop.in.in.h:2
msgid "Photo Viewer"
diff --git a/po/ko.po b/po/ko.po
index bf44e2f..0027d6a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,595 +2,1633 @@
# Copyright (C) 2007 THE f-spot'S COPYRIGHT HOLDER
# This file is distributed under the same license as the f-spot package.
# Namhyung Kim <namhyung at gmail.com>, 2007.
-#
-#
-#
+# Kang Bundo <bundo at bundo.biz>, 2010.
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-15 00:29+0000\n"
-"PO-Revision-Date: 2007-12-11 18:46+0900\n"
-"Last-Translator: Namhyung Kim <namhyung at gmail.com>\n"
-"Language-Team: GNOME Korea <gnome-kr-hackers at lists.kldp.net>\n"
+"Report-Msgid-Bugs-To: GNOME Korea <gnome-kr at googlegroups.com>\n"
+"POT-Creation-Date: 2010-03-20 03:47+0000\n"
+"PO-Revision-Date: 2010-04-05 10:46+0000\n"
+"Last-Translator: Bundo <bundo at bundo.biz>\n"
+"Language-Team: GNOME Korea <gnome-kr at 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;"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2010-04-05 10:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "버전:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "CD(_C)..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "만든 이:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:203
+msgid "Transferring Pictures"
+msgstr "사진을 전송하는 중"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "저작권:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "\"{0}\" 사진을 CD로 보내는 중"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Add-in Dependencies:"
-msgstr "애드인 의존성:"
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:642 ../src/SingleView.cs:397
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{1} 중 {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:96
-msgid "All registered repositories"
-msgstr "등록된 모든 저장소"
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "사진 보내기 완료"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:180
-msgid "Are you sure you want to cancel the installation?"
-msgstr "정말로 설치를 취소하시겠습니까?"
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "전송 완료"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:303
-msgid "The following packages will be uninstalled:"
-msgstr "다음 꾸러미들의 설치가 제거될 것입니다:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "전송 중 오류"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "전송 오류"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "복사중..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b> <i> 다른 쓰기 예약된 항목이있습니다</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>구울 사진</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "자동 회전"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "CD 만들기"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:220
+msgid "Size"
+msgstr "크기"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "내 보낸 크기:"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "이전에 스케줄된 파일 찾아보기(_B)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:9
+#: ../src/f-spot.glade.h:97
+msgid "_Export"
+msgstr "내보내기(_E)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "이 사진들만 CD에 쓰기(_W)"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "페이스북(_A)..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "인증 기다리는 중"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
msgid ""
-"There are other add-ins that depend on the previous ones which will also be "
-"uninstalled:"
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click "
+"\"Ok\" below."
msgstr ""
-"이전 애드인에 의존성을 가진 다른 설치된 애드인들도 함께 제거될 것입니다:"
+"F-Spot 브라우저를 시작합니다 때문에 거기서 권한을 선택하십시오.\n"
+"\n"
+"페이스북 프로그램으로 하라는 메시지가 표시 되면 \"확인\" 버튼을 클릭하십시오."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "내보낼 사진이 너무 많습니다"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"The selected add-ins can't be installed because there are dependency "
-"conflicts."
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr "Facebook 에서는 한개의 앨범에 들어있는 사진은 {0} 장입니다. 사진을 선택하고 다시 다시 시도하십시오."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "사진을 업로드 하는 중"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "앨범 이름이 필요합니다"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "앨범에 이름을 지정하거나 기존 앨범을 선택하십시오."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "앨범 생성 실패"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
msgstr ""
-"의존성 충돌로 인해 선택한 애드인을 설치할 수 없습니다."
+"앨범을 만드는 중 오류가 발생했습니다.\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:393
-msgid "The following packages will be installed:"
-msgstr "다음 꾸러미들이 설치될 것입니다:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "\"{0}\" 사진을 업로드 하는 중 ({1} / {2})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:397
-msgid " (in user directory)"
-msgstr "(사용자 디렉토리에)"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Facebook에 업로드하는 중 오류: {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:403
-msgid "The following packages need to be uninstalled:"
-msgstr "다음 꾸러미들의 설치가 제거되어야 합니다:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
+msgid "Error"
+msgstr "오류"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:411
-msgid "The following dependencies could not be resolved:"
-msgstr "다음 의존성을 해결할 수 없었습니다:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "업로드 완료"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:435
-msgid "The installation has been successfully completed."
-msgstr "설치가 성공적으로 완료되었습니다."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "페이스 북에서 F - Spot 구릅 방문"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:436
-msgid "The installation failed!"
-msgstr "설치가 실패하였습니다!"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "인증을 기다리는 중"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:439
-msgid "The uninstallation has been successfully completed."
-msgstr "제거가 성공적으로 완료되었습니다."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click "
+"\"Ok\" below. F-Spot will cache your session in gnome-keyring, if possible, "
+"and re-use it on future Facebook exports."
+msgstr ""
+"F-Spot Facebook에 로그인하기 위해 브라우저를 시작합니다.\n"
+"\n"
+"Facebook 응용 프로그램에 이전하라는 메시지가 표시되면 다음 \"OK\"버튼을 클릭하십시오. F-Spot은 가능하면 당신의 세션을 "
+"Gnome-Keyring에 캐시하고 후반 Facebook에 내보내기에 다시 사용합니다."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:440
-msgid "The uninstallation failed!"
-msgstr "제거가 실패하였습니다!"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "인증하는 중..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:599
-msgid "Repository"
-msgstr "저장소"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Facebook에 로그인하는 동안 오류"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "설치 취소됨"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr "Facebook에 로그인에 문제가 있었습니다. 계정 정보를 확인하고 다시 시도하십시오."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required add-ins were not found"
-msgstr "필요한 몇몇 애드인을 찾을 수 없습니다"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "세션 인증 중"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "설치 실패"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "세션을 설정, 사용자 정보를 가져오는 중..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Add-in"
-msgstr "애드인"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "세션을 설정, 친구 목록을 가져오는 중..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-msgid "Version"
-msgstr "버전"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "세션을 설정, 친구 정보를 가져오는 중..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "기타"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "세션을 설정, 앨범을 요청 중..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} 페이스 북에 로그인 합니다."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "페이스북 연결 오류"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"Facebook에서 당신의 사용자 정보를 다운로드할 때 오류가 발생했습니다.\n"
+"\n"
+"Facebook 답변 :{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "당신은 로그인 되지 않았습니다."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "사진 자동-확인"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "표제"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "새 앨범 만들기"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "설명"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Facebook으로 내보내기"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "이 사진 속의"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "위치"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "로그인"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "로그아웃"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
+#: ../src/Widgets/InfoBox.cs:211
msgid "Name"
msgstr "이름"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "URL"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "로그인되어 있지 않습니다."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "권한:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "연결한 상태로 두기"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "기존 앨범을 이용"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "이것은 누구입니까?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "23hq(_2)..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "Flickr(_F)..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "Zooomr(_Z)..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "인증"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "예외 발생: {0}"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr "{0}의 인증 과정을 마친 후 이 창으로 돌아와서 아래의 \"인증 완료\" 단추를 누르세요"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "F-Spot Package"
-msgstr "F-Spot 꾸러미"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "인증 완료"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Add-in Installation"
-msgstr "애드인 설치"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "{0}(으)로 로그인 하는 중"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:134
-msgid "<b>Select the add-ins to install and click on Next</b>"
-msgstr "<b>설치할 애드인을 선택하고 다음을 클릭하십시오</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "자격을 점검하는 중..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:148
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "{0}님 {1}에 연결하신 것을 환영합니다!"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "다른 사용자로 로그인"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "한달 사용할 수 있는 공간 {1} 중 {0}을 사용할 때"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "로그인 할 수 없음"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "{1}의 {0} 응답을 기다리는 중"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "\"{0}\" 사진을 업로드 하는 중"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "{0}으로 업로드 하는 중 오류: {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "로그인 할 수 없음."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"F-Spot에서 {0}(으)로 로그인 할 수 없습니다. {0} 웹 브라우저 인터페이스를 이용한 인증 과정이 올바른지 확인하여 주십시오."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>계정</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>사진</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>스타일</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>보기 권한</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
+#: ../src/f-spot.glade.h:45
+msgid "Export"
+msgstr "내보내기"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "태그 계층 구조를 내보내기(_H)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"F-Spot에서 여러분의 {0} 계정에 사진을 업로드 하기 위해 인증이 필요합니다. \"인증\" 단추를 눌러 웹 브라우저를 열고 인증 "
+"과정을 수행해 주십시오. "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "최상위 태그는 무시(_T)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "비공개"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "공개"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "메타데이터 없앰(_M)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "가족들과 공유"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "친구들과 공유"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:98
+msgid "_Export tags"
+msgstr "태그 내보내기(_E)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:111
+msgid "_Resize to: "
+msgstr "크기 조정(_R): "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "업로드 할 때 브라우저에서 사진 보기(_V)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:127
+msgid "pixels"
+msgstr "픽셀"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "폴더(_O)..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "내보내기 폴더 선택"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "갤러리를 구성하는 중"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "\"{0}\" 사진을 갤러리로 업로드 하는 중 오류: {2}{1}"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "오류: 전송 중 오류 - 중지"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "오류: 파일이 이미 존재함 - 중지"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "밝게"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "어둡게"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "이전"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:83
+msgid "Index"
+msgstr "인덱스"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+msgid "Tags"
+msgstr "태그"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:59 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "다음"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "다음으로 만들어진 갤러리:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "스타일 보기"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "스타일 숨기기"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "태그: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "페이지:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>대상</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>내보내기 방식</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "\"원본\"을 이용하여 갤러리 만들기(_G)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "별도의 웹 갤러리 만들기(_W)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "설명(_E):"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "태그 내보내기(_T)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "태그 아이콘 내보내기(_I)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "폴더 내보내기"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "갤러리 이름(_A):"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "내보내기가 끝나면 대상 폴더 열기(_D)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "폴더(_F):"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "파일들만 저장(_S)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "웹 갤러리(_G)..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"이 버전에서는 갤러리에 연결할 수 없습니다.\n"
+"원격 플러그인이 1.08 이상인지 확인하십시오."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "잘못된 URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "갤러리 URL 항목이 올바르지 않은 URL인 것 같습니다"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "갤러리에 연결하는 도중 오류"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "로그인을 시도하는 중 다음과 같은 오류가 발생했습니다: {0}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "같은 이름의 갤러리가 이미 존재합니다"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr "입력된 갤러리 이름과 같은 이름의 걀러리가 이미 존재합니다. 다른 이름을 선택하십시오."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(최상위)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "잘못된 갤러리 이름"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"갤러리 이름에 잘못된 문자가 포함되어 있습니다.\n"
+"오직 문자, 숫자, - 그리고 _ 이외의 문자는 사용할 수 없습니다"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "\"{0}\" 사진을 갤러리로 업로드 하는 중 오류: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(갤러리 없음)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(연결되지 않음)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(앨범 없음)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "계정이 선택되지 않음"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>앨범</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>갤러리</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid ""
+"<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr "<span weight='bold' size='larger'>갤러리에 연결하는 중 오류</span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "제목과 메모 내보내기(_T)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "업로드가 끝나면 브라우저에서 앨범 열기(_A)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "이 갤러리에 대한 설정이 올바른지 확인하십시오."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "URL(_R):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "앨범 이름(_A):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "설명(_D):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:99
+msgid "_Export to Album:"
+msgstr "앨범으로 내보내기(_E):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "갤러리 이름(_G):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "갤러리(_G):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "상위 앨범(_P):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:10
+msgid "_Password:"
+msgstr "암호(_P):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "제목(_T):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:11
+msgid "_Username:"
+msgstr "사용자 이름(_U):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "서버의 응답을 읽는 중 오류"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "서버에서 갤러리의 내용을 포함하지 않은 응답을 반환했습니다"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "새 앨범을 만드는 중 오류"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"요청한 작업을 할 때 다음 오류가 발생했습니다:\n"
+"{0} ({1})"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "피카사웹(_P)..."
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "앨범을 만드는 중 오류"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr "앨범을 만드는 도중 다음과 같은 오류가 발생했습니다: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} 보냄"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} 의 약. {1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "갤러리로 업로드 하는 중 오류: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "사용 가능 공간: {0}, {1}% 중에 {2}사용"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"선택한 앨범은 사용 가능한 사진 매수가 {0} 개의 제한이 있습니다,\n"
+"따라서 선택된 사진에서 {1}개를 업로드합니다."
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>PicasaWeb 내보내기</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>여러분의 Google 계정이 잠겨있습니다</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"이 갤러리에 대한 설정이 올바른지 확인하십시오.\n"
+"'Captcha' 부분의 이미지에 표시된 글자를 입력하세요.\n"
+"<i>대소문자는 구분하지 않습니다</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "공개 앨범"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "앨범 제목(_A):"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "자동 회전(_A)"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "Captcha(_C):"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "SmugMug(_S)..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>SmugMug 내보내기</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "계정(_A):"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "사진 \"{0}\" 업로드 중"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Tabblo에 로그인 중"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "업로드를위한 URL을 검색하는 중"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "Tabblo(_T)..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "사진 전송 완료"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "업로드 완료"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Tabblo에 업로드하는 동안 오류: "
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot 태그</b>"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo 계정</b>"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "내보내기 사진에서 제외(_O):"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:7
+msgid "Select..."
+msgstr "선택하기..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:8
+msgid "_Attach to exported photos:"
+msgstr "내보내기 사진에 첨부(_A):"
+
+#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "액세스하는 동안 인증 오류"
+
+#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
+msgid "Abort this session"
+msgstr "이 세션 중지"
+
+#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
+msgid "Always trust this site's certificate"
+msgstr "이 사이트에 대한 인증을 항상 허용"
+
+#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
+msgid "Do you wish to:"
+msgstr "하시겠습니까:"
+
+#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
+msgid "Trust Error"
+msgstr "인증 오류"
+
+#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
+msgid "Trust the site's certificate this once"
+msgstr "이 사이트에 대한 인증을 한번만 허용"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "압축 파일(_E)..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:219
+msgid "No selection available"
+msgstr "선택한 영역이 없음"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr "이 도구는 선택한 사진이 필요합니다. 1개 이상의 사진을 선택하고 다시 시도하십시오"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "내보내기 폴더 선택"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "파일 내보내기 중"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "사진 \"{0}\" 준비 중"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "만들기(_C)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "파일 이름(_F):"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "위치(_L):"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "크기 조절(_S):"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"버전 0.5.0 이전에 가져온 사진의 중복을 감지하기 위해 F-Spot은 사진 컬렉션을 분석 해야합니다. 이 작업은 시간이 걸리기 때문에 "
+"기본적으로 제공하지 않습니다. 이 업데이트 프로세스에 대한 시작/일시 중지는 이 대화 상자에서 할 수 있습니다."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr "현재 {0} 사진은 MD5 계산을 필요로 하고, {1} 보류중인 작업"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "닫기(_C)"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "이미지 처리중..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "정지됨"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "중복 확인을 위한..."
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "DB 병합"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "선택된 파일을 불러오는 중 오류"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"선택한 파일은 잘못된 것, 또는 지원되지 않는 데이터베이스입니다.\n"
+"\n"
+"수신된 예외 \"{0}\""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import "
+"from</i></small>"
+msgstr "<small><i>가져올 데이터베이스의 위치를 선택하십시오</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>선택한 데이터베이스에서 가져오는 역할을 선택합니다.\n"
+"\"새로운 롤스 전용\"이 전에 가져온 사진을 다시 또 가져오기 위해 적절한 선택입니다.\n"
+"\"특정 룰스\"로 병합하고 싶은 역할을 선택할 수 있습니다.\n"
+"\"모두\"는 전체를 가져옵니다. 중복되게 만들면 동일한 데이터베이스에서 이미 가져오려 할 때 충돌이 발생합니다.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-"
+"spot.</i></small>"
+msgstr ""
+"<small><i>이미지를 로컬로 복사하거나 원래 위치에 그대로 유지 할지 여부를 선택합니다. 후자를 선택하면, F-Spot이 앞으로도 "
+"그 위치를 액세스할 수 있는지 확인하십시오.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "단일 룰 가져오기"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "사진 폴더로 이미지 복사"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "데이터베이스의 위치:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "전체"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "불러오기:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "이미지를 원래 위치에 그대로 보존"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "다른 F-Spot 컬렉션을 병합"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "새로운 룰스 전용"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "건너뜀"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>데이터베이스가 <b>{0}</b> 폴더에 있는 파일을 참조합니다.\n"
+"이 폴더를 선택하면 매핑합니다.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "화면 보호기 설정"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "모든 이미지"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "지연:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "표시:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "다음 태그가 붙은 이미지:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "F-Spot에서 화면 보호기 만들기"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "화면 보호기 설정"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-Spot 사진 관리자"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "여러분의 사진을 관리하고 공유하세요"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "사진 관리자"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "F-스팟으로 가져오기"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-Spot 사진 보기"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "사진 보기"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
+msgid "File not found"
+msgstr "파일을 찾을 수 없음"
+
+#: ../lib/libfspot/f-jpeg-utils.c:464
+#, c-format
+msgid "Unknown transform type %d"
+msgstr "알 수 없는 변형 방식 %d"
+
+#: ../lib/libfspot/f-jpeg-utils.c:472
+msgid "Operation failed"
+msgstr "작업 실패"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
+msgid "Package"
+msgstr "패키지"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
+msgid "Extension Installation"
+msgstr "확장기능 설치"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
+msgid "<b>Select the extensions to install and click on Next</b>"
+msgstr "<b>설치할 확장기능을 선택하고 다음을 누르십시오</b>"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
msgid "Install from:"
msgstr "설치 경로:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:177
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:181
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
msgid "_Repositories..."
msgstr "저장소(_R)..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:217
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
msgid "Show all packages"
msgstr "모든 꾸러미 보기"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:218
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
msgid "Show new versions only"
msgstr "새 버전 만 보기"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:219
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
msgid "Show updates only"
msgstr "업데이트 만 보기"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:244
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
msgid "_Unselect All"
msgstr "모두 선택 해제(_U)"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:256
-#: ../src/f-spot.glade.h:192
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
+#: ../src/ui/main_window.ui.h:18
msgid "Select _All"
msgstr "모두 선택(_A)"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:331
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
msgid "label124"
msgstr "label124"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:342
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
msgid "Overall Progress:"
msgstr "전체 진행도:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:370
-msgid "Downloading add-ins..."
-msgstr "애드인을 다운로드하는 중..."
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
+msgid "Downloading extensions..."
+msgstr "확장기능을 다운로드하는 중..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-msgid "Add-in Manager"
-msgstr "애드인 관리자"
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
+msgid "Extension Manager"
+msgstr "확장기능 관리자"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:52
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
msgid "Additional extensions are required to perform this operation."
msgstr "이 작업을 수행하려면 추가적인 확장이 필요합니다."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:62
-msgid "The following add-ins will be installed:"
-msgstr "다음 애드인이 설치될 것입니다:"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "F-Spot Add-in Manager"
-msgstr "F-Spot 애드인 관리자"
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
+msgid "The following extensions will be installed:"
+msgstr "다음 확장기능을 설치할 것입니다:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:88
-msgid "<big><b>F-Spot Add-in Manager</b></big>"
-msgstr "<big><b>F-Spot 애드인 관리자</b></big>"
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
+msgid "<big><b>Extension Manager</b></big>"
+msgstr "<big><b>확장기능 관리자</b></big>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:108
-msgid "The following add-ins are currently installed:"
-msgstr "다음 애드인들이 현재 설치되어 있습니다:"
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
+msgid "The following extensions are currently installed:"
+msgstr "다음 확장기능이 설치되어 있습니다:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:166
-msgid "_Install Add-ins..."
-msgstr "애드인 설치(_I)..."
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
+msgid "_Install Extensions..."
+msgstr "확장 기능 설치(_I)..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:215
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
msgid "_Uninstall..."
msgstr "설치 제거(_U)..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:245
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
msgid "Enable"
msgstr "사용"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:275
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
msgid "Disable"
msgstr "사용 안함"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../src/f-spot.glade.h:118
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
msgid "Details"
msgstr "상세 정보"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Add-in Repository Management"
-msgstr "애드인 저장소 관리"
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
+msgid "Extension Repository Management"
+msgstr "확장기능 저장소 관리"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
msgid "Add New Repository"
msgstr "새 저장소 더하기"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:68
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
msgid "Select the location of the repository you want to register:"
msgstr "등록하고 싶은 저장소의 위치를 선택하십시오:"
#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:75
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
msgid "Register an on-line repository"
msgstr "온라인 저장소 등록"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:104
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
msgid "Url:"
msgstr "URL:"
#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:125
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
msgid "Register a local repository"
msgstr "로컬 저장소 등록"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:153
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
msgid "Path:"
msgstr "경로:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:177
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
msgid "Browse..."
msgstr "찾아보기..."
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "({0} 제공)"
-
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:108
-msgid "Disabled add-ins can't be loaded."
-msgstr "사용하지 않는 애드인을 읽어들일 수 없습니다."
-
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:133
-#, csharp-format
-msgid "Loading {0} add-in"
-msgstr "{0} 애드인 읽어오는 중"
-
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:216
-#, csharp-format
-msgid "The required addin '{0}' is disabled."
-msgstr "필요한 애드인 {0}은(는) 사용하지 않도록 설정되어 있습니다."
-
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:218
-#, csharp-format
-msgid "The required addin '{0}' is not installed."
-msgstr "필요한 애드인 {0}은(는) 설치되어 있지 않습니다."
-
-#: ../extensions/DefaultExporters/DefaultExporters.addin.xml.h:1
-msgid "23hq..."
-msgstr "23hq..."
-
-#: ../extensions/DefaultExporters/DefaultExporters.addin.xml.h:2
-msgid "CD..."
-msgstr "CD..."
-
-#: ../extensions/DefaultExporters/DefaultExporters.addin.xml.h:3
-msgid "Flickr..."
-msgstr "Flickr..."
-
-#: ../extensions/DefaultExporters/DefaultExporters.addin.xml.h:4
-msgid "Folder..."
-msgstr "폴더..."
-
-#: ../extensions/DefaultExporters/DefaultExporters.addin.xml.h:5
-msgid "PicasaWeb..."
-msgstr "Picasa 웹앨범..."
-
-#: ../extensions/DefaultExporters/DefaultExporters.addin.xml.h:6
-msgid "SmugMug..."
-msgstr "SmugMug..."
-
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "F-Spot 사진 보기"
-
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "사진 보기"
-
-#: ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "F-Spot 사진 관리자"
-
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "여러분의 사진을 관리하고 공유하세요"
-
-#: ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "사진 관리자"
-
-#: ../google-sharp/CaptchaException.cs:58
-msgid "url"
-msgstr "URL"
-
-#: ../google-sharp/CaptchaException.cs:59
-msgid "token"
-msgstr "토큰"
-
-#: ../google-sharp/CaptchaException.cs:60
-msgid "captcha_url"
-msgstr "captcha_url"
-
-#: ../libeog/eog-file-selection.c:29 ../libeog/eog-file-selection.c:46
-msgid "By Extension"
-msgstr "확장자로"
-
-#: ../libeog/eog-file-selection.c:30
-msgid "BMP"
-msgstr "BMP"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
+msgid "Version:"
+msgstr "버전:"
-#: ../libeog/eog-file-selection.c:31
-msgid "GIF"
-msgstr "GIF"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
+msgid "Author:"
+msgstr "만든 이:"
-#: ../libeog/eog-file-selection.c:32
-msgid "ICO"
-msgstr "ICO"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
+msgid "Copyright:"
+msgstr "저작권:"
-#: ../libeog/eog-file-selection.c:33 ../libeog/eog-file-selection.c:48
-msgid "JPEG"
-msgstr "JPEG"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
+msgid "Extension Dependencies:"
+msgstr "확장기능 의존성:"
-#: ../libeog/eog-file-selection.c:34 ../libeog/eog-file-selection.c:51
-msgid "PNG"
-msgstr "PNG"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
+msgid "All registered repositories"
+msgstr "등록된 모든 저장소"
-#: ../libeog/eog-file-selection.c:35
-msgid "PNM"
-msgstr "PNM"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
+msgid "Are you sure you want to cancel the installation?"
+msgstr "정말로 설치를 취소하시겠습니까?"
-#: ../libeog/eog-file-selection.c:36
-msgid "RAS"
-msgstr "RAS"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
+msgid "The following packages will be uninstalled:"
+msgstr "다음 꾸러미들의 설치가 제거될 것입니다:"
-#: ../libeog/eog-file-selection.c:37
-msgid "SVG"
-msgstr "SVG"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+msgid ""
+"There are other extensions that depend on the previous ones which will also "
+"be uninstalled:"
+msgstr "먼저 설치하는 확장 기능에 의존하는 다른 확장 기능이 있습니다 :"
-#: ../libeog/eog-file-selection.c:38
-msgid "TGA"
-msgstr "TGA"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+msgid ""
+"The selected extensions can't be installed because there are dependency "
+"conflicts."
+msgstr "의존성 충돌로 선택한 확장 기능을 설치할 수 없습니다."
-#: ../libeog/eog-file-selection.c:39
-msgid "TIFF"
-msgstr "TIFF"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
+msgid "The following packages will be installed:"
+msgstr "다음 꾸러미들이 설치될 것입니다:"
-#: ../libeog/eog-file-selection.c:40
-msgid "XBM"
-msgstr "XBM"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
+msgid " (in user directory)"
+msgstr " (사용자 디렉터리에)"
-#: ../libeog/eog-file-selection.c:41 ../libeog/eog-file-selection.c:54
-msgid "XPM"
-msgstr "XPM"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
+msgid "The following packages need to be uninstalled:"
+msgstr "다음 꾸러미들의 설치가 제거되어야 합니다:"
-#: ../libeog/eog-file-selection.c:207
-msgid "Unsupported file format."
-msgstr "지원되지 않는 파일 형식."
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
+msgid "The following dependencies could not be resolved:"
+msgstr "다음 의존성을 해결할 수 없었습니다:"
-#: ../libeog/eog-file-selection.c:225
-msgid "Determine File Type:"
-msgstr "파일 형식 결정:"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
+msgid "The installation has been successfully completed."
+msgstr "설치가 성공적으로 완료되었습니다."
-#: ../libeog/eog-file-selection.c:268
-msgid "Load Image"
-msgstr "이미지 읽어오기"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
+msgid "The installation failed!"
+msgstr "설치가 실패하였습니다!"
-#: ../libeog/eog-file-selection.c:274
-msgid "Save Image"
-msgstr "이미지 저장하기"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
+msgid "The installation has completed with warnings."
+msgstr "설치가 완료되었고 경고가 있습니다."
-#: ../libeog/eog-image.c:773
-msgid "No image loaded."
-msgstr "읽어올 이미지가 없습니다."
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
+msgid "The uninstallation has been successfully completed."
+msgstr "제거가 성공적으로 완료되었습니다."
-#: ../libeog/eog-image.c:780
-msgid "Can't save non local files."
-msgstr "로컬 파일이 아닌 파일을 저장할 수 없습니다."
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
+msgid "The uninstallation failed!"
+msgstr "제거가 실패하였습니다!"
-#: ../libeog/eog-image.c:803
-msgid "Unsupported image type for saving."
-msgstr "저장할 수 없는 이미지 형식입니다."
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
+msgid "The uninstallation has completed with warnings."
+msgstr "제가가 완료되었고 경고가 있습니다."
-#: ../libeog/image-view.c:2128
-msgid "interpolation type"
-msgstr "인터폴레이션 타입"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
+msgid "Repository"
+msgstr "저장소"
-#: ../libeog/image-view.c:2129
-msgid "the type of interpolation to use"
-msgstr "사용할 인터폴레이션 방식"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
+msgid "Installation cancelled"
+msgstr "설치 취소됨"
-#: ../libeog/image-view.c:2135 ../libeog/image-view.c:2142
-msgid "check type"
-msgstr "검사 방식"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
+msgid "Some of the required extensions were not found"
+msgstr "몇몇 필요한 확장기능을 찾을 수 없습니다."
-#: ../libeog/image-view.c:2136
-msgid "the type of chequering to use"
-msgstr "사용할 검사 방식"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
+msgid "Installation failed"
+msgstr "설치 실패"
-#: ../libeog/image-view.c:2143
-msgid "the size of chequers to use"
-msgstr "사용할 검사기의 크기"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
+msgid "Extension"
+msgstr "확장기능"
-#: ../libeog/image-view.c:2149
-msgid "dither"
-msgstr "디더링"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
+#: ../src/Widgets/InfoBox.cs:214
+msgid "Version"
+msgstr "버전"
-#: ../libeog/image-view.c:2150
-msgid "dither type"
-msgstr "디더링 방식"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
+msgid "Other"
+msgstr "기타"
-#: ../libfspot/f-jpeg-utils.c:445
-msgid "File not found"
-msgstr "파일을 찾을 수 없음"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
+msgid "Url"
+msgstr "URL"
-#: ../libfspot/f-jpeg-utils.c:468
-#, c-format
-msgid "Unknown transform type %d"
-msgstr "알 수 없는 변형 방식 %d"
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#, csharp-format
+msgid "Exception occurred: {0}"
+msgstr "예외 발생: {0}"
-#: ../libfspot/f-jpeg-utils.c:476
-msgid "Operation failed"
-msgstr "작업 실패"
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
+msgid "Disabled extensions can't be loaded."
+msgstr "비활성화된 확장기능을 로드할 수 없습니다."
-#: ../src/CDExport.cs:116
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "\"{0}\" 사진을 CD로 보내는 중"
+msgid "Loading {0} extension"
+msgstr "확장기능 {0}을(를) 로드하는 중"
-#. This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/CDExport.cs:118 ../src/FlickrExport.cs:288
-#: ../src/FolderExport.cs:197 ../src/GalleryExport.cs:704
-#: ../src/ProgressDialog.cs:82 ../src/TimeDialog.cs:147
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
#, csharp-format
-msgid "{0} of {1}"
-msgstr "{1} 중 {0}"
-
-#: ../src/CDExport.cs:131 ../src/FlickrExport.cs:305
-#: ../src/FolderExport.cs:228 ../src/GalleryExport.cs:728
-#: ../src/PicasaWebExport.cs:644 ../src/SmugMugExport.cs:579
-msgid "Done Sending Photos"
-msgstr "사진 보내기 완료"
-
-#: ../src/CDExport.cs:133 ../src/FolderExport.cs:230
-msgid "Transfer Complete"
-msgstr "전송 완료"
+msgid "The required extension '{0}' is disabled."
+msgstr "필요한 확장기능 '{0}'이(가) 비활성화되었습니다."
-#: ../src/CDExport.cs:140 ../src/FolderExport.cs:235
-msgid "Error While Transferring"
-msgstr "전송 도중 오류"
-
-#: ../src/CDExport.cs:147 ../src/FolderExport.cs:252
-msgid "Error Transferring"
-msgstr "전송 오류"
-
-#: ../src/CDExport.cs:168 ../src/FolderExport.cs:274
-msgid "Error: Error while transferring; Aborting"
-msgstr "오류: 전송 중 오류 - 중지"
-
-#: ../src/CDExport.cs:171 ../src/FolderExport.cs:277
-msgid "Error: File Already Exists; Aborting"
-msgstr "오류: 파일이 이미 존재함 - 중지"
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#, csharp-format
+msgid "The required extension '{0}' is not installed."
+msgstr "필요한 확장기능 '{0}'이(가) 설치되지 않았습니다."
-#: ../src/CDExport.cs:210 ../src/CameraFileSelectionDialog.cs:194
-#: ../src/FolderExport.cs:331
-msgid "Transferring Pictures"
-msgstr "사진을 전송하는 중"
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#, csharp-format
+msgid "(provided by {0})"
+msgstr "({0} 제공)"
-#: ../src/CameraFileSelectionDialog.cs:73
+#: ../src/CameraFileSelectionDialog.cs:77
msgid "Preview"
msgstr "미리보기"
-#: ../src/CameraFileSelectionDialog.cs:75
+#: ../src/CameraFileSelectionDialog.cs:79
msgid "Path"
msgstr "경로"
-#: ../src/CameraFileSelectionDialog.cs:77 ../src/f-spot.glade.h:121
+#: ../src/CameraFileSelectionDialog.cs:81 ../src/f-spot.glade.h:48
msgid "File"
msgstr "파일"
-#: ../src/CameraFileSelectionDialog.cs:79 ../src/FolderExport.cs:855
-msgid "Index"
-msgstr "인덱스"
-
-#: ../src/CameraFileSelectionDialog.cs:99
+#: ../src/CameraFileSelectionDialog.cs:106
msgid "Select Tag"
msgstr "태그 선택"
-#: ../src/CameraFileSelectionDialog.cs:135
+#: ../src/CameraFileSelectionDialog.cs:142
msgid "Downloading Previews"
msgstr "미리보기를 다운로드하는 중"
-#: ../src/CameraFileSelectionDialog.cs:143
+#: ../src/CameraFileSelectionDialog.cs:152
#, csharp-format
msgid "Downloading Preview of {0}"
msgstr "{0}의 미리보기를 다운로드하는 중"
-#: ../src/CameraFileSelectionDialog.cs:217
+#: ../src/CameraFileSelectionDialog.cs:224
#, csharp-format
msgid "Copying file {0} of {1}"
msgstr "{1} 중 {0} 파일 복사하는 중"
-#: ../src/CameraFileSelectionDialog.cs:227
+#: ../src/CameraFileSelectionDialog.cs:239
msgid "Error transferring file"
msgstr "파일 전송 오류"
-#: ../src/CameraFileSelectionDialog.cs:236
-msgid "Done Copying Files"
-msgstr "파일 복사 완료"
-
-#: ../src/CameraFileSelectionDialog.cs:238
+#: ../src/CameraFileSelectionDialog.cs:248
msgid "Download Complete"
msgstr "다운로드 완료"
-#: ../src/CameraFileSelectionDialog.cs:263
+#: ../src/CameraFileSelectionDialog.cs:248
+msgid "Done Copying Files"
+msgstr "파일 복사 완료"
+
+#: ../src/CameraFileSelectionDialog.cs:272
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "카메라에서 \"{0}\"을(를) 전송하는 중"
-#: ../src/CameraSelectionDialog.cs:28
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
msgid "Camera"
msgstr "카메라"
-#: ../src/CameraSelectionDialog.cs:29
+#: ../src/CameraSelectionDialog.cs:30
msgid "Port"
msgstr "포트"
-#: ../src/ColorDialog.cs:211
-msgid "Error saving adjusted photo"
-msgstr "조정된 사진을 저장하는 도중 오류"
-
-#: ../src/ColorDialog.cs:212 ../src/HigMessageDialog.cs:15 ../src/Loupe.cs:58
-#: ../src/MainWindow.cs:2043 ../src/PhotoView.cs:265
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "\"{0}\" 예외가 발생했습니다. {1} 사진을 저장할 수 없습니다"
-
-#: ../src/Core.cs:190
+#: ../src/Core.cs:203
#, csharp-format
msgid "No photos matching {0} found"
msgstr "{0}와(과) 일치하는 사진을 찾을 수 없습니다"
-#: ../src/Core.cs:191
+#: ../src/Core.cs:204
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -601,11 +1639,11 @@ msgstr ""
"이 태그를 몇몇 사진에 더하거나, F-Spot 기본 설정 대화상자에서\n"
"다른 태그를 선택해 보십시오."
-#: ../src/Core.cs:195
+#: ../src/Core.cs:208
msgid "Search returned no results"
-msgstr "찾기 결과가 없습니다"
+msgstr "검색 결과가 없습니다"
-#: ../src/Core.cs:196
+#: ../src/Core.cs:209
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -615,125 +1653,123 @@ msgstr ""
"F-Spot 기본 설정 대화상자에서 다른 태그를\n"
"선택해 보십시오."
-#: ../src/DateCommands.cs:54
-msgid "Today"
-msgstr "오늘"
-
-#: ../src/DateCommands.cs:56
-msgid "Yesterday"
-msgstr "어제"
-
-#: ../src/DateCommands.cs:58
-msgid "Last 7 days"
-msgstr "일주일 이내"
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Core/Photo.cs:473
+msgid "Reparented"
+msgstr "재연결"
-#: ../src/DateCommands.cs:60
-msgid "Last 30 days"
-msgstr "한 달 이내"
+#: ../src/Core/Photo.cs:473
+#, csharp-format
+msgid "Reparented ({0})"
+msgstr "재연결 ({0})"
-#: ../src/DateCommands.cs:62
-msgid "Last 90 days"
-msgstr "3 달 이내"
+#: ../src/Core/Photo.cs:492
+#, csharp-format
+msgid "Modified"
+msgid_plural "Modified ({0})"
+msgstr[0] "수정됨 ({0})"
-#: ../src/DateCommands.cs:64
-msgid "Last 360 days"
-msgstr "1 년 이내"
+#: ../src/Core/Photo.cs:518
+#, csharp-format
+msgid "Modified in {1}"
+msgstr "{1}에 수정됨"
-#: ../src/DateCommands.cs:66
-msgid "Current Week (Mon-Sun)"
-msgstr "이번 주 (월-일요일)"
+#: ../src/Core/Photo.cs:518
+#, csharp-format
+msgid "Modified in {1} ({0})"
+msgstr "{1}에서 수정 ({0})"
-#: ../src/DateCommands.cs:68
-msgid "Previous Week (Mon-Sun)"
-msgstr "지난 주 (월-일요일)"
+#. Note that the original version is never stored in the photo_versions table in the
+#. database.
+#: ../src/Core/Photo.cs:676 ../src/f-spot.glade.h:63
+msgid "Original"
+msgstr "원본"
-#: ../src/DateCommands.cs:84 ../src/f-spot.glade.h:75
-msgid "All Images"
-msgstr "모든 이미지"
+#: ../src/Editors/AutoStretchEditor.cs:17
+msgid "Auto Color"
+msgstr "자동 색조정"
-#: ../src/DateCommands.cs:86
-msgid "Customized Range"
-msgstr "사용자가 지정한 범위"
+#: ../src/Editors/ColorEditor.cs:38
+msgid "Adjust Colors"
+msgstr "색상 조정"
-#: ../src/Editors/SoftFocus.cs:25 ../src/ItemAction.cs:341
-msgid "Soft Focus"
-msgstr "소프트 포커스"
+#: ../src/Editors/ColorEditor.cs:41
+msgid "Adjust"
+msgstr "조정"
-#: ../src/Editors/SoftFocus.cs:55 ../src/PhotoVersionCommands.cs:136
-msgid "Cancel"
-msgstr "취소"
+#: ../src/Editors/CropEditor.cs:35
+msgid "4 x 3 (Book)"
+msgstr "4 x 3 (책)"
-#: ../src/Editors/SoftFocus.cs:58
-msgid "Apply"
-msgstr "적용"
+#: ../src/Editors/CropEditor.cs:36
+msgid "4 x 6 (Postcard)"
+msgstr "4 x 6 (엽서)"
-#: ../src/Editors/Tilt.cs:28 ../src/ItemAction.cs:325
-msgid "Straighten"
-msgstr "수평 조정"
+#: ../src/Editors/CropEditor.cs:37
+msgid "5 x 7 (L, 2L)"
+msgstr "5 x 7 (L, 2L)"
-#: ../src/ExceptionDialog.cs:24
-msgid "F-Spot Encountered a Fatal Error"
-msgstr "F-Spot에 치명적인 오류가 발생했습니다"
+#: ../src/Editors/CropEditor.cs:38
+msgid "8 x 10"
+msgstr "8 x 10"
-#: ../src/ExceptionDialog.cs:60
-msgid "Error Details"
-msgstr "오류 상세 정보"
+#: ../src/Editors/CropEditor.cs:39
+msgid "Square"
+msgstr "정사각형"
-#: ../src/ExceptionDialog.cs:104
-msgid "An unhandled exception was thrown: "
-msgstr "처리할 수 없는 예외 발생: "
+#: ../src/Editors/CropEditor.cs:42
+msgid "Crop"
+msgstr "잘라내기"
-#: ../src/Extensions/OpenWithMenu.cs:93
-msgid "No applications available"
-msgstr "이용할 수 있는 프로그램이 없음"
+#: ../src/Editors/CropEditor.cs:73
+msgid "Select the area that needs cropping."
+msgstr "잘라낼 영역을 선택하십시오."
-#: ../src/FSpot.addin.xml.h:1
-msgid "Attach Tag"
-msgstr "태그 붙이기"
+#: ../src/Editors/CropEditor.cs:98
+msgid "No Constraint"
+msgstr "제한 없음"
-#: ../src/FSpot.addin.xml.h:2
-msgid "Copy Photo Location"
-msgstr "사진 위치 복사"
+#: ../src/Editors/CropEditor.cs:99
+msgid "Same as photo"
+msgstr "사진과 동일"
-#: ../src/FSpot.addin.xml.h:3
-msgid "Delete From Drive"
-msgstr "드라이브에서 지우기"
+#: ../src/Editors/CropEditor.cs:104
+msgid "Custom Ratios..."
+msgstr "사용자 지정 비율..."
-#: ../src/FSpot.addin.xml.h:4
-msgid "Export to"
-msgstr "다음으로 내보내기"
+#: ../src/Editors/DesaturateEditor.cs:17
+msgid "Desaturate"
+msgstr "흑백 사진"
-#: ../src/FSpot.addin.xml.h:5
-msgid "Open With"
-msgstr "다른 프로그램으로 열기"
+#: ../src/Editors/RedEyeEditor.cs:19
+msgid "Red-eye Reduction"
+msgstr "적목감소"
-#: ../src/FSpot.addin.xml.h:6
-msgid "Remove From Catalog"
-msgstr "카탈로그에서 지우기"
+#: ../src/Editors/RedEyeEditor.cs:21
+msgid "Fix!"
+msgstr "고치기!"
-#: ../src/FSpot.addin.xml.h:7
-msgid "Remove Tag"
-msgstr "태그 지우기"
+#: ../src/Editors/RedEyeEditor.cs:25
+msgid "Select the eyes you wish to fix."
+msgstr "고칠 눈을 선택하십시오."
-#: ../src/FSpot.addin.xml.h:8 ../src/ItemAction.cs:80 ../src/MainWindow.cs:255
-#: ../src/SingleView.cs:73
-msgid "Rotate Left"
-msgstr "왼쪽으로 회전"
+#: ../src/Editors/SepiaEditor.cs:17
+msgid "Sepia Tone"
+msgstr "세피아 톤"
-#: ../src/FSpot.addin.xml.h:9 ../src/ItemAction.cs:92 ../src/MainWindow.cs:259
-#: ../src/SingleView.cs:78
-msgid "Rotate Right"
-msgstr "오른쪽으로 회전"
+#: ../src/Editors/SoftFocusEditor.cs:32
+msgid "Soft Focus"
+msgstr "소프트 포커스"
-#: ../src/FSpot.addin.xml.h:10
-msgid "Tools"
-msgstr "도구"
+#: ../src/Editors/TiltEditor.cs:30
+msgid "Straighten"
+msgstr "수평 조정"
-#: ../src/FileImportBackend.cs:265
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "가져오기 오류"
-#: ../src/FileImportBackend.cs:266
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "{0}{2}{2}{1} 가져오기 도중 오류"
@@ -743,313 +1779,568 @@ msgstr "{0}{2}{2}{1} 가져오기 도중 오류"
msgid "No way to save files of type \"{0}\""
msgstr "\"{0}\" 형식의 파일을 저장할 수 없습니다"
-#: ../src/FlickrExport.cs:73 ../src/f-spot.glade.h:82
-msgid "Authorize"
-msgstr "인증"
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "처리되지 않은 예외"
-#: ../src/FlickrExport.cs:78
-#, csharp-format
-msgid ""
-"Return to this window after you have finished the authorization process on "
-"{0} and click the \"Complete Authorization\" button below"
-msgstr ""
-"{0}의 인증 과정을 마친 후 이 창으로 돌아와서 "
-"아래의 \"인증 완료\" 단추를 누르세요"
+#: ../src/FSpot.addin.xml.h:1
+msgid "Copy Photo Locat_ion"
+msgstr "사진 위치 복사(_I)"
-#: ../src/FlickrExport.cs:79
-msgid "Complete Authorization"
-msgstr "인증 완료"
+#: ../src/FSpot.addin.xml.h:2
+msgid "Export to"
+msgstr "다음으로 내보내기"
-#: ../src/FlickrExport.cs:83
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "{0}(으)로 로그인 하는 중"
+#: ../src/FSpot.addin.xml.h:3
+msgid "Open _With"
+msgstr "다른 프로그램으로 열기(_W)"
-#: ../src/FlickrExport.cs:84
-msgid "Checking credentials..."
-msgstr "자격을 점검하는 중..."
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
+msgid "Rem_ove Tag"
+msgstr "태그 제거(_O)"
-#: ../src/FlickrExport.cs:90
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "{0}님 {1}에 연결하신 것을 환영합니다! "
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:797 ../src/ui/main_window.ui.h:16
+msgid "Rotate _Left"
+msgstr "왼쪽으로 회전(_L)"
-#: ../src/FlickrExport.cs:93
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "다른 사용자로 로그인"
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:71
+#: ../src/SingleView.cs:798 ../src/ui/main_window.ui.h:17
+msgid "Rotate _Right"
+msgstr "오른쪽으로 회전(_R)"
-#: ../src/FlickrExport.cs:244
-msgid "Unable to log on"
-msgstr "로그인 할 수 없음"
+#: ../src/FSpot.addin.xml.h:7
+msgid "Tools"
+msgstr "도구"
-#: ../src/FlickrExport.cs:264
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "{1}의 {0} 응답을 기다리는 중"
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
+msgid "_Attach Tag"
+msgstr "태그 붙이기(_A)"
-#: ../src/FlickrExport.cs:283 ../src/FolderExport.cs:194
-#: ../src/GalleryExport.cs:700
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "\"{0}\" 사진을 업로드 하는 중"
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
+msgid "_Delete From Drive"
+msgstr "드라이브에서 삭제(_D)"
-#: ../src/FlickrExport.cs:307 ../src/GalleryExport.cs:730
-#: ../src/PicasaWebExport.cs:646 ../src/SmugMugExport.cs:581
-msgid "Upload Complete"
-msgstr "업로드 완료"
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
+msgid "_Remove From Catalog"
+msgstr "카탈로그에서 제거(_R)"
-#: ../src/FlickrExport.cs:310
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "{0}으로 업로드 하는 중 오류: {1}"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FlickrExport.cs:313 ../src/FolderExport.cs:202
-#: ../src/GalleryExport.cs:720 ../src/PicasaWebExport.cs:636
-#: ../src/SmugMugExport.cs:571
-msgid "Error"
-msgstr "오류"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
-#: ../src/FlickrExport.cs:378
-msgid "Unable to log on."
-msgstr "로그인 할 수 없음."
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
-#: ../src/FlickrExport.cs:379
-#, csharp-format
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
+
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b> </b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>수정(_R)</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>이미지 보간(Interpolation)</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>크기</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>요약</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>투명 부분</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>가져온 모든 사진 보기</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>화이트 밸런스(_W)</b>"
+
+#: ../src/f-spot.glade.h:21
msgid ""
-"F-Spot was unable to log on to {0}. Make sure you have given the "
-"authentication using {0} web browser interface."
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
msgstr ""
-"F-Spot에서 {0}(으)로 로그인 할 수 없습니다. {0} 웹 브라우저 인터페이스를 "
-"이용한 인증 과정이 올바른지 확인하여 주십시오."
+"<small><i>사진을 확대하기 위해 보관 허용을 활성화합니다. 사진을 볼 때 해제해야 하지 않지만 아이콘을 볼 때 비활성화 하는 것이 "
+"도움이 될 것입니다.</i></small>"
-#: ../src/FlickrExport.cs:397 ../src/GalleryExport.cs:653
-#: ../src/PicasaWebExport.cs:548 ../src/SmugMugExport.cs:497
-msgid "Uploading Pictures"
-msgstr "사진을 업로드 하는 중"
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>이미지 내의 투명한 부분을 표시하는 방식을 선택할 수 있습니다. 이 옵션은 일반 사진에서는 아무 효과도 없지만, 이를 "
+"체크 패턴이나 특정 색상으로 지정해 두면 투명한 영역을 포함한아이콘이나 다른 아트워크를 볼 때 유용하게 사용할 수 "
+"있습니다.</i></small>"
-#: ../src/FolderExport.cs:111
-msgid "Select Export Folder"
-msgstr "내보내기 폴더 선택"
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "배경색으로(_B)"
-#: ../src/FolderExport.cs:156
-msgid "Building Gallery"
-msgstr "갤러리를 구성하는 중"
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "사용자 정의 색(_C) "
-#: ../src/FolderExport.cs:200
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "\"{0}\" 사진을 갤러리로 업로드 하는 중 오류: {2}{1}"
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "체크무늬로(_P)"
-#: ../src/FolderExport.cs:709
-msgid "Light"
-msgstr "밝게"
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "태그 붙이기:"
-#: ../src/FolderExport.cs:710
-msgid "Dark"
-msgstr "어둡게"
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "태그 붙이기:"
-#. Abbreviation of previous
-#: ../src/FolderExport.cs:853
-msgid "Prev"
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "대비(_O):"
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "만들기(_R)"
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "카메라 선택"
+
+#: ../src/f-spot.glade.h:33
+msgid "Choose destination directory"
+msgstr "원하는 디렉터리를 선택"
+
+#: ../src/f-spot.glade.h:34
+msgid "Copy files to the Photos folder"
+msgstr "파일을 사진 폴더로 복사"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create Mail"
+msgstr "메일 작성하기"
+
+#: ../src/f-spot.glade.h:36
+msgid "Create _icon for this tag when first used"
+msgstr "이 태그를 처음 사용할 때 아이콘 만들기(_I)"
+
+#: ../src/f-spot.glade.h:37
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "사진을 첨부한 메일을 작성합니다. (필요에 따라 크기를 조절할 수 있습니다)"
+
+#: ../src/f-spot.glade.h:38
+msgid "Detect duplicates"
+msgstr "중복 검색"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display File _Names"
+msgstr "파일 이름 표시(_N)"
+
+#: ../src/f-spot.glade.h:40
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "지정된 롤에서 가져온 사진만을 표시."
+
+#: ../src/f-spot.glade.h:41
+msgid "Do not send a mail"
+msgstr "메일을 보내지 않음"
+
+#: ../src/f-spot.glade.h:42
+msgid "E-_Mail:"
+msgstr "전자메일(_M):"
+
+#: ../src/f-spot.glade.h:43
+msgid "E_xport titles and comments"
+msgstr "제목과 메모 내보내기(_X)"
+
+#: ../src/f-spot.glade.h:44
+msgid "Estimated new size"
+msgstr "예상 새 크기"
+
+#: ../src/f-spot.glade.h:46
+msgid "Extra large"
+msgstr "매우 크게"
+
+#: ../src/f-spot.glade.h:47
+msgid "F-Spot View"
+msgstr "F-Spot 보기"
+
+#: ../src/f-spot.glade.h:49
+msgid "Filter on selected rolls"
+msgstr "선택된 롤에 필터 적용"
+
+#: ../src/f-spot.glade.h:50
+msgid "G_allery:"
+msgstr "갤러리(_A):"
+
+#: ../src/f-spot.glade.h:51
+msgid "Gallery"
+msgstr "갤러리"
+
+#: ../src/f-spot.glade.h:52 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:267
+msgid "Import"
+msgstr "가져오기"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:54
+msgid "Import Source:"
+msgstr "가져오기 소스:"
+
+#: ../src/f-spot.glade.h:55
+msgid "Include subfolders"
+msgstr "하위 폴더 포함"
+
+#: ../src/f-spot.glade.h:56
+msgid "Large"
+msgstr "크게"
+
+#: ../src/f-spot.glade.h:57
+msgid "Manage your custom selection ratios"
+msgstr "사용자 정의 선택 화면 비율 관리"
+
+#: ../src/f-spot.glade.h:58
+msgid "Medium"
+msgstr "보통"
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of photos in selected rolls:"
+msgstr "선택된 룰의 사진 수:"
+
+#: ../src/f-spot.glade.h:61
+msgid "Number of pictures"
+msgstr "사진의 수"
+
+#: ../src/f-spot.glade.h:62
+msgid "Open _Folder..."
+msgstr "폴더 열기(_F)..."
+
+#: ../src/f-spot.glade.h:64
+msgid "Original size (possible very large file size)"
+msgstr "원본 크기 (아마도 매우 클 것입니다)"
+
+#: ../src/f-spot.glade.h:65 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "상위 태그(_A):"
+
+#: ../src/f-spot.glade.h:66
+msgid "Pause"
+msgstr "일시 정지"
+
+#: ../src/f-spot.glade.h:67
+msgid "Preferences"
+msgstr "기본 설정"
+
+#: ../src/f-spot.glade.h:68 ../src/ItemAction.cs:123
+msgid "Previous"
msgstr "이전"
-#: ../src/FolderExport.cs:858 ../src/ItemAction.cs:103
-#: ../src/f-spot.glade.h:151
-msgid "Next"
-msgstr "다음"
+#: ../src/f-spot.glade.h:69
+msgid "Repair"
+msgstr "복구"
-#: ../src/FolderExport.cs:911 ../src/FolderExport.cs:1084
-msgid "Show Styles"
-msgstr "스타일 보기"
+#: ../src/f-spot.glade.h:72
+msgid "Select Photos to Copy From Camera..."
+msgstr "카메라에서 복사할 사진 선택..."
-#: ../src/FolderExport.cs:912 ../src/FolderExport.cs:1085
-msgid "Hide Styles"
-msgstr "스타일 숨기기"
+#: ../src/f-spot.glade.h:73
+msgid "Select a Tag..."
+msgstr "태그 선택..."
-#: ../src/FolderExport.cs:969
-msgid "Gallery generated by"
-msgstr "다음으로 만들어진 갤러리:"
+#: ../src/f-spot.glade.h:74
+msgid "Select the camera from which you want to transfer files"
+msgstr "파일을 전송할 카메라를 선택하십시오"
-#: ../src/FolderExport.cs:1014
-msgid "Page:"
-msgstr "페이지:"
+#: ../src/f-spot.glade.h:75
+msgid "Selected Camera: "
+msgstr "선택한 카메라: "
-#: ../src/FormClient.cs:292
-msgid "Unhandled exception"
-msgstr "처리되지 않은 예외"
+#: ../src/f-spot.glade.h:76
+msgid "Selection Constraints"
+msgstr "선택화면 비율 관리"
-#: ../src/FullScreenView.cs:51
-msgid "Hide"
-msgstr "숨기기"
+#: ../src/f-spot.glade.h:77 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "배경으로 설정(_B)"
-#: ../src/FullScreenView.cs:53
-msgid "Hide Toolbar"
-msgstr "도구 모음 숨기기"
+#: ../src/f-spot.glade.h:78
+msgid "Show all photos."
+msgstr "모든 사진 보기."
-#: ../src/FullScreenView.cs:59
-msgid "Info"
-msgstr "정보"
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the side pane"
+msgstr "왼쪽 창을 보이거나 숨깁니다"
-#: ../src/FullScreenView.cs:61
-msgid "Image Information"
-msgstr "이미지 정보"
+#: ../src/f-spot.glade.h:80
+msgid "Show or hide the toolbar"
+msgstr "도구 모음을 보이거나 숨깁니다"
-#: ../src/FullScreenView.cs:66
-msgid "Exit fullscreen"
-msgstr "전체화면 끝내기"
+#: ../src/f-spot.glade.h:81
+msgid "Side _pane"
+msgstr "왼쪽 창(_P)"
-#: ../src/FullScreenView.cs:76 ../src/MainWindow.cs:288
-#: ../src/SingleView.cs:90
-msgid "Slideshow"
-msgstr "슬라이드쇼"
+#: ../src/f-spot.glade.h:82
+msgid "Small"
+msgstr "작게"
-#: ../src/FullScreenView.cs:77
-msgid "Start slideshow"
-msgstr "슬라이드쇼 시작"
+#: ../src/f-spot.glade.h:83
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr "원본 크기의 사진이 회전되어야 하는지 여부를 지정합니다. 작은 크기의 사진들은 자동으로 회전됩니다."
-#: ../src/FullScreenView.cs:142
-msgid "Slide transition: "
-msgstr "슬라이드 전환: "
+#: ../src/f-spot.glade.h:84
+msgid "Strip image _metadata"
+msgstr "이미지 메타데이터 삭제(_M)"
-#: ../src/GalleryExport.cs:376
-msgid "Invalid URL"
-msgstr "잘못된 URL"
+#: ../src/f-spot.glade.h:85
+msgid "Target location:\t"
+msgstr "대상 위치:\t"
-#: ../src/GalleryExport.cs:377
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "갤러리 URL 항목이 올바르지 않은 URL인 것 같습니다"
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:87
+msgid "Te_mp:"
+msgstr "색온도(_M):"
-#: ../src/GalleryExport.cs:387 ../src/GalleryExport.cs:402
-msgid "Error while connecting to Gallery"
-msgstr "갤러리에 연결하는 도중 오류"
+#: ../src/f-spot.glade.h:88
+msgid "Tiny"
+msgstr "매우 작게"
-#: ../src/GalleryExport.cs:388 ../src/GalleryExport.cs:403
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "로그인을 시도하는 중 다음과 같은 오류가 발생했습니다: {0}"
+#: ../src/f-spot.glade.h:89
+msgid "Total original size"
+msgstr "총 원본 크기"
-#: ../src/GalleryExport.cs:481
-msgid "(TopLevel)"
-msgstr "(최상위)"
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "확대(_I)"
-#: ../src/GalleryExport.cs:719
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "\"{0}\" 사진을 갤러리로 업로드 하는 중 오류: {1}"
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "축소(_O)"
-#: ../src/GalleryExport.cs:746 ../src/PicasaWebExport.cs:667
-#: ../src/SmugMugExport.cs:602
-msgid "(No Gallery)"
-msgstr "(갤러리 없음)"
+#: ../src/f-spot.glade.h:92 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "확대"
-#: ../src/GalleryExport.cs:833 ../src/PicasaWebExport.cs:794
-#: ../src/SmugMugExport.cs:700
-msgid "(Not Connected)"
-msgstr "(연결되지 않음)"
+#: ../src/f-spot.glade.h:93 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "축소"
-#: ../src/GalleryExport.cs:834 ../src/PicasaWebExport.cs:795
-#: ../src/SmugMugExport.cs:701
-msgid "(No Albums)"
-msgstr "(앨범 없음)"
+#: ../src/f-spot.glade.h:94
+msgid "_Brightness:"
+msgstr "밝기(_B):"
-#: ../src/GalleryExport.cs:886 ../src/PicasaWebExport.cs:839
-#: ../src/SmugMugExport.cs:745
-msgid "No account selected"
-msgstr "계정이 선택되지 않음"
+#: ../src/f-spot.glade.h:95
+msgid "_Create Mail"
+msgstr "메일 만들기(_C)"
-#: ../src/GalleryRemote.cs:356
-msgid "Error reading server response"
-msgstr "서버의 응답을 읽는 중 오류"
+#: ../src/f-spot.glade.h:96 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "편집(_E)"
-#. failed to find the response
-#: ../src/GalleryRemote.cs:368
-msgid "Server returned response without Gallery content"
-msgstr "서버에서 갤러리의 내용을 포함하지 않은 응답을 반환했습니다"
+#: ../src/f-spot.glade.h:100
+msgid "_Exposure:"
+msgstr "노출(_E):"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Flickr"
+msgstr "Flickr(_F)"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "전체 화면(_F)"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Gallery"
+msgstr "갤러리(_G)"
+
+#: ../src/f-spot.glade.h:104 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "도움말(_H)"
+
+#: ../src/f-spot.glade.h:105
+msgid "_Hue:"
+msgstr "색조(_H):"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Interpolate image on zoom"
+msgstr "확대/축소할 때 인터폴레이션(_I)"
+
+#: ../src/f-spot.glade.h:107
+msgid "_New Window"
+msgstr "새 창(_N)"
+
+#: ../src/f-spot.glade.h:108
+msgid "_Open album in browser when done uploading"
+msgstr "업로드가 끝나면 브라우저에서 앨범 열기(_O)"
+
+#: ../src/f-spot.glade.h:109
+msgid "_Open destination when done exporting"
+msgstr "내보내기가 끝나면 대상 폴더 열기(_O)"
+
+#: ../src/f-spot.glade.h:110 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "사진(_P)"
+
+#: ../src/f-spot.glade.h:112
+msgid "_Saturation:"
+msgstr "채도(_S):"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Scale photos to no larger than: "
+msgstr "다음 보다 크지 않게 사진 확대(_S): "
+
+#: ../src/f-spot.glade.h:114 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "슬라이드쇼(_S)"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Strip metadata"
+msgstr "메타데이터 제거(_S)"
+
+#: ../src/f-spot.glade.h:116 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "태그 이름(_T):"
+
+#: ../src/f-spot.glade.h:117
+msgid "_Tint:"
+msgstr "색조(_T):"
+
+#: ../src/f-spot.glade.h:118
+msgid "_Toolbar"
+msgstr "도구 모음(_T)"
+
+#: ../src/f-spot.glade.h:119
+msgid "_URI:"
+msgstr "URI(_U):"
+
+#: ../src/f-spot.glade.h:120 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "보기(_V)"
+
+#: ../src/f-spot.glade.h:121
+msgid "_Virtual Filesystem"
+msgstr "가상 파일 시스템(_V)"
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "오버랩"
+#: ../src/f-spot.glade.h:122 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "그리고"
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "뒤집기"
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:124
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"일치\n"
+"이후\n"
+"사이"
-#: ../src/GlTransition.cs:148
-msgid "Cover"
-msgstr "덮기"
+#: ../src/f-spot.glade.h:128
+msgid "x"
+msgstr "x"
-#: ../src/GlTransition.cs:175
-msgid "Reveal"
-msgstr "나타나기"
+#: ../src/FullScreenView.cs:58
+msgid "Hide"
+msgstr "숨기기"
-#: ../src/GlTransition.cs:202
-msgid "Wipe"
-msgstr "밀어내기"
+#: ../src/FullScreenView.cs:60
+msgid "Hide Toolbar"
+msgstr "도구 모음 숨기기"
-#: ../src/GlTransition.cs:260
-msgid "Split"
-msgstr "자르기"
+#: ../src/FullScreenView.cs:66
+msgid "Info"
+msgstr "정보"
+
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+msgid "Image Information"
+msgstr "이미지 정보"
-#: ../src/GlTransition.cs:350
-msgid "Push"
-msgstr "밀기"
+#: ../src/FullScreenView.cs:73
+msgid "Exit fullscreen"
+msgstr "전체화면 끝내기"
+
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
+#: ../src/SingleView.cs:149
+msgid "Slideshow"
+msgstr "슬라이드쇼"
+
+#: ../src/FullScreenView.cs:82
+msgid "Start slideshow"
+msgstr "슬라이드쇼 시작"
+
+#: ../src/FullScreenView.cs:128
+msgid "Slide transition:"
+msgstr "슬라이드 전환:"
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "다른 날짜"
#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "다른 디렉토리"
-
-#: ../src/GroupSelector.cs:63 ../src/GroupSelector.cs:64
msgid "More"
msgstr "기타"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "월 별로 정렬(_M)"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "폴더 별로 정렬(_F)"
-
-#: ../src/GroupSelector.cs:523 ../src/f-spot.glade.h:292
-msgid "_Reverse Order"
-msgstr "역순으로(_R)"
-
-#: ../src/GroupSelector.cs:529
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "날짜 범위 초기화(_C)"
-#: ../src/HigMessageDialog.cs:28 ../src/PhotoView.cs:264
-msgid "Error editing photo"
-msgstr "사진을 편집하는 중 오류"
-
#: ../src/Imaging/Exif.cs:228
msgid "Image Directory"
-msgstr "이미지 디렉토리"
+msgstr "이미지 디렉터리"
#: ../src/Imaging/Exif.cs:230
msgid "Thumbnail Directory"
-msgstr "미리보기(Thumbnail) 디렉토리"
+msgstr "미리보기(Thumbnail) 디렉터리"
#: ../src/Imaging/Exif.cs:232
msgid "Exif Directory"
-msgstr "Exif 디렉토리"
+msgstr "Exif 디렉터리"
#: ../src/Imaging/Exif.cs:234
msgid "GPS Directory"
-msgstr "GPS 디렉토리"
+msgstr "GPS 디렉터리"
#: ../src/Imaging/Exif.cs:236
msgid "InterOperability Directory"
-msgstr "상호운용성 디렉토리"
+msgstr "상호운용성 디렉터리"
#: ../src/Imaging/Exif.cs:238
msgid "Unknown Directory"
-msgstr "알 수 없는 디렉토리"
+msgstr "알 수 없는 디렉터리"
+
+#: ../src/Imaging/ImageFile.cs:95
+msgid "Writing to this file format is not supported"
+msgstr "이 파일 형식은 쓰기를 지원하지 않습니다"
#: ../src/Imaging/IptcFile.cs:145
msgid "IPTC Information Interchange Model (IIM) Version number"
@@ -1078,8 +2369,7 @@ msgstr "고유 번호"
#: ../src/Imaging/IptcFile.cs:157
msgid ""
"The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
-msgstr ""
-"envelope 처리 우선 순위: 1 (가장 빠름)부터 9 (가장 느림)"
+msgstr "envelope 처리 우선 순위: 1 (가장 빠름)부터 9 (가장 느림)"
#: ../src/Imaging/IptcFile.cs:159
msgid "The year, month and day (CCYYMMDD) the service sent the material"
@@ -1144,8 +2434,7 @@ msgstr "내용에서 포커스를 맞추고 있는 국가의 (완전한) 이름"
#: ../src/Imaging/IptcFile.cs:206
msgid ""
"Two or three letter ISO3166 code of the country of the focus of the content"
-msgstr ""
-"내용에서 포커스를 맞추고 있는 국가에 대한 2 글자 혹은 3 글자의 ISO3166 코드"
+msgstr "내용에서 포커스를 맞추고 있는 국가에 대한 2 글자 혹은 3 글자의 ISO3166 코드"
#: ../src/Imaging/IptcFile.cs:209
msgid "Creator of the content"
@@ -1163,8 +2452,7 @@ msgstr "만든 사람들"
msgid ""
"The person involved in writing, editing or correcting the object data or "
"caption/abstract"
-msgstr ""
-"대상 데이터 및 캡션, 요약문을 작성하거나, 편집하거나, 수정해 준 사람들"
+msgstr "대상 데이터 및 캡션, 요약문을 작성하거나, 편집하거나, 수정해 준 사람들"
#: ../src/Imaging/IptcFile.cs:222
msgid "Headline of the content"
@@ -1173,8 +2461,7 @@ msgstr "내용의 머리글"
#: ../src/Imaging/IptcFile.cs:225
msgid ""
"Instructions from the creator to the receiver not covered by other fields"
-msgstr ""
-"작성자가 제공하는 다른 항목에서 다루지 않은 수신자에 대한 지시"
+msgstr "작성자가 제공하는 다른 항목에서 다루지 않은 수신자에 대한 지시"
#: ../src/Imaging/IptcFile.cs:228
msgid "Intellectual genre of the object"
@@ -1184,2283 +2471,1615 @@ msgstr "대상의 지적인 장르"
msgid "Unknown IIM DataSet"
msgstr "알 수 없는 IIM 데이터셋"
-#: ../src/ImportCommand.cs:44 ../src/SingleView.cs:329
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:703
msgid "Select Folder"
msgstr "폴더 선택"
-#: ../src/ImportCommand.cs:256
+#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
msgstr "(카메라를 찾을 수 없음)"
-#: ../src/ImportCommand.cs:400
+#: ../src/ImportCommand.cs:404
#, csharp-format
msgid "Loading {0} of {1}"
msgstr "{1} 중 {0} 읽어오는 중"
-#: ../src/ImportCommand.cs:468
+#: ../src/ImportCommand.cs:470
msgid "Done Loading"
msgstr "읽어오기 완료"
-#: ../src/ImportCommand.cs:665
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
-msgstr "디렉토리가 존재하지 않음."
+msgstr "디렉터리가 존재하지 않습니다."
-#: ../src/ImportCommand.cs:666
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
"different directory"
-msgstr ""
-"선택한 \"{0}\" 디렉토리가 존재하지 않습니다. 다른 디렉토리를 선택하여 "
-"주십시오"
+msgstr "선택한 \"{0}\" 디렉터리가 존재하지 않습니다. 다른 디렉터리를 선택하여 주십시오"
-#. Prepare the Last Import root tag
-#: ../src/ImportCommand.cs:718 ../src/ImportCommand.cs:720
-#: ../src/XmpTagsImporter.cs:86
+#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
+#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/XmpTagsImporter.cs:89
msgid "Import Tags"
msgstr "태그 가져오기"
-#: ../src/InfoBox.cs:81
-msgid "name"
-msgstr "이름"
-
-#: ../src/InfoBox.cs:83
-msgid "version"
-msgstr "버전"
-
-#: ../src/InfoBox.cs:85
-msgid "date"
-msgstr "날짜"
-
-#: ../src/InfoBox.cs:87
-msgid "size"
-msgstr "크기"
-
-#: ../src/InfoBox.cs:89
-msgid "exposure"
-msgstr "노출"
-
-#. The label for the root category is used in new and edit tag dialogs
-#: ../src/InfoBox.cs:232 ../src/TagStore.cs:451
-msgid "(None)"
-msgstr "(없음)"
-
-#: ../src/InfoBox.cs:243 ../src/InfoBox.cs:252
-msgid "(Unknown)"
-msgstr "(알 수 없음)"
-
-#: ../src/InfoDisplay.cs:14 ../src/MainWindow.cs:1547
-#: ../src/f-spot.glade.h:149
-msgid "Metadata Browser"
-msgstr "메타데이터 탐색기"
-
-#. Obsolete, remove after db rev4
-#: ../src/InfoDisplay.cs:135 ../src/InfoDisplay.cs:137
-#: ../src/f-spot.glade.h:124
-msgid "Folder"
-msgstr "폴더"
-
-#: ../src/InfoDisplay.cs:139
-msgid "Picasaweb"
-msgstr "Picasaweb"
-
-#: ../src/InfoDisplay.cs:141
-msgid "SmugMug"
-msgstr "SmugMug"
-
-#: ../src/InfoDisplay.cs:143
-msgid "Gallery2"
-msgstr "Gallery2"
-
-#: ../src/InfoDisplay.cs:235
-msgid "Extended Metadata"
-msgstr "확장 메타데이터"
-
-#: ../src/InfoDisplay.cs:267
-msgid "Exported Locations"
-msgstr "내보내기 위치"
-
-#: ../src/InfoDisplay.cs:290
-msgid "No active photo"
-msgstr "활성화된 사진이 없음"
-
-#: ../src/InfoDisplay.cs:292
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "\"{0}\" 사진이 존재하지 않습니다"
-
-#: ../src/InfoDisplay.cs:298
-msgid "No metadata available"
-msgstr "메타데이터 없음"
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:122
+msgid "Rotate Left"
+msgstr "왼쪽으로 회전"
-#: ../src/ItemAction.cs:81 ../src/ItemAction.cs:93
+#: ../src/ItemAction.cs:80
msgid "Rotate picture left"
msgstr "사진을 왼쪽으로 회전"
-#: ../src/ItemAction.cs:104
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:127
+msgid "Rotate Right"
+msgstr "오른쪽으로 회전"
+
+#: ../src/ItemAction.cs:92
+msgid "Rotate picture right"
+msgstr "오른쪽으로 그림 돌리기"
+
+#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "다음 사진"
-#: ../src/ItemAction.cs:125 ../src/f-spot.glade.h:177
-msgid "Previous"
-msgstr "이전"
-
-#: ../src/ItemAction.cs:126
+#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "이전 사진"
-#: ../src/ItemAction.cs:256
-msgid "Auto Color"
-msgstr "자동 색조정"
-
-#: ../src/ItemAction.cs:257
-msgid "Automatically adjust the colors"
-msgstr "자동으로 색상을 조정합니다"
-
-#: ../src/ItemAction.cs:272
-msgid "Apply straightening"
-msgstr "수평 조정"
-
-#: ../src/ItemAction.cs:273
-msgid "Apply straightening to image"
-msgstr "이미지에 수평 조정을 적용합니다"
-
-#: ../src/ItemAction.cs:326
-msgid "Adjust the angle of the image to straighten the horizon"
-msgstr "이미지의 각도를 조정하여 수평으로 맞춥니다"
-
-#: ../src/ItemAction.cs:342
-msgid "Create a soft focus visual effect"
-msgstr "소프트 포커스 시각 효과를 만듭니다"
-
-#: ../src/Loupe.cs:57 ../src/MainWindow.cs:2042
-msgid "Error saving sharpened photo"
-msgstr "선명하게 만든 사진을 저장하는 도중 오류"
-
-#: ../src/Loupe.cs:87
-msgid "Sharpen"
-msgstr "선명하게"
-
-#: ../src/Loupe.cs:97 ../src/MainWindow.cs:2009
-msgid "Amount:"
-msgstr "강도:"
-
-#: ../src/Loupe.cs:98 ../src/MainWindow.cs:2010
-msgid "Radius:"
-msgstr "반경:"
-
-#: ../src/Loupe.cs:99 ../src/MainWindow.cs:2011
-msgid "Threshold:"
-msgstr "임계치:"
-
-#: ../src/MainWindow.cs:248 ../src/f-spot.glade.h:139
-msgid "Import"
-msgstr "가져오기"
-
-#: ../src/MainWindow.cs:250
+#: ../src/MainWindow.cs:269
msgid "Import new images"
msgstr "새 이미지 가져오기"
-#: ../src/MainWindow.cs:266 ../src/f-spot.glade.h:85
+#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
msgid "Browse"
-msgstr "탐색기"
+msgstr "찾아보기"
-#: ../src/MainWindow.cs:270
+#: ../src/MainWindow.cs:289
msgid "Browse many photos simultaneously"
msgstr "여러 사진들을 동시에 찾아봅니다"
-#: ../src/MainWindow.cs:274
+#: ../src/MainWindow.cs:293
msgid "Edit Image"
msgstr "이미지 편집"
-#: ../src/MainWindow.cs:278
+#: ../src/MainWindow.cs:297
msgid "View and edit a photo"
msgstr "사진을 보고 편집합니다"
-#: ../src/MainWindow.cs:283 ../src/SingleView.cs:85
+#: ../src/MainWindow.cs:302 ../src/SingleView.cs:144
msgid "Fullscreen"
msgstr "전체 화면"
-#: ../src/MainWindow.cs:285 ../src/SingleView.cs:87
+#: ../src/MainWindow.cs:304 ../src/SingleView.cs:146
msgid "View photos fullscreen"
msgstr "사진을 전체 화면으로 봅니다"
-#: ../src/MainWindow.cs:290 ../src/SingleView.cs:92
+#: ../src/MainWindow.cs:309 ../src/SingleView.cs:151
msgid "View photos in a slideshow"
msgstr "사진을 슬라이드쇼로 봅니다"
-#: ../src/MainWindow.cs:867
-msgid "Error loading database."
-msgstr "데이터베이스를 읽어오는 중 오류."
+#: ../src/MainWindow.cs:324 ../src/SingleView.cs:166
+msgid "Previous photo"
+msgstr "이전 사진"
-#: ../src/MainWindow.cs:868
-#, csharp-format
-msgid ""
-"F-Spot encountered an error while loading the photo database. The old "
-"database has be moved to {0} and a new database has been created."
-msgstr ""
-"F-Spot이 사진 데이터베이스를 읽어오는 도중 오류가 발생했습니다. "
-"예전 데이터베이스는 {0}(으)로 옮겨지고 새 데이터베이스가 만들어 졌습니다."
+#: ../src/MainWindow.cs:329 ../src/SingleView.cs:171
+msgid "Next photo"
+msgstr "다음 사진"
-#: ../src/MainWindow.cs:1465
+#: ../src/MainWindow.cs:1491
msgid "No cameras detected."
msgstr "카메라를 찾을 수 없음."
-#: ../src/MainWindow.cs:1466
+#: ../src/MainWindow.cs:1492
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
msgstr ""
-"F-Spot에서 시스템에 연결된 카메라를 찾을 수 없습니다. 카메라가 연결되어 있고 "
-"전원이 켜져 있는지 다시 한 번 확인해 주십시오"
+"F-Spot에서 시스템에 연결된 카메라를 찾을 수 없습니다. 카메라가 연결되어 있고 전원이 켜져 있는지 다시 한 번 확인해 주십시오"
-#: ../src/MainWindow.cs:1506
+#: ../src/MainWindow.cs:1531
msgid "Error connecting to camera"
msgstr "카메라에 연결하는 중 오류"
-#: ../src/MainWindow.cs:1507
+#: ../src/MainWindow.cs:1532
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "카메라에 연결하는 도중 \"{0}\" 오류가 발생했습니다"
-#. Translators should localize the following string
-#. * which will give them credit in the About box.
-#. * E.g. "Martin Willemoes Hansen"
-#: ../src/MainWindow.cs:1650
-msgid "translator-credits"
-msgstr "Namhyung Kim <namhyung at gmail.com>, 2007."
-
-#: ../src/MainWindow.cs:1658
-msgid "Copyright © 2003-2007 Novell Inc."
-msgstr "Copyright © 2003-2007 Novell Inc."
-
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1922
+#: ../src/MainWindow.cs:1834
#, csharp-format
msgid "Merge the selected tag"
-msgstr "선택한 태그를 통합"
+msgid_plural "Merge the {0} selected tags?"
+msgstr[0] "{0} 선택한 태그를 통합"
-#: ../src/MainWindow.cs:1949
+#: ../src/MainWindow.cs:1861
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
-msgstr ""
-"이 작업은 선택한 태그들과 하위 태그들을 하나의 태그로 통합할 것입니다."
+msgstr "이 작업은 선택한 태그들과 하위 태그들을 하나의 태그로 통합할 것입니다."
-#: ../src/MainWindow.cs:1951
+#: ../src/MainWindow.cs:1863
msgid "_Merge Tags"
msgstr "태그 통합(_M)"
-#: ../src/MainWindow.cs:2000
-msgid "Unsharp Mask"
-msgstr "Unsharp 마스크"
-
-#: ../src/MainWindow.cs:2203 ../src/SingleView.cs:471
+#: ../src/MainWindow.cs:2068
#, csharp-format
-msgid "{0} Photo"
-msgstr "{0} 사진"
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] "총 {1}개중 {0}번째 사진"
-#: ../src/MainWindow.cs:2210
+#: ../src/MainWindow.cs:2070 ../src/SingleView.cs:911
#, csharp-format
-msgid " out of {0}"
-msgstr " 전체: {0}"
+msgid "{0} Photo"
+msgid_plural "{0} Photos"
+msgstr[0] "{0} 사진"
-#: ../src/MainWindow.cs:2213
+#: ../src/MainWindow.cs:2073
#, csharp-format
msgid " ({0} selected)"
-msgstr " ({0} 선택됨)"
+msgid_plural " ({0} selected)"
+msgstr[0] " ({0} 선택됨)"
-#: ../src/MainWindow.cs:2300
+#: ../src/MainWindow.cs:2154
msgid "_Ok"
msgstr "확인(_O)"
-#: ../src/MainWindow.cs:2301
+#: ../src/MainWindow.cs:2155
msgid "Error Deleting Picture"
msgstr "사진을 지우는 중 오류"
-#: ../src/MainWindow.cs:2306
+#: ../src/MainWindow.cs:2160
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "파일을 지울 권한이 없음:{1}{0}"
-#: ../src/MainWindow.cs:2310
+#: ../src/MainWindow.cs:2164
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "파일을 지우는 도중 {0} 오류가 발생했습니다:{2}{1}"
-#: ../src/MainWindow.cs:2336
+#: ../src/MainWindow.cs:2196
#, csharp-format
msgid "Delete the selected photo permanently?"
-msgstr "선택한 사진들을 완전히 지우겠습니까?"
+msgid_plural "Delete the {0} selected photos permanently?"
+msgstr[0] "선택한 {0}개의 사진을 완전히 지우겠습니까?"
-#: ../src/MainWindow.cs:2340
+#: ../src/MainWindow.cs:2200
msgid "This deletes all versions of the selected photo from your drive."
+msgid_plural ""
"This deletes all versions of the selected photos from your drive."
-msgstr "이 작업은 드라이브에서 선택한 사진의 모든 버전을 지웁니다."
-"이 작업은 드라이브에서 선택한 사진의 모든 버전을 지웁니다."
+msgstr[0] "선택한 사진의 모든 버전을 드라이브에서 지웁니다."
-#: ../src/MainWindow.cs:2343
+#: ../src/MainWindow.cs:2203
msgid "_Delete photo"
-msgstr "사진 지우기(_D)"
+msgid_plural "_Delete photos"
+msgstr[0] "사진 삭제(_D)"
-#: ../src/MainWindow.cs:2374
+#: ../src/MainWindow.cs:2239
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
-msgstr "선택한 사진을 F-Spot에서 지우겠습니까?"
+msgid_plural "Remove the {0} selected photos from F-Spot?"
+msgstr[0] "{0} 선택한 사진을 F-Spot에서 지우겠습니까?"
-#: ../src/MainWindow.cs:2379
+#: ../src/MainWindow.cs:2244
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
"again."
msgstr ""
-"사진을 F-Spot 카탈로그에서 지우면 모든 태그 정보가 사라질 것입니다. "
-"사진은 컴퓨터에 남아 있게 되며 나중에 다시 F-Spot(으)로 가져올 수 있습니다."
+"사진을 F-Spot 카탈로그에서 지우면 모든 태그 정보가 사라질 것입니다. 사진은 컴퓨터에 남아 있게 되며 나중에 다시 F-"
+"Spot(으)로 가져올 수 있습니다."
-#: ../src/MainWindow.cs:2380
+#: ../src/MainWindow.cs:2245
msgid "_Remove from Catalog"
-msgstr "카탈로그에서 지우기(_R)"
+msgstr "카탈로그에서 제거(_R)"
-#: ../src/MainWindow.cs:2437
+#: ../src/MainWindow.cs:2308
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "\"{0}\" 태그를 지우겠습니까?"
-#: ../src/MainWindow.cs:2439
+#: ../src/MainWindow.cs:2310
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "선택한 {0} 태그를 지우겠습니까?"
-#: ../src/MainWindow.cs:2442
-msgid "If you delete a tag, all associations with photos are lost."
-msgstr "태그를 지우면, 사진에 적용된 해당 태그 정보도 사라집니다."
+#: ../src/MainWindow.cs:2315
+msgid "photo"
+msgid_plural "photos"
+msgstr[0] "사진"
-#: ../src/MainWindow.cs:2443
+#: ../src/MainWindow.cs:2317
+#, csharp-format
+msgid "If you delete this tag, the association with {0} {1} will be lost."
+msgid_plural ""
+"If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] "태그를 삭제하면 {0}개의 {1}연결이 손실 됩니다."
+
+#: ../src/MainWindow.cs:2322
msgid "_Delete tag"
-msgstr "태그 지우기(_D)"
+msgid_plural "_Delete tags"
+msgstr[0] "태그 삭제(_D)"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2457
+#: ../src/MainWindow.cs:2336
msgid "Tag is not empty"
msgstr "태그가 존재함"
-#: ../src/MainWindow.cs:2458
+#: ../src/MainWindow.cs:2337
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
"\"{0}\" first"
-msgstr ""
-"다른 태그들을 포함하는 태그를 지울 수 없습니다. \"{0}\" 아래의 태그들을 "
-"먼저 지우십시오."
+msgstr "다른 태그들을 포함하는 태그를 지울 수 없습니다. \"{0}\" 아래의 태그들을 먼저 지우십시오."
-#: ../src/MainWindow.cs:2885
+#: ../src/MainWindow.cs:2769
msgid "Rotate selected photo left"
-msgstr "선택한 사진을 왼쪽으로 회전"
+msgid_plural "Rotate selected photos left"
+msgstr[0] "선택한 사진을 왼쪽으로 회전"
-#: ../src/MainWindow.cs:2898
+#: ../src/MainWindow.cs:2782
msgid "Rotate selected photo right"
-msgstr "선택한 사진을 오른쪽으로 회전"
+msgid_plural "Rotate selected photos right"
+msgstr[0] "선택한 사진을 오른쪽으로 회전"
-#: ../src/MainWindow.cs:2906
+#: ../src/MainWindow.cs:2793
#, csharp-format
-msgid "Find Selected Tag"
-msgstr "선택한 태그 찾기"
+msgid "Find _Selected Tag"
+msgid_plural "Find _Selected Tags"
+msgstr[0] "선택된 태그 찾기(_S)"
-#: ../src/MainWindow.cs:2910
+#: ../src/MainWindow.cs:2797
#, csharp-format
-msgid "Find Selected Tag With"
-msgstr "다음으로 선택된 태그 찾기"
+msgid "Find Selected Tag _With"
+msgid_plural "Find Selected Tags _With"
+msgstr[0] "선택된 태그에서 찾기(_W)"
-#: ../src/MainWindow.cs:2927
+#: ../src/MainWindow.cs:2838
msgid "Create New Version?"
-msgstr "새 버전을 만들겠습니까?"
+msgid_plural "Create New Versions?"
+msgstr[0] "새 버전을 만들겠습니까?"
-#: ../src/MainWindow.cs:2929
+#: ../src/MainWindow.cs:2840
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
"photo to preserve the original?"
+msgid_plural ""
"Before launching {1}, should F-Spot create new versions of the selected "
"photos to preserve the originals?"
-msgstr "{1}을(를) 실행하기 전에, F-Spot에서 원본을 보관하기 위해 선택한 사진의 새 버전을 만들겠습니까?"
-"{1}을(를) 실행하기 전에, F-Spot에서 원본을 보관하기 위해 선택한 사진의 새 버전을 만들겠습니까?"
+msgstr[0] "시작 하기 전에, 원본을 유지하기 위해 \"{1}\"에 선택한 사진의 새 버전을 만드시겠습니까?"
-#: ../src/MetadataStore.cs:18
+#: ../src/MainWindow.cs:2862
+msgid "XCF version"
+msgstr "XCF 버전"
+
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "만든 이"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "제목"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "저작권"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "주제와 키워드"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "압축"
-#: ../src/MetadataStore.cs:24
+#: ../src/MetadataStore.cs:25
msgid "Planar Configuration"
msgstr "Planar 설정"
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:27
msgid "Orientation"
msgstr "방향"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:29
msgid "Photometric Interpretation"
msgstr "광도 해석"
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:31
msgid "Resolution Unit"
msgstr "해상도 단위"
-#: ../src/MetadataStore.cs:32
+#: ../src/MetadataStore.cs:33
msgid "Exposure Program"
msgstr "노출 프로그램"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:35
msgid "Metering Mode"
msgstr "미터법 모드"
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:37
msgid "Exposure Mode"
msgstr "노출 모드"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:39
msgid "Custom Rendered"
-msgstr ""
+msgstr "사용자 정의된"
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:41
msgid "Components Configuration"
msgstr "컴포넌트 설정"
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:43
msgid "Light Source"
msgstr "광원"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:45
msgid "Sensing Method"
msgstr "센싱 방식"
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:47
msgid "Color Space"
msgstr "색 공간"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:49
msgid "White Balance"
msgstr "화이트 밸런스"
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:51
msgid "Focal Plane Resolution Unit"
msgstr "초점면 해상도 단위"
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:53
msgid "File Source Type"
msgstr "파일 소스 타입"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:55
msgid "Scene Capture Type"
msgstr "장면 캡처 타입"
-#: ../src/MetadataStore.cs:56
+#: ../src/MetadataStore.cs:57
msgid "Gain Control"
msgstr "게인 조정"
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:59
msgid "Contrast"
msgstr "대비"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:61
msgid "Saturation"
msgstr "채도"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:63
msgid "Sharpness"
msgstr "선명도"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:65
msgid "Scene Type"
msgstr "장면 타입"
-#: ../src/PhotoStore.cs:451
-#, csharp-format
-msgid "Reparented"
-msgstr ""
-
-#: ../src/PhotoStore.cs:468
-#, csharp-format
-msgid "Modified"
-msgstr "수정됨"
-
-#: ../src/PhotoStore.cs:487
-#, csharp-format
-msgid "Modified in {1}"
-msgstr "{1}에 수정됨"
-
-#. Note that the original version is never stored in the photo_versions table in the
-#. database.
-#: ../src/PhotoStore.cs:671 ../src/f-spot.glade.h:164
-msgid "Original"
-msgstr "원본"
-
#. Fixme this should really set parent menu
#. items insensitve
-#: ../src/PhotoTagMenu.cs:72
+#: ../src/PhotoTagMenu.cs:74
msgid "(No Tags)"
msgstr "(태그 없음)"
-#: ../src/PhotoVersionCommands.cs:55
+#: ../src/PhotoVersionCommands.cs:58
msgid "Create New Version"
msgstr "새 버전 만들기"
-#: ../src/PhotoVersionCommands.cs:56
+#: ../src/PhotoVersionCommands.cs:59
msgid "Name:"
msgstr "이름:"
-#: ../src/PhotoVersionCommands.cs:60
+#: ../src/PhotoVersionCommands.cs:63
msgid "Rename Version"
msgstr "버전 이름 바꾸기"
-#: ../src/PhotoVersionCommands.cs:61
+#: ../src/PhotoVersionCommands.cs:64
msgid "New name:"
msgstr "새 이름:"
-#: ../src/PhotoVersionCommands.cs:107
+#: ../src/PhotoVersionCommands.cs:110
msgid "Could not create a new version"
msgstr "새 버전을 만들 수 없습니다"
-#: ../src/PhotoVersionCommands.cs:108
+#: ../src/PhotoVersionCommands.cs:111
#, csharp-format
msgid "Received exception \"{0}\". Unable to create version \"{1}\""
msgstr "\"{0}\" 오류가 발생했습니다. \"{1}\" 버전을 만들 수 없습니다"
-#: ../src/PhotoVersionCommands.cs:135
+#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
msgstr "정말로 지우시겠습니까?"
-#: ../src/PhotoVersionCommands.cs:137
+#: ../src/PhotoVersionCommands.cs:139
+msgid "Cancel"
+msgstr "취소"
+
+#: ../src/PhotoVersionCommands.cs:140
msgid "Delete"
-msgstr "지우기"
+msgstr "삭제"
-#: ../src/PhotoVersionCommands.cs:141
+#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
msgstr "정말로 \"{0}\" 버전을 지우시겠습니까?"
-#. FIXME show error dialog.
-#: ../src/PhotoVersionCommands.cs:151
+#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
msgstr "버전을 지울 수 없음"
-#: ../src/PhotoVersionCommands.cs:152
+#: ../src/PhotoVersionCommands.cs:155
#, csharp-format
msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
msgstr "\"{0}\" 오류가 발생했습니다. \"{1}\" 버전을 지울 수 없습니다"
-#: ../src/PhotoVersionCommands.cs:193
+#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
msgstr "버전의 이름을 바꿀 수 없음"
-#: ../src/PhotoVersionCommands.cs:194
+#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "\"{0}\" 오류가 발생했습니다. 버전의 이름을 \"{1}\"(으)로 바꿀 수 없습니다"
-#: ../src/PhotoVersionMenu.cs:66
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:557
msgid "(No Edits)"
msgstr "(편집하지 않음)"
-#: ../src/PhotoView.cs:62
-msgid "No Constraint"
-msgstr "제한 없음"
-
-#: ../src/PhotoView.cs:63
-msgid "4 x 3 (Book)"
-msgstr "4 x 3 (책)"
-
-#: ../src/PhotoView.cs:64
-msgid "4 x 6 (Postcard)"
-msgstr "4 x 6 (엽서)"
-
-#: ../src/PhotoView.cs:65
-msgid "5 x 7 (L, 2L)"
-msgstr "5 x 7 (L, 2L)"
-
-#: ../src/PhotoView.cs:66
-msgid "8 x 10"
-msgstr "8 x 10"
-
-#. new SelectionConstraint (Catalog.GetString ("4 x 3 Portrait (Book)"), 3.0 / 4.0),
-#. new SelectionConstraint (Catalog.GetString ("4 x 6 Portrait (Postcard)"), 4.0 / 6.0),
-#. new SelectionConstraint (Catalog.GetString ("5 x 7 Portrait (L, 2L)"), 5.0 / 7.0),
-#. new SelectionConstraint (Catalog.GetString ("8 x 10 Portrait"), 8.0 / 10.0),
-#: ../src/PhotoView.cs:71
-msgid "Square"
-msgstr "정사각형"
-
-#: ../src/PhotoView.cs:151
-msgid "Crop photo to selected area"
-msgstr "사진의 선택한 영역을 잘라냄"
-
-#: ../src/PhotoView.cs:152
-msgid "Remove redeye from selected area"
-msgstr "선택한 영역에서 적목 현상 없애기"
-
-#: ../src/PhotoView.cs:154
-msgid "Select an area to crop"
-msgstr "잘라낼 영역 선택"
-
-#: ../src/PhotoView.cs:155
-msgid "Select an area to remove redeye"
-msgstr "적목 현상을 없앨 영역 선택"
-
-#: ../src/PhotoView.cs:316
-msgid "No selection available"
-msgstr "선택한 영역이 없음"
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
+msgid "Error editing photo"
+msgstr "사진을 편집하는 중 오류"
-#: ../src/PhotoView.cs:317
-msgid ""
-"This tool requires an active selection. Please select a region of the photo "
-"and try the operation again"
-msgstr ""
-"이 도구는 활성화된 선택 영역이 필요합니다. 사진의 일부를 선택한 뒤에 "
-"다시 시도해 주십시오"
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "\"{0}\" 예외가 발생했습니다. {1} 사진을 저장할 수 없습니다"
-#: ../src/PhotoView.cs:475
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "메모:"
-#: ../src/PhotoView.cs:491
-msgid "Constrain the aspect ratio of the selection"
-msgstr "선택한 영역의 가로세로비를 제한합니다"
-
-#: ../src/PhotoView.cs:493
-msgid "Crop"
-msgstr "잘라내기"
-
-#: ../src/PhotoView.cs:497
-msgid "Reduce Red-Eye"
-msgstr "적목 현상 없애기"
-
-#: ../src/PhotoView.cs:501
-msgid "Adjust Colors"
-msgstr "색상 조정"
-
-#: ../src/PhotoView.cs:503
-msgid "Adjust the photo colors"
-msgstr "사진의 색상을 조정합니다"
-
-#: ../src/PhotoView.cs:506
-msgid "Desaturate"
-msgstr "흑백 사진"
-
-#: ../src/PhotoView.cs:508
-msgid "Convert the photo to black and white"
-msgstr "사진을 흑백 사진으로 변환합니다"
-
-#: ../src/PhotoView.cs:511
-msgid "Sepia Tone"
-msgstr "세피아 톤"
-
-#: ../src/PhotoView.cs:513
-msgid "Convert the photo to sepia tones"
-msgstr "사진을 세피아 톤으로 변환합니다"
-
-#: ../src/PhotoView.cs:543
-msgid "Previous photo"
-msgstr "이전 사진"
-
-#: ../src/PhotoView.cs:548
-msgid "Next photo"
-msgstr "다음 사진"
-
-#: ../src/PicasaWebExport.cs:416
-msgid "Error while creating Album"
-msgstr "앨범을 만드는 중 오류"
-
-#: ../src/PicasaWebExport.cs:417
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to create an album: {0}"
-msgstr ""
-"앨범을 만드는 도중 다음과 같은 오류가 발생했습니다: {0}"
-
-#: ../src/PicasaWebExport.cs:571
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} 보냄"
-
-#: ../src/PicasaWebExport.cs:573
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr ""
-
-#: ../src/PicasaWebExport.cs:603 ../src/SmugMugExport.cs:540
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "\"{0}\" 사진을 업로드 하는 중 ({1} / {2})"
-
-#: ../src/PicasaWebExport.cs:634 ../src/SmugMugExport.cs:569
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "갤러리로 업로드 하는 중 오류: {0}"
-
-#: ../src/PicasaWebExport.cs:718
-msgid "Available space :"
-msgstr "남아 있는 공간 :"
-
-#: ../src/Preferences.cs:194
+#: ../src/Preferences.cs:151
msgid "Photos"
msgstr "사진"
-#: ../src/QueryWidget.cs:37
+#: ../src/PrintOperation.cs:32
+msgid "Image Settings"
+msgstr "이미지 설정"
+
+#: ../src/QueryWidget.cs:58
msgid "Find: "
msgstr "찾기: "
-#: ../src/QueryWidget.cs:42
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "태그가 붙지 않은 사진"
-#: ../src/QueryWidget.cs:50
+#: ../src/QueryWidget.cs:71
+msgid "Rated photos"
+msgstr "사진 등급"
+
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
msgstr "가져오기 롤"
-#: ../src/QueryWidget.cs:70
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "찾아보기 없앰"
-#: ../src/QueryWidget.cs:72
+#: ../src/QueryWidget.cs:111
+msgid "Refresh search"
+msgstr "다시 검색"
+
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "일치하는 사진을 찾을 수 없음"
-#: ../src/QueryWidget.cs:103
-msgid "Hide Find Bar"
-msgstr "찾아보기 줄 숨기기"
+#: ../src/QueryWidget.cs:155
+msgid "Hide _Find Bar"
+msgstr "찾기 정보 숨김(_F)"
-#: ../src/QueryWidget.cs:109
-msgid "Show Find Bar"
-msgstr "찾아보기 줄 보기"
+#: ../src/QueryWidget.cs:161
+msgid "Show _Find Bar"
+msgstr "찾기 정보 보기(_F)"
-#: ../src/RotateCommand.cs:200
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
+msgid "Unable to rotate this type of photo"
+msgstr "이러한 종류의 사진은 회전시킬 수 없습니다."
+
+#: ../src/RotateCommand.cs:131
+msgid "Unable to rotate readonly file"
+msgstr "읽기전용 파일을 회전시킬 수 없습니다."
+
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
msgstr "사진을 회전시키는 중"
-#: ../src/RotateCommand.cs:211
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
msgstr "\"{0}\" 사진을 회전시키는 중"
-#: ../src/RotateCommand.cs:237
+#: ../src/RotateCommand.cs:222
+msgid "Directory not found"
+msgstr "폴더를 찾을 수 없습니다."
+
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
-msgstr "사진을 회전시킬 수 없음"
+msgid_plural "Unable to rotate {0} photos"
+msgstr[0] "{0} 사진을 회전시킬 수 없음"
-#: ../src/RotateCommand.cs:241
+#: ../src/RotateCommand.cs:244
#, csharp-format
msgid ""
"The photo could not be rotated because it is on a read only file system or "
-"media such as a CDROM. Please check the permissions and try again"
+"media such as a CDROM. Please check the permissions and try again."
+msgid_plural ""
"{0} photos could not be rotated because they are on a read only file system "
-"or media such as a CDROM. Please check the permissions and try again"
-msgstr ""
-"사진이 읽기 전용 파일 시스템이나 CD-ROM과 같은 읽기 전용 미디어에 저장되어 "
-"있어서 회전 시킬 수 없습니다. 권한을 확인하고 다시 시도해 주십시오"
-"{0} 사진이 읽기 전용 파일 시스템이나 CD-ROM과 같은 읽기 전용 미디어에 저장되어 "
-"있어서 회전 시킬 수 없습니다. 권한을 확인하고 다시 시도해 주십시오"
+"or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] ""
+"읽기 전용 파일 시스템이나 CD-ROM등의 매체에 있으므로 {0}개의 사진을 회전시킬 수 없습니다. 권한을 확인하고 다시 시도해보십시오."
-#: ../src/RotateCommand.cs:263
+#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
msgstr "{1}을(를) 회전시키는 도중 \"{0}\" 오류가 발생했습니다"
-#: ../src/RotateCommand.cs:268
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
msgstr "사진을 회전하는 중 오류."
-#: ../src/SendEmail.cs:233
+#: ../src/SendEmail.cs:240
msgid "Preparing email"
msgstr "전자메일을 준비하는 중"
-#: ../src/SendEmail.cs:285
+#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
msgstr "\"{0}\" 사진을 내보내는 중"
+#: ../src/SendEmail.cs:314
+msgid "Error processing image"
+msgstr "이미지 처리 오류"
+
+#: ../src/SendEmail.cs:315
+#, csharp-format
+msgid "An error occured while processing \"{0}\": {1}"
+msgstr "\"{0}\"처리 중 오류: {1}"
+
#. Send the mail :)
-#: ../src/SendEmail.cs:310
-msgid "my photos"
+#: ../src/SendEmail.cs:330
+msgid "My Photos"
msgstr "내 사진"
-#: ../src/SingleView.cs:75
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "선명하게 만든 사진을 저장하는 도중 오류"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "선명하게"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "강도:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "반경:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "임계치:"
+
+#: ../src/SingleView.cs:124
msgid "Rotate photo left"
msgstr "사진을 왼쪽으로 회전"
-#: ../src/SingleView.cs:80
+#: ../src/SingleView.cs:129
msgid "Rotate photo right"
msgstr "사진을 오른쪽으로 회전"
-#: ../src/SingleView.cs:326
-msgid "Open"
-msgstr "열기"
+#: ../src/SingleView.cs:200
+msgid "Folder"
+msgstr "폴더"
-#: ../src/SingleView.cs:428 ../src/f-spot.glade.h:187
-msgid "Rotate _Left"
-msgstr "왼쪽으로 회전(_L)"
+#: ../src/SingleView.cs:659
+msgid "Save As..."
+msgstr "다른 이름으로 저장..."
-#: ../src/SingleView.cs:429 ../src/f-spot.glade.h:188
-msgid "Rotate _Right"
-msgstr "오른쪽으로 회전(_R)"
+#: ../src/SingleView.cs:700
+msgid "Open"
+msgstr "열기"
-#: ../src/SingleView.cs:431
+#: ../src/SingleView.cs:800
msgid "Set as Background"
-msgstr "바탕그림으로 설정"
+msgstr "배경으로 설정"
+
+#: ../src/SingleView.cs:820
+#, csharp-format
+msgid "Save changes to image: {0} before closing?"
+msgid_plural ""
+"Save changes to images:\n"
+"{0}\n"
+"before closing?"
+msgstr[0] "{0}를 닫기 전에: 이미지가 바뀐 사항을 저장 하겠습니까?"
-#: ../src/TagCommands.cs:89 ../src/TagCommands.cs:217
-#: ../src/TagSelectionWidget.cs:506
+#: ../src/SingleView.cs:826
+msgid ""
+"If you don't save, the changes you have made to this image will be "
+"permanently lost"
+msgid_plural ""
+"If you don't save, the changes you have made to these images will be "
+"permanently lost"
+msgstr[0] "저장하지 않으면, 당신이 바꾼 내용의 이 이미지가 영구적으로 손실 됩니다"
+
+#: ../src/SingleView.cs:831
+msgid "Discard changes"
+msgstr "바뀐 사항 무시"
+
+#: ../src/SingleView.cs:837
+msgid "Continue editing"
+msgstr "계속 편집"
+
+#: ../src/SingleView.cs:843
+msgid "Save"
+msgid_plural "Save all"
+msgstr[0] "저장"
+
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "이 이름은 이미 사용 중입니다"
-#: ../src/TagCommands.cs:136
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "새 태그 만들기"
-#: ../src/TagCommands.cs:137
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "새 태그의 이름:"
-#: ../src/TagCommands.cs:287
-msgid "Edit Tag"
-msgstr "태그 편집"
-
-#: ../src/TagCommands.cs:288
-msgid "Tag Name:"
-msgstr "태그 이름:"
-
-#: ../src/TagCommands.cs:421
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "사진 {0} / {1}"
-
-#: ../src/TagCommands.cs:451
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "{0} 태그의 아이콘 편집"
-
-#: ../src/TagCommands.cs:467
-msgid "Select Photo from file"
-msgstr "파일에서 사진 선택"
-
-#: ../src/TagCommands.cs:490
+#: ../src/TagPopup.cs:26
#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
+msgid "Find"
+msgid_plural "Find"
+msgstr[0] "찾기"
-#: ../src/TagMenu.cs:89 ../src/TagPopup.cs:34
+#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
msgid "Create New Tag..."
msgstr "새 태그 만들기..."
-#: ../src/TagPopup.cs:24
-#, csharp-format
-msgid "Find"
-msgstr "찾기"
+#: ../src/TagPopup.cs:42
+msgid "Edit Tag..."
+msgstr "태그 편집..."
-#: ../src/TagPopup.cs:40
-msgid "Edit Selected Tag..."
-msgstr "선택한 태그 편집..."
-
-#: ../src/TagPopup.cs:44
+#: ../src/TagPopup.cs:46
msgid "Delete Tag"
-msgstr "태그 지우기"
+msgid_plural "Delete Tags"
+msgstr[0] "태그 삭제"
-#: ../src/TagPopup.cs:50
+#: ../src/TagPopup.cs:52
msgid "Attach Tag to Selection"
-msgstr "선택한 사진에 태그 붙이기"
+msgid_plural "Attach Tags to Selection"
+msgstr[0] "선택한 사진에 태그 붙이기"
-#: ../src/TagPopup.cs:54
+#: ../src/TagPopup.cs:56
msgid "Remove Tag From Selection"
-msgstr "선택한 사진에서 태그 지우기"
+msgid_plural "Remove Tags From Selection"
+msgstr[0] "선택한 사진에서 태그 제거"
-#: ../src/TagPopup.cs:60
+#: ../src/TagPopup.cs:62
msgid "Merge Tags"
msgstr "태그 통합"
-#: ../src/TagQueryWidget.cs:31
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr "\"{0}\" 태그가 붙은 사진 포함"
-#: ../src/TagQueryWidget.cs:36
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr "\"{0}\" 태그가 붙은 사진 제외"
-#: ../src/TagQueryWidget.cs:41
+#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
-msgstr "찾기에서 지우기"
+msgstr "검색에서 제거"
-#: ../src/TagQueryWidget.cs:85
+#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
-msgstr "다음으로 찾기(_W)"
+msgid_plural "Find _With"
+msgstr[0] "다음으로 찾기(_W)"
-#: ../src/TagQueryWidget.cs:111
+#: ../src/TagQueryWidget.cs:114
msgid "All"
msgstr "모두"
-#: ../src/TagQueryWidget.cs:146 ../src/Term.cs:591
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "{0}이(가) 아님"
-#: ../src/TagQueryWidget.cs:276
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr "찾아볼 태그를 여기로 끌어다 놓으세요"
-#: ../src/TagSelectionWidget.cs:505
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "태그 이름 바꾸기 오류"
-#: ../src/TagStore.cs:415
+#: ../src/TagStore.cs:203
msgid "Favorites"
msgstr "좋은 사진"
-#: ../src/TagStore.cs:420
+#: ../src/TagStore.cs:208
msgid "Hidden"
msgstr "숨김"
-#: ../src/TagStore.cs:428
+#: ../src/TagStore.cs:216
msgid "People"
msgstr "사람"
-#: ../src/TagStore.cs:433
+#: ../src/TagStore.cs:221
msgid "Places"
msgstr "장소"
-#: ../src/TagStore.cs:438
+#: ../src/TagStore.cs:226
msgid "Events"
msgstr "이벤트"
-#: ../src/Term.cs:297
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:408
+msgid "(None)"
+msgstr "(없음)"
+
+#: ../src/Term.cs:298
msgid " and "
-msgstr "와(과) "
+msgstr " 와(과) "
#. operators.Add (Catalog.GetString (" && "));
-#: ../src/Term.cs:299
+#: ../src/Term.cs:300
msgid ", "
msgstr ", "
-#: ../src/Term.cs:355
+#: ../src/Term.cs:356
msgid " or "
msgstr " 혹은 "
-#: ../src/Term.cs:379 ../src/f-spot.glade.h:321
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "혹은"
-#: ../src/ThreadProgressDialog.cs:66
-msgid "Retry"
-msgstr "재시도"
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "미리보기 업데이트 중"
-#: ../src/ThreadProgressDialog.cs:68
-msgid "Skip"
-msgstr "건너뜀"
-
-#. The preceding text here is the second checkbutton in the Time dialog
-#. that says "Space all photos by []"
-#: ../src/TimeDialog.cs:125 ../src/f-spot.glade.h:320
+#: ../src/ThumbnailCommand.cs:28
#, csharp-format
-msgid "min. Starting at {0}"
-msgstr "분. {0}에 시작"
+msgid "Updating picture \"{0}\""
+msgstr "사진 \"{0}\" 업데이트 중"
-#: ../src/TimeDialog.cs:130 ../src/f-spot.glade.h:204
-#, csharp-format
-msgid "Shift all photos by {0}"
-msgstr "모든 사진을 {0} 만큼 시프트"
+#: ../src/UI.Dialog/AboutDialog.cs:76
+msgid "Photo management for GNOME"
+msgstr "그놈을 위한 사진관리기"
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Unix.cs:25
-msgid "Unable to create temporary file"
-msgstr "임시 파일을 만들 수 없음"
-
-#: ../src/Updater.cs:230
-msgid "Updating F-Spot Database"
-msgstr "F-Spot 데이터베이스 갱신하는 중"
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/Updater.cs:231
-msgid ""
-"Please wait while your F-Spot gallery's database is updated. This may take "
-"some time."
+#: ../src/UI.Dialog/AboutDialog.cs:100
+msgid "translator-credits"
msgstr ""
-"F-Spot 갤러리 데이터베이스를 갱신하는 동안 잠시 기다려 주십시오. "
-"이 과정은 약간의 시간이 소요됩니다."
+"Namhyung Kim <namhyung at gmail.com>, 2007.\n"
+"강분도 <bundo at bundo.biz>, 2010.\n"
+"\n"
+"Launchpad Contributions:\n"
+" Bundo https://launchpad.net/~kang-bundo"
-#: ../src/Util.cs:428
-msgid "There was an error invoking the external handler"
-msgstr "외부 처리기를 불러오는 중 오류가 발생했습니다"
+#: ../src/UI.Dialog/AboutDialog.cs:105
+msgid "F-Spot Website"
+msgstr "F-Spot 웹사이트"
-#: ../src/Util.cs:429
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
-msgid "Received error:{1}\"{0}\"{1}"
-msgstr "오류 발생:{1}\"{0}\"{1}"
-
-#: ../src/Util.cs:453
-msgid ""
-"The \"F-Spot Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"F-Spot 설명서\"를 찾을 수 없습니다. 설치가 성공적으로 "
-"완료되었는지 확인해 보십시오."
-
-#: ../src/Util.cs:461
-msgid "Help not found"
-msgstr "도움말을 찾을 수 없음"
-
-#: ../src/Widgets/FindBar.cs:83
-msgid "Find:"
-msgstr "찾기:"
-
-#: ../src/XmpTagsImporter.cs:87
-msgid "Location"
-msgstr "위치"
-
-#: ../src/XmpTagsImporter.cs:88
-msgid "Country"
-msgstr "국가"
-
-#: ../src/XmpTagsImporter.cs:89
-msgid "City"
-msgstr "도시"
-
-#: ../src/XmpTagsImporter.cs:90
-msgid "State"
-msgstr "주"
-
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid "\n"
-msgstr "\n"
+msgid "Shift all photos by {0}"
+msgstr "모든 사진을 {0} 만큼 시프트"
-#: ../src/f-spot.glade.h:3
-msgid " "
-msgstr " "
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "오늘"
-#: ../src/f-spot.glade.h:4
-msgid "0000:00:00 00:00:00"
-msgstr "0000:00:00 00:00:00"
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "어제"
-#: ../src/f-spot.glade.h:5
-msgid "00:00:00"
-msgstr "00:00:00"
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "일주일 이내"
-#: ../src/f-spot.glade.h:6
-msgid "1 of 1"
-msgstr "1 중 1"
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "한 달 이내"
-#: ../src/f-spot.glade.h:7
-msgid "1024 px"
-msgstr "1024 px"
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "3 달 이내"
-#: ../src/f-spot.glade.h:8
-msgid "320 px"
-msgstr "320 px"
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "1 년 이내"
-#: ../src/f-spot.glade.h:9
-msgid "480 px"
-msgstr "480 px"
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "이번 주 (월-일요일)"
-#: ../src/f-spot.glade.h:10
-msgid "5"
-msgstr "5"
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "지난 주 (월-일요일)"
-#: ../src/f-spot.glade.h:11
-msgid "640 px"
-msgstr "640 px"
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "사용자가 지정한 범위"
-#: ../src/f-spot.glade.h:12
-msgid "800 px"
-msgstr "800 px"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "{0} 태그의 아이콘 편집"
-#: ../src/f-spot.glade.h:13
-msgid "<b></b>"
-msgstr "<b></b>"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "파일에서 사진 선택"
-#: ../src/f-spot.glade.h:14
-msgid "<b>Account</b>"
-msgstr "<b>계정</b>"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>사진에서 만든 </b>\n"
+" 이 태그를 위해 아이콘 라이브러리의 사진 1장을 사용할 수 있습니다.\n"
+" 그러나 이 태그와 관련된 사진 이어야 합니다. 좋아하는\n"
+" 사진에 태그 '{0}' 부여하고 여기에서 돌아가서는 아이콘으로\n"
+" 이용하세요."
-#: ../src/f-spot.glade.h:15
-msgid "<b>Action</b>"
-msgstr "<b>동작</b>"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "그림을 불러올 수 없음"
-#: ../src/f-spot.glade.h:16
-msgid "<b>Album</b>"
-msgstr "<b>앨범</b>"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "태그 아이콘으로 \"{0}\"를 읽을 수 없습니다."
-#: ../src/f-spot.glade.h:17
-msgid "<b>Co_rrections</b>"
-msgstr "<b>수정(_R)</b>"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "사진 {0} / {1}"
-#: ../src/f-spot.glade.h:18
-msgid "<b>Color Management</b>"
-msgstr "<b>색 관리</b>"
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
+msgstr "F-Spot에 치명적인 오류가 발생했습니다"
-#: ../src/f-spot.glade.h:19
-msgid "<b>Color Temperature</b>"
-msgstr "<b>색 온도</b>"
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "오류 상세 정보"
-#: ../src/f-spot.glade.h:20
-msgid "<b>Destination</b>"
-msgstr "<b>대상</b>"
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr "처리할 수 없는 예외 발생: "
-#: ../src/f-spot.glade.h:21
-msgid "<b>End Date</b>"
-msgstr "<b>종료일</b>"
+#: ../src/UI.Dialog/PreferenceDialog.cs:53
+#: ../src/UI.Dialog/PreferenceDialog.cs:71
+msgid "None"
+msgstr "없음"
-#: ../src/f-spot.glade.h:22
-msgid "<b>Export Method</b>"
-msgstr "<b>내보내기 방식</b>"
+#: ../src/UI.Dialog/PreferenceDialog.cs:55
+msgid "System profile"
+msgstr "시스템 프로필"
-#: ../src/f-spot.glade.h:23
-msgid "<b>Exposure</b>"
-msgstr "<b>노출</b>"
+#: ../src/UI.Dialog/PreferenceDialog.cs:84
+msgid "Standard theme"
+msgstr "표준 테마"
-#: ../src/f-spot.glade.h:24
-msgid "<b>From External Photo</b>"
-msgstr "<b>외부 사진에서</b>"
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "데이터베이스를 읽어오는 중 오류."
-#: ../src/f-spot.glade.h:25
-msgid "<b>From Photo</b>"
-msgstr "<b>사진에서</b>"
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#, csharp-format
+msgid ""
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
+msgstr ""
+"F-Spot이 사진 데이터베이스를 읽어오는 도중 오류가 발생했습니다. 예전 데이터베이스는 {0}(으)로 옮겨지고 새 데이터베이스가 만들어 "
+"졌습니다."
-#: ../src/f-spot.glade.h:26
-msgid "<b>Gallery</b>"
-msgstr "<b>갤러리</b>"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "레이블"
-#: ../src/f-spot.glade.h:27
-msgid "<b>Histo_gram</b>"
-msgstr "<b>히스토그램(_G)</b>"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "비율"
-#: ../src/f-spot.glade.h:28
-msgid "<b>Histogram</b>"
-msgstr "<b>히스토그램</b>"
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "재시도"
-#: ../src/f-spot.glade.h:29
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>이미지 보간(Interpolation)</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
-#: ../src/f-spot.glade.h:30
-msgid "<b>Import Settings</b>"
-msgstr "<b>가져오기 설정</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
-#: ../src/f-spot.glade.h:31
-msgid "<b>Metadata</b>"
-msgstr "<b>메타데이터</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
-#: ../src/f-spot.glade.h:32
-msgid "<b>Photograph Layout</b>"
-msgstr "<b>사진 레이아웃</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>동작</b>"
-#: ../src/f-spot.glade.h:33
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>구울 사진</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>참조 사진</b>"
-#: ../src/f-spot.glade.h:34
-msgid "<b>Photos</b>"
-msgstr "<b>사진</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "시간 조정"
-#: ../src/f-spot.glade.h:35
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>PicasaWeb 내보내기</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "조정된 날짜: "
-#: ../src/f-spot.glade.h:36
-msgid "<b>Predefined</b>"
-msgstr "<b>미리 정의된 항목</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "오늘:"
-#: ../src/f-spot.glade.h:37
-msgid "<b>Preview</b>"
-msgstr "<b>미리보기</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "공간의 모든 사진에 의해"
-#: ../src/f-spot.glade.h:38
-msgid "<b>Printer Details</b>"
-msgstr "<b>프린터 정보</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "차이:"
-#: ../src/f-spot.glade.h:39
-msgid "<b>Reference Photo</b>"
-msgstr "<b>참조 사진</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "분. {0}에 시작"
-#: ../src/f-spot.glade.h:40
-msgid "<b>Screensaver</b>"
-msgstr "<b>화면 보호기</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>종료일</b>"
-#: ../src/f-spot.glade.h:41
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
msgid "<b>Select period</b>"
msgstr "<b>기간 선택</b>"
-#: ../src/f-spot.glade.h:42
-msgid "<b>Size</b>"
-msgstr "<b>크기</b>"
-
-#: ../src/f-spot.glade.h:43
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>SmugMug 내보내기</b>"
-
-#: ../src/f-spot.glade.h:44
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
msgid "<b>Start Date</b>"
msgstr "<b>시작일</b>"
-#: ../src/f-spot.glade.h:45
-msgid "<b>Style</b>"
-msgstr "<b>스타일</b>"
-
-#: ../src/f-spot.glade.h:46
-msgid "<b>Summary</b>"
-msgstr "<b>요약</b>"
-
-#: ../src/f-spot.glade.h:47
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>투명 부분</b>"
-
-#: ../src/f-spot.glade.h:48
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>가져온 모든 사진 보기</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "취소, 현재 타임라인을 바꾸지 않습니다. "
-#: ../src/f-spot.glade.h:49
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>보기 권한</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "이 날짜 내에 찍힌 사진만이 표시될 것입니다."
-#: ../src/f-spot.glade.h:50
-msgid "<b>_White Balance</b>"
-msgstr "<b>화이트 밸런스(_W)</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "날짜 범위 지정"
-#: ../src/f-spot.glade.h:51
-msgid "<small> </small>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
msgstr "<small> </small>"
-#: ../src/f-spot.glade.h:52
-msgid "<small></small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "태그 편집"
-#: ../src/f-spot.glade.h:53
-msgid ""
-"<small><i>Choose the folder where F-Spot should store newly imported photos</"
-"i></small>"
-msgstr ""
-"<small><i>F-Spot이(가) 새로 가져온 사진들을 저장할 폴더를 선택하세요</"
-"i></small>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "아이콘 편집"
-#: ../src/f-spot.glade.h:54
-msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr ""
-"<small><i>이 옵션을 사용하면 지원하는 이미지 형식 내에 \n"
-"태그과 설명 정보를 저장합니다.</i></small>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "아이콘(_I):"
-#: ../src/f-spot.glade.h:56
-msgid ""
-"<small><i>Enable this to allow interpolation on zoomed images. You should'nt "
-"disable this for viewing photos, but disabling the interpolation could be "
-"usefull in icon design.</i></small>"
-msgstr ""
-"<small><i>이 옵션을 사용하면 확대된 이미지에 보간법을 적용합니다."
-"사진을 보는 경우에는 이 옵션을 끄면 안됩니다. 하지만 아이콘을 디자인하는 "
-"경우에는 이 옵션을 꺼두는 것이 좋습니다.</i></small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>외부 사진에서</b>"
-#: ../src/f-spot.glade.h:57
-msgid ""
-"<small><i>While acting as a screensaver, F-Spot can display all of your "
-"images, or a small subset based on tags.</i></small>"
-msgstr ""
-"<small><i>화면 보호기로 동작하는 동안, F-Spot이(가) 여러분의 모든 "
-"이미지 혹은 특정 태그가 붙은 이미지를 보여줄 수 있습니다.</i></small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>사진에서</b>"
-#: ../src/f-spot.glade.h:58
-msgid ""
-"<small><i>You can choose how to display transparent parts in images. This "
-"option has no effect on photos, but setting this as check pattern or custom "
-"color could be usefull when viewing icons or other artworks with transparent "
-"parts.</i></small>"
-msgstr ""
-"<small><i>이미지 내의 투명한 부분을 표시하는 방식을 선택할 수 있습니다. "
-"이 옵션은 일반 사진에서는 아무 효과도 없지만, 이를 체크 패턴이나 특정 색상으로 "
-"지정해 두면 투명한 영역을 포함한아이콘이나 다른 아트워크를 볼 때 "
-"유용하게 사용할 수 있습니다.</i></small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>미리정의된 아이콘</b>"
-#: ../src/f-spot.glade.h:59
-msgid "<small>C_ontrast:</small>"
-msgstr "<small>대비(_O):</small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>미리보기</b>"
-#: ../src/f-spot.glade.h:60
-msgid "<small>Te_mp:</small>"
-msgstr "<small>온도(_M):</small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "디자인 아이콘에서"
-#: ../src/f-spot.glade.h:61
-msgid "<small>_Brightness:</small>"
-msgstr "<small>밝기(_B):</small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "태그 아이콘 편집"
-#: ../src/f-spot.glade.h:62
-msgid "<small>_Exposure:</small>"
-msgstr "<small>노출(_E):</small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "이미지 없음(_I)"
-#: ../src/f-spot.glade.h:63
-msgid "<small>_Hue:</small>"
-msgstr "<small>색조(_H):</small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "0 중 0 사진"
-#: ../src/f-spot.glade.h:64
-msgid "<small>_Saturation:</small>"
-msgstr "<small>채도(_S):</small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "디스플레이 색 프로필 :"
-#: ../src/f-spot.glade.h:65
-msgid "<small>_Tint:</small>"
-msgstr "<small>Tint(_T):</small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "프린팅 색 프로필 :"
-#: ../src/f-spot.glade.h:66
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr "<span weight='bold' size='larger'>갤러리에 연결하는 중 오류</span>\n"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "F-Spot 기본 설정"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-Spot 외양:"
-#: ../src/f-spot.glade.h:68
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
-"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
-"<span weight='bold' size='larger'>여러분의 Google 계정이 잠겨있습니다</span>\n"
-
-#: ../src/f-spot.glade.h:70
-msgid "Ad_just Color..."
-msgstr "색상 조정(_J)..."
-
-#: ../src/f-spot.glade.h:71
-msgid "Adjust Color"
-msgstr "색상 조정"
-
-#: ../src/f-spot.glade.h:72
-msgid "Adjust Time"
-msgstr "시간 조정"
+"가능하면 이미지 파일 안에서\n"
+"<small> 다른 이미지 편집 프로그램에 액세스 할 수 있습니다.</small>"
-#: ../src/f-spot.glade.h:73
-msgid "Adjust _Time..."
-msgstr "시간 조정(_T)..."
-
-#: ../src/f-spot.glade.h:74
-msgid "Adjusted date: "
-msgstr "조정된 날짜: "
-
-#: ../src/f-spot.glade.h:76
-msgid "Arrange _by"
-msgstr "다음으로 정렬(_B)"
-
-#: ../src/f-spot.glade.h:77
-msgid "As _background"
-msgstr "배경색으로(_B)"
-
-#: ../src/f-spot.glade.h:78
-msgid "As check pattern"
-msgstr "체크 패턴으로"
-
-#: ../src/f-spot.glade.h:79
-msgid "As custom color: "
-msgstr "특정 색상으로: "
-
-#: ../src/f-spot.glade.h:80
-msgid "Attach Tags:"
-msgstr "태그 붙이기:"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "폴더 선택"
-#: ../src/f-spot.glade.h:81
-msgid "Attach tag:"
-msgstr "태그 붙이기:"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "별도로 이미지 파일에서"
-#: ../src/f-spot.glade.h:83
-msgid "Autorotate"
-msgstr "자동 회전"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "스토어 태그와 사진 설명:"
-#: ../src/f-spot.glade.h:84
-msgid "Beneath _Photos"
-msgstr ""
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "사진 가져오기했을 때, 복사 해올곳 :"
-#: ../src/f-spot.glade.h:86
-msgid "CD"
-msgstr "CD"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>최고 평가</b>"
-#: ../src/f-spot.glade.h:87
-msgid "C_aption:"
-msgstr "캡션(_A):"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>최소 평가g</b>"
-#: ../src/f-spot.glade.h:88
-msgid "C_ontrast:"
-msgstr "대비(_O):"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "설정 평가 필터"
-#: ../src/f-spot.glade.h:89
-msgid "Camera Selection"
-msgstr "카메라 선택"
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "시간 조정(_T)..."
-#: ../src/f-spot.glade.h:90
-msgid "Cancel, do not change the current timeline. "
-msgstr "취소, 현재 타임라인을 바꾸지 않습니다. "
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "다음으로 정렬(_B)"
-#: ../src/f-spot.glade.h:91
-msgid "Clea_r Date Range"
-msgstr "날짜 범위 지우기(_R)"
+#: ../src/ui/main_window.ui.h:4
+msgid "By _Date"
+msgstr "날짜순(_D)"
-#: ../src/f-spot.glade.h:92
-msgid "Clear Roll Filter"
-msgstr "롤 필터 지우기"
+#: ../src/ui/main_window.ui.h:5
+msgid "By _Import Roll"
+msgstr "가져오기 규칙순(_I)"
-#: ../src/f-spot.glade.h:93
-msgid "Co_nfigure"
-msgstr "설정(_N)"
+#: ../src/ui/main_window.ui.h:6
+msgid "By _Rating"
+msgstr "평가순(_R)"
-#: ../src/f-spot.glade.h:94
+#: ../src/ui/main_window.ui.h:7
msgid "Copy Locat_ion"
msgstr "위치 복사(_I)"
-#: ../src/f-spot.glade.h:95
-msgid "Copy files to the Photos folder"
-msgstr "파일을 Photos 폴더로 복사"
-
-#: ../src/f-spot.glade.h:96
-msgid "Create CD"
-msgstr "CD 만들기"
-
-#: ../src/f-spot.glade.h:97
-msgid "Create Mail"
-msgstr "메일 작성하기"
-
-#: ../src/f-spot.glade.h:98
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "새 태그 만들기(_T)..."
-#: ../src/f-spot.glade.h:99
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "새 버전 만들기(_N)..."
-#: ../src/f-spot.glade.h:100
-msgid "Create _gallery using \"Original\""
-msgstr "\"원본\"을 이용하여 갤러리 만들기(_G)"
-
-#: ../src/f-spot.glade.h:101
-msgid "Create a mail with the selected photos (possible resized) attached"
-msgstr "선택한 사진들을 첨부하여 메일 작성하기 (크기가 변경될 수 있음)"
-
-#: ../src/f-spot.glade.h:102
-msgid "Create standalone _web gallery"
-msgstr "별도의 웹 갤러리 만들기(_W)"
-
-#: ../src/f-spot.glade.h:103
-msgid "Crop photo to _fit"
-msgstr "사진을 알맞게 잘라내기(_F)"
-
-#: ../src/f-spot.glade.h:104
-msgid "Current date:"
-msgstr "오늘:"
-
-#: ../src/f-spot.glade.h:105
-msgid "D_escription:"
-msgstr "설명(_E):"
-
-#: ../src/f-spot.glade.h:106
-msgid "Display File Names"
-msgstr "파일 이름 표시"
-
-#: ../src/f-spot.glade.h:107
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "지정된 롤에서 가져온 사진만을 표시."
-
-#: ../src/f-spot.glade.h:108
-msgid "Do not send a mail"
-msgstr "메일을 보내지 않음"
-
-#: ../src/f-spot.glade.h:109
-msgid "E-_Mail:"
-msgstr "전자메일(_M):"
-
-#: ../src/f-spot.glade.h:110
-msgid "E_xport titles and comments"
-msgstr "제목과 메모 내보내기(_X)"
-
-#: ../src/f-spot.glade.h:111
-msgid "Edit"
-msgstr "편집"
-
-#: ../src/f-spot.glade.h:112
-msgid "Edit Tag Icon"
-msgstr "태그 아이콘 편집"
-
-#: ../src/f-spot.glade.h:113
-msgid "Edit icon"
-msgstr "아이콘 편집"
-
-#: ../src/f-spot.glade.h:114
-msgid "Estimated new size"
-msgstr "예상 새 크기"
-
-#: ../src/f-spot.glade.h:115
-msgid "Export"
-msgstr "내보내기"
-
-#: ../src/f-spot.glade.h:116
-msgid "Export _titles and comments"
-msgstr "제목과 메모 내보내기(_T)"
-
-#: ../src/f-spot.glade.h:117
-msgid "Extra large"
-msgstr "매우 크게"
-
-#: ../src/f-spot.glade.h:119
-msgid "F-Spot View"
-msgstr "F-Spot 보기"
-
-#: ../src/f-spot.glade.h:120
-msgid ""
-"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
-msgstr ""
-"F-Spot에서 여러분의 {0} 계정에 사진을 업로드 하기 위해 인증이 필요합니다. "
-"\"인증\" 단추를 눌러 웹 브라우저를 열고 인증 과정을 수행해 주십시오. "
-
-#: ../src/f-spot.glade.h:122
-msgid "Filter on selected rolls"
-msgstr "선택된 롤에 필터 적용"
-
-#: ../src/f-spot.glade.h:123
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "찾기(_D)"
-#: ../src/f-spot.glade.h:125
-msgid "Folder Export"
-msgstr "폴더 내보내기"
-
-#: ../src/f-spot.glade.h:126
-msgid ""
-"From Screen\n"
-"Standard RGB"
-msgstr ""
-"화면에서\n"
-"표준 RGB"
-
-#: ../src/f-spot.glade.h:128
-msgid ""
-"Full Page\n"
-"Standard - 4x6"
-msgstr ""
-"전체 페이지\n"
-"표준 - 4x6"
-
-#: ../src/f-spot.glade.h:130
-msgid "G_allery Name:"
-msgstr "갤러리 이름(_A):"
-
-#: ../src/f-spot.glade.h:131
-msgid "G_allery:"
-msgstr "갤러리(_A):"
-
-#: ../src/f-spot.glade.h:132
-msgid "Gallery"
-msgstr "갤러리"
-
-#: ../src/f-spot.glade.h:133
-msgid ""
-"Hairline\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-msgstr ""
-"Hairline\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-
-#: ../src/f-spot.glade.h:138
-msgid "Images tagged with:"
-msgstr "다음 태그가 붙은 이미지:"
-
-#: ../src/f-spot.glade.h:140
-msgid "Import Rolls"
-msgstr "가져오기 롤"
-
-#: ../src/f-spot.glade.h:141
-msgid "Import Source:"
-msgstr "가져오기 소스:"
-
-#: ../src/f-spot.glade.h:142
-msgid "Include subfolders"
-msgstr "하위 폴더 포함"
-
-#: ../src/f-spot.glade.h:143
-msgid "Interpolate image on zoom"
-msgstr "확대 시 이미지 보간"
-
-#: ../src/f-spot.glade.h:144
-msgid "Large"
-msgstr "크게"
-
-#: ../src/f-spot.glade.h:145
-msgid "Last Import Roll"
-msgstr "이전 가져오기 롤"
-
-#: ../src/f-spot.glade.h:146
-msgid "Make F-Spot your screensaver"
-msgstr "F-Spot을(를) 화면 보호기로 지정"
-
-#: ../src/f-spot.glade.h:147
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
msgstr "확장 기능 관리(_E)"
-#: ../src/f-spot.glade.h:148
-msgid "Medium"
-msgstr "보통"
-
-#: ../src/f-spot.glade.h:150
-msgid "N_umber of Copies:"
-msgstr "복사본의 수(_U):"
+#: ../src/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "페이지 설정(_U)..."
-#: ../src/f-spot.glade.h:152
-msgid "No _image"
-msgstr "이미지 없음(_I)"
-
-#: ../src/f-spot.glade.h:153
-msgid ""
-"None\n"
-"Title\n"
-"Filename\n"
-"Date\n"
-"Photo Details"
-msgstr ""
-"없음\n"
-"제목\n"
-"파일 이름\n"
-"날짜\n"
-"사진 정보"
-
-#: ../src/f-spot.glade.h:158
-msgid "Number of photos in selected rolls :"
-msgstr "선택된 롤 내의 사진 수 :"
-
-#: ../src/f-spot.glade.h:159
-msgid "Number of pictures"
-msgstr "사진의 수"
-
-#: ../src/f-spot.glade.h:160
-msgid "Only photos taken within these dates will be displayed."
-msgstr "이 날짜 내에 찍힌 사진만이 표시될 것입니다."
-
-#: ../src/f-spot.glade.h:161
-msgid "Open _Folder..."
-msgstr "폴더 열기(_F)..."
-
-#: ../src/f-spot.glade.h:162
-msgid "Open _album in browser when done uploading"
-msgstr "업로드가 끝나면 브라우저에서 앨범 열기(_A)"
-
-#: ../src/f-spot.glade.h:163
-msgid "Open _destination when done exporting"
-msgstr "내보내기가 끝나면 대상 폴더 열기(_D)"
-
-#: ../src/f-spot.glade.h:165
-msgid "Original size (possible very large file size)"
-msgstr "원본 크기 (아마도 매우 클 것입니다)"
-
-#: ../src/f-spot.glade.h:166
-msgid "P_arent Tag:"
-msgstr "상위 태그(_A):"
-
-#: ../src/f-spot.glade.h:167
-msgid "P_hoto Source:"
-msgstr "사진 소스(_H):"
-
-#: ../src/f-spot.glade.h:168
-msgid "Page 1 of 3"
-msgstr "3 중 1 페이지"
-
-#: ../src/f-spot.glade.h:169
-msgid "Pause"
-msgstr "일시 정지"
-
-#: ../src/f-spot.glade.h:170
-msgid "Photo 0 of 0"
-msgstr "0 중 0 사진"
-
-#: ../src/f-spot.glade.h:171
-msgid "Photo _Size:"
-msgstr "사진 크기(_S):"
-
-#: ../src/f-spot.glade.h:172
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "이 갤러리에 대한 설정이 올바른지 확인하십시오."
-
-#: ../src/f-spot.glade.h:173
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-"이 갤러리에 대한 설정이 올바른지 확인하십시오.\n"
-"'Captcha' 부분의 이미지에 표시된 글자를 입력하세요.\n"
-"<i>대소문자는 구분하지 않습니다</i>"
-
-#: ../src/f-spot.glade.h:176
-msgid "Preferences"
-msgstr "기본 설정"
-
-#: ../src/f-spot.glade.h:178
-msgid "Print"
-msgstr "인쇄"
-
-#: ../src/f-spot.glade.h:179
-msgid "Print crop _marks"
-msgstr ""
-
-#: ../src/f-spot.glade.h:180
-msgid "Private"
-msgstr "비공개"
-
-#: ../src/f-spot.glade.h:181
-msgid "Public"
-msgstr "공개"
-
-#: ../src/f-spot.glade.h:182
-msgid "Public Album"
-msgstr "공개 앨범"
-
-#: ../src/f-spot.glade.h:183
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
msgstr "미리보기 새로 고침(_F)"
-#: ../src/f-spot.glade.h:184
-msgid "Rem_ove Tag"
-msgstr "태그 지우기(_O)"
-
-#: ../src/f-spot.glade.h:185
-msgid "Repair"
-msgstr "복구"
-
-#: ../src/f-spot.glade.h:186
-msgid "Reset"
-msgstr "초기화"
-
-#: ../src/f-spot.glade.h:189
-msgid "Select A Folder"
-msgstr "폴더 선택"
-
-#: ../src/f-spot.glade.h:190
-msgid "Select Import Rolls..."
-msgstr "가져오기 롤 선택..."
-
-#: ../src/f-spot.glade.h:191
-msgid "Select Photos to Copy From Camera..."
-msgstr "카메라에서 복사할 사진 선택..."
-
-#: ../src/f-spot.glade.h:193
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "선택하지 않음(_N)"
-#: ../src/f-spot.glade.h:194
-msgid "Select a Tag..."
-msgstr "태그 선택..."
-
-#: ../src/f-spot.glade.h:195
-msgid "Select the camera from which you want to transfer files"
-msgstr "파일을 전송할 카메라를 선택하십시오"
-
-#: ../src/f-spot.glade.h:196
-msgid "Selected Camera: "
-msgstr "선택한 카메라: "
-
-#: ../src/f-spot.glade.h:197
-msgid ""
-"Selection\n"
-"Gallery\n"
-"Viewport"
-msgstr ""
-"선택\n"
-"갤러리\n"
-"뷰 포트"
-
-#: ../src/f-spot.glade.h:200
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
msgstr "메일로 보내기(_M)..."
-#: ../src/f-spot.glade.h:201
-msgid "Set _Date Range..."
-msgstr "날짜 범위 설정(_D)..."
-
-#: ../src/f-spot.glade.h:202
-msgid "Set as _Background"
-msgstr "바탕그림으로 설정(_B)"
-
-#: ../src/f-spot.glade.h:203
-msgid "Set date range"
-msgstr "날짜 범위 지정"
-
-#: ../src/f-spot.glade.h:205
-msgid "Show all photos."
-msgstr "모든 사진 보기."
-
-#: ../src/f-spot.glade.h:206
-msgid "Show or hide the side pane"
-msgstr "왼쪽 창을 보이거나 숨깁니다"
-
-#: ../src/f-spot.glade.h:207
-msgid "Show or hide the toolbar"
-msgstr "도구 모음을 보이거나 숨깁니다"
-
-#: ../src/f-spot.glade.h:208
-msgid "Side _pane"
-msgstr "왼쪽 창(_P)"
-
-#: ../src/f-spot.glade.h:209
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "왼쪽 창(_B)"
-#: ../src/f-spot.glade.h:210
-msgid "Size"
-msgstr "크기"
-
-#: ../src/f-spot.glade.h:211
-msgid "Size of the exported selection :"
-msgstr "내보내기로 선택한 크기 :"
-
-#: ../src/f-spot.glade.h:212
-msgid "Small"
-msgstr "작게"
-
-#: ../src/f-spot.glade.h:213
-msgid "So_urce Temp"
-msgstr "원본 온도(_U)"
-
-#: ../src/f-spot.glade.h:214
-msgid "Space all photos by"
-msgstr ""
-
-#: ../src/f-spot.glade.h:215
-msgid ""
-"Specify if an original size picture should be rotated or not. Smaller sizes "
-"are automatically rotated."
-msgstr ""
-"원본 크기의 사진이 회전되어야 하는지 여부를 지정합니다. 작은 크기의 "
-"사진들은 자동으로 회전됩니다."
-
-#: ../src/f-spot.glade.h:216
-msgid ""
-"Standard RGB\n"
-"Image Profile\n"
-"Custom\n"
-msgstr ""
-"표준 RGB\n"
-"이미지 프로파일\n"
-"사용자 지정\n"
+#: ../src/ui/main_window.ui.h:23
+msgid "T_ags"
+msgstr "태그(_A)"
-#: ../src/f-spot.glade.h:220
-msgid "Strip _metadata"
-msgstr "메타데이터 없앰(_M)"
+#: ../src/ui/main_window.ui.h:25
+msgid "Thumbnail _elements"
+msgstr "미리보기 환경(_E)"
-#: ../src/f-spot.glade.h:221
-msgid "Strip image _metadata"
-msgstr "이미지 메타데이터 삭제(_M)"
+#: ../src/ui/main_window.ui.h:26
+msgid "Too_lbar"
+msgstr "도구 모음(_L)"
-#: ../src/f-spot.glade.h:222
-msgid "T_ags"
-msgstr "태그(_A)"
+#: ../src/ui/main_window.ui.h:27
+msgid "View"
+msgstr "보기"
-#: ../src/f-spot.glade.h:223
-msgid "Tag Icons"
-msgstr "태그 아이콘"
+#: ../src/ui/main_window.ui.h:33
+msgid "_Attach Tag to Selection"
+msgstr "선택한 사진에 태그 붙이기(_A)"
-#: ../src/f-spot.glade.h:224
-msgid "Tags: "
-msgstr "태그: "
+#: ../src/ui/main_window.ui.h:35
+msgid "_Clear Rating Filter"
+msgstr "평가 필터 청소(_C)"
-#: ../src/f-spot.glade.h:225
-msgid "Tiny"
-msgstr "매우 작게"
+#: ../src/ui/main_window.ui.h:36
+msgid "_Clear Roll Filter"
+msgstr "목록 필터 청소(_C)"
-#: ../src/f-spot.glade.h:226
-msgid "Too_lbar"
-msgstr "도구 모음(_L)"
+#: ../src/ui/main_window.ui.h:38
+msgid "_Components"
+msgstr "컴포넌트(_C)"
-#: ../src/f-spot.glade.h:227
-msgid "Toolbar"
-msgstr "도구 모음"
+#: ../src/ui/main_window.ui.h:39
+msgid "_Contents"
+msgstr "차례(_C)"
-#: ../src/f-spot.glade.h:228
-msgid "Total original size"
-msgstr "총 원본 크기"
+#: ../src/ui/main_window.ui.h:40
+msgid "_Dates"
+msgstr "날짜(_D)"
-#: ../src/f-spot.glade.h:229
-msgid "U_RL:"
-msgstr "URL(_R):"
+#: ../src/ui/main_window.ui.h:42
+msgid "_Delete Selected Tag"
+msgstr "선택한 태그 삭제(_D)"
-#: ../src/f-spot.glade.h:230
-msgid "View"
-msgstr "보기"
+#: ../src/ui/main_window.ui.h:43
+msgid "_Delete Version"
+msgstr "버전 삭제(_D)"
-#: ../src/f-spot.glade.h:231
-msgid "Visible to Family"
-msgstr "가족들과 공유"
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Selected Tag..."
+msgstr "선택한 태그 편집(_E)..."
-#: ../src/f-spot.glade.h:232
-msgid "Visible to Friends"
-msgstr "친구들과 공유"
+#: ../src/ui/main_window.ui.h:46
+msgid "_Export to"
+msgstr "다음으로 내보내기(_E)"
-#: ../src/f-spot.glade.h:233
-msgid "Will print using: US Letter size on Generic Postscript"
-msgstr "일반 엽서에 미국 편지지 크기로 인쇄할 것입니다:"
+#: ../src/ui/main_window.ui.h:47
+msgid "_Filmstrip"
+msgstr "슬라이드(_F)"
-#: ../src/f-spot.glade.h:234
-msgid "Write _metadata to file"
-msgstr "메타데이터를 파일로 쓰기(_M)"
+#: ../src/ui/main_window.ui.h:50
+msgid "_Hidden"
+msgstr "숨김(_H)"
-#: ../src/f-spot.glade.h:235
-msgid "Zoom _in"
-msgstr "확대(_I)"
+#: ../src/ui/main_window.ui.h:51
+msgid "_Import..."
+msgstr "가져오기(_I)..."
-#: ../src/f-spot.glade.h:236
-msgid "Zoom _out"
-msgstr "축소(_O)"
+#: ../src/ui/main_window.ui.h:52
+msgid "_Large"
+msgstr "크게(_L)"
-#: ../src/f-spot.glade.h:237
-msgid "Zoom in"
-msgstr "확대"
+#: ../src/ui/main_window.ui.h:53
+msgid "_Last Import Roll"
+msgstr "마지막 가져온 룰(_L)"
-#: ../src/f-spot.glade.h:238
-msgid "Zoom out"
-msgstr "축소"
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr "확대경(_L)"
-#: ../src/f-spot.glade.h:239
-msgid "_Account:"
-msgstr "계정(_A):"
+#: ../src/ui/main_window.ui.h:55
+msgid "_Medium"
+msgstr "보통(_M)"
-#: ../src/f-spot.glade.h:240
-msgid "_Album Name:"
-msgstr "앨범 이름(_A):"
+#: ../src/ui/main_window.ui.h:57
+msgid "_Quit"
+msgstr "끝내기(_Q)"
-#: ../src/f-spot.glade.h:241
-msgid "_Album Title:"
-msgstr "앨범 제목(_A):"
+#: ../src/ui/main_window.ui.h:58
+msgid "_Ratings"
+msgstr "평가(_R)"
-#: ../src/f-spot.glade.h:242
-msgid "_Attach Tag"
-msgstr "태그 붙이기(_A)"
+#: ../src/ui/main_window.ui.h:60
+msgid "_Remove Tag From Selection"
+msgstr "선택한 사진에서 태그 제거(_R)"
-#: ../src/f-spot.glade.h:243
-msgid "_Attach Tag to Selection"
-msgstr "선택한 사진에 태그 붙이기(_A)"
+#: ../src/ui/main_window.ui.h:61
+msgid "_Rename Version"
+msgstr "버전 이름 바꾸기(_R)"
-#: ../src/f-spot.glade.h:244
-msgid "_Autorotate"
-msgstr "자동 회전(_A)"
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "역순으로(_R)"
-#: ../src/f-spot.glade.h:245
-msgid "_Border:"
-msgstr "외곽선(_B):"
+#: ../src/ui/main_window.ui.h:63
+msgid "_Select Import Rolls..."
+msgstr "선택된 룰 가져오기(_S)..."
-#: ../src/f-spot.glade.h:246
-msgid "_Brightness:"
-msgstr "밝기(_B):"
+#: ../src/ui/main_window.ui.h:64
+msgid "_Set Date Range..."
+msgstr "날짜 범위를 설정(_S)..."
-#: ../src/f-spot.glade.h:247
-msgid "_Browse Previously Scheduled Files"
-msgstr "이전에 스케줄된 파일 찾아보기(_B)"
+#: ../src/ui/main_window.ui.h:65
+msgid "_Set Rating filter..."
+msgstr "평가 필터 셋(_S)..."
-#: ../src/f-spot.glade.h:248
-msgid "_Captcha:"
-msgstr "Captcha(_C):"
+#: ../src/ui/main_window.ui.h:66
+msgid "_Sharpen..."
+msgstr "선명하게(_S)..."
-#: ../src/f-spot.glade.h:249
-msgid "_Components"
-msgstr "컴포넌트(_C)"
+#: ../src/ui/main_window.ui.h:68
+msgid "_Small"
+msgstr "작게(_S)"
-#: ../src/f-spot.glade.h:250
-msgid "_Contents"
-msgstr "차례(_C)"
+#: ../src/ui/main_window.ui.h:69
+msgid "_Tag Icons"
+msgstr "아이콘 상태(_T)"
-#: ../src/f-spot.glade.h:251
-msgid "_Dates"
-msgstr "날짜(_D)"
+#: ../src/ui/main_window.ui.h:70
+msgid "_Tags"
+msgstr "태그(_T)"
-#: ../src/f-spot.glade.h:252
-msgid "_Delete From Drive"
-msgstr "드라이브에서 지우기(_D)"
+#: ../src/ui/main_window.ui.h:71
+msgid "_Timeline"
+msgstr "타임라인(_T)"
-#: ../src/f-spot.glade.h:253
-msgid "_Delete Selected Tag"
-msgstr "선택한 태그 지우기(_D)"
+#: ../src/ui/main_window.ui.h:72
+msgid "_Tools"
+msgstr "도구(_T)"
-#: ../src/f-spot.glade.h:254
-msgid "_Delete Version"
-msgstr "버전 지우기(_D)"
+#: ../src/ui/main_window.ui.h:73
+msgid "_Untagged Photos"
+msgstr "태그가 없는 사진(_U)"
-#: ../src/f-spot.glade.h:255
-msgid "_Description:"
-msgstr "설명(_D):"
+#: ../src/ui/main_window.ui.h:74
+msgid "_Version"
+msgstr "버전(_V)"
-#: ../src/f-spot.glade.h:256
-msgid "_Destination Temp"
-msgstr "대상 온도(_D)"
+#: ../src/Updater.cs:616
+msgid "Updating F-Spot Database"
+msgstr "F-Spot 데이터베이스 업데이트 하는 중"
-#: ../src/f-spot.glade.h:257
-msgid "_Display:"
-msgstr "표시(_D):"
+#: ../src/Updater.cs:617
+msgid ""
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
+msgstr "F-Spot 갤러리 데이터베이스를 업데이트하는 동안 잠시 기다려 주십시오. 이 과정은 약간의 시간이 소요됩니다."
-#: ../src/f-spot.glade.h:258
-msgid "_Edit"
-msgstr "편집(_E)"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "임시 파일을 만들 수 없음"
-#: ../src/f-spot.glade.h:259
-msgid "_Edit Selected Tag..."
-msgstr "선택한 태그 편집(_E)..."
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "페이지 설정"
-#: ../src/f-spot.glade.h:260
-msgid "_Export"
-msgstr "내보내기(_E)"
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "용지 크기: {0} x {1} mm"
-#: ../src/f-spot.glade.h:261
-msgid "_Export tags"
-msgstr "태그 내보내기(_E)"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "용지 크기와 방향을 설정하기"
-#: ../src/f-spot.glade.h:262
-msgid "_Export to"
-msgstr "다음으로 내보내기(_E)"
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "1페이지에 인쇄할 사진 매수"
-#: ../src/f-spot.glade.h:263
-msgid "_Export to Album:"
-msgstr "앨범으로 내보내기(_E):"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "반복"
-#: ../src/f-spot.glade.h:264
-msgid "_File"
-msgstr "파일(_F)"
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "인쇄 잘라내기 표시"
-#: ../src/f-spot.glade.h:265
-msgid "_Flickr"
-msgstr "Flickr(_F)"
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "사진 레이아웃"
-#: ../src/f-spot.glade.h:266
-msgid "_Folder"
-msgstr "폴더(_F)"
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "전체 페이지 (여백 없음)"
-#: ../src/f-spot.glade.h:267
-msgid "_Folder:"
-msgstr "폴더(_F):"
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "확대"
-#: ../src/f-spot.glade.h:268
-msgid "_Fullscreen"
-msgstr "전체 화면(_F)"
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "채움"
-#: ../src/f-spot.glade.h:269
-msgid "_Gallery"
-msgstr "갤러리(_G)"
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "크기 조정"
-#: ../src/f-spot.glade.h:270
-msgid "_Gallery Name:"
-msgstr "갤러리 이름(_G):"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "흰 테두리"
-#: ../src/f-spot.glade.h:271
-msgid "_Gallery:"
-msgstr "갤러리(_G):"
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "사용자 정의 글자"
-#: ../src/f-spot.glade.h:272
-msgid "_Help"
-msgstr "도움말(_H)"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "사진 정보"
-#: ../src/f-spot.glade.h:273
-msgid "_Hidden"
-msgstr "숨김(_H)"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "파일 이름을 인쇄하기"
-#: ../src/f-spot.glade.h:274
-msgid "_Hue:"
-msgstr "색조(_H):"
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "사진 날짜 인쇄하기"
-#: ../src/f-spot.glade.h:275
-msgid "_Icon:"
-msgstr "아이콘(_I):"
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "사진 시간 인쇄하기"
-#: ../src/f-spot.glade.h:276
-msgid "_Import..."
-msgstr "가져오기(_I)..."
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "사진 태그 인쇄하기"
-#: ../src/f-spot.glade.h:277
-msgid "_Large"
-msgstr "크게(_L)"
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "사진 설명 인쇄하기"
-#: ../src/f-spot.glade.h:278
-msgid "_Medium"
-msgstr "보통(_M)"
+#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+msgid "Edit"
+msgstr "편집"
-#: ../src/f-spot.glade.h:279
-msgid "_Metadata Browser"
-msgstr "메타데이터 탐색기(_M)"
+#: ../src/Widgets/EditorPage.cs:220
+msgid ""
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
+msgstr "이 도구는 활성화된 선택 영역이 필요합니다. 사진의 일부를 선택한 뒤에 다시 시도해 주십시오"
-#: ../src/f-spot.glade.h:280
-msgid "_Month"
-msgstr "월(_M)"
+#: ../src/Widgets/EditorPage.cs:238
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "조정된 사진을 저장하는 도중 오류"
-#: ../src/f-spot.glade.h:281
-msgid "_New Window"
-msgstr "새 창(_N)"
+#: ../src/Widgets/EditorPage.cs:240
+#, csharp-format
+msgid ""
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
+msgstr "예외 \"{0}\"오류가 발생했습니다. 편집하기 전에 RAW파일을 JPEG파일에 현상해야함을 주의하십시오."
-#: ../src/f-spot.glade.h:282
-msgid "_Open album in browser when done uploading"
-msgstr "업로드가 끝나면 브라우저에서 앨범 열기(_O)"
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "수평(_H)"
-#: ../src/f-spot.glade.h:283
-msgid "_Open destination when done exporting"
-msgstr "내보내기가 끝나면 대상 폴더 열기(_O)"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "수직(_V)"
-#: ../src/f-spot.glade.h:284
-msgid "_Output:"
-msgstr "출력(_O):"
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "찾기:"
-#: ../src/f-spot.glade.h:285
-msgid "_Parent Album:"
-msgstr "상위 앨범(_P):"
+#: ../src/Widgets/FolderTreePage.cs:21
+msgid "Folders"
+msgstr "폴더"
-#: ../src/f-spot.glade.h:286
-msgid "_Password:"
-msgstr "암호(_P):"
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "파일 시스템"
-#: ../src/f-spot.glade.h:287
-msgid "_Quit"
-msgstr "끝내기(_Q)"
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "히스토그램"
-#: ../src/f-spot.glade.h:288
-msgid "_Remove From Catalog"
-msgstr "카탈로그에서 지우기(_R)"
+#: ../src/Widgets/InfoBox.cs:217
+msgid "Date"
+msgstr "날짜"
-#: ../src/f-spot.glade.h:289
-msgid "_Remove Tag From Selection"
-msgstr "선택한 사진에서 태그 지우기(_R)"
+#: ../src/Widgets/InfoBox.cs:223
+msgid "Exposure"
+msgstr "노출"
-#: ../src/f-spot.glade.h:290
-msgid "_Rename Version"
-msgstr "버전 이름 바꾸기(_R)"
+#: ../src/Widgets/InfoBox.cs:227
+msgid "Focal Length"
+msgstr "초점 거리"
-#: ../src/f-spot.glade.h:291
-msgid "_Resize to: "
-msgstr "크기 조정(_R): "
+#: ../src/Widgets/InfoBox.cs:233
+msgid "File Size"
+msgstr "파일 크기"
-#: ../src/f-spot.glade.h:293
-msgid "_Saturation:"
-msgstr "채도(_S):"
+#: ../src/Widgets/InfoBox.cs:236
+msgid "Rating"
+msgstr "평가"
-#: ../src/f-spot.glade.h:294
-msgid "_Save the files only"
-msgstr "파일들만 저장(_S)"
+#: ../src/Widgets/InfoBox.cs:389 ../src/Widgets/InfoBox.cs:397
+#: ../src/Widgets/InfoBox.cs:427
+msgid "(wrong format)"
+msgstr "(잘못된 형식)"
-#: ../src/f-spot.glade.h:295
-msgid "_Scale photos to no larger than: "
-msgstr "다음 보다 크지 않게 사진 확대(_S): "
+#: ../src/Widgets/InfoBox.cs:417 ../src/Widgets/InfoBox.cs:440
+#: ../src/Widgets/InfoBox.cs:450 ../src/Widgets/InfoBox.cs:459
+msgid "(Unknown)"
+msgstr "(알 수 없음)"
-#: ../src/f-spot.glade.h:296
-msgid "_Sharpen..."
-msgstr "선명하게(_S)..."
+#: ../src/Widgets/InfoBox.cs:566
+msgid "(File read error)"
+msgstr "(파일 읽기 오류)"
-#: ../src/f-spot.glade.h:297
-msgid "_Slideshow"
-msgstr "슬라이드쇼(_S)"
+#: ../src/Widgets/InfoBox.cs:611
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0} 사진"
-#: ../src/f-spot.glade.h:298
-msgid "_Small"
-msgstr "작게(_S)"
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:631
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"{0}\n"
+"{1} 〜 {2}"
-#: ../src/f-spot.glade.h:299
-msgid "_Strip metadata"
-msgstr "메타데이터 제거(_S)"
+#: ../src/Widgets/InfoBox.cs:636
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"{0} 〜\n"
+"{1}"
-#: ../src/f-spot.glade.h:300
-msgid "_Tag Name:"
-msgstr "태그 이름(_T):"
+#: ../src/Widgets/InfoBox.cs:663
+msgid "(At least one File not found)"
+msgstr "(파일이 하나도 찾을 수 없음)"
-#: ../src/f-spot.glade.h:301
-msgid "_Tags"
-msgstr "태그(_T)"
+#: ../src/Widgets/InfoBox.cs:780
+msgid "Show Photo Name"
+msgstr "사진 이름 표시"
-#: ../src/f-spot.glade.h:302
-msgid "_Timeline"
-msgstr "타임라인(_T)"
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Date"
+msgstr "날짜 보기"
-#: ../src/f-spot.glade.h:303
-msgid "_Title:"
-msgstr "제목(_T):"
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Size"
+msgstr "크기 표시"
-#: ../src/f-spot.glade.h:304
-msgid "_Tools"
-msgstr "도구(_T)"
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Exposure"
+msgstr "노출 표시"
-#: ../src/f-spot.glade.h:305
-msgid "_URI:"
-msgstr "URI(_U):"
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Focal Length"
+msgstr "초점 거리 표시"
-#: ../src/f-spot.glade.h:306
-msgid "_Untagged Photos"
-msgstr "태그가 없는 사진(_U)"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Camera"
+msgstr "카메라 표시"
-#: ../src/f-spot.glade.h:307
-msgid "_Username:"
-msgstr "사용자 이름(_U):"
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show File Size"
+msgstr "파일 크기 표시"
-#: ../src/f-spot.glade.h:308
-msgid "_Version"
-msgstr "버전(_V)"
+#: ../src/Widgets/MetadataDisplay.cs:23
+msgid "Metadata"
+msgstr "메타데이터"
-#: ../src/f-spot.glade.h:309
-msgid "_View"
-msgstr "보기(_V)"
+#: ../src/Widgets/MetadataDisplay.cs:104
+msgid "Extended Metadata"
+msgstr "확장 메타데이터"
-#: ../src/f-spot.glade.h:310
-msgid "_View photos in browser when done uploading"
-msgstr "업로드 할 때 브라우저에서 사진 보기(_V)"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:392
+msgid "No Extended Metadata Available"
+msgstr "사용 가능한 확장 메타데이터가 없습니다"
-#: ../src/f-spot.glade.h:311
-msgid "_Virtual Filesystem"
-msgstr "가상 파일 시스템(_V)"
+#: ../src/Widgets/MetadataDisplay.cs:410
+msgid "No active photo"
+msgstr "활성화된 사진이 없음"
-#: ../src/f-spot.glade.h:312
-msgid "_Write only these photos to CD"
-msgstr "이 사진들만 CD에 쓰기(_W)"
+#: ../src/Widgets/MetadataDisplay.cs:412
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "\"{0}\" 사진이 존재하지 않습니다"
-#: ../src/f-spot.glade.h:313
-msgid "and"
-msgstr "그리고"
+#: ../src/Widgets/MetadataDisplay.cs:415
+msgid "No metadata available"
+msgstr "메타데이터 없음"
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:315
-msgid ""
-"at\n"
-"after\n"
-"between"
-msgstr ""
-"일치\n"
-"이후\n"
-"사이"
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "이용할 수 있는 프로그램이 없음"
-#: ../src/f-spot.glade.h:318
-msgid "difference:"
-msgstr "차이:"
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "평가 :"
-#: ../src/f-spot.glade.h:319
-msgid "img_000.jpg"
-msgstr "img_000.jpg"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "국가"
-#: ../src/f-spot.glade.h:322
-msgid "pixels"
-msgstr "픽셀"
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "도시"
-#: ../src/f-spot.glade.h:323
-msgid "x"
-msgstr "x"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "상태"
+#. namespace
#: ../tools/f-spot-screensaver.desktop.in.h:1
msgid "Display a slideshow from F-Spot"
msgstr "F-Spot에서 슬라이드쇼 보기"
@@ -3469,3 +4088,8 @@ msgstr "F-Spot에서 슬라이드쇼 보기"
msgid "F-Spot photos"
msgstr "F-Spot 사진"
+#~ msgid "my photos"
+#~ msgstr "내 사진"
+
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "선택한 태그 편집..."
diff --git a/po/lt.po b/po/lt.po
index e0d5529..3bff725 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,342 +9,1427 @@ msgid ""
msgstr ""
"Project-Id-Version: F-Spot master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-26 20:59+0300\n"
-"PO-Revision-Date: 2009-06-26 22:22+0300\n"
+"POT-Creation-Date: 2010-03-27 12:41+0200\n"
+"PO-Revision-Date: 2010-03-27 12:41+0200\n"
"Last-Translator: Žygimantas Beručka <zygis at gnome.org>\n"
"Language-Team: Lithuanian <gimp-lt at lists.akl.lt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\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"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Versija:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Siunčiami paveikslėliai"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Paveikslėlis „{0}“ siunčiamas į CD"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} iš {1}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "Fotografijos nusiųstos"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Siuntimas baigtas"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "Siunčiant įvyko klaida"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "Siunčiant įvyko klaida"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "kopijuojama..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>Yra keletas anksčiau suplanuotų įrašymui elementų</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Rašytinos fotografijos</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Automatinis pasukimas"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Autorius:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Sukurti CD"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Autorinės teisės:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Dydis"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Plėtinių priklausomybės:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Eksportuoto pažymėjimo dydis:"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Visos registruotos saugyklos"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Naršyti anksčiau suplanuotus failus"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Ar tikrai norite atšaukti diegimą?"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Eksportuoti"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Bus pašalinti šie paketai:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "Į CD į_rašyti tik šias fotografijas"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "Laukiama tapatybės nustatymo"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
msgstr ""
-"Taip pat yra kitų plėtinių, priklausančių nuo ankstesniųjų, kurie taip pat "
-"bus pašalinti:"
+"F-Spot dabar paleis jūsų naršyklę, kad galėtumėte įjungti ką tik parinktas "
+"teises.\n"
+"\n"
+"Kai jums Facebook nurodys grįžti prie šios programos, spustelėkite žemiau "
+"esantį mygtuką „Gerai“."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "Per daug eksportuotinų paveikslėlių"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
msgstr ""
-"Pasirinkti plėtiniai negali būti įdiegti, nes yra priklausomybių konfliktų."
+"Facebook leidžia tik {0} fotografijų albume. Sumažinkite savo pasirinktų "
+"fotografijų skaičių ir bandykite dar kartą."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Bus įdiegti šie paketai:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Išsiunčiami paveikslėliai"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (naudotojo aplanke)"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "Reikia nurodyti albumo pavadinimą"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Šie paketai turi būti pašalinti:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "Nurodykite savo albumo pavadinimą arba pasirinkite esantį albumą."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Šių priklausomybių nepavyko išspręsti:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "Nepavyko sukurti naujo albumo"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Įdiegimas sėkmingai baigtas."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"Klaida kuriant naują albumą.\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Įdiegti nepavyko!"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Siunčiamas paveikslėlis „{0}“ ({1} iš {2})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Įdiegiant buvo gauta perspėjimų."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Klaida siunčiant į Facebook: {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Pašalinta sėkmingai."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Klaida"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Pašalinti nepavyko!"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Išsiųsta"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Pašalinimas baigtas, tačiau gauta perspėjimų."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Aplankykite F-Spot grupę Facebooke"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Saugykla"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Laukiama tapatybės nustatymo"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Įdiegimas atšauktas"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"F-Spot dabar paleis jūsų naršyklę, kad galėtumėte prisijungti prie "
+"Facebook.\n"
+"\n"
+"Kai Facebook jums nurodys grįžti prie šios programos, spustelėkite žemiau "
+"esantį mygtuką „Gerai“. F-Spot įrašys jūsų seansą gnome-keyring podėlyje, "
+"jei įmanoma, ir naudos jį ateityje eksportuojant į Facebook."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Kai kurie reikalingi plėtiniai nerasti"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Nustatoma tapatybė..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Įdiegti nepavyko"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Klaida jungiantis į Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Plėtinys"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr ""
+"Problema jungiantis prie Facebook. Patikrinkite savo prisjungimo duomenis ir "
+"bandykite dar kartą."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Versija"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Nustatoma seanso tapatybė"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Kitas"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "Sukurtas seansas, gaunama naudotojo informacija..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:9
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "Sukurtas seansas, gaunamas draugų sąrašas..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "Sukurtas seansas, gaunama draugų informacija..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "Sukurtas seansas, gaunami fotoalbumai..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} prisijungęs (-usi) prie Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Facebook ryšio klaida"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"Klaida atsiunčiant jūsų informaciją iš Facebook.\n"
+"\n"
+"Facebook grąžino: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Jūs neprisijungę."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Automatiškai patvirtinti fotografijas"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Antraštė"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Sukurti naują albumą"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Aprašymas"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Eksportuoti į Facebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "Šioje fotografijoje"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Vieta"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Prisijungti"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Atsijungti"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Pavadinimas"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Neprisijungę"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Leidimai:"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Likti prisijungus"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Naudoti esantį albumą"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Kas tai?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Nustatyti tapatybę"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Išimtinė situacija: {0}“"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"Gavę {0} prieigos teises, grįžkite į šį langą ir spustelėkite žemiau esantį "
+"mygtuką „Baigti tapatybės nustatymą“"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paketas"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Baigti tapatybės nustatymą"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Plėtinio įdiegimas"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Jungiamasi prie {0}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Pasirinkite įdiegtinus plėtinius ir spustelėkite Pirmyn</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Trikrinama tapatybė..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Įdiegti iš:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Sveiki, {0}, dabar esate prisijungę prie {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Saugyklos..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Prisijungti kitu naudotoju"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Rodyti visus paketus"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "Naudojama {0} iš jūsų leidžiamos {1} mėnesinės kvotos"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Rodyti tik naujas versijas"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Nepavyko prisijungti"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Rodyti tik atnaujinimus"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Laukiama atsako {0} iš {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "_Nepasirinkti jokių"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "Siunčiamas paveikslėlis „{0}“"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Siunčiant į {0} įvyko klaida: {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "Nepavyko prisijungti"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"F-Spot nepavyko prisijungti prie {0}. Įsitikinkite, kad gavote prieigos "
+"teisę naudodami {0} žiniatinklio naršyklės sąsają."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Paskyra</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Fotografijos</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Stilius</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Peržiūros leidimai</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "Eksportuoti"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "Eksportuoti žymų _hierarchiją"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"Norint nusiųsti fotografijas į jūsų {0} paskyrą, reikia prieigos teisių. "
+"Norėdami atverti žiniatinklio naršyklę ir suteikti F-Spot prieigos teisę, "
+"spustelėkite mygtuką „Nustatyti tapatybę“. "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "Nepaisyti _viršutinio lygmens žymų"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Asmeniška"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Vieša"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "Pašalinti _metaduomenis"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Matoma šeimai"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Matoma draugams"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "_Eksportuoti žymas"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "_Keisti dydį į: "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "Įkėlus, _rodyti fotografijas naršyklėje"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "pikseliai"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "_Aplankas..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Pasirinkite eksportavimo aplanką"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "Kuriama galerija"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "Siunčiant paveikslėlį „{0}“ į galeriją įvyko klaida:{2}{1}"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "Klaida: siunčiant įvyko klaida. Nutraukiama"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Klaida: toks failas jau egzistuoja. Nutraukiama"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "Šviesu"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "Tamsu"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "Ankst"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Rodyklė"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "Žymos"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Kitas"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "Galeriją sukūrė"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "Rodyti stilius"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "Paslėpti stilius"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Žymos: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "Puslapis:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Paskirties vieta</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Eksportavimo metodas</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "Sukurti _galeriją naudojant „Original“"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "Sukurti autonominę _žiniatinklio galeriją"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "Ap_rašymas:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "Eksportuoti ž_ymas"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "Eksportuoti žymų _piktogramas"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Aplanko eksportavimas"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "G_alerijos pavadinimas:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "Baigus eksportavimą atverti _paskirties vietą"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Aplankas:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "Iš_saugoti tik failus"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "Žiniatinklio _galerija..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Nepavyko prisijungti prie Gallery, kurios versija nežinoma.\n"
+"Įsitikinkite, kad turite Nuotolinio įskipio versiją 1.0.8 ar\n"
+"naujesnę"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "Netinkamas URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "Galerijos URL įrašas, atrodo, nėra tinkamas URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "Klaida jungiantis prie Galerijos"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "Bandant prisijungti susidurta su šia klaida: {0}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "Galerija tokiu pavadinimu jau yra"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+"Jūsų registruotose Galerijose jau yra Galerija, turinti tokį pavadinimą. "
+"Pasirinkite unikalų pavadinimą."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(Aukščiausio lygio)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "Netinkamas Galerijos pavadinimas"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Galerijos pavadinime yra neleistinų simbolių.\n"
+"Leidžiama tik raidės, skaitmenys, - ir _."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Klaida siunčiant paveikslėlį „{0}“ į galeriją: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(Nėra galerijos)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(Neprisijungta)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(Nėra albumų)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Nepasirinkta paskyra"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Albumas</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Galerija</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Jungiantis prie galerijos įvyko klaida</"
+"span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "Eksportuoti _pavadinimus ir komentarus"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "Įkėlus, _atverti albumą naršyklėje"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Patvirtinkite, kad šios galerijos nustatymai yra teisingi."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "_Albumo pavadinimas:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Aprašymas:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
#: ../src/f-spot.glade.h:97
-msgid "Select _All"
-msgstr "Pasirinkti _visas"
+msgid "_Export to Album:"
+msgstr "_Eksportuoti į albumą:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "_Galerijos pavadinimas:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Bendra pažanga:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Galerija:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Atsiunčiami plėtiniai..."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "_Pirminis albumas:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Plėtinių valdyklė"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "_Slaptažodis:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Norint atlikti šią operaciją, reikia papildomų plėtinių."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Pavadinimas:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Bus įdiegti šie plėtiniai:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "_Naudotojo vardas:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Plėtinių valdyklė</b></big>"
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "Klaida skaitant serverio atsaką"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Šiuo metu yra įdiegti šie plėtiniai:"
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Serveris grąžino atsaką be galerijos turinio"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "Į_diegti plėtinius..."
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "Klaida kuriant naują albumą"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Pašalinti..."
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"Bandant atlikti nurodytą operaciją iškilo ši klaida:\n"
+"{0} ({1})"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:13
-msgid "Enable"
-msgstr "Įjungti"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Išjungti"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "Klaida kuriant albumą"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:799
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:647
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-msgid "Error"
-msgstr "Klaida"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr "Bandant sukurti albumą aptikta ši klaida: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} išsiųsta"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} iš apytikliai {1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Siunčiant į galeriją įvyko klaida: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Prieinama vieta: {0}, naudojama {1}% iš {2}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"Pasirinktame albume yra {0} paveikslėlių riba,\n"
+"kuri būtų viršyta pasirinkus dabar pažymėtus {1} paveikslėlius"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>Eksportavimas į PicasaWeb</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Jūsų Google paskyra užrakinta</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Įsitikinkite, jog šios galerijos nustatymai yra teisingi.\n"
+"Įveskite paveikslėlyje parodytas raides į „Captcha“ laukelį.\n"
+"<i>Raidžių registras nesvarbus</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Viešas albumas"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "_Albumo pavadinimas:"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "_Automatinis pasukimas"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>Eksportavimas į SmugMug</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Paskyra:"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Išsiunčiama fotografija „{0}“"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Jungiamasi prie Tabblo"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Gaunamas URL išsiuntimui"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "Fotografijos išsiųstos"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Išsiųsta"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Klaida siunčiant į Tabblo: "
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot žymos</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo paskyra</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>F-Spot žymos gali padėti jums sekti fotografijų eksportavimo "
+"būseną. Pavyzdžiui: naudokite vieną žymą planuojamom eksportuoti "
+"fotografijoms, kitą jau eksportuotoms. Čia galite nurodyti F-Spot pakeisti "
+"šias žymas, kaip norite.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Pašalinti iš eksportuotų fotografijų:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Pasirinkti..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Prikabinti eksportuotoms fotografijoms:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Bandant gauti prieigą iškilo pasitikėjimo klaida"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Nutraukti šį seansą"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Visada pasitikėti šios svetainės liudijimu"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Ar norite:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Pasitikėjimo klaida"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Pasitikėti svetainės liudijimu tik šį kartą"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "Suglaudintas _failas..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Išsami informacija"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "Pasirinkimas negalimas"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Plėtinių saugyklų valdymas"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"Šiam įrankiui reikalingas aktyvus pažymėjimas. Pažymėkite vieną ar daugiau "
+"paveikslėlių ir bandykite dar kartą"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Pridėti naują saugyklą"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Pasirinkite eksportavimo aplanką"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Pasirinkite norimos registruoti saugyklos vietą:"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Eksportuojami failai"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Registruoti tinklinę saugyklą"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Ruošiama fotografija „{0}“"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "_Sukurti"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Registruoti vietinę saugyklą"
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "_Failo vardas:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Kelias:"
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Vieta:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Naršyti..."
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Ištempti:"
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"Norint aptikti paveikslėlių dublikatus, importuotus iki versijos 0.5.0, F-"
+"Spot turi išanalizuoti jūsų paveikslėlių kolekciją. Ši operacija nevykdoma "
+"automatiškai, kadangi ji ilgokai užtrunka. Šį atnaujinimo procesą galite "
+"paleisti arba pristabdyti šiame lange."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
#, csharp-format
-msgid "(provided by {0})"
-msgstr "(suteikė {0})"
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+"Dabar turite {0} paveikslėlių, kuriems reikia apskaičiuoti md5, ir {1} "
+"nebaigtas užduotis"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Išjungtų plėtinių įkelti negalima."
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Užverti"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "Apdorojami paveikslėliai..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "Sustabdyta"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "Ieškoti dublikatų..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "F-Spot galerija"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Atrodo, kad žiniatinklio galerija dabar yra atsijungus"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Rodyti visas"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Įkeliamas plėtinys {0}"
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} fotografija"
+msgstr[1] "{0} fotografijos"
+msgstr[2] "{0} fotografijų"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Dabartinis rodinys"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Pasirinkta"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Tiesioginė žiniatinklio galerija"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Ši galerija išlieka aktyvi, kol jos neišjungiate arba neužveriate\n"
+"F-Spot. Įsitikinkite, kad vietiniai žiūrovai prieina ją apeidami tarpinį\n"
+"HTTP serverį.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Kai galerija yra aktyvi, aukščiau pateiktas URL, kurį reikia\n"
+"atverti kitame kompiuteryje, norint gauti prieigą prie viešinamų fotografijų."
+"</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Įjungia ir išjungia žiniatinklio galeriją"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Leisti žiūrovams pridėti žymas"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Kopijuoti URL į iškarpinę"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spot tiesioginė žiniatinklio galerija"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "Galerijos URL:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Riboti viešinamų fotografijų skaičių iki"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Parinktys:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Fotografijos su žyma"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Pasirinktos fotografijos"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Viešinti:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Peržiūrų:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "nėra"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Reikalingas plėtinys „{0}“ yra išjungtas."
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galerija: {0}, Fotografijos: {1}, Paskutinis klientas: {3}"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Galerija neaktyvi"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Sujungti DB"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Klaida atveriant pasirinktą failą"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Reikalingas plėtinys „{0}“ neįdiegtas."
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"Pasirinktas failas nėra galiojanti ar palaikoma duomenų bazė.\n"
+"\n"
+"Gauta išimtis „{0}“."
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "Fotografijų peržiūros programa F-Spot"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+"<small><i>Pasirinkite duomenų bazės, iš kurios norite importuoti, vietą</i></"
+"small>"
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "Fotografijų peržiūros programa"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>Pasirinkite, ką imporuoti iš pasirinktos duomenų bazės.\n"
+"„Tik naujos juostelės“ – išmani parinktis, leidžianti išvengti pakartotino "
+"fotografijų, kurias esate importavę anksčiau, importavimo.\n"
+"„Viena importavimo juostelė“ – galite nurodyti, kurią juostelę norite vėl "
+"sulieti.\n"
+"„Viską“ – importuojama viskas, sukuriant kopijas, jei jau esate importavę iš "
+"tos duomenų bazės.</i></small>"
-#: ../f-spot-import.desktop.in.in.h:1 ../f-spot.desktop.in.in.h:1
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>Nukopijuokite paveikslėlius į savo kompiuterį arba palikite jas, "
+"kur jos yra. Pastaruoju atveju įsitikinkite, kad ši vieta bus pasiekiama iš "
+"F-Spot.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "Viena importavimo juostelė"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Kopijuoti paveikslėlius į fotografijų aplanką"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Duomenų bazės vieta:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Viską"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Importuoti:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "Palikti paveikslėlius pradinėje vietoje"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "Sulieti kitą F-Spot kolekciją"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "Tik naujos juostelės"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Praleisti"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>Duomenų bazė – tai failai, esantys aplanke <b>{0}</b>.\n"
+" Pasirinkite tą aplanką, kad būtų galima atlikti žymėjimą.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "Konfigūruoti ekrano užsklandą"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Visi paveikslėliai"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Delsa:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Rodyti:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Paveikslėliai, turintys žymą:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "Padaryti F-Spot ekrano užsklanda"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Ekrano užsklandos konfigūracija"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
msgid "F-Spot Photo Manager"
msgstr "Fotografijų tvarkymo programa F-Spot"
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "Importuoti į F-Spot"
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Rūšiuokite, mėgaukitės ir dalinkitės savo fotografijomis"
-#: ../f-spot-import.desktop.in.in.h:3 ../f-spot.desktop.in.in.h:3
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
msgid "Photo Manager"
msgstr "Fotografijų tvarkymo programa"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "Rūšiuokite, mėgaukitės ir dalinkitės savo fotografijomis"
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Importuoti į F-Spot"
-#: ../libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "Fotografijų peržiūros programa F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Fotografijų peržiūros programa"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
msgstr "Failas nerastas"
-#: ../libfspot/f-jpeg-utils.c:464
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr "Nežinomas transformacijos tipas %d"
-#: ../libfspot/f-jpeg-utils.c:472
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
msgstr "Operacija nesėkminga"
@@ -356,16 +1441,10 @@ msgstr "Peržiūra"
msgid "Path"
msgstr "Kelias"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:65
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Failas"
-#: ../src/CameraFileSelectionDialog.cs:82
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1234
-msgid "Index"
-msgstr "Rodyklė"
-
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
msgstr "Pasirinkite žymą"
@@ -379,12 +1458,6 @@ msgstr "Atsiunčiamos peržiūros"
msgid "Downloading Preview of {0}"
msgstr "Atsiunčiama {0} peržiūra"
-#: ../src/CameraFileSelectionDialog.cs:199
-#: ../extensions/Exporters/CDExport/CDExport.cs:246
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
-msgid "Transferring Pictures"
-msgstr "Siunčiami paveikslėliai"
-
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
@@ -395,19 +1468,19 @@ msgid "Error transferring file"
msgstr "Siunčiant failą įvyko klaida"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Failai nukopijuoti"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Atsiųsta"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Failai nukopijuoti"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "Iš fotoaparato siunčiama „{0}“"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Fotoaparatas"
@@ -415,12 +1488,12 @@ msgstr "Fotoaparatas"
msgid "Port"
msgstr "Prievadas"
-#: ../src/Core.cs:200
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Fotografijų atitinkančių {0} nerasta"
-#: ../src/Core.cs:201
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -431,11 +1504,11 @@ msgstr ""
"pridėti žymą kai kurioms fotografijoms arba F-Spot nustatymų\n"
"dialoge pasirinkite kitą žymą."
-#: ../src/Core.cs:205
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Paieška negrąžino jokių rezultatų"
-#: ../src/Core.cs:206
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -462,19 +1535,19 @@ msgstr[0] "Modifikuota ({0})"
msgstr[1] "Modifikuota ({0})"
msgstr[2] "Modifikuota ({0})"
-#: ../src/Core/Photo.cs:516
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Pakeista {1}"
-#: ../src/Core/Photo.cs:516
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Pakeista {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:83
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Originalas"
@@ -512,7 +1585,7 @@ msgstr "Kontrastas"
#: ../src/Editors/CropEditor.cs:42
msgid "Crop"
-msgstr "Iškirpti"
+msgstr "Apkirpti"
#: ../src/Editors/CropEditor.cs:73
msgid "Select the area that needs cropping."
@@ -550,17 +1623,35 @@ msgstr "Pasirinkite taisytinas akis."
msgid "Sepia Tone"
msgstr "Sepijos tonas"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
-msgstr "Nedidelis fokusavimas"
+msgstr "Išfokusavimas"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Ištiesinti"
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "Importavimo klaida"
+
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Klaida importuojant {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Negalima išsaugoti „{0}“ tipo failų"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Neapdorota išskirtinė situacija"
+
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Kopijuoti fotografijos v_ietą"
+msgid "Copy Photo"
+msgstr "Kopijuoti fotografiją"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -570,17 +1661,17 @@ msgstr "Eksportuoti į"
msgid "Open _With"
msgstr "Atverti _su"
-#: ../src/FSpot.addin.xml.h:4 ../src/f-spot.glade.h:92
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
msgstr "Paša_linti žymą"
-#: ../src/FSpot.addin.xml.h:5 ../src/SingleView.cs:454
-#: ../src/f-spot.glade.h:94
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Pasukti _kairėn"
-#: ../src/FSpot.addin.xml.h:6 ../src/SingleView.cs:455
-#: ../src/f-spot.glade.h:95
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Pasukti _dešinėn"
@@ -588,40 +1679,460 @@ msgstr "Pasukti _dešinėn"
msgid "Tools"
msgstr "Įrankiai"
-#: ../src/FSpot.addin.xml.h:8 ../src/f-spot.glade.h:127
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "_Pridėti žymą"
-#: ../src/FSpot.addin.xml.h:9 ../src/f-spot.glade.h:138
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
msgstr "_Ištrinti iš disko"
-#: ../src/FSpot.addin.xml.h:10 ../src/f-spot.glade.h:170
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
msgstr "_Pašalinti iš katalogo"
-#: ../src/FileImportBackend.cs:285
-msgid "Import error"
-msgstr "Importavimo klaida"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:286
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr "Klaida importuojant {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
-#: ../src/FileImportBackend.cs:287 ../src/UI.Dialog/ThreadProgressDialog.cs:51
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-msgid "Skip"
-msgstr "Praleisti"
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
-#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "Negalima išsaugoti „{0}“ tipo failų"
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
-#: ../src/FormClient.cs:295
-msgid "Unhandled exception"
-msgstr "Neapdorota išskirtinė situacija"
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>_Korekcijos</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Paveikslėlių interpoliacija</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Dydis</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Santrauka</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Permatomos dalys</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Žiūrėti visus importuotus paveikslėlius</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>_Baltumo balansas</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr ""
+"<small><i>Įjunkite norėdami leisti interpoliaciją pakeisto mastelio "
+"paveikslėliuose. To nereikėtų išjungti fotografijų peržiūrai, tačiau gali "
+"būti naudinga išjungti interpoliaciją kuriant piktogramas.<i></small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>Galite pasirinkti kaip rodyti permatomas paveikslėlių dalis. Ši "
+"parinktis neturi jokio efekto fotografijoms, tačiau žiūrint piktogramas ar "
+"kitus paveikslėlius su permatomis dalimis, šios parinkties nustatymas į "
+"šachmatų lentos raštą ar kitą spalvą gali būti naudingas.</i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "Kaip _fonas"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "Kaip _pasirinktinė spalva: "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "Kaip šachmatų _raštas"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Prisegti žymas:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Prisegti žymą:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "K_ontrastas:"
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Sukurti"
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "Fotoaparato pasirinkimas"
+
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "Kopijuoti failus į fotografijų aplanką"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "Sukurti el. laišką"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr "Sukurti _piktogramą šiai žymai, pirmąkart ją panaudojus"
+
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr ""
+"Sukurti el. laišką su prisegtomis pasirinktomis fotografijomis "
+"(pageidaujant, pakeisto dydžio)"
+
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr "Rasti dublikatus"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "Rodyti failų _pavadinimus"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr ""
+"Rodyti tik tas fotografijas, kurios buvo importuotos pasirinktose juostelėse."
+
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "Nesiųsti el. laiško"
+
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "El. _laiškas:"
+
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "E_ksportuoti pavadinimus ir komentarus"
+
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "Apskaičiuotas naujas dydis"
+
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "Labai didelis"
+
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "F-Spot rodinys"
+
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr "Filtruoti pagal pasirinktas juosteles"
+
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "G_alerija:"
+
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "Galerija"
+
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Importuoti"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "Importavimo šaltinis:"
+
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "Įtraukti poaplankius"
+
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "Didelis"
+
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr "Valdyti pasirinktines žymėjimo proporcijas"
+
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "Vidutinis"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "Fotografijų pasirinktose juostelėse skaičius:"
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "Paveikslėlių skaičius"
+
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "Atverti _aplanką..."
+
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "Originalus dydis (gali būti labai didelis failų dydis)"
+
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "_Pirminė žyma:"
+
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "Pauzė"
+
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "Nustatymai"
+
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Ankstesnis"
+
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "Pataisyti"
+
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr "Pasirinkite iš fotoaparato kopijuotinas fotografijas..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "Pasirinkite žymą..."
+
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "Pasirinkite fotoaparatą, iš kurio norite perkelti failus"
+
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "Pasirinktas fotoaparatas: "
+
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "Pasirinkimo apribojimai"
+
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "Padaryti darbastalio _fonu"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "Rodyti visas fotografijas."
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "Rodyti arba slėpti šoninį polangį"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "Rodyti arba slėpti įrankinę"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "Šoninis _polangis"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "Mažas"
+
+#: ../src/f-spot.glade.h:82
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"Nurodykite, ar originalaus dydžio paveikslėliai turėtų būti pasukami. "
+"Mažesnių dydžių – pasukami automatiškai."
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "Pašalinti paveikslėlio _metaduomenis"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr "Te_mp:"
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "Mažytis"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr "Visas originalus dydis"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "_Didinti"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "_Mažinti"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Didinti"
+
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Mažinti"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "R_yškumas:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_Sukurti el. laišką"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "_Keisti"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "_Ekspozicija:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "_Visame ekrane"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Galerija"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "_Žinynas"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "_Atspalvis:"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "_Keičiant mastelį interpoliuoti paveikslėlį"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Naujas langas"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "Baigus siuntimą, _atverti albumą naršyklėje"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "Baigus eksportavimą, _atverti paskirties vietą"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Fotografija"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "_Sodrumas:"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "_Ištempti fotografijas ne daugiau kaip: "
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "_Skaidrių rodymas"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "_Pašalinti metaduomenis"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "Ž_ymos pavadinimas:"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "_Atspalvis:"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "Į_rankinė"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "R_odymas"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "_Virtuali failų sistema"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "ir"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"tiksliai\n"
+"po\n"
+"tarp"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
#: ../src/FullScreenView.cs:58
msgid "Hide"
@@ -635,7 +2146,7 @@ msgstr "Paslėpti įrankinę"
msgid "Info"
msgstr "Informacija"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Paveikslėlio informacija"
@@ -643,72 +2154,28 @@ msgstr "Paveikslėlio informacija"
msgid "Exit fullscreen"
msgstr "Išjungti viso ekrano veikseną"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:315
-#: ../src/SingleView.cs:104
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
-msgstr "Skaidrių šou"
+msgstr "Skaidrių rodymas"
#: ../src/FullScreenView.cs:82
msgid "Start slideshow"
-msgstr "Rodyti skaidrių šou"
+msgstr "Pradėti skaidrių rodymą"
#: ../src/FullScreenView.cs:128
msgid "Slide transition:"
msgstr "Skaidrių perėjimas:"
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "Pamažu išnykti"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "Perversti"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "Uždengti"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "Atskleisti"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "Nušluoti"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "Padalinti"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "Nustumti"
-
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "Daugiau datų"
#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "Daugiau aplankų"
-
-#: ../src/GroupSelector.cs:63 ../src/GroupSelector.cs:64
msgid "More"
msgstr "Daugiau"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "Rikiuoti pagal _mėnesį"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "Rikiuoti pagal _aplanką"
-
-#: ../src/GroupSelector.cs:523 ../src/f-spot.glade.h:174
-msgid "_Reverse Order"
-msgstr "_Atvirkštinė tvarka"
-
-#: ../src/GroupSelector.cs:529 ../src/f-spot.glade.h:130
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "_Išvalyti datos diapazoną"
@@ -736,7 +2203,7 @@ msgstr "InterOperability aplankas"
msgid "Unknown Directory"
msgstr "Nežinomas aplankas"
-#: ../src/Imaging/ImageFile.cs:93
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Rašymas į šį failo formatą nepalaikomas"
@@ -874,46 +2341,40 @@ msgstr "Intelektualus objekto žanras"
msgid "Unknown IIM DataSet"
msgstr "Nežinomas IIM DataSet"
-#: ../src/ImportCommand.cs:47 ../src/SingleView.cs:360
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Pasirinkite aplanką"
-#: ../src/ImportCommand.cs:258
+#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
msgstr "(Fotoaparatų neaptikta)"
-#: ../src/ImportCommand.cs:403
+#: ../src/ImportCommand.cs:404
#, csharp-format
msgid "Loading {0} of {1}"
msgstr "Įkeliama {0} iš {1}"
-#: ../src/ImportCommand.cs:469
+#: ../src/ImportCommand.cs:470
msgid "Done Loading"
msgstr "Įkelta"
-#: ../src/ImportCommand.cs:539 ../src/MainWindow.cs:275
-#: ../src/f-spot.glade.h:70
-msgid "Import"
-msgstr "Importuoti"
-
-#: ../src/ImportCommand.cs:669
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "Aplankas neegzistuoja."
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
"different directory"
-msgstr "Jūsų pasirinktas aplankas „{0}“ neegzistuoja. Pasirinkite kitą aplanką"
+msgstr "Pasirinktas aplankas „{0}“ neegzistuoja. Pasirinkite kitą aplanką"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:723 ../src/ImportCommand.cs:725
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Importuoti žymas"
+msgid "Imported Tags"
+msgstr "Importuotos žymos"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:282 ../src/SingleView.cs:87
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Pasukti kairėn"
@@ -921,7 +2382,7 @@ msgstr "Pasukti kairėn"
msgid "Rotate picture left"
msgstr "Pasukti fotografiją kairėn"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:286 ../src/SingleView.cs:92
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Pasukti dešinėn"
@@ -929,87 +2390,59 @@ msgstr "Pasukti dešinėn"
msgid "Rotate picture right"
msgstr "Pasukti fotografiją dešinėn"
-#: ../src/ItemAction.cs:102 ../src/f-spot.glade.h:78
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:999
-msgid "Next"
-msgstr "Kitas"
-
#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "Kitas paveikslėlis"
-#: ../src/ItemAction.cs:123 ../src/f-spot.glade.h:90
-msgid "Previous"
-msgstr "Ankstesnis"
-
#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "Ankstesnis paveikslėlis"
-#: ../src/MainWindow.cs:277
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importuoti naujus paveikslėlius"
-#: ../src/MainWindow.cs:293 ../src/f-spot.glade.h:38
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Naršyti"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Naršyti vienu metu daug fotografijų"
-#: ../src/MainWindow.cs:301
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Redaguoti paveikslėlį"
-#: ../src/MainWindow.cs:305
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Žiūrėti ir redaguoti fotografiją"
-#: ../src/MainWindow.cs:310 ../src/SingleView.cs:99
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Visame ekrane"
-#: ../src/MainWindow.cs:312 ../src/SingleView.cs:101
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Žiūrėti fotografijas visame ekrane"
-#: ../src/MainWindow.cs:317 ../src/SingleView.cs:106
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Žiūrėti fotografijas kaip skaidres"
-#: ../src/MainWindow.cs:332
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Ankstesnė fotografija"
-#: ../src/MainWindow.cs:337
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Kita fotografija"
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/MainWindow.cs:350 ../src/Widgets/Sidebar.cs:73
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1168
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1208
-msgid "Tags"
-msgstr "Žymos"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/MainWindow.cs:641 ../src/UI.Dialog/AdjustTimeDialog.cs:129
-#: ../src/UI.Dialog/ProgressDialog.cs:92
-#: ../extensions/Exporters/CDExport/CDExport.cs:164
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:783
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} iš {1}"
-
-#: ../src/MainWindow.cs:1501
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Fotoaparatų neaptikta."
-#: ../src/MainWindow.cs:1502
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -1017,17 +2450,17 @@ msgstr ""
"F-Spot nepavyko surasti nei vieno prie šios sistemos prijungto fotoaparato. "
"Patikrinkite ar fotoaparatas prijungtas ir įjungtas"
-#: ../src/MainWindow.cs:1541
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Prijungiant fotoaparatą įvyko klaida"
-#: ../src/MainWindow.cs:1542
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Prijungiant fotoaparatą gauta klaida „{0}“"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1875
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
@@ -1035,7 +2468,7 @@ msgstr[0] "Sujungti {0} pasirinktą žymą?"
msgstr[1] "Sujungti {0} pasirinktas žymas?"
msgstr[2] "Sujungti {0} pasirinktų žymų?"
-#: ../src/MainWindow.cs:1902
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -1043,11 +2476,11 @@ msgstr ""
"Atlikus šią operaciją visos pasirinktos žymos ir bet kokios jose esančios "
"žymos bus sujungtos į vieną žymą."
-#: ../src/MainWindow.cs:1904
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Sujungti žymas"
-#: ../src/MainWindow.cs:2109
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
@@ -1055,7 +2488,7 @@ msgstr[0] "{0} fotografija iš {1}"
msgstr[1] "{0} fotografijos iš {1}"
msgstr[2] "{0} fotografijų iš {1}"
-#: ../src/MainWindow.cs:2111 ../src/SingleView.cs:496
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
@@ -1063,33 +2496,33 @@ msgstr[0] "{0} fotografija"
msgstr[1] "{0} fotografijos"
msgstr[2] "{0} fotografijų"
-#: ../src/MainWindow.cs:2114
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
-msgstr[0] " ({0} pasirinkta)"
-msgstr[1] " ({0} pasirinktos)"
-msgstr[2] " ({0} pasirinktų)"
+msgstr[0] " (pasirinkta {0})"
+msgstr[1] " (pasirinktos {0})"
+msgstr[2] " (pasirinkta {0})"
-#: ../src/MainWindow.cs:2195
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Gerai"
-#: ../src/MainWindow.cs:2196
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Klaida trinant paveikslėlį"
-#: ../src/MainWindow.cs:2201
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Nėra leidimo ištrinti šį failą:{1}{0}"
-#: ../src/MainWindow.cs:2205
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Iškilo {0} tipo klaida trinant failą:{2}{1}"
-#: ../src/MainWindow.cs:2237
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
@@ -1097,7 +2530,7 @@ msgstr[0] "Visam laikui ištrinti {0} pasirinktą fotografiją?"
msgstr[1] "Visam laikui ištrinti {0} pasirinktas fotografijas?"
msgstr[2] "Visam laikui ištrinti {0} pasirinktų fotografijų?"
-#: ../src/MainWindow.cs:2241
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
@@ -1106,14 +2539,14 @@ msgstr[0] ""
msgstr[1] "Iš jūsų disko bus ištrintos visos pasirinktų fotografijų versijos."
msgstr[2] "Iš jūsų disko bus ištrintos visos pasirinktų fotografijų versijos."
-#: ../src/MainWindow.cs:2244
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Ištrinti fotografiją"
msgstr[1] "_Ištrinti fotografijas"
msgstr[2] "_Ištrinti fotografijas"
-#: ../src/MainWindow.cs:2280
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
@@ -1121,7 +2554,7 @@ msgstr[0] "Pašalinti {0} pasirinktą fotografiją iš F-Spot?"
msgstr[1] "Pašalinti {0} pasirinktas fotografijas iš F-Spot?"
msgstr[2] "Pašalinti {0} pasirinktų fotografijų iš F-Spot?"
-#: ../src/MainWindow.cs:2285
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -1131,28 +2564,28 @@ msgstr ""
"prarasta. Fotografijos liks jūsų kompiuteryje ir jas bus galima importuoti į "
"F-Spot dar kartą."
-#: ../src/MainWindow.cs:2286
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Pašalinti iš katalogo"
-#: ../src/MainWindow.cs:2349
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Ištrinti žymą „{0}“?"
-#: ../src/MainWindow.cs:2351
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Ištrinti {0} pasirinktas žymas?"
-#: ../src/MainWindow.cs:2356
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "fotografija"
msgstr[1] "fotografijos"
msgstr[2] "fotografijų"
-#: ../src/MainWindow.cs:2358
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -1161,7 +2594,7 @@ msgstr[0] "Jeigu ištrinsite šią žymą, saitas su {0} {1} bus prarastas."
msgstr[1] "Jeigu ištrinsite šias žymas, saitas su {0} {1} bus prarastas."
msgstr[2] "Jeigu ištrinsite šias žymas, saitas su {0} {1} bus prarastas."
-#: ../src/MainWindow.cs:2363
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Ištrinti žymą"
@@ -1169,11 +2602,11 @@ msgstr[1] "_Ištrinti žymas"
msgstr[2] "_Ištrinti žymas"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2377
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Žyma yra netuščia"
-#: ../src/MainWindow.cs:2378
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -1182,21 +2615,21 @@ msgstr ""
"Nepavyko ištrinti žymų, kuriose yra žymų. Pirma ištrinkite žymas, esančias "
"„{0}“"
-#: ../src/MainWindow.cs:2816
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Pasukti pasirinktą fotografiją kairėn"
msgstr[1] "Pasukti pasirinktas fotografijas kairėn"
msgstr[2] "Pasukti pasirinktas fotografijas kairėn"
-#: ../src/MainWindow.cs:2829
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Pasukti pasirinktą fotografiją dešinėn"
msgstr[1] "Pasukti pasirinktas fotografijas dešinėn"
msgstr[2] "Pasukti pasirinktas fotografijas dešinėn"
-#: ../src/MainWindow.cs:2837
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
@@ -1204,7 +2637,7 @@ msgstr[0] "Rasti _pasirinktą žymą"
msgstr[1] "Rasti _pasirinktas žymas"
msgstr[2] "Rasti _pasirinktas žymas"
-#: ../src/MainWindow.cs:2841
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
@@ -1212,14 +2645,14 @@ msgstr[0] "Rasti pasirinktą žymą _su"
msgstr[1] "Rasti pasirinktas žymas _su"
msgstr[2] "Rasti pasirinktas žymas _su"
-#: ../src/MainWindow.cs:2880
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Sukurti naują versiją?"
msgstr[1] "Sukurti naujas versijas?"
msgstr[2] "Sukurti naujas versijas?"
-#: ../src/MainWindow.cs:2882
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -1237,7 +2670,7 @@ msgstr[2] ""
"Ar prieš paleidžiant {1}, F-Spot, siekiant išsaugoti originalias, turėtų "
"sukurti naujas pasirinktų fotografijų versijas?"
-#: ../src/MainWindow.cs:2904
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "XCF versija"
@@ -1261,87 +2694,93 @@ msgstr "Tema ir raktažodžiai"
msgid "Compression"
msgstr "Suspaudimas"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Plokštuminė konfigūracija"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientacija"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Fotometrinė interpretacija"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Raiškos vienetai"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Ekspozicijos programa"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Matavimo veiksena"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Ekspozicijos veiksena"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Pasirinktinai atvaizduota"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Komponentų konfigūracija"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Šviesos šaltinis"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Jutimo metodas"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Spalvų gama"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Baltumo balansas"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Židinio plokštumos raiškos vienetas"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Failo šaltinio tipas"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Kadro užfiksavimo tipas"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Padidėjimo valdymas"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrastas"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Sodrumas"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Ryškumas"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Kadro tipas"
@@ -1411,20 +2850,22 @@ msgstr "Nepavyko pervadinti versijos"
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Gauta išimtis „{0}“. Nepavyko pervadinti versijos į „{1}“"
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:549
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Nėra redagavimų)"
-#: ../src/PhotoView.cs:163 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Redaguojant fotografiją įvyko klaida"
-#: ../src/PhotoView.cs:164 ../src/UI.Dialog/EditExceptionDialog.cs:25
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "Gauta išimtis „{0}“. Nepavyko išsaugoti fotografijos {1}"
-#: ../src/PhotoView.cs:302
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Komentaras:"
@@ -1436,40 +2877,40 @@ msgstr "Fotografijos"
msgid "Image Settings"
msgstr "Paveikslėlio parametrai"
-#: ../src/QueryWidget.cs:47
+#: ../src/QueryWidget.cs:58
msgid "Find: "
msgstr "Rasti: "
-#: ../src/QueryWidget.cs:52
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "Fotografijos be žymų"
-#: ../src/QueryWidget.cs:60
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "Įvertintos fotografijos"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:69
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
msgstr "Importuoti juostelę"
-#: ../src/QueryWidget.cs:89
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "Išvalyti paiešką"
-#: ../src/QueryWidget.cs:96
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "Atnaujinti paiešką"
-#: ../src/QueryWidget.cs:98
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "Atitinkančių fotografijų nerasta"
-#: ../src/QueryWidget.cs:136
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "Paslėpti _paieškos juostą"
-#: ../src/QueryWidget.cs:142
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "Rodyti _paieškos juostą"
@@ -1511,17 +2952,17 @@ msgid_plural ""
"{0} photos could not be rotated because they are on a read only file system "
"or media such as a CDROM. Please check the permissions and try again."
msgstr[0] ""
-"{0} fotografijos pasukti nepavyko, nes ji yra tik skaitymui skirtoje "
-"failų sistemoje ar laikmenoje, pvz., CDROM. Patikrinkite teises ir "
-"bandykite dar kartą"
+"{0} fotografijos pasukti nepavyko, nes ji yra tik skaitymui skirtoje failų "
+"sistemoje ar laikmenoje, pvz., CDROM. Patikrinkite teises ir bandykite dar "
+"kartą"
msgstr[1] ""
-"{0} fotografijų pasukti nepavyko, nes jos yra tik skaitymui skirtoje "
-"failų sistemoje arba laikmenoje, pvz., CDROM. Patikrinkite teises ir "
-"bandykite dar kartą"
+"{0} fotografijų pasukti nepavyko, nes jos yra tik skaitymui skirtoje failų "
+"sistemoje arba laikmenoje, pvz., CDROM. Patikrinkite teises ir bandykite dar "
+"kartą"
msgstr[2] ""
-"{0} fotografijų pasukti nepavyko, nes jos yra tik skaitymui skirtoje "
-"failų sistemoje arba laikmenoje, pvz., CDROM. Patikrinkite teises ir "
-"bandykite dar kartą"
+"{0} fotografijų pasukti nepavyko, nes jos yra tik skaitymui skirtoje failų "
+"sistemoje arba laikmenoje, pvz., CDROM. Patikrinkite teises ir bandykite dar "
+"kartą"
#: ../src/RotateCommand.cs:271
#, csharp-format
@@ -1552,90 +2993,62 @@ msgstr "Klaida apdorojant „{0}“: {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "mano fotografijos"
+msgid "My Photos"
+msgstr "Mano fotografijos"
+
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Klaida saugant paryškintą fotografiją"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Paryškinti"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Kiekis:"
-#: ../src/SingleView.cs:89
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Spindulys"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Slenkstis:"
+
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Pasukti fotografiją kairėn"
-#: ../src/SingleView.cs:94
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Pasukti fotografiją dešinėn"
-#: ../src/SingleView.cs:131 ../src/UI.Dialog/ui/PreferenceDialog.glade.h:14
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Aplankas"
-#: ../src/SingleView.cs:357
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Atverti"
-#: ../src/SingleView.cs:457
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Nustatyti kaip darbastalio foną"
-#: ../src/TagCommands.cs:93 ../src/TagCommands.cs:226
-#: ../src/TagSelectionWidget.cs:501
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "Šis pavadinimas jau naudojamas"
-#: ../src/TagCommands.cs:141
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "Sukurti naują žymą"
-#: ../src/TagCommands.cs:142
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "Naujos žymos pavadinimas:"
-#: ../src/TagCommands.cs:292
-msgid "Edit Tag"
-msgstr "Keisti žymą"
-
-#: ../src/TagCommands.cs:293
-msgid "Tag Name:"
-msgstr "Žymos pavadinimas:"
-
-#: ../src/TagCommands.cs:409
-msgid "Unable to load image"
-msgstr "Nepavyko įkelti paveikslėlio"
-
-#: ../src/TagCommands.cs:410
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "Nepavyko įkelti „{0}“ kaip žymos piktogramos"
-
-#: ../src/TagCommands.cs:453
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "{0} fotografija iš {1}"
-
-#: ../src/TagCommands.cs:483
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "Keisti žymos {0} piktogramą"
-
-#: ../src/TagCommands.cs:499
-msgid "Select Photo from file"
-msgstr "Pasirinkti fotografiją iš failo"
-
-#: ../src/TagCommands.cs:522
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-"\n"
-"<b>Iš fotografijos</b>\n"
-" Šiai žymai galite naudoti vieną iš savo fotografijų.\n"
-" Tačiau iš pradžių turite su šia žyma susieti bent vieną\n"
-" fotografiją. Pažymėkite šią fotografiją kaip „{0}“ ir\n"
-" tuomet grįžkite čia, kad naudotumėte ją kaip piktogramą."
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
@@ -1649,8 +3062,8 @@ msgid "Create New Tag..."
msgstr "Sukurti naują žymą..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "_Taisyti pasirinktą žymą..."
+msgid "Edit Tag..."
+msgstr "Keisti žymą..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -1703,7 +3116,7 @@ msgstr[2] "Rasti _su"
msgid "All"
msgstr "Visus"
-#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:596
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "Ne {0}"
@@ -1712,7 +3125,7 @@ msgstr "Ne {0}"
msgid "Drag tags here to search for them"
msgstr "Norėdami ieškoti žymų, nuvilkite jas čia"
-#: ../src/TagSelectionWidget.cs:500
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "Pervadinant žymą įvyko klaida"
@@ -1737,93 +3150,139 @@ msgid "Events"
msgstr "Įvykiai"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Nėra)"
-#: ../src/Term.cs:302
+#: ../src/Term.cs:298
msgid " and "
msgstr " ir "
#. operators.Add (Catalog.GetString (" && "));
-#: ../src/Term.cs:304
+#: ../src/Term.cs:300
msgid ", "
msgstr ", "
-#: ../src/Term.cs:360
+#: ../src/Term.cs:356
msgid " or "
msgstr " arba "
#. OPS The operators we support, case insensitive
#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:384 ../src/Widgets/FindBar.cs:177
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "arba"
-#: ../src/UI.Dialog/AboutDialog.cs:70
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Atnaujinamos miniatiūros"
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "Atnaujinamas paveikslėlis „{0}“"
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "GNOME fotografijų valdymas"
-#: ../src/UI.Dialog/AboutDialog.cs:71
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Autorinės teisės © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:94
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"Žygimantas Beručka <zygis at gnome.org>\n"
"Justina Klingaitė <justina.klingaite at gmail.com>"
-#: ../src/UI.Dialog/AboutDialog.cs:99
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "F-Spot tinklalapis"
#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
msgid "Shift all photos by {0}"
-msgstr "Pakelti visas fotografijas {0}"
+msgstr "Paslinkti visas fotografijas {0}"
-#: ../src/UI.Dialog/DateRangeDialog.cs:102
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
msgid "Today"
msgstr "Šiandien"
-#: ../src/UI.Dialog/DateRangeDialog.cs:104
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
msgid "Yesterday"
msgstr "Vakar"
-#: ../src/UI.Dialog/DateRangeDialog.cs:106
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
msgid "Last 7 days"
msgstr "Paskutinės 7 dienos"
-#: ../src/UI.Dialog/DateRangeDialog.cs:108
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
msgid "Last 30 days"
msgstr "Paskutinės 30 dienų"
-#: ../src/UI.Dialog/DateRangeDialog.cs:110
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
msgid "Last 90 days"
msgstr "Paskutinės 90 dienų"
-#: ../src/UI.Dialog/DateRangeDialog.cs:112
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
msgid "Last 360 days"
msgstr "Paskutinės 360 dienų"
-#: ../src/UI.Dialog/DateRangeDialog.cs:114
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
msgid "Current Week (Mon-Sun)"
msgstr "Dabartinė savaitė (Pir-Sek)"
-#: ../src/UI.Dialog/DateRangeDialog.cs:116
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
msgid "Previous Week (Mon-Sun)"
msgstr "Ankstesnė savaitė (Pir-Sek)"
-#: ../src/UI.Dialog/DateRangeDialog.cs:132
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:11
-msgid "All Images"
-msgstr "Visi paveikslėliai"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:134
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
msgid "Customized Range"
msgstr "Pasirinktinis diapazonas"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Keisti žymos {0} piktogramą"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "Pasirinkti fotografiją iš failo"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>Iš fotografijos</b>\n"
+" Šiai žymai galite naudoti vieną iš savo fotografijų.\n"
+" Tačiau iš pradžių turite su šia žyma susieti bent vieną\n"
+" fotografiją. Pažymėkite šią fotografiją kaip „{0}“ ir\n"
+" tuomet grįžkite čia, kad naudotumėte ją kaip piktogramą."
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Nepavyko įkelti paveikslėlio"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "Nepavyko įkelti „{0}“ kaip žymos piktogramos"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "{0} fotografija iš {1}"
+
#: ../src/UI.Dialog/ExceptionDialog.cs:24
msgid "F-Spot Encountered a Fatal Error"
msgstr "F-Spot aptiko lemtingą klaidą"
@@ -1836,6 +3295,19 @@ msgstr "Informacija apie klaidą"
msgid "An unhandled exception was thrown: "
msgstr "Buvo gauta neapdorota išimtis:"
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "Nėra"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "Sistemos profilis"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "Standartinė tema"
+
#: ../src/UI.Dialog/RepairDbDialog.cs:20
msgid "Error loading database."
msgstr "Įvyko klaida įkeliant duomenų bazę."
@@ -1857,2288 +3329,1081 @@ msgstr "Užrašas"
msgid "Ratio"
msgstr "Proporcija"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Kartoti"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:1
-msgid "<b>Color Management</b>"
-msgstr "<b>Spalvų valdymas</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:2
-msgid "<b>Import Settings</b>"
-msgstr "<b>Importavimo parametrai</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:3
-msgid "<b>Metadata</b>"
-msgstr "<b>Metaduomenys</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:4
-msgid "<b>Screensaver</b>"
-msgstr "<b>Ekrano užsklanda</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Veiksmas</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:5
-msgid "<b>Theming</b>"
-msgstr "<b>Apipavidalinimas</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Pamatinė fotografija</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:6
-msgid ""
-"<small><i>Choose the folder where F-Spot should store newly imported photos</"
-"i></small>"
-msgstr ""
-"<small><i>Pasirinkite aplanką, kur F-Spot turėtų saugoti naujai importuotas "
-"fotografijas</i></small>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Koreguoti laiką"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:7
-msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr ""
-"<small><i>Įjunkite šią parinktį, jei norite išsaugoti žymas ir aprašymus\n"
-"palaikomų formatų paveikslėliuose.</i></small>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Pakoreguota data:"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:9
-msgid ""
-"<small><i>While acting as a screensaver, F-Spot can display all of your "
-"images, or a small subset based on tags.</i></small>"
-msgstr ""
-"<small><i>Veikdama kaip ekrano užsklanda F-Spot gali rodyti visus arba dalį "
-"(pagal žymas) jūsų paveikslėlių.</i></small>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Dabartinė data:"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:10
-msgid ""
-"<small><i>You'll have to restart F-Spot to load the new theme.</i></small>"
-msgstr ""
-"<small><i>Idant įkeltumėte naują temą, turėsite paleisti F-Spot iš naujoi."
-"</i></small>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Praretinti visas fotografijas"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:12
-msgid "Custom Theme"
-msgstr "Pasirinktinė tema"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "skirtumas:"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:15
-msgid "From List:"
-msgstr "Iš sąrašo:"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "min. Pradedant nuo {0}"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:16
-msgid "From gtkrc File:"
-msgstr "Iš gtkrc failo:"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>Pabaigos data</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:17
-msgid "Images tagged with:"
-msgstr "Paveikslėliai pažymėti:"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Pasirinkite laikotarpį</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:18
-msgid "Make F-Spot your screensaver"
-msgstr "Padaryti F-Spot ekrano užsklanda"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Pradžios data</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:19 ../src/f-spot.glade.h:89
-msgid "Preferences"
-msgstr "Nustatymai"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:20
-msgid "Select A Folder"
-msgstr "Pasirinkite aplanką"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:21
-msgid "Select A gtkrc File"
-msgstr "Pasirinkite gtkrc aplanką"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:22
-msgid "System Theme"
-msgstr "Sistemos tema"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:23
-msgid "Try to use the system display profile"
-msgstr "Bandyti naudoti sistemos rodymo profilį"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:24
-msgid "Write _metadata to file"
-msgstr "Rašyti _metaduomenis į failą"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:25
-msgid "_Display:"
-msgstr "_Rodyti:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:26
-msgid "_Print output:"
-msgstr "_Spausdinimo išvestis:"
-
-#: ../src/Updater.cs:528
-msgid "Updating F-Spot Database"
-msgstr "Atnaujinama F-Spot duomenų bazė"
-
-#: ../src/Updater.cs:529
-msgid ""
-"Please wait while your F-Spot gallery's database is updated. This may take "
-"some time."
-msgstr ""
-"Luktelėkite, kol bus atnaujinta jūsų F-Spot galerijos duomenų bazė. Tai gali "
-"šiek tiek užtrukti."
-
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:35
-msgid "Unable to create temporary file"
-msgstr "Nepavyko sukurti laikino aplanko"
-
-#: ../src/Widgets/CustomPrintWidget.cs:119
-msgid "Page Setup"
-msgstr "Puslapio sąranka"
-
-#: ../src/Widgets/CustomPrintWidget.cs:123
-#: ../src/Widgets/CustomPrintWidget.cs:127
-#: ../src/Widgets/CustomPrintWidget.cs:133
-#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr "Popieriaus dydis: {0} x {1} mm"
-
-#: ../src/Widgets/CustomPrintWidget.cs:130
-msgid "Set Page Size and Orientation"
-msgstr "Nustatyti puslapio dydį ir padėtį"
-
-#: ../src/Widgets/CustomPrintWidget.cs:141
-msgid "Photos per page"
-msgstr "Fotografijų puslapyje"
-
-#: ../src/Widgets/CustomPrintWidget.cs:151
-msgid "Repeat"
-msgstr "Kartoti"
-
-#: ../src/Widgets/CustomPrintWidget.cs:152
-msgid "Print cut marks"
-msgstr "Spausdinti kirpimo žymes"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Atšaukti, nekeisti dabartinės laiko juostos."
-#: ../src/Widgets/CustomPrintWidget.cs:158
-msgid "Photos layout"
-msgstr "Fotografijų išdėstymas"
-
-#: ../src/Widgets/CustomPrintWidget.cs:160
-msgid "Full Page (no margin)"
-msgstr "Visas puslapis (be paraščių)"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Bus rodomos tik fotografjos, nufotografuotos šiuo laikotarpiu."
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Widgets/CustomPrintWidget.cs:163
-msgid "Zoom"
-msgstr "Pritraukti"
-
-#: ../src/Widgets/CustomPrintWidget.cs:164
-msgid "Fill"
-msgstr "Užpildyti"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Nustatyti datos diapazoną"
-#: ../src/Widgets/CustomPrintWidget.cs:165
-msgid "Scaled"
-msgstr "Ištempta"
-
-#: ../src/Widgets/CustomPrintWidget.cs:170
-msgid "White borders"
-msgstr "Balti rėmeliai"
-
-#: ../src/Widgets/CustomPrintWidget.cs:176
-msgid "Custom Text: "
-msgstr "Pasirinktinis tekstas:"
-
-#: ../src/Widgets/CustomPrintWidget.cs:180
-msgid "Photos infos"
-msgstr "Fotografijų informacija"
-
-#: ../src/Widgets/CustomPrintWidget.cs:182
-msgid "Print file name"
-msgstr "Spausdinti failo vardą"
-
-#: ../src/Widgets/CustomPrintWidget.cs:183
-msgid "Print photo date"
-msgstr "Spausdinti fotografavimo datą"
-
-#: ../src/Widgets/CustomPrintWidget.cs:184
-msgid "Print photo time"
-msgstr "Spausdinti fotografavimo laiką"
-
-#: ../src/Widgets/CustomPrintWidget.cs:185
-msgid "Print photo tags"
-msgstr "Spausdinti fotografijos žymas"
-
-#: ../src/Widgets/CustomPrintWidget.cs:186
-msgid "Print photo comment"
-msgstr "Spausdinti fotografijos komentarą"
-
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:71
-msgid "Edit"
-msgstr "Taisyti"
-
-#: ../src/Widgets/EditorPage.cs:196
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:46
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:45
-#: ../extensions/Tools/PictureTile/PictureTile.cs:51
-msgid "No selection available"
-msgstr "Pasirinkimas negalimas"
-
-#: ../src/Widgets/EditorPage.cs:197
-msgid ""
-"This tool requires an active selection. Please select a region of the photo "
-"and try the operation again"
-msgstr ""
-"Šiam įrankiui reikia aktyvaus pažymėjimo. Pažymėkite dalį fotografijos ir "
-"bandykite dar kartą"
-
-#: ../src/Widgets/EditorPage.cs:215
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] "Saugant pakoreguotą fotografiją įvyko klaida"
-msgstr[1] "Saugant pakoreguotas fotografijas įvyko klaida"
-msgstr[2] "Saugant pakoreguotas fotografijas įvyko klaida"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#: ../src/Widgets/EditorPage.cs:217
-#, csharp-format
-msgid ""
-"Received exception \"{0}\". Note that you have to develop RAW files into "
-"JPEG before you can edit them."
-msgstr ""
-"Gauta išimtis „{0}“. Atminkite, kad prieš redaguodami turite konvertuoti RAW "
-"failą į JPEG."
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Keisti žymą"
-#: ../src/Widgets/FindBar.cs:58
-msgid "Find:"
-msgstr "Rasti:"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Keisti piktogramą"
-#: ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:196
-msgid "and"
-msgstr "ir"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Piktograma:"
-#: ../src/Widgets/InfoBox.cs:182
-msgid "Histogram"
-msgstr "Histograma"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Iš išorinės fotografijos</b>"
-#: ../src/Widgets/InfoBox.cs:217
-msgid "Date"
-msgstr "Data"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Iš fotografijos</b>"
-#: ../src/Widgets/InfoBox.cs:220
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:5
-msgid "Size"
-msgstr "Dydis"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Numatytosios piktogramos</b>"
-#: ../src/Widgets/InfoBox.cs:223
-msgid "Exposure"
-msgstr "Ekspozicija"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Peržiūra</b>"
-#: ../src/Widgets/InfoBox.cs:227
-msgid "Focal Length"
-msgstr "Židinio nuotolis"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Sukurti piktogramą iš"
-#: ../src/Widgets/InfoBox.cs:233
-msgid "File Size"
-msgstr "Failo dydis"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Keisti žymos piktogramą"
-#: ../src/Widgets/InfoBox.cs:236
-msgid "Rating"
-msgstr "Įvertinimas"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Nėra _paveikslėlio"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Nežinoma)"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "0 fotografija iš 0"
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr "(netinkamas formatas)"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Spalvos profilis rodymui ekrane:"
-#: ../src/Widgets/InfoBox.cs:558
-msgid "(File read error)"
-msgstr "(Failo skaitymo klaida)"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Spalvos profilis spausdinimui:"
-#: ../src/Widgets/InfoBox.cs:603
-#, csharp-format
-msgid "{0} Photos"
-msgstr "{0} fotografijos"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "F-Spot nustatymai"
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:623
-#, csharp-format
-msgid ""
-"On {0} between \n"
-"{1} and {2}"
-msgstr ""
-"{0} tarp\n"
-"{1} ir {2}"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-Spot išvaizda:"
-#: ../src/Widgets/InfoBox.cs:628
-#, csharp-format
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
-"Between {0} \n"
-"and {1}"
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
-"Tarp {0} \n"
-"ir {1}"
-
-#: ../src/Widgets/InfoBox.cs:655
-msgid "(At least one File not found)"
-msgstr "(Bent vienas failas nerastas)"
-
-#: ../src/Widgets/InfoBox.cs:772
-msgid "Show Photo Name"
-msgstr "Rodyti fotografijos vardą"
-
-#: ../src/Widgets/InfoBox.cs:781
-msgid "Show Date"
-msgstr "Rodyti datą"
+"Paveikslėlių failuose, kai įmanoma\n"
+"<small>Taip jie prieinami kitoms paveikslėlių redagavimo programoms.</small>"
-#: ../src/Widgets/InfoBox.cs:790
-msgid "Show Size"
-msgstr "Rodyti dydį"
-
-#: ../src/Widgets/InfoBox.cs:799
-msgid "Show Exposure"
-msgstr "Rodyti ekspoziciją"
-
-#: ../src/Widgets/InfoBox.cs:808
-msgid "Show Focal Length"
-msgstr "Rodyti židinio nuotolį"
-
-#: ../src/Widgets/InfoBox.cs:817
-msgid "Show Camera"
-msgstr "Rodyti fotoaparatą"
-
-#: ../src/Widgets/InfoBox.cs:826
-msgid "Show File Size"
-msgstr "Rodyti failo dydį"
-
-#: ../src/Widgets/MetadataDisplay.cs:23
-msgid "Metadata"
-msgstr "Metaduomenys"
-
-#: ../src/Widgets/MetadataDisplay.cs:104
-msgid "Extended Metadata"
-msgstr "Išplėstiniai metaduomenys"
-
-#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
-msgid "No Extended Metadata Available"
-msgstr "Išplėstinių metaduomenų neprieinama"
-
-#: ../src/Widgets/MetadataDisplay.cs:410
-msgid "No active photo"
-msgstr "Nėra aktyvios fotografijos"
-
-#: ../src/Widgets/MetadataDisplay.cs:412
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "Fotografija „{0}“ neegzistuoja"
-
-#: ../src/Widgets/MetadataDisplay.cs:415
-msgid "No metadata available"
-msgstr "Metaduomenų neprieinama"
-
-#: ../src/Widgets/OpenWithMenu.cs:71
-msgid "No applications available"
-msgstr "Nėra prieinamų programų"
-
-#: ../src/Widgets/RatingMenuItem.cs:56
-msgid "Rating:"
-msgstr "Įvertinimas:"
-
-#: ../src/XmpTagsImporter.cs:90
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:6
-msgid "Location"
-msgstr "Vieta"
-
-#: ../src/XmpTagsImporter.cs:91
-msgid "Country"
-msgstr "Šalis"
-
-#: ../src/XmpTagsImporter.cs:92
-msgid "City"
-msgstr "Miestas"
-
-#: ../src/XmpTagsImporter.cs:93
-msgid "State"
-msgstr "Valstija"
-
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/f-spot.glade.h:2
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/f-spot.glade.h:3
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/f-spot.glade.h:4
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/f-spot.glade.h:5
-msgid "640 px"
-msgstr "640 px"
-
-#: ../src/f-spot.glade.h:6
-msgid "800 px"
-msgstr "800 px"
-
-#: ../src/f-spot.glade.h:7
-msgid "<b></b>"
-msgstr "<b></b>"
-
-#: ../src/f-spot.glade.h:8
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>Paskyra</b>"
-
-#: ../src/f-spot.glade.h:9
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>Albumas</b>"
-
-#: ../src/f-spot.glade.h:10
-msgid "<b>Co_rrections</b>"
-msgstr "<b>_Korekcijos</b>"
-
-#: ../src/f-spot.glade.h:11
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>Paskirties vieta</b>"
-
-#: ../src/f-spot.glade.h:12
-msgid "<b>From External Photo</b>"
-msgstr "<b>Iš išorinės fotografijos</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Pasirinkite aplanką"
-#: ../src/f-spot.glade.h:13
-msgid "<b>From Photo</b>"
-msgstr "<b>Iš fotografijos</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "Atskirai nuo paveikslėlių failų"
-#: ../src/f-spot.glade.h:14
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>Galerija</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Saugoti paveikslėlių žymas ir aprašymus:"
-#: ../src/f-spot.glade.h:15
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>Paveikslėlių interpoliacija</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "Importuojant fotografijas, nukopijuotis juos į:"
-#: ../src/f-spot.glade.h:16
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
msgid "<b>Max Rating</b>"
msgstr "<b>Didžiausias įvertinimas</b>"
-#: ../src/f-spot.glade.h:17
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
msgid "<b>Min Rating</b>"
msgstr "<b>Mažiausias įvertinimas</b>"
-#: ../src/f-spot.glade.h:18
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
-msgid "<b>Photos</b>"
-msgstr "<b>Fotografijos</b>"
-
-#: ../src/f-spot.glade.h:19
-msgid "<b>Predefined</b>"
-msgstr "<b>Iš anksto nustatyta</b>"
-
-#: ../src/f-spot.glade.h:20
-msgid "<b>Preview</b>"
-msgstr "<b>Peržiūra</b>"
-
-#: ../src/f-spot.glade.h:21
-msgid "<b>Size</b>"
-msgstr "<b>Dydis</b>"
-
-#: ../src/f-spot.glade.h:22
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>Stilius</b>"
-
-#: ../src/f-spot.glade.h:23
-msgid "<b>Summary</b>"
-msgstr "<b>Santrauka</b>"
-
-#: ../src/f-spot.glade.h:24
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>Permatomos dalys</b>"
-
-#: ../src/f-spot.glade.h:25
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>Žiūrėti visus importuotus paveikslėlius</b>"
-
-#: ../src/f-spot.glade.h:26
-msgid "<b>_White Balance</b>"
-msgstr "<b>_Baltumo balansas</b>"
-
-#: ../src/f-spot.glade.h:27
-msgid "<small></small>"
-msgstr "<small></small>"
-
-#: ../src/f-spot.glade.h:28
-msgid ""
-"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
-"disable this for viewing photos, but disabling the interpolation could be "
-"usefull in icon design.</i></small>"
-msgstr ""
-"<small><i>Įjunkite norėdami leisti interpoliaciją pakeisto mastelio "
-"paveikslėliuose. To nereikėtų išjungti fotografijų peržiūrai, tačiau gali "
-"būti naudinga išjungti interpoliaciją kuriant piktogramas.<i></small>"
-
-#: ../src/f-spot.glade.h:29
-msgid ""
-"<small><i>You can choose how to display transparent parts in images. This "
-"option has no effect on photos, but setting this as check pattern or custom "
-"color could be usefull when viewing icons or other artworks with transparent "
-"parts.</i></small>"
-msgstr ""
-"<small><i>Galite pasirinkti kaip rodyti permatomas paveikslėlių dalis. Ši "
-"parinktis neturi jokio efekto fotografijoms, tačiau žiūrint piktogramas ar "
-"kitus paveikslėlius su permatomis dalimis, šios parinkties nustatymas į "
-"šachmatų lentos raštą ar kitą spalvą gali būti naudingas.</i></small>"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Nustatyti įvertinimo filtrą"
-#: ../src/f-spot.glade.h:30
+#: ../src/ui/main_window.ui.h:1
msgid "Adjust _Time..."
msgstr "Koreguoti _laiką..."
-#: ../src/f-spot.glade.h:31
+#: ../src/ui/main_window.ui.h:2
msgid "Arrange _by"
msgstr "Rikiuoti _pagal"
-#: ../src/f-spot.glade.h:32
-msgid "As _background"
-msgstr "Kaip _fonas"
-
-#: ../src/f-spot.glade.h:33
-msgid "As _custom color: "
-msgstr "Kaip _pasirinktinė spalva: "
-
-#: ../src/f-spot.glade.h:34
-msgid "As check _pattern"
-msgstr "Kaip šachmatų _raštas"
-
-#: ../src/f-spot.glade.h:35
-msgid "Attach Tags:"
-msgstr "Prisegti žymas:"
-
-#: ../src/f-spot.glade.h:36
-msgid "Attach tag:"
-msgstr "Prisegti žymą:"
-
-#: ../src/f-spot.glade.h:37
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "Automatinis pasukimas"
-
-#: ../src/f-spot.glade.h:39
+#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
msgstr "Pagal _datą"
-#: ../src/f-spot.glade.h:40
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
msgstr "Pagal _importavimo juostelę"
-#: ../src/f-spot.glade.h:41
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
msgstr "Pagal į_vertinimą"
-#: ../src/f-spot.glade.h:42
-msgid "CD"
-msgstr "CD"
-
-#: ../src/f-spot.glade.h:43
-msgid "C_ontrast:"
-msgstr "K_ontrastas:"
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "Kopijuoti"
-#: ../src/f-spot.glade.h:44
-msgid "Camera Selection"
-msgstr "Fotoaparato pasirinkimas"
-
-#: ../src/f-spot.glade.h:45
-msgid "Copy Locat_ion"
-msgstr "Kopijuoti v_ietą"
-
-#: ../src/f-spot.glade.h:46
-msgid "Copy files to the Photos folder"
-msgstr "Kopijuoti failus į fotografijų aplanką"
-
-#: ../src/f-spot.glade.h:47
-msgid "Create Mail"
-msgstr "Sukurti el. laišką"
-
-#: ../src/f-spot.glade.h:48
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "Sukurti naują žy_mą..."
-#: ../src/f-spot.glade.h:49
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "Sukurti _naują versiją..."
-#: ../src/f-spot.glade.h:50
-msgid "Create _icon for this tag when first used"
-msgstr "Sukurti _piktogramą šiai žymai, pirmąkart ją panaudojus"
-
-#: ../src/f-spot.glade.h:51
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr ""
-"Sukurti el. laišką su prisegtomis pasirinktomis fotografijomis "
-"(pageidaujant, pakeisto dydžio)"
-
-#: ../src/f-spot.glade.h:52
-msgid "Detect duplicates"
-msgstr "Rasti dublikatus"
-
-#: ../src/f-spot.glade.h:53
-msgid "Display File _Names"
-msgstr "Rodyti failų _pavadinimus"
-
-#: ../src/f-spot.glade.h:54
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr ""
-"Rodyti tik tas fotografijas, kurios buvo importuotos pasirinktose juostelėse."
-
-#: ../src/f-spot.glade.h:55
-msgid "Do not send a mail"
-msgstr "Nesiųsti el. laiško"
-
-#: ../src/f-spot.glade.h:56
-msgid "E-_Mail:"
-msgstr "El. _laiškas:"
-
-#: ../src/f-spot.glade.h:57
-msgid "E_xport titles and comments"
-msgstr "E_ksportuoti pavadinimus ir komentarus"
-
-#: ../src/f-spot.glade.h:58
-msgid "Edit Tag Icon"
-msgstr "Keisti žymos piktogramą"
-
-#: ../src/f-spot.glade.h:59
-msgid "Edit icon"
-msgstr "Keisti piktogramą"
-
-#: ../src/f-spot.glade.h:60
-msgid "Estimated new size"
-msgstr "Apskaičiuotas naujas dydis"
-
-#: ../src/f-spot.glade.h:61
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-msgid "Export"
-msgstr "Eksportuoti"
-
-#: ../src/f-spot.glade.h:62
-msgid "Extra large"
-msgstr "Labai didelis"
-
-#: ../src/f-spot.glade.h:63
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:64
-msgid "F-Spot View"
-msgstr "F-Spot rodinys"
-
-#: ../src/f-spot.glade.h:66
-msgid "Filter on selected rolls"
-msgstr "Filtruoti pagal pasirinktas juosteles"
-
-#: ../src/f-spot.glade.h:67
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "Ra_sti"
-#: ../src/f-spot.glade.h:68
-msgid "G_allery:"
-msgstr "G_alerija:"
-
-#: ../src/f-spot.glade.h:69
-msgid "Gallery"
-msgstr "Galerija"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:72
-msgid "Import Source:"
-msgstr "Importavimo šaltinis:"
-
-#: ../src/f-spot.glade.h:73
-msgid "Include subfolders"
-msgstr "Įtraukti poaplankius"
-
-#: ../src/f-spot.glade.h:74
-msgid "Large"
-msgstr "Didelis"
-
-#: ../src/f-spot.glade.h:75
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
msgstr "Valdyti _plėtinius"
-#: ../src/f-spot.glade.h:76
-msgid "Manage your custom selection ratios"
-msgstr "Valdyti pasirinktines žymėjimo proporcijas"
-
-#: ../src/f-spot.glade.h:77
-msgid "Medium"
-msgstr "Vidutinis"
-
-#: ../src/f-spot.glade.h:79
-msgid "No _image"
-msgstr "Nėra _paveikslėlio"
-
-#: ../src/f-spot.glade.h:80
-msgid "Number of photos in selected rolls:"
-msgstr "Fotografijų pasirinktose juostelėse skaičius:"
-
-#: ../src/f-spot.glade.h:81
-msgid "Number of pictures"
-msgstr "Paveikslėlių skaičius"
-
-#: ../src/f-spot.glade.h:82
-msgid "Open _Folder..."
-msgstr "Atverti _aplanką..."
-
-#: ../src/f-spot.glade.h:84
-msgid "Original size (possible very large file size)"
-msgstr "Originalus dydis (gali būti labai didelis failų dydis)"
-
-#: ../src/f-spot.glade.h:85
-msgid "P_arent Tag:"
-msgstr "_Pirminė žyma:"
-
-#: ../src/f-spot.glade.h:86
+#: ../src/ui/main_window.ui.h:13
msgid "Page Set_up..."
msgstr "Puslapio sąran_ka..."
-#: ../src/f-spot.glade.h:87
-msgid "Pause"
-msgstr "Pauzė"
-
-#: ../src/f-spot.glade.h:88
-msgid "Photo 0 of 0"
-msgstr "0 fotografija iš 0"
-
-#: ../src/f-spot.glade.h:91
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
msgstr "_Atnaujinti miniatiūrą"
-#: ../src/f-spot.glade.h:93
-msgid "Repair"
-msgstr "Pataisyti"
-
-#: ../src/f-spot.glade.h:96
-msgid "Select Photos to Copy From Camera..."
-msgstr "Pasirinkite iš fotoaparato kopijuotinas fotografijas..."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Pasirinkti _visas"
-#: ../src/f-spot.glade.h:98
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "_Nepasirinkti jokių"
-#: ../src/f-spot.glade.h:99
-msgid "Select a Tag..."
-msgstr "Pasirinkite žymą..."
-
-#: ../src/f-spot.glade.h:100
-msgid "Select the camera from which you want to transfer files"
-msgstr "Pasirinkite fotoaparatą, iš kurio norite perkelti failus"
-
-#: ../src/f-spot.glade.h:101
-msgid "Selected Camera: "
-msgstr "Pasirinktas fotoaparatas: "
-
-#: ../src/f-spot.glade.h:102
-msgid "Selection Constraints"
-msgstr "Pasirinkimo apribojimai"
-
-#: ../src/f-spot.glade.h:103
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
msgstr "Siųsti _el. paštu..."
-#: ../src/f-spot.glade.h:104
-msgid "Set Rating Filter"
-msgstr "Nustatyti įvertinimo filtrą"
-
-#: ../src/f-spot.glade.h:105
-msgid "Set as _Background"
-msgstr "Padaryti darbastalio _fonu"
-
-#: ../src/f-spot.glade.h:106
-msgid "Show all photos."
-msgstr "Rodyti visas fotografijas."
-
-#: ../src/f-spot.glade.h:107
-msgid "Show or hide the side pane"
-msgstr "Rodyti arba slėpti šoninį polangį"
-
-#: ../src/f-spot.glade.h:108
-msgid "Show or hide the toolbar"
-msgstr "Rodyti arba slėpti įrankinę"
-
-#: ../src/f-spot.glade.h:109
-msgid "Side _pane"
-msgstr "Šoninis _polangis"
-
-#: ../src/f-spot.glade.h:110
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "Šoninė j_uosta"
-#: ../src/f-spot.glade.h:111
-msgid "Small"
-msgstr "Mažas"
-
-#: ../src/f-spot.glade.h:112
-msgid ""
-"Specify if an original size picture should be rotated or not. Smaller sizes "
-"are automatically rotated."
-msgstr ""
-"Nurodykite, ar originalaus dydžio paveikslėliai turėtų būti pasukami. "
-"Mažesnių dydžių – pasukami automatiškai."
-
-#: ../src/f-spot.glade.h:113
-msgid "Strip image _metadata"
-msgstr "Pašalinti paveikslėlio _metaduomenis"
-
-#: ../src/f-spot.glade.h:114
+#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
msgstr "Žy_mos"
-#: ../src/f-spot.glade.h:115
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1180
-msgid "Tags: "
-msgstr "Žymos: "
-
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:117
-msgid "Te_mp:"
-msgstr "Te_mp:"
-
-#: ../src/f-spot.glade.h:118
+#: ../src/ui/main_window.ui.h:25
msgid "Thumbnail _elements"
msgstr "Miniatiūrų _elementai"
-#: ../src/f-spot.glade.h:119
-msgid "Tiny"
-msgstr "Mažytis"
-
-#: ../src/f-spot.glade.h:120
+#: ../src/ui/main_window.ui.h:26
msgid "Too_lbar"
msgstr "Į_rankinė"
-#: ../src/f-spot.glade.h:121
-msgid "Total original size"
-msgstr "Visas originalus dydis"
-
-#: ../src/f-spot.glade.h:122
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "Vaizduoti"
-#: ../src/f-spot.glade.h:123
-msgid "Zoom _in"
-msgstr "_Pritraukti"
-
-#: ../src/f-spot.glade.h:124
-msgid "Zoom _out"
-msgstr "_Atitraukti"
-
-#: ../src/f-spot.glade.h:125
-msgid "Zoom in"
-msgstr "Pritraukti"
-
-#: ../src/f-spot.glade.h:126
-msgid "Zoom out"
-msgstr "Atitraukti"
-
-#: ../src/f-spot.glade.h:128
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
msgstr "_Prisegti žymą pažymėtoms"
-#: ../src/f-spot.glade.h:129
-msgid "_Brightness:"
-msgstr "R_yškumas:"
-
-#: ../src/f-spot.glade.h:131
+#: ../src/ui/main_window.ui.h:35
msgid "_Clear Rating Filter"
msgstr "_Išvalyti įvertinimų filtrą"
-#: ../src/f-spot.glade.h:132
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
msgstr "_Išvalyti juostelių filtrą"
-#: ../src/f-spot.glade.h:133
+#: ../src/ui/main_window.ui.h:38
msgid "_Components"
msgstr "_Komponentai"
-#: ../src/f-spot.glade.h:134
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
msgstr "_Turinys"
-#: ../src/f-spot.glade.h:135
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-msgid "_Create"
-msgstr "_Sukurti"
-
-#: ../src/f-spot.glade.h:136
-msgid "_Create Mail"
-msgstr "_Sukurti el. laišką"
-
-#: ../src/f-spot.glade.h:137
+#: ../src/ui/main_window.ui.h:40
msgid "_Dates"
msgstr "_Datos"
-#: ../src/f-spot.glade.h:139
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
msgstr "_Ištrinti pažymėtą žymą"
-#: ../src/f-spot.glade.h:140
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
msgstr "_Ištrinti versiją"
-#: ../src/f-spot.glade.h:141
-msgid "_Edit"
-msgstr "_Keisti"
-
-#: ../src/f-spot.glade.h:142
-msgid "_Edit Selected Tag..."
-msgstr "_Redaguoti pasirinktą žymą..."
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "_Keisti žymą..."
-#: ../src/f-spot.glade.h:143
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export"
-msgstr "_Eksportuoti"
-
-#: ../src/f-spot.glade.h:144
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "_Eksportuoti žymas"
-
-#: ../src/f-spot.glade.h:145
+#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
msgstr "_Eksportuoti į"
-#: ../src/f-spot.glade.h:146
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-msgid "_Export to Album:"
-msgstr "_Eksportuoti į albumą:"
-
-#: ../src/f-spot.glade.h:147
-msgid "_Exposure:"
-msgstr "_Ekspozicija:"
-
-#: ../src/f-spot.glade.h:148
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
msgstr "_Diafilmas"
-#: ../src/f-spot.glade.h:149
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:150
-msgid "_Folder"
-msgstr "_Aplanką"
-
-#: ../src/f-spot.glade.h:151
-msgid "_Fullscreen"
-msgstr "_Visame ekrane"
-
-#: ../src/f-spot.glade.h:152
-msgid "_Gallery"
-msgstr "_Galerija"
-
-#: ../src/f-spot.glade.h:153
-msgid "_Help"
-msgstr "_Žinynas"
-
-#: ../src/f-spot.glade.h:154
+#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
msgstr "_Paslėptos"
-#: ../src/f-spot.glade.h:155
-msgid "_Hue:"
-msgstr "_Atspalvis:"
-
-#: ../src/f-spot.glade.h:156
-msgid "_Icon:"
-msgstr "_Piktograma:"
-
-#: ../src/f-spot.glade.h:157
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
msgstr "_Importuoti..."
-#: ../src/f-spot.glade.h:158
-msgid "_Interpolate image on zoom"
-msgstr "_Keičiant mastelį interpoliuoti paveikslėlį"
-
-#: ../src/f-spot.glade.h:159
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
msgstr "_Didelės"
-#: ../src/f-spot.glade.h:160
+#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
msgstr "_Paskutinioji importuota juostelė"
-#: ../src/f-spot.glade.h:161
+#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
msgstr "_Lupa"
-#: ../src/f-spot.glade.h:162
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
msgstr "_Vidutinės"
-#: ../src/f-spot.glade.h:163
-msgid "_Month"
-msgstr "_Mėnesį"
-
-#: ../src/f-spot.glade.h:164
-msgid "_New Window"
-msgstr "_Naujas langas"
-
-#: ../src/f-spot.glade.h:165
-msgid "_Open album in browser when done uploading"
-msgstr "Baigus siuntimą, _atverti albumą naršyklėje"
-
-#: ../src/f-spot.glade.h:166
-msgid "_Open destination when done exporting"
-msgstr "Baigus eksportavimą, _atverti paskirties vietą"
-
-#: ../src/f-spot.glade.h:167
-msgid "_Photo"
-msgstr "_Fotografija"
-
-#: ../src/f-spot.glade.h:168
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
msgstr "Iš_eiti"
-#: ../src/f-spot.glade.h:169
+#: ../src/ui/main_window.ui.h:58
msgid "_Ratings"
msgstr "Į_vertinimai"
-#: ../src/f-spot.glade.h:171
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
msgstr "_Pašalinti žymą iš pasirinktų elementų"
-#: ../src/f-spot.glade.h:172
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
msgstr "_Pervadinti versiją"
-#: ../src/f-spot.glade.h:173
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-msgid "_Resize to: "
-msgstr "_Keisti dydį į: "
-
-#: ../src/f-spot.glade.h:175
-msgid "_Saturation:"
-msgstr "_Sodrumas:"
-
-#: ../src/f-spot.glade.h:176
-msgid "_Scale photos to no larger than: "
-msgstr "_Ištempti fotografijas ne daugiau kaip: "
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "_Atvirkštinė tvarka"
-#: ../src/f-spot.glade.h:177
+#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
msgstr "_Pasirinkti importuotinas juosteles..."
-#: ../src/f-spot.glade.h:178
+#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
msgstr "_Nustatyti datos diapazoną..."
-#: ../src/f-spot.glade.h:179
+#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
msgstr "_Nustatyti įvertinimo filtrą..."
-#: ../src/f-spot.glade.h:180
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "_Paryškinti..."
-#: ../src/f-spot.glade.h:181
-msgid "_Slideshow"
-msgstr "_Skaidrių šou"
-
-#: ../src/f-spot.glade.h:182
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
msgstr "_Mažos"
-#: ../src/f-spot.glade.h:183
-msgid "_Strip metadata"
-msgstr "_Pašalinti metaduomenis"
-
-#: ../src/f-spot.glade.h:184
+#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
msgstr "Ž_ymų piktogramos"
-#: ../src/f-spot.glade.h:185
-msgid "_Tag Name:"
-msgstr "Ž_ymos pavadinimas:"
-
-#: ../src/f-spot.glade.h:186
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
msgstr "Žy_mos"
-#: ../src/f-spot.glade.h:187
+#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
-msgstr "_Laiko juostą"
-
-#: ../src/f-spot.glade.h:188
-msgid "_Tint:"
-msgstr "_Atspalvis:"
+msgstr "_Laiko juosta"
-#: ../src/f-spot.glade.h:189
-msgid "_Toolbar"
-msgstr "Į_rankinė"
-
-#: ../src/f-spot.glade.h:190
+#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
msgstr "Įran_kiai"
-#: ../src/f-spot.glade.h:191
-msgid "_URI:"
-msgstr "_URI:"
-
-#: ../src/f-spot.glade.h:192
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
msgstr "_Fotografijos be žymų"
-#: ../src/f-spot.glade.h:193
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
msgstr "_Versija"
-#: ../src/f-spot.glade.h:194
-msgid "_View"
-msgstr "R_odymas"
-
-#: ../src/f-spot.glade.h:195
-msgid "_Virtual Filesystem"
-msgstr "_Virtuali failų sistema"
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "Atnaujinama F-Spot duomenų bazė"
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:198
+#: ../src/Updater.cs:623
msgid ""
-"at\n"
-"after\n"
-"between"
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
msgstr ""
-"tiksliai\n"
-"po\n"
-"tarp"
+"Luktelėkite, kol bus atnaujinta jūsų F-Spot galerijos duomenų bazė. Tai gali "
+"šiek tiek užtrukti."
-#: ../src/f-spot.glade.h:201
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
-msgid "pixels"
-msgstr "taškai"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "Nepavyko sukurti laikino aplanko"
-#: ../src/f-spot.glade.h:202
-msgid "x"
-msgstr "x"
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Puslapio sąranka"
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "Rodyti skaidrių šou iš F-Spot"
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Popieriaus dydis: {0} x {1} mm"
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "F-Spot fotografijos"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "Nustatyti puslapio dydį ir padėtį"
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_CD..."
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Fotografijų puslapyje"
-#: ../extensions/Exporters/CDExport/CDExport.cs:162
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "Paveikslėlis „{0}“ siunčiamas į CD"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Kartoti"
-#: ../extensions/Exporters/CDExport/CDExport.cs:177
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:655
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
-msgid "Done Sending Photos"
-msgstr "Fotografijos nusiųstos"
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Spausdinti kirpimo žymes"
-#: ../extensions/Exporters/CDExport/CDExport.cs:179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
-msgid "Transfer Complete"
-msgstr "Siuntimas baigtas"
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "Fotografijų išdėstymas"
-#: ../extensions/Exporters/CDExport/CDExport.cs:186
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
-msgid "Error While Transferring"
-msgstr "Siunčiant įvyko klaida"
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "Visas puslapis (be paraščių)"
-#: ../extensions/Exporters/CDExport/CDExport.cs:193
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
-msgid "Error Transferring"
-msgstr "Siunčiant įvyko klaida"
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Didinti"
-#: ../extensions/Exporters/CDExport/CDExport.cs:206
-msgid "copying..."
-msgstr "kopijuojama..."
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Užpildyti"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr "<b><i>Yra keletas anksčiau suplanuotų įrašymui elementų</i></b>"
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Ištempta"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>Rašytinos fotografijos</b>"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "Balti rėmeliai"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:4
-msgid "Create CD"
-msgstr "Sukurti CD"
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Pasirinktinis tekstas"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:6
-msgid "Size of the exported selection:"
-msgstr "Eksportuoto pažymėjimo dydis:"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Fotografijų informacija"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr "_Naršyti anksčiau suplanuotus failus"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "Spausdinti failo vardą"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:8
-msgid "_Write only these photos to CD"
-msgstr "Į CD į_rašyti tik šias fotografijas"
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "Spausdinti fotografavimo datą"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "Spausdinti fotografavimo laiką"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr..."
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "Spausdinti fotografijos žymas"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-msgid "_Zooomr..."
-msgstr "_Zooomr..."
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "Spausdinti fotografijos komentarą"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "Nustatyti tapatybę"
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "Taisyti"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
-"Return to this window after you have finished the authorization process on "
-"{0} and click the \"Complete Authorization\" button below"
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
msgstr ""
-"Gavę {0} prieigos teises, grįžkite į šį langą ir spustelėkite žemiau esantį "
-"mygtuką „Baigti tapatybės nustatymą“"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "Baigti tapatybės nustatymą"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "Jungiamasi prie {0}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr "Trikrinama tapatybė..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "Sveiki, {0}, dabar esate prisijungę prie {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "Prisijungti kitu naudotoju"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "Naudojama {0} iš jūsų leidžiamos {1} mėnesinės kvotos"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "Nepavyko prisijungti"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "Laukiama atsako {0} iš {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:779
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "Siunčiamas paveikslėlis „{0}“"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "Siunčiant į {0} įvyko klaida: {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:810
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:657
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
-msgid "Upload Complete"
-msgstr "Išsiųsta"
+"Šiam įrankiui reikia aktyvaus pažymėjimo. Pažymėkite dalį fotografijos ir "
+"bandykite dar kartą"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-msgid "Unable to log on."
-msgstr "Nepavyko prisijungti"
+#: ../src/Widgets/EditorPage.cs:216
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Saugant pakoreguotą fotografiją įvyko klaida"
+msgstr[1] "Saugant pakoreguotas fotografijas įvyko klaida"
+msgstr[2] "Saugant pakoreguotas fotografijas įvyko klaida"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
-"F-Spot was unable to log on to {0}. Make sure you have given the "
-"authentication using {0} web browser interface."
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
msgstr ""
-"F-Spot nepavyko prisijungti prie {0}. Įsitikinkite, kad gavote prieigos "
-"teisę naudodami {0} žiniatinklio naršyklės sąsają."
+"Gauta išimtis „{0}“. Atminkite, kad prieš redaguodami turite konvertuoti RAW "
+"failą į JPEG."
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:732
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:573
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
-msgid "Uploading Pictures"
-msgstr "Išsiunčiami paveikslėliai"
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Horizontali"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>Žiūrėjimo leidimai</b>"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "_Vertikali"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "Eksportuoti žymų _hierarchiją"
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Rasti:"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
-msgid ""
-"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
-msgstr ""
-"Norint nusiųsti fotografijas į jūsų {0} paskyrą, reikia prieigos teisių. "
-"Norėdami atverti žiniatinklio naršyklę ir suteikti F-Spot prieigos teisę, "
-"spustelėkite mygtuką „Nustatyti tapatybę“. "
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "Aplankai"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "Nepaisyti _viršutinio lygmens žymų"
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Failų sistema"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "Asmeniška"
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Histograma"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "Vieša"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Versija"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "Pašalinti _metaduomenis"
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Data"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "Matoma šeimai"
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Ekspozicija"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "Matoma draugams"
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "Židinio nuotolis"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-msgid "_View photos in browser when done uploading"
-msgstr "Pabaigus įkėlimą _rodyti fotografijas naršyklėje"
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Failo dydis"
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "_Aplankas..."
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Įvertinimas"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
-msgid "Select Export Folder"
-msgstr "Pasirinkite eksportavimo aplanką"
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(netinkamas formatas)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
-msgid "Building Gallery"
-msgstr "Kuriama galerija"
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Nežinoma)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "Siunčiant paveikslėlį „{0}“ į galeriją įvyko klaida:{2}{1}"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
-msgid "Error: Error while transferring; Aborting"
-msgstr "Klaida: siunčiant įvyko klaida. Nutraukiama"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
-msgid "Error: File Already Exists; Aborting"
-msgstr "Klaida: toks failas jau egzistuoja. Nutraukiama"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:810
-msgid "Light"
-msgstr "Šviesu"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:811
-msgid "Dark"
-msgstr "Tamsu"
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:991
-msgid "Prev"
-msgstr "Ankst"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1103
-msgid "Gallery generated by"
-msgstr "Galeriją sukūrė"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1143
-msgid "Show Styles"
-msgstr "Rodyti stilius"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1144
-msgid "Hide Styles"
-msgstr "Paslėpti stilius"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1311
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1444
-msgid "Page:"
-msgstr "Puslapis:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>Eksportavimo metodas</b>"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr "Sukurti _galeriją naudojant „Original“"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr "Sukurti autonominę _žiniatinklio galeriją"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "Ap_rašymas:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
-msgid "Export _tags"
-msgstr "Eksportuoti ž_ymas"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
-msgid "Export tag _icons"
-msgstr "Eksportuoti žymų _piktogramas"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-msgid "Folder Export"
-msgstr "Aplanko eksportavimas"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-msgid "G_allery Name:"
-msgstr "G_alerijos pavadinimas:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
-msgid "Open _destination when done exporting"
-msgstr "Baigus eksportavimą atverti _paskirties vietą"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-msgid "_Folder:"
-msgstr "_Aplankas:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-msgid "_Save the files only"
-msgstr "Iš_saugoti tik failus"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-msgid "Web _Gallery..."
-msgstr "Žiniatinklio _galerija..."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
-msgstr ""
-"Nepavyko prisijungti prie Gallery, kurios versija nežinoma.\n"
-"Įsitikinkite, kad turite Nuotolinio įskipio versiją 1.0.8 ar\n"
-"naujesnę"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:393
-msgid "Invalid URL"
-msgstr "Netinkamas URL"
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "({0} kartą redaguota)"
+msgstr[1] "({0} kartus redaguota)"
+msgstr[2] "({0} kartų redaguota)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:394
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "Galerijos URL įrašas, atrodo, nėra tinkamas URL"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:404
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:431
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:442
-msgid "Error while connecting to Gallery"
-msgstr "Klaida jungiantis prie Galerijos"
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(Failo skaitymo klaida)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:405
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:432
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:443
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "Bandant prisijungti susidurta su šia klaida: {0}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:419
-msgid "A Gallery with this name already exists"
-msgstr "Galerija tokiu pavadinimu jau yra"
+msgid "{0} Photos"
+msgstr "{0} fotografijos"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:420
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
-"There is already a Gallery with the same name in your registered Galleries. "
-"Please choose a unique name."
-msgstr ""
-"Jūsų registruotose Galerijose jau yra Galerija, turinti tokį pavadinimą. "
-"Pasirinkite unikalų pavadinimą."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:530
-msgid "(TopLevel)"
-msgstr "(Aukščiausio lygio)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:592
-msgid "Invalid Gallery name"
-msgstr "Netinkamas Galerijos pavadinimas"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:593
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
+"On {0} between \n"
+"{1} and {2}"
msgstr ""
-"Galerijos pavadinime yra neleistinų simbolių.\n"
-"Leidžiama tik raidės, skaitmenys, - ir _."
+"{0} tarp\n"
+"{1} ir {2}"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:798
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Klaida siunčiant paveikslėlį „{0}“ į galeriją: {1}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:826
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
-msgid "(No Gallery)"
-msgstr "(Nėra galerijos)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:918
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(Not Connected)"
-msgstr "(Neprisijungta)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:919
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
-msgid "(No Albums)"
-msgstr "(Nėra albumų)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:971
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
-msgid "No account selected"
-msgstr "Nepasirinkta paskyra"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgid ""
+"Between {0} \n"
+"and {1}"
msgstr ""
-"<span weight='bold' size='larger'>Jungiantis prie galerijos įvyko klaida</"
-"span>\n"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-msgid "Export _titles and comments"
-msgstr "Eksportuoti _pavadinimus ir komentarus"
+"Tarp {0} \n"
+"ir {1}"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "Baigus siuntimą _atverti albumą naršyklėje"
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(Bent vienas failas nerastas)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "Patvirtinkite, kad šios galerijos nustatymai yra teisingi."
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Rodyti fotografijos vardą"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-msgid "U_RL:"
-msgstr "U_RL:"
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Rodyti datą"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-msgid "_Album Name:"
-msgstr "_Albumo pavadinimas:"
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Rodyti dydį"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "_Aprašymas:"
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Rodyti ekspoziciją"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-msgid "_Gallery Name:"
-msgstr "_Galerijos pavadinimas:"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "Rodyti židinio nuotolį"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "_Galerija:"
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Rodyti fotoaparatą"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-msgid "_Parent Album:"
-msgstr "_Pirminis albumas:"
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Rodyti failo dydį"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:9
-msgid "_Password:"
-msgstr "_Slaptažodis:"
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "Metaduomenys"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-msgid "_Title:"
-msgstr "_Pavadinimas:"
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "Išplėstiniai metaduomenys"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:10
-msgid "_Username:"
-msgstr "_Naudotojo vardas:"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "Išplėstinių metaduomenų neprieinama"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr "Klaida skaitant serverio atsaką"
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "Nėra aktyvios fotografijos"
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
-msgstr "Serveris grąžino atsaką be galerijos turinio"
+#: ../src/Widgets/MetadataDisplay.cs:414
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "Fotografija „{0}“ neegzistuoja"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
-msgid "Error while creating new album"
-msgstr "Klaida kuriant naują albumą"
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "Metaduomenų neprieinama"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to perform the "
-"requested operation:\n"
-"{0} ({1})"
-msgstr ""
-"Bandant atlikti nurodytą operaciją iškilo ši klaida:\n"
-"{0} ({1})"
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Nėra prieinamų programų"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
-msgstr "F_acebook..."
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "Įvertinimas:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
-msgid "Too many images to export"
-msgstr "Per daug eksportuotinų paveikslėlių"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Šalis"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
-msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
-"selection and try again."
-msgstr ""
-"Facebook leidžia tik 60 fotografijų albume. Sumažinkite savo pasirinktų "
-"fotografijų skaičių ir bandykite dar kartą."
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "Miestas"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:384
-msgid "Waiting for authentication"
-msgstr "Laukiama tapatybės nustatymo"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Valstija"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:384
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook. Turn "
-"on the \"Save my login information\" checkbox on Facebook and F-Spot will "
-"log into Facebook automatically from now on."
-msgstr ""
-"F-Spot dabar paleist jūsų naršyklę, kad galėtumėte prisijungti prie "
-"Facebook. Facebook pažymėkite parinktį „Save my login information“ ir F-Spot "
-"kitą kartą prisijungs prie Facebook automatiškai."
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Rodyti skaidrių peržiūrą iš F-Spot"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:389
-msgid " Authenticating..."
-msgstr " Nustatoma tapatybė..."
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot fotografijos"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:398
-msgid "Error logging into Facebook"
-msgstr "Klaida jungiantis į Facebook"
+#~ msgid "Package"
+#~ msgstr "Paketas"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:398
-msgid ""
-"There was a problem logging into Facebook. Check your credentials and try "
-"again."
-msgstr ""
-"Problema jungiantis prie Facebook. Patikrinkite savo prisjungimo duomenis ir "
-"bandykite dar kartą."
+#~ msgid "Extension Installation"
+#~ msgstr "Plėtinio įdiegimas"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:409
-msgid "Session established, fetching user info..."
-msgstr "Sukurtas seansas, gaunama naudotojo informacija..."
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Pasirinkite įdiegtinus plėtinius ir spustelėkite Pirmyn</b>"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:412
-msgid "Session established, fetching friend list..."
-msgstr "Sukurtas seansas, gaunamas draugų sąrašas..."
+#~ msgid "Install from:"
+#~ msgstr "Įdiegti iš:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:419
-msgid "Session established, fetching friend details..."
-msgstr "Sukurtas seansas, gaunama draugų informacija..."
+#~ msgid "_Repositories..."
+#~ msgstr "_Saugyklos..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:426
-msgid "Session established, fetching photo albums..."
-msgstr "Sukurtas seansas, gaunami fotoalbumai..."
+#~ msgid "Show all packages"
+#~ msgstr "Rodyti visus paketus"
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:439
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr "{0} {1} prisijungęs (-usi) prie Facebook"
+#~ msgid "Show new versions only"
+#~ msgstr "Rodyti tik naujas versijas"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:442
-msgid "Error connecting to Facebook"
-msgstr "Klaida jungiantis prie Facebook"
+#~ msgid "Show updates only"
+#~ msgstr "Rodyti tik atnaujinimus"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:442
-msgid ""
-"There was an unexpected problem when downloading your information from "
-"Facebook."
-msgstr "Netikėta problema siunčiant jūsų informaciją iš Facebook."
+#~ msgid "_Unselect All"
+#~ msgstr "_Nepasirinkti jokių"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:466
-msgid "You are not logged in."
-msgstr "Jūs neprisijungę."
+#~ msgid "label124"
+#~ msgstr "label124"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:595
-msgid "Album must have a name"
-msgstr "Reikia nurodyti albumo pavadinimą"
+#~ msgid "Overall Progress:"
+#~ msgstr "Bendra pažanga:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:595
-msgid "Please name your album or choose an existing album."
-msgstr "Nurodykite savo albumo pavadinimą arba pasirinkite esantį albumą."
+#~ msgid "Downloading extensions..."
+#~ msgstr "Atsiunčiami plėtiniai..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:608
-msgid "Creating a new album failed"
-msgstr "Nepavyko sukurti naujo albumo"
+#~ msgid "Extension Manager"
+#~ msgstr "Plėtinių valdyklė"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:608
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
-"Klaida kuriant naują albumą.\n"
-"\n"
-"{0}"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "Norint atlikti šią operaciją, reikia papildomų plėtinių."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:632
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "Siunčiamas paveikslėlis „{0}“ ({1} iš {2})"
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Bus įdiegti šie plėtiniai:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:646
-#, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr "Klaida siunčiant į Facebook: {0}"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Plėtinių valdyklė</b></big>"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:1
-msgid "Caption"
-msgstr "Antraštė"
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Šiuo metu yra įdiegti šie plėtiniai:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:2
-msgid "Create a new album"
-msgstr "Sukurti naują albumą"
+#~ msgid "_Install Extensions..."
+#~ msgstr "Į_diegti plėtinius..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:3
-msgid "Description"
-msgstr "Aprašymas"
+#~ msgid "_Uninstall..."
+#~ msgstr "_Pašalinti..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:4
-msgid "Export to Facebook"
-msgstr "Eksportuoti į Facebook..."
+#~ msgid "Enable"
+#~ msgstr "Įjungti"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:5
-msgid "In this photo"
-msgstr "Šioje fotografijoje"
+#~ msgid "Disable"
+#~ msgstr "Išjungti"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:7
-msgid "Login"
-msgstr "Prisijungti"
+#~ msgid "Details"
+#~ msgstr "Išsami informacija"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:8
-msgid "Logout"
-msgstr "Atsijungti"
+#~ msgid "Extension Repository Management"
+#~ msgstr "Plėtinių saugyklų valdymas"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:10
-msgid "Not logged in"
-msgstr "Neprisijungę"
+#~ msgid "Add New Repository"
+#~ msgstr "Pridėti naują saugyklą"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:11
-msgid "Use an existing album"
-msgstr "Naudoti esantį albumą"
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Pasirinkite norimos registruoti saugyklos vietą:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:12
-msgid "Who is this?"
-msgstr "Kas tai?"
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registruoti tinklinę saugyklą"
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-msgid "Compressed fil_e..."
-msgstr "Suglaudintas _failas..."
+#~ msgid "Url:"
+#~ msgstr "Url:"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:46
-#: ../extensions/Tools/PictureTile/PictureTile.cs:52
-msgid ""
-"This tool requires an active selection. Please select one or more pictures "
-"and try again"
-msgstr ""
-"Šiam įrankiui reikalingas aktyvus pažymėjimas. Pažymėkite vieną ar daugiau "
-"paveikslėlių ir bandykite dar kartą"
+#~ msgid "Register a local repository"
+#~ msgstr "Registruoti vietinę saugyklą"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:63
-msgid "Select export folder"
-msgstr "Pasirinkite eksportavimo aplanką"
+#~ msgid "Path:"
+#~ msgstr "Kelias:"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:101
-msgid "Exporting files"
-msgstr "Eksportuojami failai"
+#~ msgid "Browse..."
+#~ msgstr "Naršyti..."
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:107
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:140
-#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "Ruošiama fotografija „{0}“"
+#~ msgid "Version:"
+#~ msgstr "Versija:"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-msgid "_File name:"
-msgstr "_Failo vardas:"
+#~ msgid "Author:"
+#~ msgstr "Autorius:"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-msgid "_Location:"
-msgstr "_Vieta:"
+#~ msgid "Copyright:"
+#~ msgstr "Autorinės teisės:"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
-msgid "_Scale:"
-msgstr "_Ištempti:"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Plėtinių priklausomybės:"
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-msgid "Merge Db"
-msgstr "Sujungti DB"
+#~ msgid "All registered repositories"
+#~ msgstr "Visos registruotos saugyklos"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
-msgid "Error opening the selected file"
-msgstr "Klaida atveriant pasirinktą failą"
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Ar tikrai norite atšaukti diegimą?"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
-#, csharp-format
-msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-"Jūsų pasirinktas failas nėra galiojanti ar palaikoma duomenų bazė.\n"
-"\n"
-"Gauta išimtis „{0}“."
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Bus pašalinti šie paketai:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-msgid ""
-"<small><i>Choose the location of the database you want to import from</i></"
-"small>"
-msgstr ""
-"<small><i>Pasirinkite duomenų bazės, iš kurios norite importuoti, vietą</i></"
-"small>"
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Taip pat yra kitų plėtinių, priklausančių nuo ankstesniųjų, kurie taip "
+#~ "pat bus pašalinti:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
-"you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already "
-"imported from that database.</i></small>"
-msgstr ""
-"<small><i>Pasirinkite, ką imporuoti iš pasirinktos duomenų bazės.\n"
-"„Tik naujos juostelės“ – išmani parinktis, leidžianti išvengti pakartotino "
-"fotografijų, kurias esate importavę anksčiau, importavimo.\n"
-"„Viena importavimo juostelė“ – galite nurodyti, kurią juostelę norite vėl "
-"sulieti.\n"
-"„Viską“ – importuojama viskas, sukuriant kopijas, jei jau esate importavę iš "
-"tos duomenų bazės.</i></small>"
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Pasirinkti plėtiniai negali būti įdiegti, nes yra priklausomybių "
+#~ "konfliktų."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
-msgid ""
-"<small><i>Copy the images locally or keep them where they are. If you chose "
-"the later, be sure that this location will stay accessible from f-spot.</i></"
-"small>"
-msgstr ""
-"<small><i>Nukopijuokite paveikslėlius į savo kompiuterį arba palikite jas, "
-"kur jos yra. Pastaruoju atveju įsitikinkite, kad ši vieta bus pasiekiama iš "
-"F-Spot.</i></small>"
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Bus įdiegti šie paketai:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
-msgid "A Single Import Roll"
-msgstr "Viena importavimo juostelė"
+#~ msgid " (in user directory)"
+#~ msgstr " (naudotojo aplanke)"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
-msgid "Copy images to photos folder"
-msgstr "Kopijuoti paveikslėlius į fotografijų aplanką"
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Šie paketai turi būti pašalinti:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-msgid "Database Location:"
-msgstr "Duomenų bazės vieta:"
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Šių priklausomybių nepavyko išspręsti:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr "Viską"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Įdiegimas sėkmingai baigtas."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-msgid "Import:"
-msgstr "Importuoti:"
+#~ msgid "The installation failed!"
+#~ msgstr "Įdiegti nepavyko!"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr "Palikti paveikslėlius pradinėje vietoje"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Įdiegiant buvo gauta perspėjimų."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another F-Spot collection"
-msgstr "Sulieti kitą F-Spot kolekciją"
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Pašalinta sėkmingai."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr "Tik naujos juostelės"
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Pašalinti nepavyko!"
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-"<big>Duomenų bazė – tai failai, esantys aplanke <b>{0}</b>.\n"
-" Pasirinkite tą aplanką, kad būtų galima atlikti žymėjimą.</big>"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Pašalinimas baigtas, tačiau gauta perspėjimų."
-#: ../extensions/Tools/MetaPixel/MetaPixel.addin.xml.h:1
-msgid "Create p_hotomosaic"
-msgstr "Sukurti _fotomozaiką"
+#~ msgid "Repository"
+#~ msgstr "Saugykla"
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:65
-msgid "Metapixel not available"
-msgstr "Metapixel neprieinama"
+#~ msgid "Installation cancelled"
+#~ msgstr "Įdiegimas atšauktas"
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:66
-msgid ""
-"The metapixel executable was not found in path. Please check that you have "
-"it installed and that you have permissions to execute it"
-msgstr ""
-"Metapixel vykdomasis failas nerastas sistemos kelyje. Patikrinkite, ar "
-"esate jį įdiegę ir ar turite jam vykdyti reikiamas teises"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Kai kurie reikalingi plėtiniai nerasti"
-#. There is no photo for the selected tags! :(
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:121
-msgid "No photos for the selection"
-msgstr "Nėra pažymėtinų fotografijų"
+#~ msgid "Installation failed"
+#~ msgstr "Įdiegti nepavyko"
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:122
-msgid "The tags selected provided no pictures. Please select different tags"
-msgstr ""
-"Jūsų pasirinktų žymų neatitinka jokie paveikslėliai. Pasirinkite kitas žymas."
+#~ msgid "Extension"
+#~ msgstr "Plėtinys"
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:129
-msgid "Creating miniatures"
-msgstr "Kuriamos miniatiūros"
+#~ msgid "Other"
+#~ msgstr "Kitas"
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:180
-msgid "Creating photomosaics"
-msgstr "Kuriamos fotomozaikos"
+#~ msgid "Url"
+#~ msgstr "Url"
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:187
-#: ../extensions/Tools/PictureTile/PictureTile.cs:120
-#, csharp-format
-msgid "Processing \"{0}\""
-msgstr "Apdorojama „{0}“"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Išimtinė situacija: {0}“"
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:236
-msgid "PhotoMosaics generated!"
-msgstr "Fotomozaikos sugeneruotos!"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Išjungtų plėtinių įkelti negalima."
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:254
-#, csharp-format
-msgid "PhotoMosaic"
-msgid_plural "PhotoMosaic ({0})"
-msgstr[0] "Fotomozaika ({0})"
-msgstr[1] "Fotomozaikos ({0})"
-msgstr[2] "Fotomozaikų ({0})"
+#~ msgid "Loading {0} extension"
+#~ msgstr "Įkeliamas plėtinys {0}"
-#: ../extensions/Tools/PictureTile/PictureTile.addin.xml.h:1
-msgid "Create photo_wall"
-msgstr "Sukurti fotografijų sieną"
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Reikalingas plėtinys „{0}“ yra išjungtas."
-#: ../extensions/Tools/PictureTile/PictureTile.cs:71
-msgid "PictureTile not available"
-msgstr "PictureTile neprieinama"
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Reikalingas plėtinys „{0}“ neįdiegtas."
-#: ../extensions/Tools/PictureTile/PictureTile.cs:72
-msgid ""
-"The picturetile.pl executable was not found in path. Please check that you "
-"have it installed and that you have permissions to execute it"
-msgstr ""
-"Vykdomasis failas picturetile.pl nerastas sistemos kelyje. Patikrinkite, ar "
-"esate jį įdiegę ir ar turite jo vykdymui reikalingas teises."
+#~ msgid "(provided by {0})"
+#~ msgstr "(suteikė {0})"
-#: ../extensions/Tools/PictureTile/PictureTile.cs:110
-msgid "Preparing selected pictures"
-msgstr "Ruošiami pasirinkti paveikslėliai"
+#~ msgid "my photos"
+#~ msgstr "mano fotografijos"
-#: ../extensions/Tools/PictureTile/PictureTile.cs:201
-msgid "PhotoWall generated!"
-msgstr "Fotografijų siena sugeneruota!"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "_Taisyti pasirinktą žymą..."
-#: ../extensions/Tools/PictureTile/PictureTile.cs:202
-msgid ""
-"Your photo wall have been generated and imported in F-Spot. Select the last "
-"roll to see it"
-msgstr ""
-"Jūsų fotografijų siena buvo sugeneruota ir importuota į F-Spot. Norėdami ją "
-"pamatyti, pasirinkite paskutinę juostelę"
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Kopijuoti v_ietą"
-#: ../extensions/Tools/PictureTile/PictureTile.cs:205
-msgid "Error importing photowall"
-msgstr "Klaida importuojant fotografijų sieną"
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Redaguoti pasirinktą žymą..."
-#: ../extensions/Tools/PictureTile/PictureTile.cs:206
-msgid ""
-"An error occurred while importing the newly generated photowall to F-Spot"
-msgstr "Klaida importuojant naujai sukurtą fotografijų sieną į F-Spot"
+#~ msgid "Dissolve"
+#~ msgstr "Pamažu išnykti"
-#: ../extensions/Tools/HashJob/HashJob.cs:53
-msgid ""
-"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
-"needs to analyze your image collection. This is not done by default as it's "
-"time consuming. You can Start or Pause this update process using this dialog."
-msgstr ""
-"Norint aptikti paveikslėlių dublikatus, importuotus prieš 0.5.0, F-Spot "
-"turi išanalizuoti jūsų paveikslėlių kolekciją. Tačiau tai nėra numatytoji "
-"operacija, kadangi ji ilgokai užtrunka. Šį atnaujinimo procesą galite "
-"paleisti arba pristabdyti šiame lange."
+#~ msgid "Flip"
+#~ msgstr "Perversti"
-#: ../extensions/Tools/HashJob/HashJob.cs:102
-msgid "Processing images..."
-msgstr "Apdorojami paveikslėliai..."
+#~ msgid "Cover"
+#~ msgstr "Uždengti"
-#: ../extensions/Tools/HashJob/HashJob.cs:108
-msgid "Stopped"
-msgstr "Sustabdyta"
+#~ msgid "Reveal"
+#~ msgstr "Atskleisti"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb..."
+#~ msgid "Wipe"
+#~ msgstr "Nušluoti"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "Klaida kuriant albumą"
+#~ msgid "Split"
+#~ msgstr "Padalinti"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to create an album: {0}"
-msgstr "Bandant sukurti albumą aptikta ši klaida: {0}"
+#~ msgid "Push"
+#~ msgstr "Nustumti"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} išsiųsta"
+#~ msgid "More directories"
+#~ msgstr "Daugiau aplankų"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{0} iš apytikliai {1}"
+#~ msgid "Arrange by _Month"
+#~ msgstr "Rikiuoti pagal _mėnesį"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "Siunčiant į galeriją įvyko klaida: {0}"
+#~ msgid "Arrange by _Folder"
+#~ msgstr "Rikiuoti pagal _aplanką"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
-#, csharp-format
-msgid "Available space: {0}, {1}% used out of {2}"
-msgstr "Prieinama vieta: {0}, naudojama {1}% iš {2}"
+#~ msgid "Tag Name:"
+#~ msgstr "Žymos pavadinimas:"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
-#, csharp-format
-msgid ""
-"The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images"
-msgstr ""
-"Pasirinktame albume yra {0} paveikslėlių riba,\n"
-"kuri būtų viršyta pasirinkus dabar pažymėtus {1} paveikslėlius"
+#~ msgid "<b>Color Management</b>"
+#~ msgstr "<b>Spalvų valdymas</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>Eksportavimas į PicasaWeb</b>"
+#~ msgid "<b>Import Settings</b>"
+#~ msgstr "<b>Importavimo parametrai</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid ""
-"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr ""
-"<span weight='bold' size='larger'>Jūsų Google paskyra užrakinta</span>\n"
+#~ msgid "<b>Metadata</b>"
+#~ msgstr "<b>Metaduomenys</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-"Įsitikinkite, jog šios galerijos nustatymai yra teisingi.\n"
-"Įveskite paveikslėlyje parodytas raides į „Captcha“ laukelį.\n"
-"<i>Raidžių registras nesvarbus</i>"
+#~ msgid "<b>Theming</b>"
+#~ msgstr "<b>Apipavidalinimas</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "Viešas albumas"
+#~ msgid ""
+#~ "<small><i>Choose the folder where F-Spot should store newly imported "
+#~ "photos</i></small>"
+#~ msgstr ""
+#~ "<small><i>Pasirinkite aplanką, kur F-Spot turėtų saugoti naujai "
+#~ "importuotas fotografijas</i></small>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "_Albumo pavadinimas:"
+#~ msgid ""
+#~ "<small><i>Enable this option to store tags and descriptions inside \n"
+#~ "supported image formats.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Įjunkite šią parinktį, jei norite išsaugoti žymas ir aprašymus\n"
+#~ "palaikomų formatų paveikslėliuose.</i></small>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "_Automatinis pasukimas"
+#~ msgid ""
+#~ "<small><i>While acting as a screensaver, F-Spot can display all of your "
+#~ "images, or a small subset based on tags.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Veikdama kaip ekrano užsklanda F-Spot gali rodyti visus arba "
+#~ "dalį (pagal žymas) jūsų paveikslėlių.</i></small>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr "_Captcha:"
+#~ msgid ""
+#~ "<small><i>You'll have to restart F-Spot to load the new theme.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Idant įkeltumėte naują temą, turėsite paleisti F-Spot iš naujoi."
+#~ "</i></small>"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>Eksportavimas į SmugMug</b>"
+#~ msgid "Custom Theme"
+#~ msgstr "Pasirinktinė tema"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "_Paskyra:"
+#~ msgid "From List:"
+#~ msgstr "Iš sąrašo:"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug..."
+#~ msgid "From gtkrc File:"
+#~ msgstr "Iš gtkrc failo:"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
-#, csharp-format
-msgid "Uploading photo \"{0}\""
-msgstr "Išsiunčiama fotografija „{0}“"
+#~ msgid "Select A gtkrc File"
+#~ msgstr "Pasirinkite gtkrc aplanką"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
-msgid "Logging into Tabblo"
-msgstr "Jungiamasi prie Tabblo"
+#~ msgid "Try to use the system display profile"
+#~ msgstr "Bandyti naudoti sistemos rodymo profilį"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
-msgid "Obtaining URL for upload"
-msgstr "Gaunamas URL išsiuntimui"
+#~ msgid "Write _metadata to file"
+#~ msgstr "Rašyti _metaduomenis į failą"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr "_Tabblo..."
+#~ msgid "_Print output:"
+#~ msgstr "_Spausdinimo išvestis:"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
-msgid "Done sending photos"
-msgstr "Fotografijos išsiųstos"
+#~ msgid "_Folder"
+#~ msgstr "_Aplanką"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
-msgid "Upload complete"
-msgstr "Išsiųsta"
+#~ msgid "_Month"
+#~ msgstr "_Mėnesį"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
-msgid "Error uploading to Tabblo: "
-msgstr "Klaida siunčiant į Tabblo: "
+#~ msgid ""
+#~ "F-Spot will now launch your browser so that you can log into Facebook. "
+#~ "Turn on the \"Save my login information\" checkbox on Facebook and F-Spot "
+#~ "will log into Facebook automatically from now on."
+#~ msgstr ""
+#~ "F-Spot dabar paleist jūsų naršyklę, kad galėtumėte prisijungti prie "
+#~ "Facebook. Facebook pažymėkite parinktį „Save my login information“ ir F-"
+#~ "Spot kitą kartą prisijungs prie Facebook automatiškai."
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
-msgid "<b>F-Spot tags</b>"
-msgstr "<b>F-Spot žymos</b>"
+#~ msgid "Error connecting to Facebook"
+#~ msgstr "Klaida jungiantis prie Facebook"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
-msgid "<b>Tabblo account</b>"
-msgstr "<b>Tabblo paskyra</b>"
+#~ msgid "Create p_hotomosaic"
+#~ msgstr "Sukurti _fotomozaiką"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
-msgid ""
-"<small><i>F-Spot tags can help you track the export status of photos. "
-"Example: Use one tag for the photos that you plan to export, and another one "
-"for those already exported. Here, you can tell F-Spot to automatically "
-"replace these tags as appropriate.</i></small>"
-msgstr ""
-"<small><i>F-Spot žymos gali padėti jums sekti fotografijų eksportavimo "
-"būseną. Pavyzdžiui: naudokite vieną žymą planuojamom eksportuoti "
-"fotografijoms, kitą jau eksportuotoms. Čia galite nurodyti F-Spot "
-"pakeisti šias žymas, kaip norite.</i></small>"
+#~ msgid "Metapixel not available"
+#~ msgstr "Metapixel neprieinama"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:6
-msgid "Rem_ove from exported photos:"
-msgstr "_Pašalinti iš eksportuotų fotografijų:"
+#~ msgid ""
+#~ "The metapixel executable was not found in path. Please check that you "
+#~ "have it installed and that you have permissions to execute it"
+#~ msgstr ""
+#~ "Metapixel vykdomasis failas nerastas sistemos kelyje. Patikrinkite, ar "
+#~ "esate jį įdiegę ir ar turite jam vykdyti reikiamas teises"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:7
-msgid "Select..."
-msgstr "Pasirinkti..."
+#~ msgid "No photos for the selection"
+#~ msgstr "Nėra pažymėtinų fotografijų"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:8
-msgid "_Attach to exported photos:"
-msgstr "_Prikabinti eksportuotoms fotografijoms:"
+#~ msgid "The tags selected provided no pictures. Please select different tags"
+#~ msgstr ""
+#~ "Jūsų pasirinktų žymų neatitinka jokie paveikslėliai. Pasirinkite kitas "
+#~ "žymas."
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
-msgid "<b>{0}</b>."
-msgstr "<b>{0}</b>."
+#~ msgid "Creating miniatures"
+#~ msgstr "Kuriamos miniatiūros"
+
+#~ msgid "Creating photomosaics"
+#~ msgstr "Kuriamos fotomozaikos"
+
+#~ msgid "Processing \"{0}\""
+#~ msgstr "Apdorojama „{0}“"
+
+#~ msgid "PhotoMosaics generated!"
+#~ msgstr "Fotomozaikos sugeneruotos!"
+
+#~ msgid "PhotoMosaic"
+#~ msgid_plural "PhotoMosaic ({0})"
+#~ msgstr[0] "Fotomozaika ({0})"
+#~ msgstr[1] "Fotomozaikos ({0})"
+#~ msgstr[2] "Fotomozaikų ({0})"
+
+#~ msgid "Create photo_wall"
+#~ msgstr "Sukurti fotografijų sieną"
+
+#~ msgid "PictureTile not available"
+#~ msgstr "PictureTile neprieinama"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
-msgid "A trust error occured while attempting to access"
-msgstr "Bandant gauti prieigą iškilo pasitikėjimo klaida"
+#~ msgid ""
+#~ "The picturetile.pl executable was not found in path. Please check that "
+#~ "you have it installed and that you have permissions to execute it"
+#~ msgstr ""
+#~ "Vykdomasis failas picturetile.pl nerastas sistemos kelyje. Patikrinkite, "
+#~ "ar esate jį įdiegę ir ar turite jo vykdymui reikalingas teises."
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
-msgid "Abort this session"
-msgstr "Nutraukti šį seansą"
+#~ msgid "Preparing selected pictures"
+#~ msgstr "Ruošiami pasirinkti paveikslėliai"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
-msgid "Always trust this site's certificate"
-msgstr "Visada pasitikėti šios svetainės liudijimu"
+#~ msgid "PhotoWall generated!"
+#~ msgstr "Fotografijų siena sugeneruota!"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
-msgid "Do you wish to:"
-msgstr "Ar norite:"
+#~ msgid ""
+#~ "Your photo wall have been generated and imported in F-Spot. Select the "
+#~ "last roll to see it"
+#~ msgstr ""
+#~ "Jūsų fotografijų siena buvo sugeneruota ir importuota į F-Spot. Norėdami "
+#~ "ją pamatyti, pasirinkite paskutinę juostelę"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
-msgid "Trust Error"
-msgstr "Pasitikėjimo klaida"
+#~ msgid "Error importing photowall"
+#~ msgstr "Klaida importuojant fotografijų sieną"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
-msgid "Trust the site's certificate this once"
-msgstr "Pasitikėti svetainės liudijimu tik šį kartą"
+#~ msgid ""
+#~ "An error occurred while importing the newly generated photowall to F-Spot"
+#~ msgstr "Klaida importuojant naujai sukurtą fotografijų sieną į F-Spot"
diff --git a/po/nb.po b/po/nb.po
index 9b352dd..5c70cb8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,7 +1,7 @@
# Norwegian Bokmål translation of f-spot.
# Copyright (C) Free Software Foundation, Inc.
# This file is distributed under the same license as the f-spot package.
-# Kjartan Maraas <kmaraas at gnome.org>, 2006-2008
+# Kjartan Maraas <kmaraas at gnome.org>, 2006-2010
# Sigurd Gartmann <sigurd-translate at brogar.org>, 2004, 2005.
# Terance Edward Sola <terance at lyse.net>, 2005.
#
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 18:42+0200\n"
-"PO-Revision-Date: 2008-10-07 18:45+0200\n"
+"POT-Creation-Date: 2010-03-28 13:37+0200\n"
+"PO-Revision-Date: 2010-03-28 13:44+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas at gnome.org>\n"
"Language-Team: Norwegian Bokmal <i18n-nb at lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
@@ -18,377 +18,1376 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Versjon:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Overfører bilder"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Overfører bilde «{0}» til CD"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} av {1}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "Overføring av bilder fullført"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Overføring fullført"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "Feil under overføring"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "Feil under overføring"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "kopierer..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Bilder som skal skrives til CD</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Roter automatisk"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Lag CD"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Størrelse"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Størrelse på det eksporterte utvalget:"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Eksporter"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Laster opp bilder"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Forfatter:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Laster opp bilde «{0}» ({1} av {2})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Opphavsrett:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Feil ved opplasting til Facebook: {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Avhengigheter til utvidelser:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Feil"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Alle registrerte lager"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Opplasting fullført"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Er du sikker på at du vil avbryte installasjonen?"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Besøk F-Spot-gruppen på Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Følgende pakker vil ikke være installert:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Venter på autentisering"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
msgstr ""
-"Det finnes andre utvidelser som er avhengige av andre som heller ikke vil "
-"bli installert:"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Autentiserer..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Feil ved innlogging på Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
msgstr ""
-"Valgte utvidelser kan ikke installeres pga konflikter i avhengighetene."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Følgene pakker vil bli installert:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Autoriserer sesjonen"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (i brukers katalog)"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Følgende pakker må avinstalleres:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Følgende avhengigheter kunne ikke løses:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Installasjonen er fullført:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Installasjonen feilet."
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Installasjonen er fullført med følgende advarsler."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Avinstallering er fullført."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Avinstallering feilet!"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Du er ikke logget inn."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Avinstallering er fullført med advarsler."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Bekreft bilder automatisk"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Lager"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Bildetekst"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Installering avbrutt"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Opprett et nytt album"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Noen av de nødvendige utviselsene ble ikke funnet"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Beskrivelse"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Installasjonen feilet"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Eksporter til Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Utvidelse"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "I dette bildet"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:211
-msgid "Version"
-msgstr "Versjon"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Lokasjon"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Andre"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Logg inn"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:208
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:9
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Logg ut"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Navn"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "URL"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Ikke logget inn"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Rettigheter:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+#, fuzzy
+msgid "Stay Connected"
+msgstr "koblet til"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Bruk et eksisterende album"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Hvem er dette?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Autoriser"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
+#, csharp-format
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Fullfør autorisasjon"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Logger på «{0}»"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Sjekker påloggingsinformasjon..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Velkommen {0} du er koblet til {1}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Unntak oppsto: {0}"
+msgid "Sign in as a different user"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Pakke"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Installering av utvidelse"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Kan ikke logge på"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Velg utvidelser som skal installeres og klikk på Neste</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Venter på svar {0} av {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Installer fra:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "Laster opp bilde «{0}»"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "Lage_r..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, fuzzy, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Feil ved import {0}{2}{2}{1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Vis alle pakkene"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+#, fuzzy
+msgid "Unable to log on."
+msgstr "Kan ikke rotere bilde"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Bare vis nye versjoner"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Bare vis oppdateringer"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Konto</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Velg _bort alle"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Foto</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:153
-msgid "Select _All"
-msgstr "Velg _alle"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Stil</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+#, fuzzy
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Velg periode</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Fremgang:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "Eksporter"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Laster ned utvidelser..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+#, fuzzy
+msgid "Export tag _hierarchy"
+msgstr "_Eksporter merker"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Håndtering av utvidelser"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Følgene utvidelse vil bli installert:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Privat"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Offentlig"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "Fjern _metadata"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Synlig for familien"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Synlig for venner"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "_Eksporter merker"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "_Endre størrelse til:"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+#, fuzzy
+msgid "_View photos in browser when done uploading"
+msgstr "_Åpne album i nettleser når opplasting er ferdig"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "piksler"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Håndtering av utvidelser</b></big>"
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "Ma_ppe..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Velg eksportmappe"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Følgene utvidelser er installert:"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "Bygger galleri"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Installer utvidelser..."
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, fuzzy, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "Feil ved import {0}{2}{2}{1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Avinstaller..."
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "Feil: Feil under overføring av fil. Avbryter"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-#: ../src/f-spot.glade.h:89
-msgid "Enable"
-msgstr "Slå på"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Feil: Filen eksisterer allerede. Avbryter"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Slå av"
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "Lys"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:249
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:799
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:544
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:694
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:595
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:176
-msgid "Error"
-msgstr "Feil"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "Mørk"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Detaljer"
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "Forrige"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Håndtering av lager for utvidelser"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Indeks"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Legg til nytt lager"
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "Merker"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Neste"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "Galleri laget av"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "Vis stiler"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "Skjul stiler"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Merker:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "Side:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Mål</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Metode for eksport</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "B_eskrivelse:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
#, fuzzy
-msgid "Select the location of the repository you want to register:"
-msgstr "Velg kameraet du vil overføre filer fra"
+msgid "Export _tags"
+msgstr "_Eksporter merker"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+#, fuzzy
+msgid "Export tag _icons"
+msgstr "_Eksporter merker"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Eksport av mappe"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "Navn på g_alleri:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+#, fuzzy
+msgid "Open _destination when done exporting"
+msgstr "_Åpne mål når eksportering er ferdig"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Mappe:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "_Lagre kun filer"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "_Galleri på nettet..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "URL:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "Ugyldig URL"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Sti:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+#, fuzzy
+msgid "Error while connecting to Gallery"
+msgstr "Feil ved tilkobling til kamera"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Bla gjennom..."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr ""
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
#, csharp-format
-msgid "(provided by {0})"
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, fuzzy, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Feil ved import {0}{2}{2}{1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(Uten galleri)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(Ikke koblet til)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(Ingen album)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Ingen konto valgt"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Album</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Galleri</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+#, fuzzy
+msgid "Export _titles and comments"
+msgstr "Eksporter _titler og kommentarer"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+#, fuzzy
+msgid "Open _album in browser when done uploading"
+msgstr "_Åpne album i nettleser når opplasting er ferdig"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
msgstr ""
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "Navn på _album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Beskrivelse:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "_Eksporter til album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "Navn på _galleri:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Galleri:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+#, fuzzy
+msgid "_Parent Album:"
+msgstr "_Eksporter til album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "_Passord:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Tittel:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "Br_ukernavn:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
msgstr ""
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+#, fuzzy
+msgid "Error while creating new album"
+msgstr "Feil under rotering av bilde."
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Laster {0} utvidelse"
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_Picasaweb..."
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "Feil under oppretting av album"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
#, csharp-format
-msgid "The required extension '{0}' is disabled."
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
msgstr ""
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
#, csharp-format
-msgid "The required extension '{0}' is not installed."
+msgid "{0} Sent"
+msgstr "{0} sendt"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} av ca. {1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, fuzzy, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Feil ved import {0}{2}{2}{1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
msgstr ""
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "F-spot bildebehandling"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "Fotovisning"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>Eksport til PicasaWeb</b>"
-#: ../f-spot-import.desktop.in.in.h:1 ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "F-Spot bildebehandling"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr ""
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "Importer til F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
-#: ../f-spot-import.desktop.in.in.h:3 ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "Fotobehandler"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Offentlig album"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "Organiser, verdsett og del bildene dine"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "_Navn på album:"
-#: ../libeog/eog-image.c:773
-#, c-format
-msgid "No image loaded."
-msgstr "Ingen bilde hentet."
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "Roter _automatisk"
-#: ../libeog/eog-image.c:780
-#, c-format
-msgid "Can't save non local files."
-msgstr "Kan ikke lagre ikke-lokale filer."
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr ""
-#: ../libeog/eog-image.c:803
-#, c-format
-msgid "Unsupported image type for saving."
-msgstr "Filtypen er ikke støttet for lagring."
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
-#: ../libeog/image-view.c:2128
-msgid "interpolation type"
-msgstr "interpolasjonstype"
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>SmugMug-eksport</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Laster opp bilde «{0}»"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Logger på Tabblo"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Henter URL for opplasting"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "Overføring av bilder fullført"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Opplasting fullført"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+#, fuzzy
+msgid "Error uploading to Tabblo: "
+msgstr "Feil ved import {0}{2}{2}{1}"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+#, fuzzy
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Innstillinger for import</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo-konto</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+#, fuzzy
+msgid "Select..."
+msgstr "Velg et merke..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+#, fuzzy
+msgid "A trust error occured while attempting to access"
+msgstr "Mottok feil «{0}» ved forsøk på å rotere {1}"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Avbryt denne sesjonen"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Vil du:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+#, fuzzy
+msgid "Trust Error"
+msgstr "Feil"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr ""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "Komprim_ert fil..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "Ingen markerte områder tilgjengelig"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+#, fuzzy
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"Dette verktøyet krever et markert felt. Velg en del av bildet og gjør "
+"operasjonen igjen"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Velg en eksportmappe"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Eksporterer filer"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Forbereder bilde «{0}»"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "_Lag"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "_Filnavn:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Lokasjon:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Skaler:"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+#, fuzzy
+msgid "Processing images..."
+msgstr "Feil ved prosessering av bilde"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+#, fuzzy
+msgid "F-Spot Gallery"
+msgstr "(Uten galleri)"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+#, fuzzy
+msgid "Show All"
+msgstr "Vis stiler"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, fuzzy, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} bilde"
+msgstr[1] "{0} bilder"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+#, fuzzy
+msgid "Current View"
+msgstr "Nåværende dato:"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+#, fuzzy
+msgid "Selected"
+msgstr "Slett"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+#, fuzzy
+msgid "Live Web Gallery"
+msgstr "_Galleri på nettet..."
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr ""
-#: ../libeog/image-view.c:2129
-msgid "the type of interpolation to use"
-msgstr "typen interpolasjon som skal brukes"
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+#, fuzzy
+msgid "Gallery URL:"
+msgstr "G_alleri:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+#, fuzzy
+msgid "Options:"
+msgstr "Bilde_tekst:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+#, fuzzy
+msgid "Photos with a Tag"
+msgstr "Bilder per side"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+#, fuzzy
+msgid "Selected Photos"
+msgstr "Slett bilde"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+#, fuzzy
+msgid "Share:"
+msgstr "Øk skarphet"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+#, fuzzy
+msgid "Views:"
+msgstr "Vis"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+#, fuzzy
+msgid "none"
+msgstr "(Ingen)"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+#, fuzzy
+msgid "Gallery is inactive"
+msgstr "Galleri laget av"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Sammenføy databaser"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Feil ved åpning av valgt fil"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+#, fuzzy
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+"<small><i>Slå på dette valget for å lagre merker og beskrivelser inne i\n"
+"støttede bildeformater.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+#, fuzzy
+msgid "A Single Import Roll"
+msgstr "Velg mappe for eksportering"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Kopier bilder til bildemappen"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Databaselokasjon:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Alt"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Importer:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr ""
-#: ../libeog/image-view.c:2135 ../libeog/image-view.c:2142
-msgid "check type"
-msgstr "rutenettype"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Hopp over"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr ""
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Alle bilder"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+#, fuzzy
+msgid "Delay:"
+msgstr "_Vis:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Vis:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Bilder merket med:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "La F-Spot være skjermsparer"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Konfigurasjon av skjermsparer"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
-#: ../libeog/image-view.c:2136
-msgid "the type of chequering to use"
-msgstr "type rutenett som skal brukes"
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-Spot bildebehandling"
-#: ../libeog/image-view.c:2143
-msgid "the size of chequers to use"
-msgstr "størrelsen på rutenettet"
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Organiser, verdsett og del bildene dine"
-#: ../libeog/image-view.c:2149
-msgid "dither"
-msgstr "fargereduksjonskompensasjon"
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Fotobehandler"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Importer til F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-spot bildebehandling"
-#: ../libeog/image-view.c:2150
-msgid "dither type"
-msgstr "fargereduksjonskompensasjonstype"
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Fotovisning"
-#: ../libfspot/f-jpeg-utils.c:445 ../src/RotateCommand.cs:222
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
msgstr "Fil ikke funnet"
-#: ../libfspot/f-jpeg-utils.c:468
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr "Ukjent transformasjonstype %d"
-#: ../libfspot/f-jpeg-utils.c:476
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
msgstr "Operasjon feilet"
@@ -400,16 +1399,10 @@ msgstr "Forhåndsvisning"
msgid "Path"
msgstr "Sti"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:95
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Fil"
-#: ../src/CameraFileSelectionDialog.cs:82
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1233
-msgid "Index"
-msgstr "Indeks"
-
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
msgstr "Velg merke"
@@ -423,12 +1416,6 @@ msgstr "Laster ned forhåndsvisninger"
msgid "Downloading Preview of {0}"
msgstr "Laster ned forhåndsvisning av {0}"
-#: ../src/CameraFileSelectionDialog.cs:199
-#: ../extensions/Exporters/CDExport/CDExport.cs:342
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:391
-msgid "Transferring Pictures"
-msgstr "Overfører bilder"
-
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
@@ -439,19 +1426,19 @@ msgid "Error transferring file"
msgstr "Feil under overføring av fil"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Ferdig med kopiering av filer"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Ferdig med nedlasting"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Ferdig med kopiering av filer"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "Overfører «{0}» fra kamera"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:227
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Kamera"
@@ -459,12 +1446,12 @@ msgstr "Kamera"
msgid "Port"
msgstr "Port"
-#: ../src/Core.cs:200
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Ingen bilder funnet med treff på {0}"
-#: ../src/Core.cs:201
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -472,11 +1459,11 @@ msgid ""
"F-Spot preference dialog."
msgstr ""
-#: ../src/Core.cs:205
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Ingen søkeresultater"
-#: ../src/Core.cs:206
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -487,79 +1474,39 @@ msgstr ""
"for F-Spot."
#. Note for translators: Reparented is a picture becoming a version of another one
-#: ../src/Core/Photo.cs:482
+#: ../src/Core/Photo.cs:473
#, fuzzy
msgid "Reparented"
msgstr "Reparer"
-#: ../src/Core/Photo.cs:482
-#, csharp-format, fuzzy
+#: ../src/Core/Photo.cs:473
+#, fuzzy, csharp-format
msgid "Reparented ({0})"
msgstr "Reparer"
-#: ../src/Core/Photo.cs:501
+#: ../src/Core/Photo.cs:492
#, csharp-format
msgid "Modified"
msgid_plural "Modified ({0})"
msgstr[0] ""
msgstr[1] ""
-#: ../src/Core/Photo.cs:520
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Endret i {1}"
-#: ../src/Core/Photo.cs:520
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr ""
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:678 ../src/f-spot.glade.h:132
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Original"
-#: ../src/DateCommands.cs:57
-msgid "Today"
-msgstr "Idag"
-
-#: ../src/DateCommands.cs:59
-msgid "Yesterday"
-msgstr "Igår"
-
-#: ../src/DateCommands.cs:61
-msgid "Last 7 days"
-msgstr "Siste 7 dagene"
-
-#: ../src/DateCommands.cs:63
-msgid "Last 30 days"
-msgstr "Siste 30 dagene"
-
-#: ../src/DateCommands.cs:65
-msgid "Last 90 days"
-msgstr "Siste 90 dagene"
-
-#: ../src/DateCommands.cs:67
-msgid "Last 360 days"
-msgstr "Siste 360 dagene"
-
-#: ../src/DateCommands.cs:69
-msgid "Current Week (Mon-Sun)"
-msgstr "Nåværende uke (Man-Søn)"
-
-#: ../src/DateCommands.cs:71
-msgid "Previous Week (Mon-Sun)"
-msgstr "Forrige uke (Man-Søn)"
-
-#: ../src/DateCommands.cs:87 ../src/f-spot.glade.h:54
-msgid "All Images"
-msgstr "Alle bilder"
-
-#: ../src/DateCommands.cs:89
-msgid "Customized Range"
-msgstr "Egendefinert område"
-
#: ../src/Editors/AutoStretchEditor.cs:17
msgid "Auto Color"
msgstr "Automatisk farge"
@@ -632,21 +1579,35 @@ msgstr "Velg øynene du vil ordne."
msgid "Sepia Tone"
msgstr "Sepiatone"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Mykt fokus"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Rett ut"
-#: ../src/Extensions/OpenWithMenu.cs:93
-msgid "No applications available"
-msgstr "Ingen programmer tilgjengelig"
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "Feil ved importering"
+
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Feil ved import {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Ingen måte å lagre filer av type «{0}»"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Uhåndtert unntak"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Kopier b_ildeplassering"
+msgid "Copy Photo"
+msgstr "Kopier bilde"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -656,17 +1617,17 @@ msgstr "Eksporter til"
msgid "Open _With"
msgstr "Åpne _med"
-#: ../src/FSpot.addin.xml.h:4 ../src/f-spot.glade.h:146
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
msgstr "_Fjern merke"
-#: ../src/FSpot.addin.xml.h:5 ../src/SingleView.cs:438
-#: ../src/f-spot.glade.h:148
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Roter mot _venstre"
-#: ../src/FSpot.addin.xml.h:6 ../src/SingleView.cs:439
-#: ../src/f-spot.glade.h:149
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Roter mot _høyre"
@@ -674,127 +1635,494 @@ msgstr "Roter mot _høyre"
msgid "Tools"
msgstr "Verktøy"
-#: ../src/FSpot.addin.xml.h:8 ../src/f-spot.glade.h:193
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "_Legg til merke"
-#: ../src/FSpot.addin.xml.h:9 ../src/f-spot.glade.h:205
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
msgstr "_Slett fra disk"
-#: ../src/FSpot.addin.xml.h:10 ../src/f-spot.glade.h:239
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
msgstr "_Fjern fra katalog"
-#: ../src/FileImportBackend.cs:286
-msgid "Import error"
-msgstr "Feil ved importering"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:287
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr "Feil ved import {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 piksler"
-#: ../src/FileImportBackend.cs:288 ../src/ThreadProgressDialog.cs:68
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-msgid "Skip"
-msgstr "Hopp over"
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 piksler"
-#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "Ingen måte å lagre filer av type «{0}»"
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 piksler"
-#: ../src/FormClient.cs:297
-msgid "Unhandled exception"
-msgstr "Uhåndtert unntak"
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 piksler"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 piksler"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>Forbedringer</b>"
+
+#: ../src/f-spot.glade.h:13
+#, fuzzy
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Mål</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Størrelse</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Sammendrag</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Gjennomsiktige deler</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Vis alle importerte bilder</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>_Hvitbalanse</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "Som _bakgrunn"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "Som _egendefinert farge: "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "Som rutenetty_pe"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Fest merkelapper:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Legg til merke:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "K_ontrast:"
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Lag"
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "Kamerautvalg"
+
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "Kopier filer til bildemappen"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "Lag e-post"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr ""
+
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr ""
+
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr ""
+
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "Vis fil_navn"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr ""
-#: ../src/FullScreenView.cs:59
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "Ikke send e-post"
+
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "E-_post:"
+
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "Eksporter _titler og kommentarer"
+
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "Estimert ny størrelse"
+
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "Ekstra stor"
+
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "F-Spot bildebehandling"
+
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr ""
+
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "G_alleri:"
+
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "Galleri"
+
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Importer"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "Importer kilde:"
+
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "Ta med undermapper"
+
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "Stor:"
+
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr ""
+
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "Middelse"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "Antall bilder i valgt valgte ruller:"
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "Antall bilder"
+
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "Åpne mappe"
+
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "Opprinnelig størrelse (kan være veldig stor fil)"
+
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "Brukervalg"
+
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "Reparer"
+
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr "Velg bilder som skal kopieres fra kameraet..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "Velg et merke..."
+
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "Velg kameraet du vil overføre filer fra"
+
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "Valgt kamera:"
+
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "Begrensning for utvalg"
+
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "Bruk som _bakgrunn"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "Vis alle bilder."
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "Vis eller skjul sidefeltet"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "Vis eller skjul verktøylinjen"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "Side_felt"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "Liten"
+
+#: ../src/f-spot.glade.h:82
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "Fjern bildemetadata"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "Liten"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr ""
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "Zoom _inn"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "Zoom _ut"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Zoom inn"
+
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Zoom ut"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "_Lysstyrke:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_Lag e-post"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "R_ediger"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "_Eksponering:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "_Fullskjerm"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Galleri"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "_Tone:"
+
+#: ../src/f-spot.glade.h:104
+#, fuzzy
+msgid "_Interpolate image on zoom"
+msgstr "interpolasjonstype"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Nytt vindu"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "_Åpne album i nettleser når opplasting er ferdig"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "_Åpne mål når eksportering er ferdig"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Bilde"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "_Metning:"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "Skaler bilder så de ikke er større enn: "
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "_Bildefremvisning"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "_Fjern metadata"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "_Merkenavn:"
+
+#: ../src/f-spot.glade.h:115
+#, fuzzy
+msgid "_Tint:"
+msgstr "Tittel"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "Verk_tøylinje"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "_Vis"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "_Virtuelt filsystem"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "og"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"den\n"
+"etter\n"
+"mellom"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
+
+#: ../src/FullScreenView.cs:58
msgid "Hide"
msgstr "Skjul"
-#: ../src/FullScreenView.cs:61
+#: ../src/FullScreenView.cs:60
msgid "Hide Toolbar"
msgstr "Skjul verktøylinje"
-#: ../src/FullScreenView.cs:67
+#: ../src/FullScreenView.cs:66
msgid "Info"
msgstr "Informasjon"
-#: ../src/FullScreenView.cs:69 ../src/Widgets/InfoBox.cs:197
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Bildeinformasjon"
-#: ../src/FullScreenView.cs:74
+#: ../src/FullScreenView.cs:73
msgid "Exit fullscreen"
msgstr "Lukk fullskjerm"
-#: ../src/FullScreenView.cs:84 ../src/MainWindow.cs:319
-#: ../src/SingleView.cs:97
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Bildefremvisning"
-#: ../src/FullScreenView.cs:85
+#: ../src/FullScreenView.cs:82
msgid "Start slideshow"
msgstr "Start lysbildefremvisning"
-#: ../src/FullScreenView.cs:150
+#: ../src/FullScreenView.cs:128
msgid "Slide transition:"
msgstr "Overgang mellom lysbilder:"
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "Løs opp"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "Vend"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "Dekk"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "Avslør"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "Slett"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "Del"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "Dytt"
-
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "Flere datoer"
#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "Flere kataloger"
-
-#: ../src/GroupSelector.cs:63 ../src/GroupSelector.cs:64
msgid "More"
msgstr "Mer"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "Sortert etter _måned"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "Sorter etter m_appe"
-
-#: ../src/GroupSelector.cs:523 ../src/f-spot.glade.h:243
-msgid "_Reverse Order"
-msgstr "_Motsatt rekkefølge"
-
-#: ../src/GroupSelector.cs:529 ../src/f-spot.glade.h:197
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "_Nullstill datointervall"
@@ -822,7 +2150,7 @@ msgstr "Samkjøringsmappe"
msgid "Unknown Directory"
msgstr "Ukjent mappe"
-#: ../src/Imaging/ImageFile.cs:87
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Skriving til dette filformatet er ikke støttet"
@@ -955,166 +2283,108 @@ msgstr "Intellektuell genre for motiv"
msgid "Unknown IIM DataSet"
msgstr "Ukjent IIM-datasett"
-#: ../src/ImportCommand.cs:49 ../src/SingleView.cs:344
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Velg mappe"
-#: ../src/ImportCommand.cs:261
+#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
msgstr "(Ingen kameraer funnet)"
-#: ../src/ImportCommand.cs:406
+#: ../src/ImportCommand.cs:404
#, csharp-format
msgid "Loading {0} of {1}"
msgstr "Laster {0} av {1}"
-#: ../src/ImportCommand.cs:472
+#: ../src/ImportCommand.cs:470
msgid "Done Loading"
msgstr "Ferdig"
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "Mappen finnes ikke."
-#: ../src/ImportCommand.cs:671
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
"different directory"
msgstr "Mappen du valgte «{0}», finnes ikke. Velg en annen mappe"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:724 ../src/ImportCommand.cs:726
-#: ../src/XmpTagsImporter.cs:88
-msgid "Import Tags"
-msgstr "Importer merker"
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
+#: ../src/XmpTagsImporter.cs:89
+msgid "Imported Tags"
+msgstr "Importerte merker"
-#: ../src/ItemAction.cs:81 ../src/MainWindow.cs:286 ../src/SingleView.cs:80
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Roter mot venstre"
-#: ../src/ItemAction.cs:82
+#: ../src/ItemAction.cs:80
msgid "Rotate picture left"
msgstr "Roter bilde mot venstre"
-#: ../src/ItemAction.cs:93 ../src/MainWindow.cs:290 ../src/SingleView.cs:85
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Roter mot høyre"
-#: ../src/ItemAction.cs:94
+#: ../src/ItemAction.cs:92
msgid "Rotate picture right"
msgstr "Roter bilde mot høyre"
-#: ../src/ItemAction.cs:104 ../src/f-spot.glade.h:121
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:998
-msgid "Next"
-msgstr "Neste"
-
-#: ../src/ItemAction.cs:105
+#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "Neste bilde"
-#: ../src/ItemAction.cs:126 ../src/f-spot.glade.h:142
-msgid "Previous"
-msgstr "Forrige"
-
-#: ../src/ItemAction.cs:127
+#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "Forrige bilde"
-#: ../src/Loupe.cs:60
-msgid "Error saving sharpened photo"
-msgstr "Feil ved lagring av oppskarpet foto"
-
-#: ../src/Loupe.cs:61 ../src/PhotoView.cs:166
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "Mottok unntak «{0}». Kunne ikke lagre bilde {1}"
-
-#: ../src/Loupe.cs:90
-msgid "Sharpen"
-msgstr "Øk skarphet"
-
-#: ../src/Loupe.cs:100
-msgid "Amount:"
-msgstr "Mengde:"
-
-#: ../src/Loupe.cs:101
-msgid "Radius:"
-msgstr "Radius:"
-
-#: ../src/Loupe.cs:102
-msgid "Threshold:"
-msgstr "Terskel:"
-
-#: ../src/MainWindow.cs:279 ../src/f-spot.glade.h:111
-msgid "Import"
-msgstr "Importer"
-
-#: ../src/MainWindow.cs:281
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importer nye bilder"
-#: ../src/MainWindow.cs:297 ../src/f-spot.glade.h:62
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Finn"
-#: ../src/MainWindow.cs:301
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Vis mange bilder samtidig"
-#: ../src/MainWindow.cs:305
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Rediger bilde"
-#: ../src/MainWindow.cs:309
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Vis og rediger et bilde"
-#: ../src/MainWindow.cs:314 ../src/SingleView.cs:92
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Fullskjerm"
-#: ../src/MainWindow.cs:316 ../src/SingleView.cs:94
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Vis bilder i fullskjerm"
-#: ../src/MainWindow.cs:321 ../src/SingleView.cs:99
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Vis bilder som lysbilder"
-#: ../src/MainWindow.cs:336
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Forrige bilde"
-#: ../src/MainWindow.cs:341
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Neste bilde"
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/MainWindow.cs:354 ../src/Widgets/Sidebar.cs:73
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:995
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1167
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1207
-msgid "Tags"
-msgstr "Merker"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/MainWindow.cs:662 ../src/ProgressDialog.cs:82
-#: ../src/TimeDialog.cs:143 ../extensions/Exporters/CDExport/CDExport.cs:221
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:244
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:783
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} av {1}"
-
-#: ../src/MainWindow.cs:1671
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Ingen kameraer funnet."
-#: ../src/MainWindow.cs:1672
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -1122,80 +2392,80 @@ msgstr ""
"F-Spot klarte ikke å finne noen kameraer koblet til. Dobbeltsjekk at "
"kameraet er tilkoblet og at det har strøm"
-#: ../src/MainWindow.cs:1712
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Feil ved tilkobling til kamera"
-#: ../src/MainWindow.cs:1713
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Mottok feil «{0}» ved tilkobling til kamera"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:2058
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Flett {0} valgt merke"
msgstr[1] "Flett de {0} valgte merkene?"
-#: ../src/MainWindow.cs:2085
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
msgstr ""
-#: ../src/MainWindow.cs:2087
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Sammenføy merker"
-#: ../src/MainWindow.cs:2292
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} bilde av {1}"
msgstr[1] "{0} bilder av {1}"
-#: ../src/MainWindow.cs:2294 ../src/SingleView.cs:481
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} bilde"
msgstr[1] "{0} bilder"
-#: ../src/MainWindow.cs:2297
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} valgt)"
msgstr[1] " ({0} valgt)"
-#: ../src/MainWindow.cs:2378
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Ok"
-#: ../src/MainWindow.cs:2379
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Kunne ikke slette bilde"
-#: ../src/MainWindow.cs:2384
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Ikke rettigheter til å slette filen:{1}{0}"
-#: ../src/MainWindow.cs:2388
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr ""
-#: ../src/MainWindow.cs:2414
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Slett det valgte bildet permanent?"
msgstr[1] "Slett de {0} valgte bildene permanent?"
-#: ../src/MainWindow.cs:2418
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
@@ -1204,20 +2474,20 @@ msgstr[0] ""
msgstr[1] ""
"Dette sletter alle versjoner av de valgte bildene fra harddisken din."
-#: ../src/MainWindow.cs:2421
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "Slett bilde"
msgstr[1] "Slett bilder"
-#: ../src/MainWindow.cs:2451
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Fjern det valgte bildet fra F-Spot?"
msgstr[1] "Fjern de {0} valgte bildene fra F-Spot?"
-#: ../src/MainWindow.cs:2456
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -1227,27 +2497,27 @@ msgstr ""
"tapt. Bildene vil fremdeles være lagret på datamaskinen, og de kan "
"importeres til F-Spot igjen seinere."
-#: ../src/MainWindow.cs:2457
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Fjern fra F-Spot"
-#: ../src/MainWindow.cs:2520
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "_Slett merket «{0}»?"
-#: ../src/MainWindow.cs:2522
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Slett {0} valgte merkelapper?"
-#: ../src/MainWindow.cs:2527
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "bilde"
msgstr[1] "bilder"
-#: ../src/MainWindow.cs:2529
+#: ../src/MainWindow.cs:2329
#, fuzzy, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -1257,57 +2527,57 @@ msgstr[0] ""
msgstr[1] ""
"Hvis du sletter et merke, vil merkets tilknytninger til bilder gå tapt."
-#: ../src/MainWindow.cs:2534
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Slett merke"
msgstr[1] "_Slett merker"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2548
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr ""
-#: ../src/MainWindow.cs:2549
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
"\"{0}\" first"
msgstr ""
-#: ../src/MainWindow.cs:2992
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Roter valgt bilde til venstre"
msgstr[1] "Roter valgte bilder til venstre"
-#: ../src/MainWindow.cs:3005
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Roter valgt bilde til høyre"
msgstr[1] "Roter valgte bilder til høyre"
-#: ../src/MainWindow.cs:3013
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Finn _valgt merkelapp"
msgstr[1] "Finn _valgte merkelapper"
-#: ../src/MainWindow.cs:3017
+#: ../src/MainWindow.cs:2817
#, fuzzy, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "_Rediger valgt merke..."
msgstr[1] "_Rediger valgt merke..."
-#: ../src/MainWindow.cs:3055
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Opprett ny versjon?"
msgstr[1] "Opprett nye versjoner?"
-#: ../src/MainWindow.cs:3057
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -1318,107 +2588,117 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ../src/MetadataStore.cs:18
+#: ../src/MainWindow.cs:2882
+msgid "XCF version"
+msgstr "XCF-versjon"
+
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "Fotograf"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "Tittel"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "Opphavsrett"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "Motiv og nøkkelord"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "Kompresjon"
-#: ../src/MetadataStore.cs:24
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr ""
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientasjon"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr ""
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Oppløsningsenhet"
-#: ../src/MetadataStore.cs:32
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Eksponeringsprogram"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr ""
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Eksponeringsmodus"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr ""
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr ""
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Lyskilde"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr ""
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Fargeområde"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Hvitbalanse"
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr ""
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Kildetype for fil"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr ""
-#: ../src/MetadataStore.cs:56
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr ""
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Metning"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Skarphet"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Motivtype"
@@ -1428,80 +2708,86 @@ msgstr "Motivtype"
msgid "(No Tags)"
msgstr "(Ingen merker)"
-#: ../src/PhotoVersionCommands.cs:57
+#: ../src/PhotoVersionCommands.cs:58
msgid "Create New Version"
msgstr "Opprett ny versjon"
-#: ../src/PhotoVersionCommands.cs:58
+#: ../src/PhotoVersionCommands.cs:59
msgid "Name:"
msgstr "Navn:"
-#: ../src/PhotoVersionCommands.cs:62
+#: ../src/PhotoVersionCommands.cs:63
msgid "Rename Version"
msgstr "Endre versjonsnavn"
-#: ../src/PhotoVersionCommands.cs:63
+#: ../src/PhotoVersionCommands.cs:64
msgid "New name:"
msgstr "Nytt navn:"
-#: ../src/PhotoVersionCommands.cs:109
+#: ../src/PhotoVersionCommands.cs:110
msgid "Could not create a new version"
msgstr "Kunne ikke opprette ny versjon"
-#: ../src/PhotoVersionCommands.cs:110
+#: ../src/PhotoVersionCommands.cs:111
#, fuzzy, csharp-format
msgid "Received exception \"{0}\". Unable to create version \"{1}\""
msgstr "Mottok unntak «{0}». Kunne ikke lagre bilde {1}"
-#: ../src/PhotoVersionCommands.cs:137
+#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
msgstr "Vil du slette?"
-#: ../src/PhotoVersionCommands.cs:138
+#: ../src/PhotoVersionCommands.cs:139
msgid "Cancel"
msgstr "Avbryt"
-#: ../src/PhotoVersionCommands.cs:139
+#: ../src/PhotoVersionCommands.cs:140
msgid "Delete"
msgstr "Slett"
-#: ../src/PhotoVersionCommands.cs:143
+#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
msgstr "Vil du slette versjon «{0}»?"
-#. FIXME show error dialog.
-#: ../src/PhotoVersionCommands.cs:153
+#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
msgstr "Kunne ikke slette versjon"
-#: ../src/PhotoVersionCommands.cs:154
+#: ../src/PhotoVersionCommands.cs:155
#, fuzzy, csharp-format
msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
msgstr "Mottok unntak «{0}». Kunne ikke lagre bilde {1}"
-#: ../src/PhotoVersionCommands.cs:195
+#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
msgstr "Kunne ikke endre navn på en versjon"
-#: ../src/PhotoVersionCommands.cs:196
+#: ../src/PhotoVersionCommands.cs:197
#, fuzzy, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Mottok unntak «{0}». Kunne ikke lagre bilde {1}"
-#: ../src/PhotoVersionMenu.cs:67 ../src/Widgets/InfoBox.cs:546
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Ingen redigeringer)"
-#: ../src/PhotoView.cs:165 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Feil ved redigering av bilde"
-#: ../src/PhotoView.cs:298
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "Mottok unntak «{0}». Kunne ikke lagre bilde {1}"
+
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Kommentar:"
-#: ../src/Preferences.cs:161
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Bilder"
@@ -1509,72 +2795,72 @@ msgstr "Bilder"
msgid "Image Settings"
msgstr "Innstillinger for bilde"
-#: ../src/QueryWidget.cs:40
+#: ../src/QueryWidget.cs:58
msgid "Find: "
msgstr "Finn: "
-#: ../src/QueryWidget.cs:45
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "Umerkede fotografier"
-#: ../src/QueryWidget.cs:53
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "Bilder med poeng"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:62
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
msgstr "Importer rull"
-#: ../src/QueryWidget.cs:82
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "Tøm søk"
-#: ../src/QueryWidget.cs:89
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "Oppdater søk"
-#: ../src/QueryWidget.cs:91
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "Ingen passende bilder funnet"
-#: ../src/QueryWidget.cs:128
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "Skjul sø_kelinjen"
-#: ../src/QueryWidget.cs:134
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "Vis sø_kelinjen"
-#: ../src/RotateCommand.cs:94 ../src/RotateCommand.cs:109
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
msgid "Unable to rotate this type of photo"
msgstr "Kan ikke rotere denne typen bilde"
-#: ../src/RotateCommand.cs:129
+#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
msgstr "Kan ikke rotere skrivebeskytte fil"
-#: ../src/RotateCommand.cs:196
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
msgstr "Roterer bilder"
-#: ../src/RotateCommand.cs:207
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
msgstr "Roterer bilde «{0}»"
-#: ../src/RotateCommand.cs:220
+#: ../src/RotateCommand.cs:222
msgid "Directory not found"
msgstr "Katalog ikke funnet"
-#: ../src/RotateCommand.cs:240
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
msgstr[0] "Kan ikke rotere bilde"
msgstr[1] "Kan ikke rotere {0} bilder"
-#: ../src/RotateCommand.cs:242
+#: ../src/RotateCommand.cs:244
#, fuzzy, csharp-format
msgid ""
"The photo could not be rotated because it is on a read only file system or "
@@ -1591,12 +2877,12 @@ msgstr[1] ""
"som ikke kan skrives til, som for eksempel en CDROM. Se over rettighetene og "
"prøv igjen"
-#: ../src/RotateCommand.cs:269
+#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
msgstr "Mottok feil «{0}» ved forsøk på å rotere {1}"
-#: ../src/RotateCommand.cs:274
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
msgstr "Feil under rotering av bilde."
@@ -1620,20 +2906,38 @@ msgstr ""
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "mine bilder"
+msgid "My Photos"
+msgstr "Mine bilder"
+
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Feil ved lagring av oppskarpet foto"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Øk skarphet"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Mengde:"
-#: ../src/SingleView.cs:82
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Radius:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Terskel:"
+
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Roter bildet til venstre"
-#: ../src/SingleView.cs:87
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Roter bildet til høyre"
-#. Obsolete, remove after db rev4
-#: ../src/SingleView.cs:122 ../src/Widgets/MetadataDisplay.cs:219
-#: ../src/Widgets/MetadataDisplay.cs:221 ../src/f-spot.glade.h:98
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Mappe"
@@ -1641,65 +2945,23 @@ msgstr "Mappe"
msgid "Open"
msgstr "Åpne"
-#: ../src/SingleView.cs:441
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Bruk som bakgrunn"
-#: ../src/TagCommands.cs:92 ../src/TagCommands.cs:220
-#: ../src/TagSelectionWidget.cs:512
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "Dette navnet er allerede i bruk"
-#: ../src/TagCommands.cs:139
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "Opprett nytt merke"
-#: ../src/TagCommands.cs:140
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "Navn på nytt merke:"
-#: ../src/TagCommands.cs:286
-msgid "Edit Tag"
-msgstr "Rediger merke"
-
-#: ../src/TagCommands.cs:287
-msgid "Tag Name:"
-msgstr "Merkenavn:"
-
-#: ../src/TagCommands.cs:403
-msgid "Unable to load image"
-msgstr "Kan ikke laste bilde"
-
-#: ../src/TagCommands.cs:404
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr ""
-
-#: ../src/TagCommands.cs:448
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "Foto {0} av {1}"
-
-#: ../src/TagCommands.cs:478
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "Rediger ikon for merke {0}"
-
-#: ../src/TagCommands.cs:494
-msgid "Select Photo from file"
-msgstr "Velg bilde fra fil"
-
-#: ../src/TagCommands.cs:517
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
@@ -1712,8 +2974,8 @@ msgid "Create New Tag..."
msgstr "Opprett nytt merke ..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Rediger valgt merke ..."
+msgid "Edit Tag..."
+msgstr "Rediger merke..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -1737,2371 +2999,930 @@ msgstr[1] "Fjern merker fra utvalg"
msgid "Merge Tags"
msgstr "Sammenføy merker"
-#: ../src/TagQueryWidget.cs:32
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr ""
-#: ../src/TagQueryWidget.cs:37
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr ""
-#: ../src/TagQueryWidget.cs:42
+#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
msgstr "Fjern fra søk"
-#: ../src/TagQueryWidget.cs:86
+#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
msgstr[0] "Finn _med"
msgstr[1] "Finn _med"
-#: ../src/TagQueryWidget.cs:112
+#: ../src/TagQueryWidget.cs:114
msgid "All"
msgstr "Alle"
-#: ../src/TagQueryWidget.cs:147 ../src/Term.cs:591
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "Ikke {0}"
-#: ../src/TagQueryWidget.cs:277
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr "Dra merkelapper hit for å søke etter dem"
-#: ../src/TagSelectionWidget.cs:511
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "Feil ved endring av merkenavn"
-#: ../src/TagStore.cs:202
+#: ../src/TagStore.cs:203
msgid "Favorites"
msgstr "Favoritter"
-#: ../src/TagStore.cs:207
+#: ../src/TagStore.cs:208
msgid "Hidden"
msgstr "Skjult"
-#: ../src/TagStore.cs:215
+#: ../src/TagStore.cs:216
msgid "People"
msgstr "Personer"
-#: ../src/TagStore.cs:220
+#: ../src/TagStore.cs:221
msgid "Places"
msgstr "Steder"
-#: ../src/TagStore.cs:225
+#: ../src/TagStore.cs:226
msgid "Events"
msgstr "Hendelser"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:238 ../src/Widgets/InfoBox.cs:397
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Ingen)"
-#: ../src/Term.cs:297
+#: ../src/Term.cs:298
msgid " and "
msgstr " og "
#. operators.Add (Catalog.GetString (" && "));
-#: ../src/Term.cs:299
+#: ../src/Term.cs:300
msgid ", "
msgstr ", "
-#: ../src/Term.cs:355
+#: ../src/Term.cs:356
msgid " or "
msgstr " eller "
#. OPS The operators we support, case insensitive
#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:379 ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:273
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "eller"
-#: ../src/ThreadProgressDialog.cs:66
-msgid "Retry"
-msgstr "Prøv igjen"
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Oppdaterer miniatyrer"
-#: ../src/TimeDialog.cs:126 ../src/f-spot.glade.h:166
+#: ../src/ThumbnailCommand.cs:28
#, csharp-format
-msgid "Shift all photos by {0}"
-msgstr ""
+msgid "Updating picture \"{0}\""
+msgstr "Oppdaterer bilde «{0}»"
-#: ../src/UI.Dialog/AboutDialog.cs:70
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Fotobehandler for GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:71
-msgid "Copyright © 2003-2008 Novell Inc."
-msgstr "Opphavsrett © 2003-2008 Novell Inc."
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Opphavsrett © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:96
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
-"Kjartan Maraas <kmaraas at gnome.org>, 2006, 2007, 2008\n"
+"Kjartan Maraas <kmaraas at gnome.org>, 2006-2010\n"
"Espen Stefansen <espens at svn.gnome.org>, 2007\n"
"Sigurd Gartmann\n"
"Øivind Hoel <ohoel at cvs.gnome.org>, 2006"
-#: ../src/UI.Dialog/AboutDialog.cs:101
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "F-Spot nettsted"
-#: ../src/UI.Dialog/ExceptionDialog.cs:24
-msgid "F-Spot Encountered a Fatal Error"
-msgstr ""
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:60
-msgid "Error Details"
-msgstr "Detaljer om feil"
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:104
-msgid "An unhandled exception was thrown: "
-msgstr "En uhåndtert feil oppstod:"
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:20
-msgid "Error loading database."
-msgstr "Feil ved lasting av database."
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
-msgid ""
-"F-Spot encountered an error while loading the photo database. The old "
-"database has be moved to {0} and a new database has been created."
-msgstr ""
-
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
-msgid "Label"
-msgstr "Etikett"
-
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
-msgid "Ratio"
-msgstr "Rate"
-
-#: ../src/Updater.cs:386
-msgid "Updating F-Spot Database"
-msgstr "Oppdaterer F-Spot-databasen"
-
-#: ../src/Updater.cs:387
-msgid ""
-"Please wait while your F-Spot gallery's database is updated. This may take "
-"some time."
-msgstr ""
-"Vennligst vent mens F-Spot-databasen blir oppdatert. Dette kan ta litt tid."
-
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:35
-msgid "Unable to create temporary file"
-msgstr "Klarte ikke å opprette midlertidig fil"
-
-#: ../src/Utils/GnomeUtil.cs:49
-msgid ""
-"The \"F-Spot Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
+msgid "Shift all photos by {0}"
msgstr ""
-#: ../src/Widgets/CustomPrintWidget.cs:99
-msgid "Page Setup"
-msgstr "Sideoppsett"
-
-#: ../src/Widgets/CustomPrintWidget.cs:103
-#: ../src/Widgets/CustomPrintWidget.cs:105
-#: ../src/Widgets/CustomPrintWidget.cs:111
-#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr "Papirstørrelse: {0} x {1} mm"
-
-#: ../src/Widgets/CustomPrintWidget.cs:121
-msgid "Photos per page"
-msgstr "Bilder per side"
-
-#. ppp1.Toggled += TriggerChanged;
-#. ppp2.Toggled += TriggerChanged;
-#. ppp4.Toggled += TriggerChanged;
-#. ppp9.Toggled += TriggerChanged;
-#: ../src/Widgets/CustomPrintWidget.cs:133
-msgid "Repeat"
-msgstr "Gjenta"
-
-#: ../src/Widgets/CustomPrintWidget.cs:134
-msgid "Print cut marks"
-msgstr "Skriv ut beskjæringsmerker"
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "Idag"
-#: ../src/Widgets/CustomPrintWidget.cs:142
-msgid "Full Page (no margin)"
-msgstr "Full side (ingen marg)"
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "Igår"
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Widgets/CustomPrintWidget.cs:146
-msgid "Zoom"
-msgstr "Zoom"
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "Siste 7 dagene"
-#: ../src/Widgets/CustomPrintWidget.cs:147
-msgid "Fill"
-msgstr "Fyll"
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "Siste 30 dagene"
-#: ../src/Widgets/CustomPrintWidget.cs:148
-msgid "Scaled"
-msgstr "Skalert"
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "Siste 90 dagene"
-#: ../src/Widgets/CustomPrintWidget.cs:154
-msgid "White borders"
-msgstr "Hvite kanter"
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "Siste 360 dagene"
-#: ../src/Widgets/CustomPrintWidget.cs:158
-msgid "Custom Text: "
-msgstr "Egendefinert tekst: "
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "Nåværende uke (Man-Søn)"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:71
-msgid "Edit"
-msgstr "Rediger"
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "Forrige uke (Man-Søn)"
-#: ../src/Widgets/EditorPage.cs:201
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:46
-msgid "No selection available"
-msgstr "Ingen markerte områder tilgjengelig"
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "Egendefinert område"
-#: ../src/Widgets/EditorPage.cs:202
-#, fuzzy
-msgid ""
-"This tool requires an active selection. Please select a region of the photo "
-"and try the operation again"
-msgstr ""
-"Dette verktøyet krever et markert felt. Velg en del av bildet og gjør "
-"operasjonen igjen"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Rediger ikon for merke {0}"
-#: ../src/Widgets/EditorPage.cs:219
-#, fuzzy
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] "Feil ved lagring av endret foto"
-msgstr[1] "Feil ved lagring av endret foto"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "Velg bilde fra fil"
-#: ../src/Widgets/EditorPage.cs:221
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
#, csharp-format
msgid ""
-"Received exception \"{0}\". Note that you have to develop RAW files into "
-"JPEG before you can edit them."
-msgstr ""
-
-#: ../src/Widgets/FindBar.cs:58
-msgid "Find:"
-msgstr "Finn:"
-
-#: ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:265
-msgid "and"
-msgstr "og"
-
-#: ../src/Widgets/InfoBox.cs:179
-msgid "Histogram"
-msgstr "Histogram"
-
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Date"
-msgstr "Dato"
-
-#: ../src/Widgets/InfoBox.cs:217
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:5
-msgid "Size"
-msgstr "Størrelse"
-
-#: ../src/Widgets/InfoBox.cs:220
-msgid "Exposure"
-msgstr "Eksponering"
-
-#: ../src/Widgets/InfoBox.cs:224
-msgid "Focal Length"
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
msgstr ""
-#: ../src/Widgets/InfoBox.cs:230
-msgid "File Size"
-msgstr "Filstørrelse"
-
-#: ../src/Widgets/InfoBox.cs:233
-msgid "Rating"
-msgstr "Poeng"
-
-#: ../src/Widgets/InfoBox.cs:406 ../src/Widgets/InfoBox.cs:429
-#: ../src/Widgets/InfoBox.cs:439 ../src/Widgets/InfoBox.cs:448
-msgid "(Unknown)"
-msgstr "(Ukjent)"
-
-#: ../src/Widgets/InfoBox.cs:416
-msgid "(wrong format)"
-msgstr "(feil format)"
-
-#: ../src/Widgets/InfoBox.cs:554
-msgid "(File not found)"
-msgstr "(Fil ikke funnet)"
-
-#: ../src/Widgets/InfoBox.cs:598
-#, csharp-format
-msgid "{0} Photos"
-msgstr "{0} bilder"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Kan ikke laste bilde"
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:618
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
#, csharp-format
-msgid ""
-"On {0} between \n"
-"{1} and {2}"
+msgid "Unable to load \"{0}\" as icon for the tag"
msgstr ""
-#: ../src/Widgets/InfoBox.cs:623
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
#, csharp-format
-msgid ""
-"Between {0} \n"
-"and {1}"
-msgstr ""
-"Mellom {0} \n"
-"og {1}"
-
-#: ../src/Widgets/InfoBox.cs:647
-#, fuzzy
-msgid "(At least one File not found)"
-msgstr "Fil ikke funnet"
-
-#: ../src/Widgets/InfoBox.cs:761
-msgid "Show Photo Name"
-msgstr "Vis navn på bilde"
-
-#: ../src/Widgets/InfoBox.cs:770
-msgid "Show Date"
-msgstr "Vis dato"
-
-#: ../src/Widgets/InfoBox.cs:779
-msgid "Show Size"
-msgstr "Vis størrelse"
-
-#: ../src/Widgets/InfoBox.cs:788
-#, fuzzy
-msgid "Show Exposure"
-msgstr "Eksponering"
+msgid "Photo {0} of {1}"
+msgstr "Foto {0} av {1}"
-#: ../src/Widgets/InfoBox.cs:797
-msgid "Show Focal Length"
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
msgstr ""
-#: ../src/Widgets/InfoBox.cs:806
-msgid "Show Camera"
-msgstr "Vis kamera"
-
-#: ../src/Widgets/InfoBox.cs:815
-msgid "Show File Size"
-msgstr "Vis filstørrelse"
-
-#: ../src/Widgets/MetadataDisplay.cs:23
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ../src/Widgets/MetadataDisplay.cs:104
-msgid "Extended Metadata"
-msgstr "Utvidet metadata"
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "Detaljer om feil"
-#: ../src/Widgets/MetadataDisplay.cs:223
-msgid "Picasaweb"
-msgstr "Picasaweb"
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr "En uhåndtert feil oppstod:"
-#: ../src/Widgets/MetadataDisplay.cs:225
-msgid "SmugMug"
-msgstr "SmugMug"
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "Ingen"
-#: ../src/Widgets/MetadataDisplay.cs:227
-msgid "Gallery2"
-msgstr "Gallery2"
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "Systemprofil"
-#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:387
-msgid "No Extended Metadata Available"
-msgstr "Ingen utvidede metadata tilgjengelig"
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "Standard tema"
-#: ../src/Widgets/MetadataDisplay.cs:405
-msgid "No active photo"
-msgstr "Intet aktivt fotografi"
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "Feil ved lasting av database."
-#: ../src/Widgets/MetadataDisplay.cs:407
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "Bildet «{0}» finnes ikke"
-
-#: ../src/Widgets/MetadataDisplay.cs:410
-msgid "No metadata available"
-msgstr "Ingen metadata tilgjengelig"
-
-#: ../src/Widgets/RatingMenuItem.cs:56
-msgid "Rating:"
+msgid ""
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
msgstr ""
-#: ../src/XmpTagsImporter.cs:89
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:6
-msgid "Location"
-msgstr "Lokasjon"
-
-#: ../src/XmpTagsImporter.cs:90
-msgid "Country"
-msgstr "Land"
-
-#: ../src/XmpTagsImporter.cs:91
-msgid "City"
-msgstr "By"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "Etikett"
-#: ../src/XmpTagsImporter.cs:92
-msgid "State"
-msgstr "Stat"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "Rate"
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "Prøv igjen"
-#: ../src/f-spot.glade.h:2
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
msgid "0000:00:00 00:00:00"
msgstr "0000:00:00:00:00:00"
-#: ../src/f-spot.glade.h:3
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
msgid "00:00:00"
msgstr "00:00:00"
-#: ../src/f-spot.glade.h:4
-msgid "1 of 1"
-msgstr "1 av 1"
-
-#: ../src/f-spot.glade.h:5
-msgid "1024 px"
-msgstr "1024 piksler"
-
-#: ../src/f-spot.glade.h:6
-msgid "320 px"
-msgstr "320 piksler"
-
-#: ../src/f-spot.glade.h:7
-msgid "480 px"
-msgstr "480 piksler"
-
-#: ../src/f-spot.glade.h:8
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
msgid "5"
msgstr "5"
-#: ../src/f-spot.glade.h:9
-msgid "640 px"
-msgstr "640 piksler"
-
-#: ../src/f-spot.glade.h:10
-msgid "800 px"
-msgstr "800 piksler"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Handling</b>"
-#: ../src/f-spot.glade.h:11
-msgid "<b></b>"
-msgstr "<b></b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Referansefotografi</b>"
-#: ../src/f-spot.glade.h:12
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>Konto</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Juster tid"
-#: ../src/f-spot.glade.h:13
-msgid "<b>Action</b>"
-msgstr "<b>Handling</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Justert dato:"
-#: ../src/f-spot.glade.h:14
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>Album</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Nåværende dato:"
-#: ../src/f-spot.glade.h:15
-msgid "<b>Co_rrections</b>"
-msgstr "<b>Forbedringer</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr ""
-#: ../src/f-spot.glade.h:16
-msgid "<b>Color Management</b>"
-msgstr "<b>Fargebehandling</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "forskjell:"
-#: ../src/f-spot.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>Mål</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "min. Start på {0}"
-#: ../src/f-spot.glade.h:18
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
msgid "<b>End Date</b>"
msgstr "<b>Sluttdato</b>"
-#: ../src/f-spot.glade.h:19
-msgid "<b>From External Photo</b>"
-msgstr "<b>Fra eksternt bilde</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Velg periode</b>"
-#: ../src/f-spot.glade.h:20
-msgid "<b>From Photo</b>"
-msgstr "<b>Fra Fotografi</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Startdato</b>"
-#: ../src/f-spot.glade.h:21
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>Galleri</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr ""
-#: ../src/f-spot.glade.h:22
-#, fuzzy
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>Mål</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr ""
-#: ../src/f-spot.glade.h:23
-msgid "<b>Import Settings</b>"
-msgstr "<b>Innstillinger for import</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Sett datoområde"
-#: ../src/f-spot.glade.h:24
-#, fuzzy
-msgid "<b>Max Rating</b>"
-msgstr "<b>Metadata</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#: ../src/f-spot.glade.h:25
-msgid "<b>Metadata</b>"
-msgstr "<b>Metadata</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Rediger merke"
-#: ../src/f-spot.glade.h:26
-#, fuzzy
-msgid "<b>Min Rating</b>"
-msgstr "<b>Mål</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Rediger ikon"
-#: ../src/f-spot.glade.h:27
-msgid "<b>Photograph Layout</b>"
-msgstr "<b>Bildelayout</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Ikon:"
-#: ../src/f-spot.glade.h:28
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
-msgid "<b>Photos</b>"
-msgstr "<b>Foto</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Fra eksternt bilde</b>"
-#: ../src/f-spot.glade.h:29
-msgid "<b>Predefined</b>"
-msgstr "<b>Forhåndsdefinert</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Fra Fotografi</b>"
-#: ../src/f-spot.glade.h:30
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Forhåndsdefinerte ikoner</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
msgid "<b>Preview</b>"
msgstr "<b>Forhåndsvisning</b>"
-#: ../src/f-spot.glade.h:31
-msgid "<b>Printer Details</b>"
-msgstr "<b>Skriverdetaljer</b>"
-
-#: ../src/f-spot.glade.h:32
-msgid "<b>Reference Photo</b>"
-msgstr "<b>Referansefotografi</b>"
-
-#: ../src/f-spot.glade.h:33
-msgid "<b>Screensaver</b>"
-msgstr "<b>Skjermbeskytter</b>"
-
-#: ../src/f-spot.glade.h:34
-msgid "<b>Select period</b>"
-msgstr "<b>Velg periode</b>"
-
-#: ../src/f-spot.glade.h:35
-msgid "<b>Size</b>"
-msgstr "<b>Størrelse</b>"
-
-#: ../src/f-spot.glade.h:36
-msgid "<b>Start Date</b>"
-msgstr "<b>Startdato</b>"
-
-#: ../src/f-spot.glade.h:37
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>Stil</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr ""
-#: ../src/f-spot.glade.h:38
-msgid "<b>Summary</b>"
-msgstr "<b>Sammendrag</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Rediger ikon for merke"
-#: ../src/f-spot.glade.h:39
-msgid "<b>Theming</b>"
-msgstr "<b>Tema</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Ingen b_ilder"
-#: ../src/f-spot.glade.h:40
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>Gjennomsiktige deler</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "Foto 0 av 0"
-#: ../src/f-spot.glade.h:41
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>Vis alle importerte bilder</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr ""
-#: ../src/f-spot.glade.h:42
-msgid "<b>_White Balance</b>"
-msgstr "<b>_Hvitbalanse</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr ""
-#: ../src/f-spot.glade.h:43
-msgid "<small></small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "Brukervalg for F-Spot"
-#: ../src/f-spot.glade.h:44
-msgid ""
-"<small><i>Choose the folder where F-Spot should store newly imported photos</"
-"i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
msgstr ""
-#: ../src/f-spot.glade.h:45
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
-"<small><i>Slå på dette valget for å lagre merker og beskrivelser inne i\n"
-"støttede bildeformater.</i></small>"
-#: ../src/f-spot.glade.h:47
-msgid ""
-"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
-"disable this for viewing photos, but disabling the interpolation could be "
-"usefull in icon design.</i></small>"
-msgstr ""
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Velg en mappe"
-#: ../src/f-spot.glade.h:48
-msgid ""
-"<small><i>While acting as a screensaver, F-Spot can display all of your "
-"images, or a small subset based on tags.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
msgstr ""
-"<small><i>Når F-spot fungerer som skjermsparer, kan det vise alle bildene "
-"dine, eller en del av de avhengig av merker.</i></small>"
-#: ../src/f-spot.glade.h:49
-msgid ""
-"<small><i>You can choose how to display transparent parts in images. This "
-"option has no effect on photos, but setting this as check pattern or custom "
-"color could be usefull when viewing icons or other artworks with transparent "
-"parts.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
msgstr ""
-#: ../src/f-spot.glade.h:50
-msgid ""
-"<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
msgstr ""
-#: ../src/f-spot.glade.h:51
-msgid "Adjust Time"
-msgstr "Juster tid"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>Høyeste poengsum</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>Laveste poengsum</b>"
-#: ../src/f-spot.glade.h:52
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:1
msgid "Adjust _Time..."
msgstr "Juster _tid ..."
-#: ../src/f-spot.glade.h:53
-msgid "Adjusted date: "
-msgstr "Justert dato:"
-
-#: ../src/f-spot.glade.h:55
+#: ../src/ui/main_window.ui.h:2
msgid "Arrange _by"
msgstr "_Sorter etter"
-#: ../src/f-spot.glade.h:56
-msgid "As _background"
-msgstr "Som _bakgrunn"
-
-#: ../src/f-spot.glade.h:57
-msgid "As _custom color: "
-msgstr "Som _egendefinert farge: "
-
-#: ../src/f-spot.glade.h:58
-msgid "As check _pattern"
-msgstr "Som rutenetty_pe"
-
-#: ../src/f-spot.glade.h:59
-msgid "Attach Tags:"
-msgstr "Fest merkelapper:"
-
-#: ../src/f-spot.glade.h:60
-msgid "Attach tag:"
-msgstr "Legg til merke:"
-
-#: ../src/f-spot.glade.h:61
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "Roter automatisk"
-
-#: ../src/f-spot.glade.h:63
+#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
msgstr "Etter _dato"
-#: ../src/f-spot.glade.h:64
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
msgstr "Etter _importrull"
-#: ../src/f-spot.glade.h:65
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
msgstr ""
-#: ../src/f-spot.glade.h:66
-msgid "CD"
-msgstr "CD"
-
-#: ../src/f-spot.glade.h:67
-msgid "C_aption:"
-msgstr "Bilde_tekst:"
-
-#: ../src/f-spot.glade.h:68
-msgid "C_ontrast:"
-msgstr "K_ontrast:"
-
-#: ../src/f-spot.glade.h:69
-msgid "Camera Selection"
-msgstr "Kamerautvalg"
-
-#: ../src/f-spot.glade.h:70
-msgid "Cancel, do not change the current timeline. "
-msgstr ""
-
-#: ../src/f-spot.glade.h:71
-msgid "Co_nfigure"
-msgstr "Sett _opp"
-
-#: ../src/f-spot.glade.h:72
-msgid "Copy Locat_ion"
-msgstr "Kopier plassering"
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "Kopier"
-#: ../src/f-spot.glade.h:73
-msgid "Copy files to the Photos folder"
-msgstr "Kopier filer til bildemappen"
-
-#: ../src/f-spot.glade.h:74
-msgid "Create Mail"
-msgstr "Lag e-post"
-
-#: ../src/f-spot.glade.h:75
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "Opprett nytt _merke..."
-#: ../src/f-spot.glade.h:76
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "Opprett ny _versjon"
-#: ../src/f-spot.glade.h:77
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr ""
-
-#: ../src/f-spot.glade.h:78
-msgid "Crop photo to _fit"
-msgstr "Beskjær bilde slik at det _passer"
-
-#: ../src/f-spot.glade.h:79
-msgid "Current date:"
-msgstr "Nåværende dato:"
-
-#: ../src/f-spot.glade.h:80
-msgid "Custom Theme"
-msgstr "Egendefinert tema"
-
-#: ../src/f-spot.glade.h:81
-msgid "Detect duplicates"
-msgstr ""
-
-#: ../src/f-spot.glade.h:82
-msgid "Display File _Names"
-msgstr "Vis fil_navn"
-
-#: ../src/f-spot.glade.h:83
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr ""
-
-#: ../src/f-spot.glade.h:84
-msgid "Do not send a mail"
-msgstr "Ikke send e-post"
-
-#: ../src/f-spot.glade.h:85
-msgid "E-_Mail:"
-msgstr "E-_post:"
-
-#: ../src/f-spot.glade.h:86
-msgid "E_xport titles and comments"
-msgstr "Eksporter _titler og kommentarer"
-
-#: ../src/f-spot.glade.h:87
-msgid "Edit Tag Icon"
-msgstr "Rediger ikon for merke"
-
-#: ../src/f-spot.glade.h:88
-msgid "Edit icon"
-msgstr "Rediger ikon"
-
-#: ../src/f-spot.glade.h:90
-msgid "Estimated new size"
-msgstr "Estimert ny størrelse"
-
-#: ../src/f-spot.glade.h:91
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
-msgid "Export"
-msgstr "Eksporter"
-
-#: ../src/f-spot.glade.h:92
-msgid "Extra large"
-msgstr "Ekstra stor"
-
-#: ../src/f-spot.glade.h:93
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:94
-msgid "F-Spot View"
-msgstr "F-Spot bildebehandling"
-
-#: ../src/f-spot.glade.h:96
-msgid "Filter on selected rolls"
-msgstr ""
-
-#: ../src/f-spot.glade.h:97
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "_Finn"
-#: ../src/f-spot.glade.h:99
-msgid "From List:"
-msgstr "Fra liste:"
-
-#: ../src/f-spot.glade.h:100
-msgid "From gtkrc File:"
-msgstr "Fra gtkrc-fil"
-
-#: ../src/f-spot.glade.h:101
-msgid ""
-"Full Page\n"
-"Standard - 4x6"
-msgstr ""
-"Hel side\n"
-"Standard - 4x6"
-
-#: ../src/f-spot.glade.h:103
-msgid "G_allery:"
-msgstr "G_alleri:"
-
-#: ../src/f-spot.glade.h:104
-msgid "Gallery"
-msgstr "Galleri"
-
-#: ../src/f-spot.glade.h:105
-msgid ""
-"Hairline\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-msgstr ""
-"Hårlinje\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-
-#: ../src/f-spot.glade.h:110
-msgid "Images tagged with:"
-msgstr "Bilder merket med:"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:113
-msgid "Import Source:"
-msgstr "Importer kilde:"
-
-#: ../src/f-spot.glade.h:114
-msgid "Include subfolders"
-msgstr "Ta med undermapper"
-
-#: ../src/f-spot.glade.h:115
-msgid "Large"
-msgstr "Stor:"
-
-#: ../src/f-spot.glade.h:116
-msgid "Make F-Spot your screensaver"
-msgstr "La F-Spot være skjermspareren din"
-
-#: ../src/f-spot.glade.h:117
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
msgstr "Håndter utvid_elser"
-#: ../src/f-spot.glade.h:118
-msgid "Manage your custom selection ratios"
-msgstr ""
-
-#: ../src/f-spot.glade.h:119
-msgid "Medium"
-msgstr "Middelse"
-
-#: ../src/f-spot.glade.h:120
-msgid "N_umber of Copies:"
-msgstr "A_ntall kopier:"
-
-#: ../src/f-spot.glade.h:122
-msgid "No _image"
-msgstr "Ingen b_ilder"
-
-#: ../src/f-spot.glade.h:123
-msgid ""
-"None\n"
-"Title\n"
-"Filename\n"
-"Date\n"
-"Photo Details"
-msgstr ""
-"Ingen\n"
-"Tittel\n"
-"Filnavn\n"
-"Dato\n"
-"Fotodetaljer"
-
-#: ../src/f-spot.glade.h:128
-msgid "Number of photos in selected rolls:"
-msgstr "Antall bilder i valgt valgte ruller:"
-
-#: ../src/f-spot.glade.h:129
-msgid "Number of pictures"
-msgstr "Antall bilder"
-
-#: ../src/f-spot.glade.h:130
-msgid "Only photos taken within these dates will be displayed."
-msgstr ""
-
-#: ../src/f-spot.glade.h:131
-msgid "Open _Folder..."
-msgstr "Åpne mappe"
-
-#: ../src/f-spot.glade.h:133
-msgid "Original size (possible very large file size)"
-msgstr "Opprinnelig størrelse (kan være veldig stor fil)"
-
-#: ../src/f-spot.glade.h:134
-msgid "P_arent Tag:"
-msgstr ""
-
-#: ../src/f-spot.glade.h:135
-msgid "P_hoto Source:"
-msgstr "Fotokilde:"
-
-#: ../src/f-spot.glade.h:136
-msgid "Page 1 of 3"
-msgstr "Side 1 av 3"
-
-#: ../src/f-spot.glade.h:137
+#: ../src/ui/main_window.ui.h:13
msgid "Page Set_up..."
msgstr "Side_oppsett..."
-#: ../src/f-spot.glade.h:138
-msgid "Pause"
-msgstr "Pause"
-
-#: ../src/f-spot.glade.h:139
-msgid "Photo 0 of 0"
-msgstr "Foto 0 av 0"
-
-#: ../src/f-spot.glade.h:140
-msgid "Photo _Size:"
-msgstr "Fotostørrelse:"
-
-#: ../src/f-spot.glade.h:141
-msgid "Preferences"
-msgstr "Brukervalg"
-
-#: ../src/f-spot.glade.h:143
-msgid "Print crop _marks"
-msgstr "Skriv ut beskjæringsmerker"
-
-#: ../src/f-spot.glade.h:144
-msgid "Print..."
-msgstr "Skriv ut..."
-
-#: ../src/f-spot.glade.h:145
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
msgstr "_Oppdater miniatyrbilde"
-#: ../src/f-spot.glade.h:147
-msgid "Repair"
-msgstr "Reparer"
-
-#: ../src/f-spot.glade.h:150
-msgid "Select A Folder"
-msgstr "Velg en mappe"
-
-#: ../src/f-spot.glade.h:151
-msgid "Select A gtkrc File"
-msgstr "Velg en gtkrc-fil"
-
-#: ../src/f-spot.glade.h:152
-msgid "Select Photos to Copy From Camera..."
-msgstr "Velg bilder som skal kopieres fra kameraet..."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Velg _alle"
-#: ../src/f-spot.glade.h:154
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Velg _ingen"
-#: ../src/f-spot.glade.h:155
-msgid "Select a Tag..."
-msgstr "Velg et merke..."
-
-#: ../src/f-spot.glade.h:156
-msgid "Select the camera from which you want to transfer files"
-msgstr "Velg kameraet du vil overføre filer fra"
-
-#: ../src/f-spot.glade.h:157
-msgid "Selected Camera: "
-msgstr "Valgt kamera:"
-
-#: ../src/f-spot.glade.h:158
-msgid ""
-"Selection\n"
-"Gallery\n"
-"Viewport"
-msgstr ""
-"Utvalg\n"
-"Galleri\n"
-"Synsfelt"
-
-#: ../src/f-spot.glade.h:161
-msgid "Selection Constraints"
-msgstr "Begrensning for utvalg"
-
-#: ../src/f-spot.glade.h:162
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
msgstr "Send _med e-post ..."
-#: ../src/f-spot.glade.h:163
-msgid "Set Rating Filter"
-msgstr ""
-
-#: ../src/f-spot.glade.h:164
-msgid "Set as _Background"
-msgstr "Bruk som _bakgrunn"
-
-#: ../src/f-spot.glade.h:165
-msgid "Set date range"
-msgstr "Sett datoområde"
-
-#: ../src/f-spot.glade.h:167
-msgid "Show all photos."
-msgstr "Vis alle bilder."
-
-#: ../src/f-spot.glade.h:168
-msgid "Show or hide the side pane"
-msgstr "Vis eller skjul sidefeltet"
-
-#: ../src/f-spot.glade.h:169
-msgid "Show or hide the toolbar"
-msgstr "Vis eller skjul verktøylinjen"
-
-#: ../src/f-spot.glade.h:170
-msgid "Side _pane"
-msgstr "Side_felt"
-
-#: ../src/f-spot.glade.h:171
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "_Sidefelt"
-#: ../src/f-spot.glade.h:172
-msgid "Small"
-msgstr "Liten"
-
-#: ../src/f-spot.glade.h:173
-msgid "Space all photos by"
-msgstr ""
-
-#: ../src/f-spot.glade.h:174
-msgid ""
-"Specify if an original size picture should be rotated or not. Smaller sizes "
-"are automatically rotated."
-msgstr ""
-
-#: ../src/f-spot.glade.h:175
-msgid "Strip image _metadata"
-msgstr "Fjern bildemetadata"
-
-#: ../src/f-spot.glade.h:176
-msgid "System Theme"
-msgstr "Systemtema"
-
-#: ../src/f-spot.glade.h:177
+#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
msgstr "_Merker"
-#: ../src/f-spot.glade.h:178
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1178
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1179
-msgid "Tags: "
-msgstr "Merker:"
-
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:180
-msgid "Te_mp:"
-msgstr ""
-
-#: ../src/f-spot.glade.h:181
+#: ../src/ui/main_window.ui.h:25
#, fuzzy
msgid "Thumbnail _elements"
msgstr "Miniatyrbildemappe"
-#: ../src/f-spot.glade.h:182
-msgid "Tiny"
-msgstr "Liten"
-
-#: ../src/f-spot.glade.h:183
+#: ../src/ui/main_window.ui.h:26
msgid "Too_lbar"
msgstr "Verktøy_linje"
-#: ../src/f-spot.glade.h:184
-msgid "Total original size"
-msgstr ""
-
-#: ../src/f-spot.glade.h:185
-msgid "Try to use the system display profile"
-msgstr ""
-
-#: ../src/f-spot.glade.h:186
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "Vis"
-#: ../src/f-spot.glade.h:187
-msgid "Will print using: US Letter size on Generic Postscript"
-msgstr ""
-
-#: ../src/f-spot.glade.h:188
-msgid "Write _metadata to file"
-msgstr "Skriv _metadata til fil"
-
-#: ../src/f-spot.glade.h:189
-msgid "Zoom _in"
-msgstr "Zoom _inn"
-
-#: ../src/f-spot.glade.h:190
-msgid "Zoom _out"
-msgstr "Zoom _ut"
-
-#: ../src/f-spot.glade.h:191
-msgid "Zoom in"
-msgstr "Zoom inn"
-
-#: ../src/f-spot.glade.h:192
-msgid "Zoom out"
-msgstr "Zoom ut"
-
-#: ../src/f-spot.glade.h:194
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
msgstr "_Legg til merkelapp for utvalg"
-#: ../src/f-spot.glade.h:195
-msgid "_Border:"
-msgstr "_Kant:"
-
-#: ../src/f-spot.glade.h:196
-msgid "_Brightness:"
-msgstr "_Lysstyrke:"
-
-#: ../src/f-spot.glade.h:198
+#: ../src/ui/main_window.ui.h:35
#, fuzzy
msgid "_Clear Rating Filter"
msgstr "_Nullstill datointervall"
-#: ../src/f-spot.glade.h:199
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
msgstr ""
-#: ../src/f-spot.glade.h:200
+#: ../src/ui/main_window.ui.h:38
msgid "_Components"
msgstr "_Komponenter"
-#: ../src/f-spot.glade.h:201
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
msgstr "_Innhold"
-#: ../src/f-spot.glade.h:202
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-msgid "_Create"
-msgstr "_Lag"
-
-#: ../src/f-spot.glade.h:203
-msgid "_Create Mail"
-msgstr "_Lag e-post"
-
-#: ../src/f-spot.glade.h:204
+#: ../src/ui/main_window.ui.h:40
msgid "_Dates"
msgstr "_Datoer"
-#: ../src/f-spot.glade.h:206
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
msgstr "_Slett valgt merke"
-#: ../src/f-spot.glade.h:207
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
msgstr "_Slett versjon"
-#: ../src/f-spot.glade.h:208
-msgid "_Display:"
-msgstr "_Vis:"
-
-#: ../src/f-spot.glade.h:209
-msgid "_Edit"
-msgstr "R_ediger"
-
-#: ../src/f-spot.glade.h:210
-msgid "_Edit Selected Tag..."
-msgstr "_Rediger valgt merke..."
-
-#: ../src/f-spot.glade.h:211
-msgid "_Export"
-msgstr "_Eksporter"
-
-#: ../src/f-spot.glade.h:212
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "_Eksporter merker"
+#: ../src/ui/main_window.ui.h:45
+#, fuzzy
+msgid "_Edit Tag..."
+msgstr "Rediger merke"
-#: ../src/f-spot.glade.h:213
+#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
msgstr "_Eksporter til"
-#: ../src/f-spot.glade.h:214
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export to Album:"
-msgstr "_Eksporter til album:"
-
-#: ../src/f-spot.glade.h:215
-msgid "_Exposure:"
-msgstr "_Eksponering:"
-
-#: ../src/f-spot.glade.h:216
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
msgstr "_Filmstripe"
-#: ../src/f-spot.glade.h:217
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:218
-msgid "_Folder"
-msgstr "_Mappe"
-
-#: ../src/f-spot.glade.h:219
-msgid "_Fullscreen"
-msgstr "_Fullskjerm"
-
-#: ../src/f-spot.glade.h:220
-msgid "_Gallery"
-msgstr "_Galleri"
-
-#: ../src/f-spot.glade.h:221
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../src/f-spot.glade.h:222
+#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
msgstr "_Skjulte"
-#: ../src/f-spot.glade.h:223
-msgid "_Hue:"
-msgstr "_Tone:"
-
-#: ../src/f-spot.glade.h:224
-msgid "_Icon:"
-msgstr "_Ikon:"
-
-#: ../src/f-spot.glade.h:225
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
msgstr "_Importer..."
-#: ../src/f-spot.glade.h:226
-#, fuzzy
-msgid "_Interpolate image on zoom"
-msgstr "interpolasjonstype"
-
-#: ../src/f-spot.glade.h:227
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
msgstr "_Stor"
-#: ../src/f-spot.glade.h:228
+#: ../src/ui/main_window.ui.h:53
#, fuzzy
msgid "_Last Import Roll"
msgstr "Importer bilder"
-#: ../src/f-spot.glade.h:229
+#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
msgstr "_Lupe"
-#: ../src/f-spot.glade.h:230
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
msgstr "_Middels"
-#: ../src/f-spot.glade.h:231
-msgid "_Month"
-msgstr "_Måned"
-
-#: ../src/f-spot.glade.h:232
-msgid "_New Window"
-msgstr "_Nytt vindu"
-
-#: ../src/f-spot.glade.h:233
-msgid "_Open album in browser when done uploading"
-msgstr "_Åpne album i nettleser når opplasting er ferdig"
-
-#: ../src/f-spot.glade.h:234
-msgid "_Open destination when done exporting"
-msgstr "_Åpne mål når eksportering er ferdig"
-
-#: ../src/f-spot.glade.h:235
-msgid "_Photo"
-msgstr "_Bilde"
-
-#: ../src/f-spot.glade.h:236
-#, fuzzy
-msgid "_Print output:"
-msgstr "_Utskrift:"
-
-#: ../src/f-spot.glade.h:237
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
msgstr "A_vslutt"
-#: ../src/f-spot.glade.h:238
+#: ../src/ui/main_window.ui.h:58
msgid "_Ratings"
msgstr "_Poeng"
-#: ../src/f-spot.glade.h:240
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
msgstr "_Fjern merke fra utvalg"
-#: ../src/f-spot.glade.h:241
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
msgstr "_Endre versjonsnavn"
-#: ../src/f-spot.glade.h:242
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-msgid "_Resize to: "
-msgstr "_Endre størrelse til:"
-
-#: ../src/f-spot.glade.h:244
-msgid "_Saturation:"
-msgstr "_Metning:"
-
-#: ../src/f-spot.glade.h:245
-msgid "_Scale photos to no larger than: "
-msgstr "Skaler bilder så de ikke er større enn: "
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "_Motsatt rekkefølge"
-#: ../src/f-spot.glade.h:246
+#: ../src/ui/main_window.ui.h:63
#, fuzzy
msgid "_Select Import Rolls..."
msgstr "Velg mappe for eksportering"
-#: ../src/f-spot.glade.h:247
+#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
msgstr "Sett _datointervall..."
-#: ../src/f-spot.glade.h:248
+#: ../src/ui/main_window.ui.h:65
#, fuzzy
msgid "_Set Rating filter..."
msgstr "Sett _datointervall..."
-#: ../src/f-spot.glade.h:249
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "_Skjerp..."
-#: ../src/f-spot.glade.h:250
-msgid "_Slideshow"
-msgstr "_Bildefremvisning"
-
-#: ../src/f-spot.glade.h:251
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
msgstr "_Liten"
-#: ../src/f-spot.glade.h:252
-msgid "_Strip metadata"
-msgstr "_Fjern metadata"
-
-#: ../src/f-spot.glade.h:253
+#: ../src/ui/main_window.ui.h:69
#, fuzzy
msgid "_Tag Icons"
msgstr "Merk ikoner"
-#: ../src/f-spot.glade.h:254
-msgid "_Tag Name:"
-msgstr "_Merkenavn:"
-
-#: ../src/f-spot.glade.h:255
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
msgstr "_Merker"
-#: ../src/f-spot.glade.h:256
+#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
msgstr "_Tidslinje"
-#: ../src/f-spot.glade.h:257
-#, fuzzy
-msgid "_Tint:"
-msgstr "Tittel"
-
-#: ../src/f-spot.glade.h:258
-msgid "_Toolbar"
-msgstr "Verk_tøylinje"
-
-#: ../src/f-spot.glade.h:259
+#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
msgstr "Verk_tøy"
-#: ../src/f-spot.glade.h:260
-msgid "_URI:"
-msgstr "_URI:"
-
-#: ../src/f-spot.glade.h:261
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
msgstr "_Umerkede fotografier"
-#: ../src/f-spot.glade.h:262
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
msgstr "_Versjon"
-#: ../src/f-spot.glade.h:263
-msgid "_View"
-msgstr "_Vis"
-
-#: ../src/f-spot.glade.h:264
-msgid "_Virtual Filesystem"
-msgstr "_Virtuelt filsystem"
-
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:267
-msgid ""
-"at\n"
-"after\n"
-"between"
-msgstr ""
-"den\n"
-"etter\n"
-"mellom"
-
-#: ../src/f-spot.glade.h:270
-msgid "difference:"
-msgstr "forskjell:"
-
-#: ../src/f-spot.glade.h:271
-msgid "img_000.jpg"
-msgstr "img_000.jpg"
-
-#: ../src/f-spot.glade.h:272
-msgid "min. Starting at {0}"
-msgstr "min. Start på {0}"
-
-#: ../src/f-spot.glade.h:274
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-msgid "pixels"
-msgstr "piksler"
-
-#: ../src/f-spot.glade.h:275
-msgid "x"
-msgstr "x"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "Vis lysbilder fra F-Spot"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "F-Spot-bilder"
-
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_CD..."
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:219
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "Overfører bilde «{0}» til CD"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:246
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:284
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:552
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:702
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:606
-msgid "Done Sending Photos"
-msgstr "Overføring av bilder fullført"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:248
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:286
-msgid "Transfer Complete"
-msgstr "Overføring fullført"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:255
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:291
-msgid "Error While Transferring"
-msgstr "Feil under overføring"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:262
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:310
-msgid "Error Transferring"
-msgstr "Feil under overføring"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:280
-msgid "copying..."
-msgstr "kopierer..."
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:296
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:332
-msgid "Error: Error while transferring; Aborting"
-msgstr "Feil: Feil under overføring av fil. Avbryter"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:299
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:335
-msgid "Error: File Already Exists; Aborting"
-msgstr "Feil: Filen eksisterer allerede. Avbryter"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr ""
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>Bilder som skal skrives til CD</b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:4
-msgid "Create CD"
-msgstr "Lag CD"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:6
-msgid "Size of the exported selection:"
-msgstr "Størrelse på det eksporterte utvalget:"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr ""
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:8
-msgid "_Write only these photos to CD"
-msgstr ""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-msgid "_Zooomr..."
-msgstr "_Zooomr..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "Autoriser"
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "Oppdaterer F-Spot-databasen"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
+#: ../src/Updater.cs:623
msgid ""
-"Return to this window after you have finished the authorization process on "
-"{0} and click the \"Complete Authorization\" button below"
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
msgstr ""
+"Vennligst vent mens F-Spot-databasen blir oppdatert. Dette kan ta litt tid."
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "Fullfør autorisasjon"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "Logger på «{0}»"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr "Sjekker påloggingsinformasjon..."
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "Klarte ikke å opprette midlertidig fil"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "Velkommen {0} du er koblet til {1}"
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Sideoppsett"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
#, csharp-format
-msgid "Sign in as a different user"
-msgstr ""
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Papirstørrelse: {0} x {1} mm"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
msgstr ""
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "Kan ikke logge på"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "Venter på svar {0} av {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:241
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:779
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "Laster opp bilde «{0}»"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, fuzzy, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "Feil ved import {0}{2}{2}{1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:810
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:554
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:608
-#, fuzzy
-msgid "Upload Complete"
-msgstr "Ferdig med nedlasting"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-#, fuzzy
-msgid "Unable to log on."
-msgstr "Kan ikke rotere bilde"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
-#, csharp-format
-msgid ""
-"F-Spot was unable to log on to {0}. Make sure you have given the "
-"authentication using {0} web browser interface."
-msgstr ""
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Bilder per side"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:732
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:478
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:598
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:521
-msgid "Uploading Pictures"
-msgstr "Laster opp bilder"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Gjenta"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-#, fuzzy
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>Velg periode</b>"
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Skriv ut beskjæringsmerker"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+#: ../src/Widgets/CustomPrintWidget.cs:158
#, fuzzy
-msgid "Export tag _hierarchy"
-msgstr "_Eksporter merker"
+msgid "Photos layout"
+msgstr "Bilder"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
-msgid ""
-"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
-msgstr ""
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "Full side (ingen marg)"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr ""
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Zoom"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "Privat"
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Fyll"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "Offentlig"
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Skalert"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "Fjern _metadata"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "Hvite kanter"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "Synlig for familien"
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Egendefinert tekst"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "Synlig for venner"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Informasjon om bilder"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../src/Widgets/CustomPrintWidget.cs:182
#, fuzzy
-msgid "_View photos in browser when done uploading"
-msgstr "_Åpne album i nettleser når opplasting er ferdig"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "Ma_ppe..."
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:139
-msgid "Select Export Folder"
-msgstr "Velg eksportmappe"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:197
-msgid "Building Gallery"
-msgstr "Bygger galleri"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:247
-#, fuzzy, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "Feil ved import {0}{2}{2}{1}"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:809
-msgid "Light"
-msgstr "Lys"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:810
-msgid "Dark"
-msgstr "Mørk"
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
-msgid "Prev"
-msgstr "Forrige"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1102
-msgid "Gallery generated by"
-msgstr "Galleri laget av"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1142
-msgid "Show Styles"
-msgstr "Vis stiler"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1143
-msgid "Hide Styles"
-msgstr "Skjul stiler"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1310
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1443
-msgid "Page:"
-msgstr "Side:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>Metode for eksport</b>"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr ""
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr ""
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "B_eskrivelse:"
+msgid "Print file name"
+msgstr "_Filnavn:"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+#: ../src/Widgets/CustomPrintWidget.cs:183
#, fuzzy
-msgid "Export _tags"
-msgstr "_Eksporter merker"
+msgid "Print photo date"
+msgstr "Forrige bilde"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+#: ../src/Widgets/CustomPrintWidget.cs:184
#, fuzzy
-msgid "Export tag _icons"
-msgstr "_Eksporter merker"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-msgid "Folder Export"
-msgstr "Eksport av mappe"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-msgid "G_allery Name:"
-msgstr "Navn på g_alleri:"
+msgid "Print photo time"
+msgstr "Forrige bilde"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+#: ../src/Widgets/CustomPrintWidget.cs:185
#, fuzzy
-msgid "Open _destination when done exporting"
-msgstr "_Åpne mål når eksportering er ferdig"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-msgid "_Folder:"
-msgstr "_Mappe:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-msgid "_Save the files only"
-msgstr "_Lagre kun filer"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-msgid "Web _Gallery..."
-msgstr "_Galleri på nettet..."
+msgid "Print photo tags"
+msgstr "Skriv ut beskjæringsmerker"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
msgstr ""
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:393
-msgid "Invalid URL"
-msgstr "Ugyldig URL"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:394
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr ""
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "Rediger"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:404
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:431
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:442
+#: ../src/Widgets/EditorPage.cs:198
#, fuzzy
-msgid "Error while connecting to Gallery"
-msgstr "Feil ved tilkobling til kamera"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:405
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:432
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:443
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:419
-msgid "A Gallery with this name already exists"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:420
-#, csharp-format
msgid ""
-"There is already a Gallery with the same name in your registered Galleries. "
-"Please choose a unique name."
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:530
-msgid "(TopLevel)"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:592
-msgid "Invalid Gallery name"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:593
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:798
-#, fuzzy, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Feil ved import {0}{2}{2}{1}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:826
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:725
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:629
-msgid "(No Gallery)"
-msgstr "(Uten galleri)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:918
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:852
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:725
-msgid "(Not Connected)"
-msgstr "(Ikke koblet til)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:919
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:853
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(No Albums)"
-msgstr "(Ingen album)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:971
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:767
-msgid "No account selected"
-msgstr "Ingen konto valgt"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-#, fuzzy
-msgid "Export _titles and comments"
-msgstr "Eksporter _titler og kommentarer"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-#, fuzzy
-msgid "Open _album in browser when done uploading"
-msgstr "_Åpne album i nettleser når opplasting er ferdig"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-msgid "U_RL:"
-msgstr "U_RL:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-msgid "_Album Name:"
-msgstr "Navn på _album:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "_Beskrivelse:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-msgid "_Gallery Name:"
-msgstr "Navn på _galleri:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "_Galleri:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-#, fuzzy
-msgid "_Parent Album:"
-msgstr "_Eksporter til album:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
-msgid "_Password:"
-msgstr "_Passord:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-msgid "_Title:"
-msgstr "_Tittel:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-msgid "_Username:"
-msgstr "Br_ukernavn:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr ""
-
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
msgstr ""
+"Dette verktøyet krever et markert felt. Velg en del av bildet og gjør "
+"operasjonen igjen"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+#: ../src/Widgets/EditorPage.cs:216
#, fuzzy
-msgid "Error while creating new album"
-msgstr "Feil under rotering av bilde."
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Feil ved lagring av endret foto"
+msgstr[1] "Feil ved lagring av endret foto"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
-"The following error was encountered while attempting to perform the "
-"requested operation:\n"
-"{0} ({1})"
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
msgstr ""
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
msgstr ""
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:256
-msgid "Too many images to export"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
msgstr ""
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:256
-msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
-"selection and try again."
-msgstr ""
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Finn:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:365
-msgid "You are not logged in."
-msgstr ""
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "Mapper"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
-msgid "Waiting for authentication"
-msgstr ""
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Filsystem"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook. Turn "
-"on the \"Save my login information\" checkbox on Facebook and F-Spot will "
-"log into Facebook automatically from now on."
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Histogram"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:326
-#, fuzzy
-msgid "Error logging into Facebook"
-msgstr "Feil ved tilkobling til kamera"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Versjon"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:326
-msgid ""
-"There was a problem logging into Facebook. Check your credentials and try "
-"again."
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Dato"
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:339
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Eksponering"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:492
-msgid "Album must have a name"
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
msgstr ""
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:492
-msgid "Please name your album or choose an existing album."
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Filstørrelse"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:505
-msgid "Creating a new album failed"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Poeng"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:505
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(feil format)"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:529
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:661
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:564
-#, fuzzy, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "Eksporter bilde «{0}»"
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Ukjent)"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:543
+#: ../src/Widgets/InfoBox.cs:561
#, fuzzy, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr "Feil ved import {0}{2}{2}{1}"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:1
-#, fuzzy
-msgid "Caption"
-msgstr "Bilde_tekst:"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:2
-msgid "Create a new album"
-msgstr "Opprett et nytt album"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:3
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:4
-msgid "Export to Facebook"
-msgstr "Eksporter til Facebook"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:5
-msgid "In this photo"
-msgstr "I dette bildet"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:7
-msgid "Login"
-msgstr "Logg inn"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:8
-msgid "Logout"
-msgstr "Logg ut"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:10
-msgid "This is who I am"
-msgstr "Dette er meg"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:11
-msgid "Use an existing album"
-msgstr "Bruk et eksisterende album"
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(Ingen redigeringer)"
+msgstr[1] "(Ingen redigeringer)"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:12
-msgid "Who is this?"
-msgstr "Hvem er dette?"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-msgid "Compressed fil_e..."
-msgstr "Komprim_ert fil..."
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#, fuzzy
-msgid ""
-"This tool requires an active selection. Please select one or more pictures "
-"and try again"
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
msgstr ""
-"Dette verktøyet krever et markert felt. Velg en del av bildet og gjør "
-"operasjonen igjen"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:63
-msgid "Select export folder"
-msgstr "Velg en eksportmappe"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:101
-msgid "Exporting files"
-msgstr "Eksporterer filer"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:107
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "Forbereder bilde «{0}»"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-msgid "_File name:"
-msgstr "_Filnavn:"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-msgid "_Location:"
-msgstr "_Lokasjon:"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
-msgid "_Scale:"
-msgstr "_Skaler:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-msgid "Merge Db"
-msgstr "Sammenføy databaser"
-
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
-msgid "Error opening the selected file"
-msgstr "Feil ved åpning av valgt fil"
+msgid "{0} Photos"
+msgstr "{0} bilder"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-#, fuzzy
-msgid ""
-"<small><i>Choose the location of the database you want to import from</i></"
-"small>"
-msgstr ""
-"<small><i>Slå på dette valget for å lagre merker og beskrivelser inne i\n"
-"støttede bildeformater.</i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
-"you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already "
-"imported from that database.</i></small>"
+"On {0} between \n"
+"{1} and {2}"
msgstr ""
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+#: ../src/Widgets/InfoBox.cs:645
+#, csharp-format
msgid ""
-"<small><i>Copy the images locally or keep them where they are. If you chose "
-"the later, be sure that this location will stay accessible from f-spot.</i></"
-"small>"
+"Between {0} \n"
+"and {1}"
msgstr ""
+"Mellom {0} \n"
+"og {1}"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+#: ../src/Widgets/InfoBox.cs:672
#, fuzzy
-msgid "A Single Import Roll"
-msgstr "Velg mappe for eksportering"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
-msgid "Copy images to photos folder"
-msgstr "Kopier bilder til bildemappen"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-msgid "Database Location:"
-msgstr "Databaselokasjon:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr "Alt"
+msgid "(At least one File not found)"
+msgstr "Fil ikke funnet"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-msgid "Import:"
-msgstr "Importer:"
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Vis navn på bilde"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Vis dato"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another f-spot collection"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Vis størrelse"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Vis eksponering"
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
msgstr ""
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_Picasaweb..."
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "Feil under oppretting av album"
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Vis kamera"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to create an album: {0}"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Vis filstørrelse"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:621
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} sendt"
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "Metadata"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:623
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{0} av ca. {1}"
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "Utvidet metadata"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:692
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:593
-#, fuzzy, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "Feil ved import {0}{2}{2}{1}"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "Ingen utvidede metadata tilgjengelig"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:776
-msgid "Available space:"
-msgstr ""
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "Intet aktivt fotografi"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:893
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
-msgid ""
-"<small>The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images</small>"
-msgstr ""
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>Eksport til PicasaWeb</b>"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid ""
-"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr ""
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "Offentlig album"
+msgid "The photo \"{0}\" does not exist"
+msgstr "Bildet «{0}» finnes ikke"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "_Navn på album:"
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "Ingen metadata tilgjengelig"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "Roter _automatisk"
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Ingen programmer tilgjengelig"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
msgstr ""
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>SmugMug-eksport</b>"
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "_Konto:"
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug..."
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:126
-#, csharp-format
-msgid "Uploading photo \"{0}\""
-msgstr "Laster opp bilde «{0}»"
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:181
-msgid "Logging into Tabblo"
-msgstr "Logger på Tabblo"
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:241
-msgid "Obtaining URL for upload"
-msgstr "Henter URL for opplasting"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr "_Tabblo..."
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:165
-msgid "Done sending photos"
-msgstr "Overføring av bilder fullført"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:167
-msgid "Upload complete"
-msgstr "Opplasting fullført"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:173
-#, fuzzy
-msgid "Error uploading to Tabblo: "
-msgstr "Feil ved import {0}{2}{2}{1}"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
-msgid "<b>Tabblo account</b>"
-msgstr "<b>Tabblo-konto</b>"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
-msgid "<b>{0}</b>."
-msgstr "<b>{0}</b>."
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
-#, fuzzy
-msgid "A trust error occured while attempting to access"
-msgstr "Mottok feil «{0}» ved forsøk på å rotere {1}"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
-msgid "Abort this session"
-msgstr "Avbryt denne sesjonen"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Land"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
-msgid "Always trust this site's certificate"
-msgstr ""
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "By"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
-msgid "Do you wish to:"
-msgstr "Vil du:"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Stat"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
-#, fuzzy
-msgid "Trust Error"
-msgstr "Feil"
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Vis lysbilder fra F-Spot"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
-msgid "Trust the site's certificate this once"
-msgstr ""
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot-bilder"
diff --git a/po/nds.po b/po/nds.po
new file mode 100644
index 0000000..0821ac7
--- /dev/null
+++ b/po/nds.po
@@ -0,0 +1,3771 @@
+# Low German translation for f-spot.
+# Copyright (C) 2009 f-spot's COPYRIGHT HOLDER
+# This file is distributed under the same license as the f-spot package.
+# Nils-Christoph Fiedler <fiedler at medienkompanie.de>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: f-spot master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&component=General\n"
+"POT-Creation-Date: 2009-12-17 22:46+0000\n"
+"PO-Revision-Date: 2009-12-18 16:03+0100\n"
+"Last-Translator: Nils-Christoph Fiedler <fiedler at medienkompanie.de>\n"
+"Language-Team: Low German <nds-lowgerman at lists.sourceforge.net>\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"
+
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr ""
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "kopere..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Billers to'm Brennen</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Vun alleen dreihn"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "CD erstellen"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Gröte"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Exporteren"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "_Just düsse Billers op CD schrieven"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok\" below."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid "Facebook only permits {0} photographs per album. Please refine your selection and try again."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Lade Billers hoch"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Fehler"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok\" below. F-Spot will cache your session in gnome-keyring, if possible, and re-use it on future Facebook exports."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid "There was a problem logging into Facebook. Check your credentials and try again."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr ""
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Nich anmellt."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Beschrieven"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "In düssem Bill"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Ort"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Anmellen"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Avmellen"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
+msgid "Name"
+msgstr "Naam"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Nich anmellt"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Rechte:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Verbunnen blieven"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr ""
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Wer is dat?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
+#, csharp-format
+msgid "Return to this window after you have finished the authorization process on {0} and click the \"Complete Authorization\" button below"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid "F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Togang</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../src/f-spot.glade.h:14
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../src/f-spot.glade.h:43
+msgid "Export"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid "F-Spot needs your authorization in order to upload photos to your {0} account. Press the \"Authorize\" button to open a web browser and give F-Spot the authorization. "
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "pixels"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "V_erteeknis..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr ""
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+msgid "Light"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+msgid "Dark"
+msgstr ""
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+msgid "Prev"
+msgstr "Utblick"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Index"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
+#: ../src/MainWindow.cs:376
+#: ../src/Widgets/Sidebar.cs:64
+msgid "Tags"
+msgstr "Slötelwöör"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
+#: ../src/f-spot.glade.h:57
+#: ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Vor"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+msgid "Gallery generated by"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+msgid "Show Styles"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+msgid "Hide Styles"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Slötelwöör:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+msgid "Page:"
+msgstr "Siet:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Verteeknis:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid "There is already a Gallery with the same name in your registered Galleries. Please choose a unique name."
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "_Albumnaam:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Beschrieven:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+msgid "_Password:"
+msgstr "_Passwoord:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Titel:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+msgid "_Username:"
+msgstr "_Brukernaam:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr ""
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the requested operation:\n"
+"{0} ({1})"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid "The following error was encountered while attempting to create an album: {0}"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr ""
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr ""
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr ""
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr ""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr ""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:196
+msgid "No selection available"
+msgstr "Keene Utwahl verfögbar"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid "This tool requires an active selection. Please select one or more pictures and try again"
+msgstr ""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr ""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr ""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr ""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+#: ../src/f-spot.glade.h:92
+msgid "_Create"
+msgstr "_Erstellen"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "_Dateinaam:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Ort"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid "In order to detect duplicates on pictures you imported before 0.5.0, F-Spot needs to analyze your image collection. This is not done by default as it's time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid "You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75
+#: ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Sluten"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Hash for Duplicates"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Allens opwiesen"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Utwählt"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "Gallerie Netsiet-URL:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Optschoonen:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Utwählte Billers"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Deelt:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Opwiest:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "keen"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr ""
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid "<small><i>Choose the location of the database you want to import from</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already imported from that database.</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid "<small><i>Copy the images locally or keep them where they are. If you chose the later, be sure that this location will stay accessible from f-spot.</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Allens"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Importeren:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:290
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Överhüppen"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr ""
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "All Billers"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr ""
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Billschirm:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr ""
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr ""
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr ""
+
+#: ../f-spot.desktop.in.in.h:1
+#: ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1
+#: ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr ""
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr ""
+
+#: ../f-spot.desktop.in.in.h:4
+#: ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr ""
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr ""
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr ""
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr ""
+
+#: ../lib/libfspot/f-jpeg-utils.c:441
+#: ../src/RotateCommand.cs:224
+msgid "File not found"
+msgstr ""
+
+#: ../lib/libfspot/f-jpeg-utils.c:464
+#, c-format
+msgid "Unknown transform type %d"
+msgstr ""
+
+#: ../lib/libfspot/f-jpeg-utils.c:472
+msgid "Operation failed"
+msgstr ""
+
+#: ../src/CameraFileSelectionDialog.cs:76
+msgid "Preview"
+msgstr "Utblick"
+
+#: ../src/CameraFileSelectionDialog.cs:78
+msgid "Path"
+msgstr "Pad"
+
+#: ../src/CameraFileSelectionDialog.cs:80
+#: ../src/f-spot.glade.h:46
+msgid "File"
+msgstr "Datei"
+
+#: ../src/CameraFileSelectionDialog.cs:102
+msgid "Select Tag"
+msgstr "Slötelwoord utwählen"
+
+#: ../src/CameraFileSelectionDialog.cs:138
+msgid "Downloading Previews"
+msgstr ""
+
+#: ../src/CameraFileSelectionDialog.cs:148
+#, csharp-format
+msgid "Downloading Preview of {0}"
+msgstr ""
+
+#: ../src/CameraFileSelectionDialog.cs:220
+#, csharp-format
+msgid "Copying file {0} of {1}"
+msgstr ""
+
+#: ../src/CameraFileSelectionDialog.cs:235
+msgid "Error transferring file"
+msgstr ""
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Download Complete"
+msgstr ""
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr ""
+
+#: ../src/CameraFileSelectionDialog.cs:268
+#, csharp-format
+msgid "Transferring \"{0}\" from camera"
+msgstr ""
+
+#: ../src/CameraSelectionDialog.cs:29
+#: ../src/Widgets/InfoBox.cs:231
+msgid "Camera"
+msgstr "Knippskassen"
+
+#: ../src/CameraSelectionDialog.cs:30
+msgid "Port"
+msgstr ""
+
+#: ../src/Core/App.cs:265
+#, csharp-format
+msgid "No photos matching {0} found"
+msgstr ""
+
+#: ../src/Core/App.cs:266
+#, csharp-format
+msgid ""
+"The tag \"{0}\" is not applied to any photos. Try adding\n"
+"the tag to some photos or selecting a different tag in the\n"
+"F-Spot preference dialog."
+msgstr ""
+
+#: ../src/Core/App.cs:270
+msgid "Search returned no results"
+msgstr ""
+
+#: ../src/Core/App.cs:271
+msgid ""
+"The tag F-Spot is looking for does not exist. Try\n"
+"selecting a different tag in the F-Spot preference\n"
+"dialog."
+msgstr ""
+
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Core/Photo.cs:473
+msgid "Reparented"
+msgstr ""
+
+#: ../src/Core/Photo.cs:473
+#, csharp-format
+msgid "Reparented ({0})"
+msgstr ""
+
+#: ../src/Core/Photo.cs:492
+#, csharp-format
+msgid "Modified"
+msgid_plural "Modified ({0})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1}"
+msgstr ""
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1} ({0})"
+msgstr ""
+
+#. Note that the original version is never stored in the photo_versions table in the
+#. database.
+#: ../src/Core/Photo.cs:671
+#: ../src/f-spot.glade.h:61
+msgid "Original"
+msgstr "Original"
+
+#: ../src/Editors/AutoStretchEditor.cs:17
+msgid "Auto Color"
+msgstr ""
+
+#: ../src/Editors/ColorEditor.cs:38
+msgid "Adjust Colors"
+msgstr ""
+
+#: ../src/Editors/ColorEditor.cs:41
+msgid "Adjust"
+msgstr ""
+
+#: ../src/Editors/CropEditor.cs:35
+msgid "4 x 3 (Book)"
+msgstr ""
+
+#: ../src/Editors/CropEditor.cs:36
+msgid "4 x 6 (Postcard)"
+msgstr "4 x 6 (Postkoort)"
+
+#: ../src/Editors/CropEditor.cs:37
+msgid "5 x 7 (L, 2L)"
+msgstr "5 x 7 (L, 2L)"
+
+#: ../src/Editors/CropEditor.cs:38
+msgid "8 x 10"
+msgstr "8 x 10"
+
+#: ../src/Editors/CropEditor.cs:39
+msgid "Square"
+msgstr ""
+
+#: ../src/Editors/CropEditor.cs:42
+msgid "Crop"
+msgstr ""
+
+#: ../src/Editors/CropEditor.cs:73
+msgid "Select the area that needs cropping."
+msgstr ""
+
+#: ../src/Editors/CropEditor.cs:98
+msgid "No Constraint"
+msgstr ""
+
+#: ../src/Editors/CropEditor.cs:99
+msgid "Same as photo"
+msgstr ""
+
+#: ../src/Editors/CropEditor.cs:104
+msgid "Custom Ratios..."
+msgstr ""
+
+#: ../src/Editors/DesaturateEditor.cs:17
+msgid "Desaturate"
+msgstr ""
+
+#: ../src/Editors/RedEyeEditor.cs:19
+msgid "Red-eye Reduction"
+msgstr ""
+
+#: ../src/Editors/RedEyeEditor.cs:21
+msgid "Fix!"
+msgstr "Fix!"
+
+#: ../src/Editors/RedEyeEditor.cs:25
+msgid "Select the eyes you wish to fix."
+msgstr ""
+
+#: ../src/Editors/SepiaEditor.cs:17
+msgid "Sepia Tone"
+msgstr ""
+
+#: ../src/Editors/SoftFocusEditor.cs:32
+msgid "Soft Focus"
+msgstr ""
+
+#: ../src/Editors/TiltEditor.cs:30
+msgid "Straighten"
+msgstr ""
+
+#: ../src/FileImportBackend.cs:288
+msgid "Import error"
+msgstr ""
+
+#: ../src/FileImportBackend.cs:289
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr ""
+
+#: ../src/Filters/ResizeFilter.cs:70
+#: ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr ""
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr ""
+
+#: ../src/FSpot.addin.xml.h:1
+msgid "Copy Photo Locat_ion"
+msgstr ""
+
+#: ../src/FSpot.addin.xml.h:2
+msgid "Export to"
+msgstr "Exporteren nah"
+
+#: ../src/FSpot.addin.xml.h:3
+msgid "Open _With"
+msgstr "Brede _opmaken"
+
+#: ../src/FSpot.addin.xml.h:4
+#: ../src/ui/main_window.ui.h:15
+msgid "Rem_ove Tag"
+msgstr "Slötelwoord _löschen"
+
+#: ../src/FSpot.addin.xml.h:5
+#: ../src/f-spot.glade.h:68
+#: ../src/SingleView.cs:438
+#: ../src/ui/main_window.ui.h:16
+msgid "Rotate _Left"
+msgstr "Nah _links dreihn"
+
+#: ../src/FSpot.addin.xml.h:6
+#: ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:439
+#: ../src/ui/main_window.ui.h:17
+msgid "Rotate _Right"
+msgstr "Nah _rechts dreihn"
+
+#: ../src/FSpot.addin.xml.h:7
+msgid "Tools"
+msgstr "Warktüüg"
+
+#: ../src/FSpot.addin.xml.h:8
+#: ../src/ui/main_window.ui.h:32
+msgid "_Attach Tag"
+msgstr ""
+
+#: ../src/FSpot.addin.xml.h:9
+#: ../src/ui/main_window.ui.h:41
+msgid "_Delete From Drive"
+msgstr ""
+
+#: ../src/FSpot.addin.xml.h:10
+#: ../src/ui/main_window.ui.h:59
+msgid "_Remove From Catalog"
+msgstr ""
+
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr ""
+
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
+
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
+
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
+
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Gröte</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Tosammenfaten</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Döörschienen Deels</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:21
+msgid "<small><i>Enable this to allow interpolation on zoomed images. You shouldn't disable this for viewing photos, but disabling the interpolation could be usefull in icon design.</i></small>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:22
+msgid "<small><i>You can choose how to display transparent parts in images. This option has no effect on photos, but setting this as check pattern or custom color could be usefull when viewing icons or other artworks with transparent parts.</i></small>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "As _Achtergrund"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr ""
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr ""
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Slötelwöör anhangen:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Slötelwoord anhangen:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "K_ontrast:"
+
+#: ../src/f-spot.glade.h:31
+msgid "Camera Selection"
+msgstr "Knippkassenutwahl"
+
+#: ../src/f-spot.glade.h:32
+msgid "Copy files to the Photos folder"
+msgstr ""
+
+#: ../src/f-spot.glade.h:33
+msgid "Create Mail"
+msgstr "E-Post erstellen"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create _icon for this tag when first used"
+msgstr ""
+
+#: ../src/f-spot.glade.h:35
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr ""
+
+#: ../src/f-spot.glade.h:36
+msgid "Detect duplicates"
+msgstr ""
+
+#: ../src/f-spot.glade.h:37
+msgid "Display File _Names"
+msgstr ""
+
+#: ../src/f-spot.glade.h:38
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr ""
+
+#: ../src/f-spot.glade.h:39
+msgid "Do not send a mail"
+msgstr "Keene E-Post sennen"
+
+#: ../src/f-spot.glade.h:40
+msgid "E-_Mail:"
+msgstr "E-_Post"
+
+#: ../src/f-spot.glade.h:41
+msgid "E_xport titles and comments"
+msgstr ""
+
+#: ../src/f-spot.glade.h:42
+msgid "Estimated new size"
+msgstr ""
+
+#: ../src/f-spot.glade.h:44
+msgid "Extra large"
+msgstr ""
+
+#: ../src/f-spot.glade.h:45
+msgid "F-Spot View"
+msgstr "F-Spot Ansicht"
+
+#: ../src/f-spot.glade.h:47
+msgid "Filter on selected rolls"
+msgstr ""
+
+#: ../src/f-spot.glade.h:48
+msgid "G_allery:"
+msgstr "G_allerie:"
+
+#: ../src/f-spot.glade.h:49
+msgid "Gallery"
+msgstr "Gallerie"
+
+#: ../src/f-spot.glade.h:50
+#: ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Importeren"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:52
+msgid "Import Source:"
+msgstr "Well importeren:"
+
+#: ../src/f-spot.glade.h:53
+msgid "Include subfolders"
+msgstr ""
+
+#: ../src/f-spot.glade.h:54
+msgid "Large"
+msgstr ""
+
+#: ../src/f-spot.glade.h:55
+msgid "Manage your custom selection ratios"
+msgstr ""
+
+#: ../src/f-spot.glade.h:56
+msgid "Medium"
+msgstr ""
+
+#: ../src/f-spot.glade.h:58
+msgid "Number of photos in selected rolls:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of pictures"
+msgstr "Billertaal"
+
+#: ../src/f-spot.glade.h:60
+msgid "Open _Folder..."
+msgstr "_Verteeknis opmaken..."
+
+#: ../src/f-spot.glade.h:62
+msgid "Original size (possible very large file size)"
+msgstr ""
+
+#: ../src/f-spot.glade.h:63
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:64
+msgid "Pause"
+msgstr "Middag"
+
+#: ../src/f-spot.glade.h:65
+msgid "Preferences"
+msgstr "Instellens"
+
+#: ../src/f-spot.glade.h:66
+#: ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Torügg"
+
+#: ../src/f-spot.glade.h:67
+msgid "Repair"
+msgstr "Wedderherstellen"
+
+#: ../src/f-spot.glade.h:70
+msgid "Select Photos to Copy From Camera..."
+msgstr ""
+
+#: ../src/f-spot.glade.h:71
+msgid "Select a Tag..."
+msgstr "Slötelwoord utwählen..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select the camera from which you want to transfer files"
+msgstr ""
+
+#: ../src/f-spot.glade.h:73
+msgid "Selected Camera: "
+msgstr ""
+
+#: ../src/f-spot.glade.h:74
+msgid "Selection Constraints"
+msgstr ""
+
+#: ../src/f-spot.glade.h:75
+#: ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr ""
+
+#: ../src/f-spot.glade.h:76
+msgid "Show all photos."
+msgstr ""
+
+#: ../src/f-spot.glade.h:77
+msgid "Show or hide the side pane"
+msgstr ""
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the toolbar"
+msgstr ""
+
+#: ../src/f-spot.glade.h:79
+msgid "Side _pane"
+msgstr ""
+
+#: ../src/f-spot.glade.h:80
+msgid "Small"
+msgstr "Lütt"
+
+#: ../src/f-spot.glade.h:81
+msgid "Specify if an original size picture should be rotated or not. Smaller sizes are automatically rotated."
+msgstr ""
+
+#: ../src/f-spot.glade.h:82
+msgid "Strip image _metadata"
+msgstr ""
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:84
+msgid "Te_mp:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:85
+msgid "Tiny"
+msgstr ""
+
+#: ../src/f-spot.glade.h:86
+msgid "Total original size"
+msgstr ""
+
+#: ../src/f-spot.glade.h:87
+#: ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "_Gröter maken"
+
+#: ../src/f-spot.glade.h:88
+#: ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "_Lütter maken"
+
+#: ../src/f-spot.glade.h:89
+#: ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Gröter maken"
+
+#: ../src/f-spot.glade.h:90
+#: ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Lütter maken"
+
+#: ../src/f-spot.glade.h:91
+msgid "_Brightness:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_E-Post erstellen"
+
+#: ../src/f-spot.glade.h:94
+#: ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "_Bewarken"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100
+#: ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "_Fullbill"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Gallerie"
+
+#: ../src/f-spot.glade.h:102
+#: ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "_Hölp"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr ""
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Nejes Finster"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr ""
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr ""
+
+#: ../src/f-spot.glade.h:108
+#: ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Bill"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr ""
+
+#: ../src/f-spot.glade.h:112
+#: ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr ""
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr ""
+
+#: ../src/f-spot.glade.h:114
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "_Slötelwoordnaam:"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "_Warktüügbalken"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118
+#: ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "_Ansicht"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "_Virtuelles Dateisystem"
+
+#: ../src/f-spot.glade.h:120
+#: ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "un"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"bi\n"
+"achter\n"
+"twüschen"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
+
+#: ../src/FullScreenView.cs:58
+msgid "Hide"
+msgstr "Verbargen"
+
+#: ../src/FullScreenView.cs:60
+msgid "Hide Toolbar"
+msgstr "Warktüügbalken verbargen"
+
+#: ../src/FullScreenView.cs:66
+msgid "Info"
+msgstr "Info"
+
+#: ../src/FullScreenView.cs:68
+#: ../src/Widgets/InfoBox.cs:201
+msgid "Image Information"
+msgstr "Billinformatschoon"
+
+#: ../src/FullScreenView.cs:73
+msgid "Exit fullscreen"
+msgstr "Fullbill sluten"
+
+#: ../src/FullScreenView.cs:81
+#: ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
+msgid "Slideshow"
+msgstr ""
+
+#: ../src/FullScreenView.cs:82
+msgid "Start slideshow"
+msgstr ""
+
+#: ../src/FullScreenView.cs:128
+msgid "Slide transition:"
+msgstr ""
+
+#: ../src/GroupSelector.cs:57
+#: ../src/GroupSelector.cs:58
+msgid "More dates"
+msgstr "Mehr Dage"
+
+#: ../src/GroupSelector.cs:60
+#: ../src/GroupSelector.cs:61
+msgid "More"
+msgstr "Mehr"
+
+#: ../src/GroupSelector.cs:517
+#: ../src/ui/main_window.ui.h:34
+msgid "_Clear Date Range"
+msgstr ""
+
+#: ../src/Imaging/Exif.cs:228
+msgid "Image Directory"
+msgstr ""
+
+#: ../src/Imaging/Exif.cs:230
+msgid "Thumbnail Directory"
+msgstr ""
+
+#: ../src/Imaging/Exif.cs:232
+msgid "Exif Directory"
+msgstr ""
+
+#: ../src/Imaging/Exif.cs:234
+msgid "GPS Directory"
+msgstr ""
+
+#: ../src/Imaging/Exif.cs:236
+msgid "InterOperability Directory"
+msgstr ""
+
+#: ../src/Imaging/Exif.cs:238
+msgid "Unknown Directory"
+msgstr ""
+
+#: ../src/Imaging/ImageFile.cs:117
+msgid "Writing to this file format is not supported"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:145
+msgid "IPTC Information Interchange Model (IIM) Version number"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:147
+msgid "OSI Destination routing information"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:149
+msgid "IPTC file format"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:151
+msgid "Identifies the provider and product"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:153
+msgid "A unique number identifying the envelope"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:155
+msgid "A unique number"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:157
+msgid "The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:159
+msgid "The year, month and day (CCYYMMDD) the service sent the material"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:161
+msgid "The hour, minute and second (HHMMSS) the service sent the material"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:163
+msgid "The character set designation"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:165
+msgid "External globally unique object identifier"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:170
+msgid "Abstract Relationship Method (ARM) identifier"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:172
+msgid "Abstract Relationship Method (ARM) version number."
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:175
+msgid "Number identifying the IIM version this application record uses"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:177
+msgid "Object type reference"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:182
+msgid "Object attribute reference"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:188
+#: ../src/Imaging/IptcFile.cs:192
+msgid "Object name"
+msgstr "Objektnaam"
+
+#: ../src/Imaging/IptcFile.cs:190
+msgid "Status of the objectdata according to the provider"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:194
+msgid "Location within a city or area where the object originates"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:197
+msgid "Name of the city the content is focussing on"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:200
+msgid "Copyright information for"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:203
+msgid "Full name of the country of the focus of the content"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:206
+msgid "Two or three letter ISO3166 code of the country of the focus of the content"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:209
+msgid "Creator of the content"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:212
+msgid "Provider of the object"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:215
+msgid "The title of the author or creator"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:218
+msgid "The person involved in writing, editing or correcting the object data or caption/abstract"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:222
+msgid "Headline of the content"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:225
+msgid "Instructions from the creator to the receiver not covered by other fields"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:228
+msgid "Intellectual genre of the object"
+msgstr ""
+
+#: ../src/Imaging/IptcFile.cs:241
+msgid "Unknown IIM DataSet"
+msgstr ""
+
+#: ../src/ImportCommand.cs:48
+#: ../src/SingleView.cs:344
+msgid "Select Folder"
+msgstr ""
+
+#: ../src/ImportCommand.cs:259
+msgid "(No Cameras Detected)"
+msgstr ""
+
+#: ../src/ImportCommand.cs:404
+#, csharp-format
+msgid "Loading {0} of {1}"
+msgstr ""
+
+#: ../src/ImportCommand.cs:470
+msgid "Done Loading"
+msgstr ""
+
+#: ../src/ImportCommand.cs:684
+msgid "Directory does not exist."
+msgstr ""
+
+#: ../src/ImportCommand.cs:685
+#, csharp-format
+msgid "The directory you selected \"{0}\" does not exist. Please choose a different directory"
+msgstr ""
+
+#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
+#: ../src/ImportCommand.cs:739
+#: ../src/ImportCommand.cs:741
+#: ../src/XmpTagsImporter.cs:89
+msgid "Import Tags"
+msgstr ""
+
+#: ../src/ItemAction.cs:79
+#: ../src/MainWindow.cs:308
+#: ../src/SingleView.cs:71
+msgid "Rotate Left"
+msgstr ""
+
+#: ../src/ItemAction.cs:80
+msgid "Rotate picture left"
+msgstr ""
+
+#: ../src/ItemAction.cs:91
+#: ../src/MainWindow.cs:312
+#: ../src/SingleView.cs:76
+msgid "Rotate Right"
+msgstr ""
+
+#: ../src/ItemAction.cs:92
+msgid "Rotate picture right"
+msgstr ""
+
+#: ../src/ItemAction.cs:103
+msgid "Next picture"
+msgstr "Vor"
+
+#: ../src/ItemAction.cs:124
+msgid "Previous picture"
+msgstr "Torügg"
+
+#: ../src/MainWindow.cs:303
+msgid "Import new images"
+msgstr "Neje Billers importeren"
+
+#: ../src/MainWindow.cs:319
+#: ../src/ui/main_window.ui.h:3
+msgid "Browse"
+msgstr "Nahkieken"
+
+#: ../src/MainWindow.cs:323
+msgid "Browse many photos simultaneously"
+msgstr ""
+
+#: ../src/MainWindow.cs:327
+msgid "Edit Image"
+msgstr "Bill bewarken"
+
+#: ../src/MainWindow.cs:331
+msgid "View and edit a photo"
+msgstr "Bill opwiesen un bewarken"
+
+#: ../src/MainWindow.cs:336
+#: ../src/SingleView.cs:83
+msgid "Fullscreen"
+msgstr "Fullbill"
+
+#: ../src/MainWindow.cs:338
+#: ../src/SingleView.cs:85
+msgid "View photos fullscreen"
+msgstr ""
+
+#: ../src/MainWindow.cs:343
+#: ../src/SingleView.cs:90
+msgid "View photos in a slideshow"
+msgstr ""
+
+#: ../src/MainWindow.cs:358
+msgid "Previous photo"
+msgstr "Torügg"
+
+#: ../src/MainWindow.cs:363
+msgid "Next photo"
+msgstr "Vor"
+
+#: ../src/MainWindow.cs:1518
+msgid "No cameras detected."
+msgstr ""
+
+#: ../src/MainWindow.cs:1519
+msgid "F-Spot was unable to find any cameras attached to this system. Double check that the camera is connected and has power"
+msgstr ""
+
+#: ../src/MainWindow.cs:1558
+msgid "Error connecting to camera"
+msgstr ""
+
+#: ../src/MainWindow.cs:1559
+#, csharp-format
+msgid "Received error \"{0}\" while connecting to camera"
+msgstr ""
+
+#. Translators, The singular case will never happen here.
+#: ../src/MainWindow.cs:1846
+#, csharp-format
+msgid "Merge the selected tag"
+msgid_plural "Merge the {0} selected tags?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:1873
+msgid "This operation will merge the selected tags and any sub-tags into a single tag."
+msgstr ""
+
+#: ../src/MainWindow.cs:1875
+msgid "_Merge Tags"
+msgstr "_Slötelwöör vermengen"
+
+#: ../src/MainWindow.cs:2080
+#, csharp-format
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2082
+#: ../src/SingleView.cs:480
+#, csharp-format
+msgid "{0} Photo"
+msgid_plural "{0} Photos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2085
+#, csharp-format
+msgid " ({0} selected)"
+msgid_plural " ({0} selected)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2166
+msgid "_Ok"
+msgstr "_OK"
+
+#: ../src/MainWindow.cs:2167
+msgid "Error Deleting Picture"
+msgstr ""
+
+#: ../src/MainWindow.cs:2172
+#, csharp-format
+msgid "No permission to delete the file:{1}{0}"
+msgstr ""
+
+#: ../src/MainWindow.cs:2176
+#, csharp-format
+msgid "An error of type {0} occurred while deleting the file:{2}{1}"
+msgstr ""
+
+#: ../src/MainWindow.cs:2208
+#, csharp-format
+msgid "Delete the selected photo permanently?"
+msgid_plural "Delete the {0} selected photos permanently?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2212
+msgid "This deletes all versions of the selected photo from your drive."
+msgid_plural "This deletes all versions of the selected photos from your drive."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2215
+msgid "_Delete photo"
+msgid_plural "_Delete photos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2251
+#, csharp-format
+msgid "Remove the selected photo from F-Spot?"
+msgid_plural "Remove the {0} selected photos from F-Spot?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2256
+msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
+msgstr ""
+
+#: ../src/MainWindow.cs:2257
+msgid "_Remove from Catalog"
+msgstr ""
+
+#: ../src/MainWindow.cs:2320
+#, csharp-format
+msgid "Delete tag \"{0}\"?"
+msgstr ""
+
+#: ../src/MainWindow.cs:2322
+#, csharp-format
+msgid "Delete the {0} selected tags?"
+msgstr ""
+
+#: ../src/MainWindow.cs:2327
+msgid "photo"
+msgid_plural "photos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2329
+#, csharp-format
+msgid "If you delete this tag, the association with {0} {1} will be lost."
+msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2334
+msgid "_Delete tag"
+msgid_plural "_Delete tags"
+msgstr[0] ""
+msgstr[1] ""
+
+#. A Category is not empty. Can not delete it.
+#: ../src/MainWindow.cs:2348
+msgid "Tag is not empty"
+msgstr ""
+
+#: ../src/MainWindow.cs:2349
+#, csharp-format
+msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
+msgstr ""
+
+#: ../src/MainWindow.cs:2781
+msgid "Rotate selected photo left"
+msgid_plural "Rotate selected photos left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2794
+msgid "Rotate selected photo right"
+msgid_plural "Rotate selected photos right"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2805
+#, csharp-format
+msgid "Find _Selected Tag"
+msgid_plural "Find _Selected Tags"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2809
+#, csharp-format
+msgid "Find Selected Tag _With"
+msgid_plural "Find Selected Tags _With"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2850
+msgid "Create New Version?"
+msgid_plural "Create New Versions?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2852
+#, csharp-format
+msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
+msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/MainWindow.cs:2874
+msgid "XCF version"
+msgstr "XCF Verschoon"
+
+#: ../src/MetadataStore.cs:19
+msgid "Creator"
+msgstr "Ersteller"
+
+#: ../src/MetadataStore.cs:20
+msgid "Title"
+msgstr "Titel"
+
+#: ../src/MetadataStore.cs:21
+msgid "Copyright"
+msgstr "Koperschod"
+
+#: ../src/MetadataStore.cs:22
+msgid "Subject and Keywords"
+msgstr ""
+
+#: ../src/MetadataStore.cs:23
+msgid "Compression"
+msgstr ""
+
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
+msgid "Planar Configuration"
+msgstr ""
+
+#: ../src/MetadataStore.cs:31
+msgid "Orientation"
+msgstr ""
+
+#: ../src/MetadataStore.cs:33
+msgid "Photometric Interpretation"
+msgstr ""
+
+#: ../src/MetadataStore.cs:35
+msgid "Resolution Unit"
+msgstr ""
+
+#: ../src/MetadataStore.cs:37
+msgid "Exposure Program"
+msgstr ""
+
+#: ../src/MetadataStore.cs:39
+msgid "Metering Mode"
+msgstr ""
+
+#: ../src/MetadataStore.cs:41
+msgid "Exposure Mode"
+msgstr ""
+
+#: ../src/MetadataStore.cs:43
+msgid "Custom Rendered"
+msgstr ""
+
+#: ../src/MetadataStore.cs:45
+msgid "Components Configuration"
+msgstr ""
+
+#: ../src/MetadataStore.cs:47
+msgid "Light Source"
+msgstr ""
+
+#: ../src/MetadataStore.cs:49
+msgid "Sensing Method"
+msgstr ""
+
+#: ../src/MetadataStore.cs:51
+msgid "Color Space"
+msgstr "Klöörrebeet"
+
+#: ../src/MetadataStore.cs:53
+msgid "White Balance"
+msgstr ""
+
+#: ../src/MetadataStore.cs:55
+msgid "Focal Plane Resolution Unit"
+msgstr ""
+
+#: ../src/MetadataStore.cs:57
+msgid "File Source Type"
+msgstr ""
+
+#: ../src/MetadataStore.cs:59
+msgid "Scene Capture Type"
+msgstr ""
+
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
+msgid "Gain Control"
+msgstr ""
+
+#: ../src/MetadataStore.cs:65
+msgid "Contrast"
+msgstr ""
+
+#: ../src/MetadataStore.cs:67
+msgid "Saturation"
+msgstr ""
+
+#: ../src/MetadataStore.cs:69
+msgid "Sharpness"
+msgstr ""
+
+#: ../src/MetadataStore.cs:71
+msgid "Scene Type"
+msgstr ""
+
+#. Fixme this should really set parent menu
+#. items insensitve
+#: ../src/PhotoTagMenu.cs:74
+msgid "(No Tags)"
+msgstr "(Keene Slötelwöör)"
+
+#: ../src/PhotoVersionCommands.cs:58
+msgid "Create New Version"
+msgstr "Neje Verschoon erstellen"
+
+#: ../src/PhotoVersionCommands.cs:59
+msgid "Name:"
+msgstr "Naam:"
+
+#: ../src/PhotoVersionCommands.cs:63
+msgid "Rename Version"
+msgstr "Verschoon een annern Naam geven"
+
+#: ../src/PhotoVersionCommands.cs:64
+msgid "New name:"
+msgstr "Nejer Naam:"
+
+#: ../src/PhotoVersionCommands.cs:110
+msgid "Could not create a new version"
+msgstr ""
+
+#: ../src/PhotoVersionCommands.cs:111
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to create version \"{1}\""
+msgstr ""
+
+#: ../src/PhotoVersionCommands.cs:138
+msgid "Really Delete?"
+msgstr "Seker löschen?"
+
+#: ../src/PhotoVersionCommands.cs:139
+msgid "Cancel"
+msgstr "Avbreken"
+
+#: ../src/PhotoVersionCommands.cs:140
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../src/PhotoVersionCommands.cs:144
+#, csharp-format
+msgid "Really delete version \"{0}\"?"
+msgstr ""
+
+#: ../src/PhotoVersionCommands.cs:154
+msgid "Could not delete a version"
+msgstr ""
+
+#: ../src/PhotoVersionCommands.cs:155
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
+msgstr ""
+
+#: ../src/PhotoVersionCommands.cs:196
+msgid "Could not rename a version"
+msgstr ""
+
+#: ../src/PhotoVersionCommands.cs:197
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
+msgstr ""
+
+#: ../src/PhotoVersionMenu.cs:66
+#: ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
+msgid "(No Edits)"
+msgstr "(Nix bewarkt)"
+
+#: ../src/PhotoView.cs:167
+#: ../src/UI.Dialog/EditExceptionDialog.cs:38
+msgid "Error editing photo"
+msgstr ""
+
+#: ../src/PhotoView.cs:168
+#: ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr ""
+
+#: ../src/PhotoView.cs:356
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: ../src/Preferences.cs:149
+msgid "Photos"
+msgstr "Billers"
+
+#: ../src/PrintOperation.cs:32
+msgid "Image Settings"
+msgstr "Billinstellens"
+
+#: ../src/QueryWidget.cs:58
+msgid "Find: "
+msgstr "Finnen:"
+
+#: ../src/QueryWidget.cs:63
+msgid "Untagged photos"
+msgstr ""
+
+#: ../src/QueryWidget.cs:71
+msgid "Rated photos"
+msgstr ""
+
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/QueryWidget.cs:80
+msgid "Import roll"
+msgstr ""
+
+#: ../src/QueryWidget.cs:104
+msgid "Clear search"
+msgstr "Sök opklaren"
+
+#: ../src/QueryWidget.cs:111
+msgid "Refresh search"
+msgstr ""
+
+#: ../src/QueryWidget.cs:113
+msgid "No matching photos found"
+msgstr ""
+
+#: ../src/QueryWidget.cs:155
+msgid "Hide _Find Bar"
+msgstr ""
+
+#: ../src/QueryWidget.cs:161
+msgid "Show _Find Bar"
+msgstr ""
+
+#: ../src/RotateCommand.cs:96
+#: ../src/RotateCommand.cs:111
+msgid "Unable to rotate this type of photo"
+msgstr ""
+
+#: ../src/RotateCommand.cs:131
+msgid "Unable to rotate readonly file"
+msgstr ""
+
+#: ../src/RotateCommand.cs:198
+msgid "Rotating photos"
+msgstr ""
+
+#: ../src/RotateCommand.cs:209
+#, csharp-format
+msgid "Rotating photo \"{0}\""
+msgstr ""
+
+#: ../src/RotateCommand.cs:222
+msgid "Directory not found"
+msgstr ""
+
+#: ../src/RotateCommand.cs:242
+#, csharp-format
+msgid "Unable to rotate photo"
+msgid_plural "Unable to rotate {0} photos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/RotateCommand.cs:244
+#, csharp-format
+msgid "The photo could not be rotated because it is on a read only file system or media such as a CDROM. Please check the permissions and try again."
+msgid_plural "{0} photos could not be rotated because they are on a read only file system or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/RotateCommand.cs:271
+#, csharp-format
+msgid "Received error \"{0}\" while attempting to rotate {1}"
+msgstr ""
+
+#: ../src/RotateCommand.cs:276
+msgid "Error while rotating photo."
+msgstr ""
+
+#: ../src/SendEmail.cs:240
+msgid "Preparing email"
+msgstr ""
+
+#: ../src/SendEmail.cs:292
+#, csharp-format
+msgid "Exporting picture \"{0}\""
+msgstr ""
+
+#: ../src/SendEmail.cs:314
+msgid "Error processing image"
+msgstr ""
+
+#: ../src/SendEmail.cs:315
+#, csharp-format
+msgid "An error occured while processing \"{0}\": {1}"
+msgstr ""
+
+#. Send the mail :)
+#: ../src/SendEmail.cs:330
+msgid "my photos"
+msgstr ""
+
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr ""
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr ""
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr ""
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr ""
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr ""
+
+#: ../src/SingleView.cs:73
+msgid "Rotate photo left"
+msgstr ""
+
+#: ../src/SingleView.cs:78
+msgid "Rotate photo right"
+msgstr ""
+
+#: ../src/SingleView.cs:115
+msgid "Folder"
+msgstr "Verteeknis"
+
+#: ../src/SingleView.cs:341
+msgid "Open"
+msgstr "Opmaken"
+
+#: ../src/SingleView.cs:441
+msgid "Set as Background"
+msgstr "As Achtergrund setten"
+
+#: ../src/TagCommands.cs:96
+#: ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
+msgid "This name is already in use"
+msgstr ""
+
+#: ../src/TagCommands.cs:144
+msgid "Create New Tag"
+msgstr ""
+
+#: ../src/TagCommands.cs:145
+msgid "Name of New Tag:"
+msgstr ""
+
+#: ../src/TagPopup.cs:26
+#, csharp-format
+msgid "Find"
+msgid_plural "Find"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/TagPopup.cs:36
+#: ../src/Widgets/TagMenu.cs:91
+msgid "Create New Tag..."
+msgstr ""
+
+#: ../src/TagPopup.cs:42
+msgid "Edit Selected Tag..."
+msgstr ""
+
+#: ../src/TagPopup.cs:46
+msgid "Delete Tag"
+msgid_plural "Delete Tags"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/TagPopup.cs:52
+msgid "Attach Tag to Selection"
+msgid_plural "Attach Tags to Selection"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/TagPopup.cs:56
+msgid "Remove Tag From Selection"
+msgid_plural "Remove Tags From Selection"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/TagPopup.cs:62
+msgid "Merge Tags"
+msgstr ""
+
+#: ../src/TagQueryWidget.cs:34
+#, csharp-format
+msgid "Include Photos Tagged \"{0}\""
+msgstr ""
+
+#: ../src/TagQueryWidget.cs:39
+#, csharp-format
+msgid "Exclude Photos Tagged \"{0}\""
+msgstr ""
+
+#: ../src/TagQueryWidget.cs:44
+msgid "Remove From Search"
+msgstr ""
+
+#: ../src/TagQueryWidget.cs:88
+#, csharp-format
+msgid "Find _With"
+msgid_plural "Find _With"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/TagQueryWidget.cs:114
+msgid "All"
+msgstr ""
+
+#: ../src/TagQueryWidget.cs:149
+#: ../src/Term.cs:592
+#, csharp-format
+msgid "Not {0}"
+msgstr ""
+
+#: ../src/TagQueryWidget.cs:278
+msgid "Drag tags here to search for them"
+msgstr ""
+
+#: ../src/TagSelectionWidget.cs:497
+msgid "Error renaming tag"
+msgstr ""
+
+#: ../src/TagStore.cs:203
+msgid "Favorites"
+msgstr "Leevste"
+
+#: ../src/TagStore.cs:208
+msgid "Hidden"
+msgstr "Verbargt"
+
+#: ../src/TagStore.cs:216
+msgid "People"
+msgstr "Lüüd"
+
+#: ../src/TagStore.cs:221
+msgid "Places"
+msgstr "Orte"
+
+#: ../src/TagStore.cs:226
+msgid "Events"
+msgstr ""
+
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/TagStore.cs:239
+#: ../src/Widgets/InfoBox.cs:409
+msgid "(None)"
+msgstr "(Keen)"
+
+#: ../src/Term.cs:298
+msgid " and "
+msgstr "un"
+
+#. operators.Add (Catalog.GetString (" && "));
+#: ../src/Term.cs:300
+msgid ", "
+msgstr ","
+
+#: ../src/Term.cs:356
+msgid " or "
+msgstr " or"
+
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Term.cs:380
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
+msgid "or"
+msgstr "or"
+
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr ""
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr ""
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
+msgid "Photo management for GNOME"
+msgstr "Billeroppassens för GNOME"
+
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr ""
+
+#: ../src/UI.Dialog/AboutDialog.cs:100
+msgid "translator-credits"
+msgstr "Nils-Christoph Fiedler <fiedler at medienkompanie.de>"
+
+#: ../src/UI.Dialog/AboutDialog.cs:105
+msgid "F-Spot Website"
+msgstr "F-Spot Netsiet"
+
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
+#, csharp-format
+msgid "Shift all photos by {0}"
+msgstr ""
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "Vandag"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "Güstern"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "Leste 7 Dage"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "Leste 30 Dage"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "Leste 90 Dage"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "Leste 360 Dage"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "Düsse Weeken (Mon-Sün)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "Leste Weeken (Mon-Sün)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr ""
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr ""
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr ""
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr ""
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr ""
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr ""
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
+msgstr ""
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "Fehlerdetails"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr ""
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:53
+#: ../src/UI.Dialog/PreferenceDialog.cs:71
+msgid "None"
+msgstr "Keen"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:55
+msgid "System profile"
+msgstr "Systemtogang"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:84
+msgid "Standard theme"
+msgstr "Standardthema"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr ""
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#, csharp-format
+msgid "F-Spot encountered an error while loading the photo database. The old database has be moved to {0} and a new database has been created."
+msgstr ""
+
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr ""
+
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr ""
+
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "Nohmal versöken"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Aktschoon</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Tied instellen"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Dag instellen:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Aktueller Dag:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "Unnerscheed:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>Enndag</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr ""
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr ""
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Slötelwoord bewarken"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Utblick</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Keen _Bill"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "F-Spot Instellens"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-Spot Utsehn"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Verteeknis utwöhlen"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr ""
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "Grupperen _nah"
+
+#: ../src/ui/main_window.ui.h:4
+msgid "By _Date"
+msgstr "Nah _Dag"
+
+#: ../src/ui/main_window.ui.h:5
+msgid "By _Import Roll"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:6
+msgid "By _Rating"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy Locat_ion"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:8
+msgid "Create New _Tag..."
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:9
+msgid "Create _New Version..."
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:11
+msgid "Fin_d"
+msgstr "F_innen"
+
+#: ../src/ui/main_window.ui.h:12
+msgid "Manage _Extensions"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "_Sieteninstellens..."
+
+#: ../src/ui/main_window.ui.h:14
+msgid "Re_fresh Thumbnail"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "_Allens markeren"
+
+#: ../src/ui/main_window.ui.h:19
+msgid "Select _None"
+msgstr "_Nix utwählen"
+
+#: ../src/ui/main_window.ui.h:20
+msgid "Send by _Mail..."
+msgstr "As _E-Post sennen..."
+
+#: ../src/ui/main_window.ui.h:22
+msgid "Side_bar"
+msgstr "_Sietenbalken"
+
+#: ../src/ui/main_window.ui.h:23
+msgid "T_ags"
+msgstr "_Slötelwöör"
+
+#: ../src/ui/main_window.ui.h:25
+msgid "Thumbnail _elements"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:26
+msgid "Too_lbar"
+msgstr "Warktüüg_balken"
+
+#: ../src/ui/main_window.ui.h:27
+msgid "View"
+msgstr "Ansicht"
+
+#: ../src/ui/main_window.ui.h:33
+msgid "_Attach Tag to Selection"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:35
+msgid "_Clear Rating Filter"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:36
+msgid "_Clear Roll Filter"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:38
+msgid "_Components"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:39
+msgid "_Contents"
+msgstr "_Inholls"
+
+#: ../src/ui/main_window.ui.h:40
+msgid "_Dates"
+msgstr "_Dage"
+
+#: ../src/ui/main_window.ui.h:42
+msgid "_Delete Selected Tag"
+msgstr "Utwähltes Slötelwoord _löschen"
+
+#: ../src/ui/main_window.ui.h:43
+msgid "_Delete Version"
+msgstr "Verschoon _löschen"
+
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Selected Tag..."
+msgstr "Utwähltes Slötelwoord _bewarken..."
+
+#: ../src/ui/main_window.ui.h:46
+msgid "_Export to"
+msgstr "_Exporteren nah"
+
+#: ../src/ui/main_window.ui.h:47
+msgid "_Filmstrip"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:50
+msgid "_Hidden"
+msgstr "_Verbargt"
+
+#: ../src/ui/main_window.ui.h:51
+msgid "_Import..."
+msgstr "_Importeren..."
+
+#: ../src/ui/main_window.ui.h:52
+msgid "_Large"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:53
+msgid "_Last Import Roll"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:55
+msgid "_Medium"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:57
+msgid "_Quit"
+msgstr "_Sluten"
+
+#: ../src/ui/main_window.ui.h:58
+msgid "_Ratings"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:60
+msgid "_Remove Tag From Selection"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:61
+msgid "_Rename Version"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:63
+msgid "_Select Import Rolls..."
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:64
+msgid "_Set Date Range..."
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:65
+msgid "_Set Rating filter..."
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:66
+msgid "_Sharpen..."
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:68
+msgid "_Small"
+msgstr "_Lütt"
+
+#: ../src/ui/main_window.ui.h:69
+msgid "_Tag Icons"
+msgstr ""
+
+#: ../src/ui/main_window.ui.h:70
+msgid "_Tags"
+msgstr "_Slötelwöör"
+
+#: ../src/ui/main_window.ui.h:71
+msgid "_Timeline"
+msgstr "_Tiedbalken"
+
+#: ../src/ui/main_window.ui.h:72
+msgid "_Tools"
+msgstr "_Warktüüg"
+
+#: ../src/ui/main_window.ui.h:73
+msgid "_Untagged Photos"
+msgstr "_Billers ohn Slötelwöör"
+
+#: ../src/ui/main_window.ui.h:74
+msgid "_Version"
+msgstr "_Verschoon"
+
+#: ../src/Updater.cs:616
+msgid "Updating F-Spot Database"
+msgstr ""
+
+#: ../src/Updater.cs:617
+msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
+msgstr ""
+
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Sieteninstellens"
+
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Wedderholen"
+
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr ""
+
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Gröte"
+
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr ""
+
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr ""
+
+#: ../src/Widgets/EditorPage.cs:29
+#: ../src/Widgets/Sidebar.cs:62
+msgid "Edit"
+msgstr "Bewarken"
+
+#: ../src/Widgets/EditorPage.cs:197
+msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
+msgstr ""
+
+#: ../src/Widgets/EditorPage.cs:215
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/Widgets/EditorPage.cs:217
+#, csharp-format
+msgid "Received exception \"{0}\". Note that you have to develop RAW files into JPEG before you can edit them."
+msgstr ""
+
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Horizontal"
+
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "_Vertikal"
+
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Finnen:"
+
+#: ../src/Widgets/FolderTreePage.cs:21
+msgid "Folders"
+msgstr "Verteeknisse"
+
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Dateisystem"
+
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Verschoon"
+
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Dag"
+
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Dateigröte"
+
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:390
+#: ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:418
+#: ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451
+#: ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Unbekannt)"
+
+#: ../src/Widgets/InfoBox.cs:561
+#, csharp-format
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:620
+#, csharp-format
+msgid "{0} Photos"
+msgstr ""
+
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:645
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Billnaam opwiesen"
+
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Dag opwiesen"
+
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Gröte opwiesen"
+
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr ""
+
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Knippkassen opwiesen"
+
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Dateigröte opwiesen"
+
+#: ../src/Widgets/MetadataDisplay.cs:23
+msgid "Metadata"
+msgstr "Metadaten"
+
+#: ../src/Widgets/MetadataDisplay.cs:104
+msgid "Extended Metadata"
+msgstr ""
+
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:392
+msgid "No Extended Metadata Available"
+msgstr ""
+
+#: ../src/Widgets/MetadataDisplay.cs:410
+msgid "No active photo"
+msgstr ""
+
+#: ../src/Widgets/MetadataDisplay.cs:412
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr ""
+
+#: ../src/Widgets/MetadataDisplay.cs:415
+msgid "No metadata available"
+msgstr ""
+
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr ""
+
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr ""
+
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Land"
+
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "Stadt"
+
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Staat"
+
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr ""
+
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot Billers"
+
diff --git a/po/or.po b/po/or.po
index 57a53a3..6cc9bc4 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: f-spot.master.or\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&component=General\n"
"POT-Creation-Date: 2009-10-13 20:41+0000\n"
-"PO-Revision-Date: 2009-10-28 19:08+0530\n"
+"PO-Revision-Date: 2009-10-31 21:42+0530\n"
"Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
"Language-Team: Oriya <oriya-it at googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -22,6 +22,11 @@ msgstr ""
"\n"
"\n"
"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
"X-Generator: KBabel 1.11.4\n"
#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
@@ -238,6 +243,11 @@ msgid ""
"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
"re-use it on future Facebook exports."
msgstr ""
+"F-Spot ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ବ୍ରାଉଜରକୁ ଆରମ୍ଭ କରିବ ଯାହାଫଳରେ ଆପଣ Facebook ରେ ଲଗଇନ କରିପାରିବେ।\n"
+"\n"
+"ଥରେ ଆପଣ Facebook ଦ୍ୱାରା ନିର୍ଦ୍ଦେଶିତ ହୋଇସାରିବା ପରେ ଏହି ପ୍ରୟୋଗକୁ ଫେରିଆସନ୍ତୁ, ତଳେ \"Ok"
+"\" ଉପରେ କ୍ଲିକ କରନ୍ତୁ। ଯଦି ସମ୍ଭବ ହୁଏ, F-Spot ଆପଣଙ୍କର ଅଧିବେଶନକୁ gnome-keyring କ୍ୟାଶେରେ ରଖିବ, ଏବଂ"
+"ଭବିଷ୍ୟତରେ Facebook ରପ୍ତାନି ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରନ୍ତୁ।"
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
msgid "Authenticating..."
@@ -386,6 +396,8 @@ msgid ""
"Return to this window after you have finished the authorization process on "
"{0} and click the \"Complete Authorization\" button below"
msgstr ""
+"{0} ଉପରେ ପ୍ରାଧିକରଣ ପ୍ରକ୍ରିୟା ସମାପ୍ତ କରିସାରିବା ପରେ ଏହି ୱିଣ୍ଡୋକୁ ଫେରିଆସନ୍ତୁ ଏବଂ "
+"ତଳେଥିବା \"Complete Authorization\" ବଟନକୁ କ୍ଲିକ କରନ୍ତୁ"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
msgid "Complete Authorization"
@@ -494,6 +506,9 @@ msgid ""
"account. Press the \"Authorize\" button to open a web browser and give F-"
"Spot the authorization. "
msgstr ""
+"F-Spot {0} ଖାତାରେ ଫୋଟୋ ଧାରଣ କରିବା ପାଇଁ ଆପଣଙ୍କର ଅନୁମତି ଆବଶ୍ୟକ "
+"କରିଥାଏ। ଗୋଟିଏ ୱେବ ବ୍ରାଉଜର ଖୋଲିବା ପାଇଁ \"Authorize\" ବଟନକୁ ଦବାନ୍ତୁ ଏବଂ "
+"F-Spot କୁ ଅଧିକାର ପ୍ରଦାନ କରନ୍ତୁ। "
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
msgid "Ignore _top level tags"
@@ -690,6 +705,8 @@ msgid ""
"Cannot connect to a Gallery for which the version is unknown.\n"
"Please check that you have Remote plugin 1.0.8 or later"
msgstr ""
+"ଗ୍ୟାଲେରୀ ସହିତ ସଂଯୁକ୍ତ ହୋଇପାରିବେ ନାହିଁ ଯାହା ପାଇଁ ସଂସ୍କରଣଟି ଜଣା ଅଛି।\n"
+"ଦୟାକରି ଯାଞ୍ଚକରନ୍ତୁ ଯେ ଆପଣଙ୍କ ପାଖରେ ସୁଦୂର ପ୍ଲଗଇନ 1.0.8 ଅଥବା ପରିବର୍ତ୍ତିଟି ଅଛି"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
msgid "Invalid URL"
@@ -722,6 +739,8 @@ msgid ""
"There is already a Gallery with the same name in your registered Galleries. "
"Please choose a unique name."
msgstr ""
+"ଆପଣଙ୍କର ଗ୍ୟାଲେରୀଗୁଡ଼ିକରେ ପୂର୍ବରୁ ସମାନ ନାମ ବିଶିଷ୍ଟ ଗୋଟିଏ ଗ୍ୟାଲେରୀ ଅଛି। "
+"ଦୟାକରି ଗୋଟିଏ ପୃଥକ ନାମ ବାଛନ୍ତୁ।"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
msgid "(TopLevel)"
@@ -870,6 +889,9 @@ msgid ""
"requested operation:\n"
"{0} ({1})"
msgstr ""
+"ଅନୁରୋଧ କରାଯାଇଥିବା ପ୍ରୟୋଗକୁ କାର୍ଯ୍ୟକାରୀ କରିବା ପାଇଁ ପ୍ରୟାସ କରିବା ସମୟରେ ନିମ୍ନଲିଖିତ "
+"ତ୍ରୁଟି ପରିଲକ୍ଷିତ ହୋଇଥିଲା:\n"
+"{0} ({1})"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
msgid "_PicasaWeb..."
@@ -928,6 +950,9 @@ msgid ""
"Enter the letters as they are shown in the image in\n"
"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
msgstr ""
+"ଦୟାକରି ଯାଞ୍ଚକରନ୍ତୁ ଯେ ଏହି ଗ୍ୟାଲେରୀ ପାଇଁ ବିନ୍ୟାସଟି ସଠିକ ଅଛି।\n"
+"ଅକ୍ଷରଗୁଡ଼ିକୁ ଭରଣ କରନ୍ତୁ ଯେପରି ସେଗୁଡ଼ିକୁ 'Captcha' କ୍ଷେତ୍ରର ପ୍ରତିଛବିରେ\n"
+"ଦର୍ଶାଯାଇଛି। <i>ଅକ୍ଷରଗୁଡ଼ିକ ଅକ୍ଷର ନିର୍ଦ୍ଦିଷ୍ଟ ନୁହଁ</i>"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
@@ -1002,6 +1027,8 @@ msgid ""
"This tool requires an active selection. Please select one or more pictures "
"and try again"
msgstr ""
+"ଏହି ସାଧନଟି ଗୋଟିଏ ସକ୍ରିୟ ଚୟନ ଆବଶ୍ୟକ କରିଥାଏ। ଦୟାକରି ଗୋଟିଏ କିମ୍ବା ଅନେକ ଛବି ବାଛନ୍ତୁ ଏବଂ "
+"ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ"
#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
msgid "Select export folder"
@@ -1039,11 +1066,14 @@ msgid ""
"needs to analyze your image collection. This is not done by default as it's "
"time consuming. You can Start or Pause this update process using this dialog."
msgstr ""
+"ଛବିଗୁଡ଼ିକରେ ନକଲିଗୁଡ଼ିକୁ ଚିହ୍ନିବା ପାଇଁ 0.5.0 ପୂର୍ବରୁ ଆମଦାନୀ କରିଛନ୍ତି, F-Spot "
+"ଆପଣଙ୍କର ଛବି ସଂଗ୍ରହକୁ ବିଶ୍ଳେଷଣ କରିବା ଆବଶ୍ୟକ। ଏହା ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ କରାଯାଇନଥାଏ ଯେପରି "
+"ଏହା ଅଧିକ ସମୟ ନେଇଥାଏ। ଏହି ସଂଳାପକୁ ବ୍ୟବହାର କରି ଆପଣ ଅଦ୍ୟତନ ପ୍ରକ୍ରିୟାକୁ ଆରମ୍ଭ ଅଥବା ସ୍ଥିର କରିପାରିବେ।"
#: ../extensions/Tools/HashJob/HashJob.cs:59
#, csharp-format
msgid "You currently have {0} photos needing md5 calculation, and {1} pending jobs"
-msgstr ""
+msgstr "ଆପଣଙ୍କ ପାଖରେ ବର୍ତ୍ତମାନ md5 ଗଣନା ଆବଶ୍ୟକ କରି {0} ଟି ଫୋଟୋ ଅଛି, ଏବଂ {1} ଟି ବକୟା କାର୍ଯ୍ୟ ଅଛି"
#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
msgid "_Close"
@@ -1104,12 +1134,16 @@ msgid ""
"<small><i>The gallery stays active until you either deactivate it or close\n"
"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
msgstr ""
+"<small><i>ଗ୍ୟାଲେରୀଟି ସକ୍ରିୟ ରହିଥାଏ ଯେପର୍ଯ୍ୟନ୍ତ ଆପଣ F-Spot କୁ ନିଷ୍କ୍ରିୟ ଅଥବା ବନ୍ଦ ନକରିଛନ୍ତି।\n"
+"ନିଶ୍ଚିତ କରନ୍ତୁ ଯେ ସ୍ଥାନୀୟ ଦର୍ଶକମାନେ HTTP ପ୍ରକ୍ସିକୁ ଏଡ଼ାଇକରି ଏହାକୁ ବ୍ୟବହାର କରିପାରିବେ।</i></small>"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
msgid ""
"<small><i>When the gallery is active, above is the URL you need to open \n"
"on another computer to access the shared photos.</i></small>"
msgstr ""
+"<small><i>ଯେତେବେଳେ ଗ୍ୟାଲେରୀଟି ସକ୍ରିୟ ଥାଏ, ଉପରେ ଆପଣ ଅନ୍ୟ ଏକ କମ୍ପୁଟରରେ ସହଭାଗୀ\n"
+"ଫୋଟୋଗୁଡ଼ିକୁ ଖୋଲିବା ପାଇଁ ଆବଶ୍ୟକ କରୁଥିବା ଗୋଟିଏ URL ଅଛି।</i></small>"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
msgid "Activates and deactivates the web gallery"
@@ -1134,7 +1168,7 @@ msgstr "ଗାଲେରୀ URL:"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
msgid "Limit number of shared photos to"
-msgstr ""
+msgstr "ସହଭାଗୀ ଫୋଟୋଗୁଡ଼ିକୁ ସୀମିତ କରନ୍ତୁ"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
#| msgid "Caption"
@@ -1143,11 +1177,11 @@ msgstr "ବିକଳ୍ପଗୁଡିକ:"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
msgid "Photos with a Tag"
-msgstr ""
+msgstr "ଟ୍ୟାଗ ସହିତ ଫୋଟୋଗୁଡ଼ିକ"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
msgid "Selected Photos"
-msgstr ""
+msgstr "ବଚ୍ଛିତ ଫୋଟୋଗୁଡ଼ିକ"
#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
#| msgid "Sharpen"
@@ -1189,12 +1223,17 @@ msgid ""
"\n"
"Received exception \"{0}\"."
msgstr ""
+"ଆପଣ ବାଛିଥିବା ଫାଇଲଟି ଗୋଟିଏ ବୈଧ କିମ୍ବା ସମର୍ଥିତ ତଥ୍ୟାଧାର ନୁହଁ।\n"
+"\n"
+"ବ୍ୟତିକ୍ରମ ଗ୍ରହଣ କରାହୋଇଛି \"{0}\"."
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
msgid ""
"<small><i>Choose the location of the database you want to import from</i></"
"small>"
msgstr ""
+"<small><i>ଆପଣ ଆମଦାନୀ କରିବାକୁ ତଥ୍ୟାଧାରରୁ ଅବସ୍ଥାନ ବାଛନ୍ତୁ</i></"
+"small>"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
msgid ""
@@ -1205,6 +1244,12 @@ msgid ""
"\"Everything\" will import everything, creating duplicates if you already "
"imported from that database.</i></small>"
msgstr ""
+"<small><i>ବଚ୍ଛିତ dbରୁ କଣ ଆମଦାନୀ କରିବାକୁ ହେବ ତାହା ବାଛନ୍ତୁ।\n"
+"\"କେବଳ ନୂତନ ଭୂମିକାଗୁଡ଼ିକ\" ହେଉଛି ଚତୁର ବିକଳ୍ପ ଯାହାକି ପୂର୍ବ ପ୍ରୟୋଗରେ ପଠାଯାଇଥିବା "
+"ଫୋଟୋଗୁଡ଼ିକୁ ପୁନଃ ପ୍ରେରଣ କରିବାରୁ ଅଟକାଇଥାଏ।\n"
+"\"ଗୋଟିଏ ଆମଦାନୀ ଭୂମିକା\" ଆପଣଙ୍କୁ ବାଛିବାକୁ ଦେଇଥାଏ ଯାହାକୁକି ଆପଣ ପଛରେ ମିଶ୍ରଣ କରିବାକୁ ଚାହାନ୍ତି।\n"
+"\"Everything\" ସବୁଗୁଡ଼ିକୁ ଆମଦାନୀ କରିଥାଏ, ନକଲି ନିର୍ମାଣ କରିଥାଏ ଯଦି ଆପଣ ପୂର୍ବରୁ "
+"ସେହି ତଥ୍ୟାଧାରରୁ ଆମଦାନୀ କରିଥାନ୍ତି।</i></small>"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
msgid ""
@@ -1212,6 +1257,9 @@ msgid ""
"the later, be sure that this location will stay accessible from f-spot.</i></"
"small>"
msgstr ""
+"<small><i>ପ୍ରତିଛବିଗୁଡ଼ିକୁ ସ୍ଥାନିୟ ଭାବରେ ନକଲ କରନ୍ତୁ ଅଥବା ସେଗୁଡ଼ିକ ଯଥାସ୍ଥାନରେ ରଖନ୍ତୁ। ଯଦି ଆପଣ "
+"ପରବର୍ତ୍ତିକୁ ବାଛନ୍ତି, ନିଶ୍ଚିତ ରହନ୍ତୁ ଯେ ଏହି ସ୍ଥାନଟି f-spot ରୁ ଅଭିଗମ୍ୟ ରହିବ।</i></"
+"small>"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
msgid "A Single Import Roll"
@@ -1256,6 +1304,8 @@ msgid ""
"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
" Please select that folder so I can do the mapping.</big>"
msgstr ""
+"<big>ଫାଇଲଗୁଡ଼ିକୁ ଦର୍ଶାଉଥିବା ତଥ୍ୟାଧାର <b>{0}</b> ଫୋଲଡରରେ ଧାରଣ ହୋଇଥାଏ।\n"
+" ଦୟାକରି ସେହି ଫୋଲଡରକୁ ବାଛନ୍ତୁ ଯାହାଫଳରେ ମୁଁ ମେଳାଇପାରିବି।</big>"
#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
msgid "Configure Screensaver"
@@ -1491,64 +1541,68 @@ msgid ""
"There are other extensions that depend on the previous ones which will also "
"be uninstalled:"
msgstr ""
+"ସେଠାରେ ଅନ୍ୟାନ୍ୟ ଅନୁଲଗ୍ନଗୁଡ଼ିକ ଅଛି ଯାହାକି ପୂର୍ବ ଅନୁଲଗ୍ନ ଉପରେ ନିର୍ଭର କରିଥାଏ ଯାହାକୁକି "
+"ବିସ୍ଥାପନ ମଧ୍ଯ କରିହେବ:"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
msgid ""
"The selected extensions can't be installed because there are dependency "
"conflicts."
msgstr ""
+"ବଚ୍ଛିତ ଅନୁଲଗ୍ନଗୁଡ଼ିକୁ ସ୍ଥାପନ କରିପାରିବେ ନାହିଁ କାରଣ ସେଥିରେ ନିର୍ଭୋରକ ମାନଙ୍କ "
+"ମଧ୍ଯରେ ଦ୍ୱନ୍ଦ ଅଛି।"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
msgid "The following packages will be installed:"
-msgstr ""
+msgstr "ନିମ୍ନଲିଖିତ ପ୍ୟାକେଜଗୁଡ଼ିକୁ ସ୍ଥାପନ କରାହେବ:"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
msgid " (in user directory)"
-msgstr ""
+msgstr " (ଚାଳକ ଡିରେକ୍ଟୋରୀରେ)"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
msgid "The following packages need to be uninstalled:"
-msgstr ""
+msgstr "ନିମ୍ନଲିଖିତ ପ୍ୟାକେଜଗୁଡ଼ିକୁ ବିସ୍ଥାପନ କରିବା ଆବଶ୍ୟକ:"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
msgid "The following dependencies could not be resolved:"
-msgstr ""
+msgstr "ନିମ୍ନଲିଖିତ ନିର୍ଭୋରକମାନଙ୍କୁ ସମାଧାନ କରିହେଲା ନାହିଁ:"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
msgid "The installation has been successfully completed."
-msgstr ""
+msgstr "ସ୍ଥାପନ କ୍ରିୟାଟି ସଫଳତାର ସହିତ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି।"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
msgid "The installation failed!"
-msgstr ""
+msgstr "ସ୍ଥାପନ କ୍ରିୟା ବିଫଳ ହୋଇଛି!"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
msgid "The installation has completed with warnings."
-msgstr ""
+msgstr "ସ୍ଥାପନ କ୍ରିୟାଟି ଚେତାବନୀ ସହିତ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି।"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
msgid "The uninstallation has been successfully completed."
-msgstr ""
+msgstr "ବିସ୍ଥାପନ କ୍ରିୟାଟି ସଫଳତାର ସହିତ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି।"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
msgid "The uninstallation failed!"
-msgstr ""
+msgstr "ବିସ୍ଥାପନ କ୍ରିୟାଟି ବିଫଳ ହୋଇଛି!"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
msgid "The uninstallation has completed with warnings."
-msgstr ""
+msgstr "ବିସ୍ଥାପନ କ୍ରିୟାଟି ଚେତାବନୀ ସହିତ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି!"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
msgid "Repository"
-msgstr ""
+msgstr "ସଂଗ୍ରହାଳୟ"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
msgid "Installation cancelled"
-msgstr ""
+msgstr "ସ୍ଥାପନ କ୍ରିୟାଟି ବାତିଲ ହୋଇଛି"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
msgid "Some of the required extensions were not found"
-msgstr ""
+msgstr "କିଛି ଆବଶ୍ୟକୀୟ ଅନୁଲଗ୍ନଗୁଡ଼ିକ ମିଳିଲାନାହିଁ"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
msgid "Installation failed"
@@ -1569,37 +1623,37 @@ msgstr "ଅନ୍ଯାନ୍ଯ"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
msgid "Url"
-msgstr ""
+msgstr "Url"
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
#, csharp-format
msgid "Exception occurred: {0}"
-msgstr ""
+msgstr "ବ୍ୟତିକ୍ରମ ଘଟିଲା: {0}"
#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
msgid "Disabled extensions can't be loaded."
-msgstr ""
+msgstr "ନିଷ୍କ୍ରିୟ ଅନୁଲଗ୍ନଗୁଡ଼ିକୁ ଧାରଣ କରିପାରିବେ ନାହିଁ।"
#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
#, csharp-format
msgid "Loading {0} extension"
-msgstr ""
+msgstr "{0} ଅନୁଲଗ୍ନକୁ ଧାରଣ କରୁଅଛି"
#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
#, csharp-format
msgid "The required extension '{0}' is disabled."
-msgstr ""
+msgstr "ଆବଶ୍ୟକୀୟ ଅନୁଲଗ୍ନ '{0}' କୁ ନିଷ୍କ୍ରିୟ ଅଛି।"
#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
#, csharp-format
msgid "The required extension '{0}' is not installed."
-msgstr ""
+msgstr "ଆବଶ୍ୟକୀୟ ଅନୁଲଗ୍ନ '{0}' ଟି ସ୍ଥାପିତ ହୋଇନାହିଁ।"
#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
#, csharp-format
msgid "(provided by {0})"
-msgstr ""
+msgstr "({0} ଦ୍ୱାରା ପ୍ରଦତ୍ତ)"
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
@@ -1615,38 +1669,38 @@ msgstr "ଫାଇଲ"
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
-msgstr ""
+msgstr "ଟ୍ୟାଗ ବାଛନ୍ତୁ"
#: ../src/CameraFileSelectionDialog.cs:138
msgid "Downloading Previews"
-msgstr ""
+msgstr "ପ୍ରାକଦର୍ଶନଗୁଡ଼ିକୁ ଆହରଣ କରୁଅଛି"
#: ../src/CameraFileSelectionDialog.cs:148
#, csharp-format
msgid "Downloading Preview of {0}"
-msgstr ""
+msgstr "{0} ର ପ୍ରାକଦର୍ଶନକୁ ଆହରଣ କରୁଅଛି"
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
-msgstr ""
+msgstr "ଫାଇଲ {0} ର {1} କୁ ନକଲ କରୁଅଛି"
#: ../src/CameraFileSelectionDialog.cs:235
msgid "Error transferring file"
-msgstr ""
+msgstr "ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ କରିବାରେ ତ୍ରୁଟି"
#: ../src/CameraFileSelectionDialog.cs:244
msgid "Download Complete"
-msgstr ""
+msgstr "ଆହରଣ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି"
#: ../src/CameraFileSelectionDialog.cs:244
msgid "Done Copying Files"
-msgstr ""
+msgstr "ଫାଇଲଗୁଡ଼ିକୁ ନକଲ କରିସାରିଛି"
#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
-msgstr ""
+msgstr "\"{0}\" କୁ କ୍ୟାମେରାରୁ ସ୍ଥାନାନ୍ତରଣ କରିସାରିଛି"
#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
msgid "Camera"
@@ -1659,7 +1713,7 @@ msgstr "ସଂଯୋଗିକୀ"
#: ../src/Core.cs:203
#, csharp-format
msgid "No photos matching {0} found"
-msgstr ""
+msgstr "{0} ସହିତ ମେଳଖାଉଥିବା କୌଣସି ଫୋଟୋ ମିଳୁନାହିଁ"
#: ../src/Core.cs:204
#, csharp-format
@@ -1668,10 +1722,13 @@ msgid ""
"the tag to some photos or selecting a different tag in the\n"
"F-Spot preference dialog."
msgstr ""
+"ଟ୍ୟାଗ \"{0}\" ଟି କୌଣସି ଫୋଟୋରେ ପ୍ରୟୋଗ କରାହୋଇନାହିଁ। ସେହି ଟ୍ୟାଗକୁ\n"
+"କିଛି ଫୋଟୋରେ ଯୋଗକରିବା ପାଇଁ ଚେଷ୍ଟାକରନ୍ତୁ ଅଥବା F-Spot ପସନ୍ଦ ସଂଳାପରେ\n"
+"ଭିନ୍ନ ଏକ ଟ୍ୟାଗ ବାଛିକରି।"
#: ../src/Core.cs:208
msgid "Search returned no results"
-msgstr ""
+msgstr "ସନ୍ଧାନ କୌଣସି ଫଳ ପ୍ରଦାନ କରିଲା ନାହିଁ"
#: ../src/Core.cs:209
msgid ""
@@ -1679,16 +1736,19 @@ msgid ""
"selecting a different tag in the F-Spot preference\n"
"dialog."
msgstr ""
+"ଟ୍ୟାଗ F-Spot ଅବସ୍ଥିତ ନଥିବା ପରି ଲାଗୁଛି। F-Spot ପସନ୍ଦ\n"
+"ସଂଳାପରେ ଭିନ୍ନ ଏକ ଟ୍ୟାଗ ବାଛିକରି\n"
+"ଚେଷ୍ଟାକରନ୍ତୁ।"
#. Note for translators: Reparented is a picture becoming a version of another one
#: ../src/Core/Photo.cs:473
msgid "Reparented"
-msgstr ""
+msgstr "ପ୍ରତିଛବି ପୁନଃସଂସ୍କରଣ"
#: ../src/Core/Photo.cs:473
#, csharp-format
msgid "Reparented ({0})"
-msgstr ""
+msgstr "ପ୍ରତିଛବି ପୁନଃସଂସ୍କରଣ ({0})"
#: ../src/Core/Photo.cs:492
#, csharp-format
@@ -1715,19 +1775,19 @@ msgstr "ମୂଳ"
#: ../src/Editors/AutoStretchEditor.cs:17
msgid "Auto Color"
-msgstr ""
+msgstr "ସ୍ୱୟଂ ରଙ୍ଗିତ"
#: ../src/Editors/ColorEditor.cs:38
msgid "Adjust Colors"
-msgstr ""
+msgstr "ରଙ୍ଗ ସଜାଡନ୍ତୁ"
#: ../src/Editors/ColorEditor.cs:41
msgid "Adjust"
-msgstr ""
+msgstr "ସଜାଡନ୍ତୁ"
#: ../src/Editors/CropEditor.cs:35
msgid "4 x 3 (Book)"
-msgstr ""
+msgstr "4 x 3 (ବହି)"
#: ../src/Editors/CropEditor.cs:36
msgid "4 x 6 (Postcard)"
@@ -1747,23 +1807,23 @@ msgstr "ବର୍ଗାକାର"
#: ../src/Editors/CropEditor.cs:42
msgid "Crop"
-msgstr "କ୍ରପ"
+msgstr "ଫସଲ"
#: ../src/Editors/CropEditor.cs:73
msgid "Select the area that needs cropping."
-msgstr ""
+msgstr "ଫସଲ ଉପୁଯାଇବା ପାଇଁ କ୍ଷେତ୍ର ଚୟନ କରନ୍ତୁ"
#: ../src/Editors/CropEditor.cs:98
msgid "No Constraint"
-msgstr ""
+msgstr "କୌଣସି ଅବରୋଧ ନାହିଁ"
#: ../src/Editors/CropEditor.cs:99
msgid "Same as photo"
-msgstr ""
+msgstr "ଫୋଟୋ ପରି ସମାନ"
#: ../src/Editors/CropEditor.cs:104
msgid "Custom Ratios..."
-msgstr ""
+msgstr "ଇଚ୍ଛାମୁତାବକ ଅନୁପାତ..."
#: ../src/Editors/DesaturateEditor.cs:17
msgid "Desaturate"
@@ -1771,61 +1831,61 @@ msgstr "ଅସିକ୍ତକର"
#: ../src/Editors/RedEyeEditor.cs:19
msgid "Red-eye Reduction"
-msgstr ""
+msgstr "ଲାଲି-ଆଖି ହ୍ରାସ"
#: ../src/Editors/RedEyeEditor.cs:21
msgid "Fix!"
-msgstr ""
+msgstr "ସ୍ଥିର!"
#: ../src/Editors/RedEyeEditor.cs:25
msgid "Select the eyes you wish to fix."
-msgstr ""
+msgstr "ଆପଣ ସ୍ଥିର ରଖିବାକୁ ଚାହୁଁଥିବା ଆଖିଗୁଡ଼ିକୁ ବାଛନ୍ତୁ।"
#: ../src/Editors/SepiaEditor.cs:17
msgid "Sepia Tone"
-msgstr ""
+msgstr "ସେପିଆ ସ୍ୱର"
#: ../src/Editors/SoftFocusEditor.cs:28
msgid "Soft Focus"
-msgstr ""
+msgstr "ନରମ ଲକ୍ଷ୍ଯ"
#: ../src/Editors/TiltEditor.cs:28
msgid "Straighten"
-msgstr ""
+msgstr "ସିଧା କରିବା"
#: ../src/FileImportBackend.cs:288
msgid "Import error"
-msgstr ""
+msgstr "ତ୍ରୁଟି ଆମଦାନି କରନ୍ତୁ"
#: ../src/FileImportBackend.cs:289
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
-msgstr ""
+msgstr "{0}{2}{2}{1} କୁ ଆମଦାନୀ କରିବାରେ ତ୍ରୁଟି"
#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
#, csharp-format
msgid "No way to save files of type \"{0}\""
-msgstr ""
+msgstr "\"{0}\" ପ୍ରକାରର ଫାଇଲଗୁଡିକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ କୌଣସି ଉପାୟ ନାହିଁ"
#: ../src/FormClient.cs:295
msgid "Unhandled exception"
-msgstr ""
+msgstr "ଅନିୟନ୍ତ୍ରିତ ବ୍ୟତିକ୍ରମ"
#: ../src/FSpot.addin.xml.h:1
msgid "Copy Photo Locat_ion"
-msgstr ""
+msgstr "ଫୋଟୋ ଅବସ୍ଥାନକୁ ନକଲ କରନ୍ତୁ (_i)"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
-msgstr ""
+msgstr "କୁ ରପ୍ତାନି କରନ୍ତୁ"
#: ../src/FSpot.addin.xml.h:3
msgid "Open _With"
-msgstr ""
+msgstr "ସହିତ ଖୋଲନ୍ତୁ (_W)"
#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
-msgstr ""
+msgstr "ଟ୍ୟାଗ କାଢ଼ନ୍ତୁ (_o)"
#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
#: ../src/SingleView.cs:451 ../src/ui/main_window.ui.h:16
@@ -1843,7 +1903,7 @@ msgstr "ଟୁଲଗୁଡିକ"
#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
-msgstr ""
+msgstr "ଟ୍ୟାଗ ସଂଲଗ୍ନ କରନ୍ତୁ (_A)"
#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
@@ -1851,7 +1911,7 @@ msgstr "ଡ୍ରାଇଭରୁ ବିଲୋପ କରନ୍ତୁ (_D)"
#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
-msgstr ""
+msgstr "ତାଲିକାରୁ କାଢ଼ନ୍ତୁ (_R)"
#: ../src/f-spot.glade.h:1
msgid " "
@@ -1859,15 +1919,15 @@ msgstr " "
#: ../src/f-spot.glade.h:2
msgid "1024 px"
-msgstr ""
+msgstr "1024 px"
#: ../src/f-spot.glade.h:3
msgid "320 px"
-msgstr ""
+msgstr "320 px"
#: ../src/f-spot.glade.h:4
msgid "480 px"
-msgstr ""
+msgstr "480 px"
#: ../src/f-spot.glade.h:5
msgid "640 px"
@@ -1887,7 +1947,7 @@ msgstr "<b>ସଂଶୋଧନ (_r)</b>"
#: ../src/f-spot.glade.h:13
msgid "<b>Image Interpolation</b>"
-msgstr ""
+msgstr "<b>ପ୍ରତିଛବି ପ୍ରକ୍ଷେପ</b>"
#: ../src/f-spot.glade.h:15
msgid "<b>Size</b>"
@@ -1903,11 +1963,11 @@ msgstr "<b>ସ୍ବଚ୍ଛ ଅଂଶ</b>"
#: ../src/f-spot.glade.h:19
msgid "<b>View all pictures imported</b>"
-msgstr ""
+msgstr "<b>ଆମଦାନୀ କରାଯାଇଥିବା ସମସ୍ତ ଛବିଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ</b>"
#: ../src/f-spot.glade.h:20
msgid "<b>_White Balance</b>"
-msgstr ""
+msgstr "<b>ଧଳା ସନ୍ତୁଳନ (_W)</b>"
#: ../src/f-spot.glade.h:21
msgid ""
@@ -1915,6 +1975,9 @@ msgid ""
"disable this for viewing photos, but disabling the interpolation could be "
"usefull in icon design.</i></small>"
msgstr ""
+"<small><i>ଛୋଟବଡ଼ କରାଯାଇଥିବା ଛବିଗୁଡ଼ିକରେ ପ୍ରକ୍ଷେପଣକୁ ସକ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଆପଣ "
+"ଫୋଟୋଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ ଏହାକୁ ନିଷ୍କ୍ରିୟ କରିବା ଉଚିତ ନୁହଁ, କିନ୍ତୁ ପ୍ରକ୍ଷେପଣକୁ ନିଷ୍କ୍ରିୟ କରିବା ଫଳରେ "
+"ଚିତ୍ର ସଂକେତ ସଂରଚନାରେ ଏହା ଫଳପ୍ରଦ ହୋଇପାରିବ।</i></small>"
#: ../src/f-spot.glade.h:22
msgid ""
@@ -1923,6 +1986,10 @@ msgid ""
"color could be usefull when viewing icons or other artworks with transparent "
"parts.</i></small>"
msgstr ""
+"<small><i>ଛବିରେ ସ୍ୱଚ୍ଛ ଅଂଶକୁ କିପରି ଦର୍ଶାଯିବ ତାହା ଆପଣ ବାଛିପାରିବେ। ଏହି "
+"ବିକଳ୍ପର ଫୋଟ ଉପରେ କୌଣସି ପ୍ରଭାବ ପଡ଼ିନଥାଏ, କିନ୍ତୁ ଏହାକୁ ଯାଞ୍ଚ ପ୍ରକାର ଅଥବା ଇଚ୍ଛାମୁତାବକ ରଙ୍ଗ ଭାବରେ "
+"ସେଟ କରିବା ଫଳରେ ଅଥବା ଚିତ୍ରସଂକେତ ଅଥବା ଅନ୍ୟାନ୍ୟ ସ୍ୱଚ୍ଛ ଅଂଶ ବିଶିଷ୍ଟ ଚିତ୍ରକଳା ଦେଖିବା ସମୟରେ "
+"ଉପଯୋଗୀ ହୋଇପାରେ।</i></small>"
#: ../src/f-spot.glade.h:23
msgid "As _background"
@@ -1930,7 +1997,7 @@ msgstr "ପୃଷ୍ଠଭୂମି ରୂପେ (_b)"
#: ../src/f-spot.glade.h:24
msgid "As _custom color: "
-msgstr ""
+msgstr "ଇଚ୍ଛାମୁତାବକ ରଙ୍ଗ ପରି (_c): "
#: ../src/f-spot.glade.h:25
msgid "As check _pattern"
@@ -1938,11 +2005,11 @@ msgstr "ଯାଞ୍ଚ ନମୁନା ରୂପେ (_p)"
#: ../src/f-spot.glade.h:26
msgid "Attach Tags:"
-msgstr ""
+msgstr "ଟ୍ୟାଗଗୁଡ଼ିକୁ ସଂଲଗ୍ନ କରନ୍ତୁ:"
#: ../src/f-spot.glade.h:27
msgid "Attach tag:"
-msgstr ""
+msgstr "ଟ୍ୟାଗ ସଂଲଗ୍ନ କରନ୍ତୁ:"
#: ../src/f-spot.glade.h:29
msgid "CD"
@@ -1950,55 +2017,55 @@ msgstr "CD"
#: ../src/f-spot.glade.h:30
msgid "C_ontrast:"
-msgstr ""
+msgstr "ବୈଷମ୍ୟ (_o):"
#: ../src/f-spot.glade.h:31
msgid "Camera Selection"
-msgstr ""
+msgstr "କ୍ୟାମେରା ଚୟନ"
#: ../src/f-spot.glade.h:32
msgid "Copy files to the Photos folder"
-msgstr ""
+msgstr "ଫୋଟୋ ଫୋଲଡରରେ ଫାଇଲଗୁଡ଼ିକୁ ଚୟନ କରନ୍ତୁ"
#: ../src/f-spot.glade.h:33
msgid "Create Mail"
-msgstr ""
+msgstr "ମେଲ ନିର୍ମାଣ କରନ୍ତୁ"
#: ../src/f-spot.glade.h:34
msgid "Create _icon for this tag when first used"
-msgstr ""
+msgstr "ପ୍ରଥମ ଥର ବ୍ୟବହାର କରିବା ସମୟରେ ଏହି ଟ୍ୟାଗ ପାଇଁ ଚିତ୍ରସଂକେତ ନିର୍ମାଣ କରନ୍ତୁ (_i)"
#: ../src/f-spot.glade.h:35
msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr ""
+msgstr "ବଚ୍ଛିତ ଫୋଟୋଗୁଡ଼ିକ ସହିତ ଗୋଟିଏ ମେଲ ତିଆରି କରନ୍ତୁ (ସମ୍ଭବତଃ ଆକାର ପରିବର୍ତ୍ତନ କରି) ସଂଲଗ୍ନ"
#: ../src/f-spot.glade.h:36
msgid "Detect duplicates"
-msgstr ""
+msgstr "ନକଲିମାନଙ୍କୁ ଚିହ୍ନଟ କରନ୍ତୁ"
#: ../src/f-spot.glade.h:37
msgid "Display File _Names"
-msgstr ""
+msgstr "ଫାଇଲ ନାମଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (_N)"
#: ../src/f-spot.glade.h:38
msgid "Display only those photos that were imported in specified Rolls."
-msgstr ""
+msgstr "କେବଳ ଆମଦାନୀ ହୋଇଥିବା ଫୋଟୋଗୁଡ଼ିକୁ ନିର୍ଦ୍ଦିଷ୍ଟିତ ଭୂମିକାରେ ଦର୍ଶାନ୍ତୁ।"
#: ../src/f-spot.glade.h:39
msgid "Do not send a mail"
-msgstr ""
+msgstr "ମେଲ ପଠାନ୍ତୁ ନାହିଁ"
#: ../src/f-spot.glade.h:40
msgid "E-_Mail:"
-msgstr ""
+msgstr "ଇ-ମେଲ (_M):"
#: ../src/f-spot.glade.h:41
msgid "E_xport titles and comments"
-msgstr ""
+msgstr "ଶୀର୍ଷକ ଏବଂ ଚିପ୍ପଣୀଗୁଡ଼ିକୁ ରପ୍ତାନି କରନ୍ତୁ (_x)"
#: ../src/f-spot.glade.h:42
msgid "Estimated new size"
-msgstr ""
+msgstr "ଆନୁମାନିକ ନୂତନ ଆକାର"
#: ../src/f-spot.glade.h:44
msgid "Extra large"
@@ -2006,15 +2073,15 @@ msgstr "ଅତ୍ୟଧିକ ବଡ"
#: ../src/f-spot.glade.h:45
msgid "F-Spot View"
-msgstr ""
+msgstr "F-Spot ଦୃଶ୍ୟ"
#: ../src/f-spot.glade.h:47
msgid "Filter on selected rolls"
-msgstr ""
+msgstr "ବଚ୍ଛିତ ଭୂମିକାରେ ଛାଣନ୍ତୁ"
#: ../src/f-spot.glade.h:48
msgid "G_allery:"
-msgstr ""
+msgstr "ଗ୍ୟାଲେରୀ (_a):"
#: ../src/f-spot.glade.h:49
msgid "Gallery"
@@ -2028,11 +2095,11 @@ msgstr "ଆମଦାନୀ କରନ୍ତୁ"
#. Translators: this string means 'source of import'
#: ../src/f-spot.glade.h:52
msgid "Import Source:"
-msgstr ""
+msgstr "ଉତ୍ସ ଆମଦାନି କରନ୍ତୁ:"
#: ../src/f-spot.glade.h:53
msgid "Include subfolders"
-msgstr ""
+msgstr "ଉପଫୋଲଡରଗୁଡ଼ିକୁ ଅନ୍ତର୍ଭୁକ୍ତ କରନ୍ତୁ"
#: ../src/f-spot.glade.h:54
msgid "Large"
@@ -2040,7 +2107,7 @@ msgstr "ବଡ"
#: ../src/f-spot.glade.h:55
msgid "Manage your custom selection ratios"
-msgstr ""
+msgstr "ଆପଣଙ୍କର ଇଚ୍ଛାରୂପଣ ଚୟନ ଅନୁପାତକୁ ପରିଚାଳନା କରନ୍ତୁ"
#: ../src/f-spot.glade.h:56
msgid "Medium"
@@ -2048,23 +2115,23 @@ msgstr "ମଧ୍ଯମ"
#: ../src/f-spot.glade.h:58
msgid "Number of photos in selected rolls:"
-msgstr ""
+msgstr "ବଚ୍ଛିତ ଭୂମିକାରେ ଫୋଟୋ ସଂଖ୍ୟା:"
#: ../src/f-spot.glade.h:59
msgid "Number of pictures"
-msgstr ""
+msgstr "ଛବି ସଂଖ୍ୟା"
#: ../src/f-spot.glade.h:60
msgid "Open _Folder..."
-msgstr ""
+msgstr "ଫୋଲଡର ଖୋଲନ୍ତୁ (_F)..."
#: ../src/f-spot.glade.h:62
msgid "Original size (possible very large file size)"
-msgstr ""
+msgstr "ପ୍ରକୃତ ଆକାର (ସମ୍ଊବତଃ ଅତି ବଡ଼ ଫାଇଲ ଆକାର)"
#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
-msgstr ""
+msgstr "ମୂଖ୍ୟ ଟ୍ୟାଗ (_a):"
#: ../src/f-spot.glade.h:64
msgid "Pause"
@@ -2080,27 +2147,27 @@ msgstr "ପୂର୍ବବର୍ତ୍ତୀ"
#: ../src/f-spot.glade.h:67
msgid "Repair"
-msgstr ""
+msgstr "ମରାମତି"
#: ../src/f-spot.glade.h:70
msgid "Select Photos to Copy From Camera..."
-msgstr ""
+msgstr "କ୍ୟାମେରାରୁ ନକଲ କରିବା ପାଇଁ ଫୋଟୋଗୁଡ଼ିକୁ ବାଛନ୍ତୁ..."
#: ../src/f-spot.glade.h:71
msgid "Select a Tag..."
-msgstr ""
+msgstr "ଗୋଟି ଏଟ୍ୟାଗ ବାଛନ୍ତୁ..."
#: ../src/f-spot.glade.h:72
msgid "Select the camera from which you want to transfer files"
-msgstr ""
+msgstr "ଆପଣ ସ୍ଥାନାନ୍ତିରତ କରିବା ପାଇଁ ଚାହୁଁଥିବା ଫାଇଲଗୁଡ଼ିକ ପାଇଁ କ୍ୟାମେରା ବାଛନ୍ତୁ"
#: ../src/f-spot.glade.h:73
msgid "Selected Camera: "
-msgstr ""
+msgstr "ବଚ୍ଛିତ କ୍ୟାମେରା: "
#: ../src/f-spot.glade.h:74
msgid "Selection Constraints"
-msgstr ""
+msgstr "ଚୟନ ଅବରୋଧ"
#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
@@ -2108,7 +2175,7 @@ msgstr "ପ୍ରୁଷ୍ଠଭୂମି ଭାବରେ ବିନ୍ଯାସ
#: ../src/f-spot.glade.h:76
msgid "Show all photos."
-msgstr ""
+msgstr "ସମସ୍ତ ଫୋଟୋଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ।"
#: ../src/f-spot.glade.h:77
msgid "Show or hide the side pane"
@@ -2120,7 +2187,7 @@ msgstr "ସାଧନ ପଟିକୁ ଦେଖାନ୍ତୁ କିମ୍ବା
#: ../src/f-spot.glade.h:79
msgid "Side _pane"
-msgstr ""
+msgstr "ପାର୍ଶ୍ୱ ପଟି (_p)"
#: ../src/f-spot.glade.h:80
msgid "Small"
@@ -2131,15 +2198,17 @@ msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
msgstr ""
+"ଉଲ୍ଲେଖ କରନ୍ତୁ ଯଦି ଗୋଟିଏ ପ୍ରକୃତ ଆକାରର ଛବିକୁ ବୁଲାଇବା ଉଚିତ କି ନୁହଁ। ଛୋଟ ଆକାରର "
+"ଛବିଗୁଡ଼ିକ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ବୁଲିବ।"
#: ../src/f-spot.glade.h:82
msgid "Strip image _metadata"
-msgstr ""
+msgstr "ଛବି ଖଣ୍ଡ ଅଧିତଥ୍ୟ (_m)"
#. Note for translators: meant as Temperature
#: ../src/f-spot.glade.h:84
msgid "Te_mp:"
-msgstr ""
+msgstr "ତାପମାନ (_m):"
#: ../src/f-spot.glade.h:85
msgid "Tiny"
@@ -2147,15 +2216,15 @@ msgstr "ଟିନି"
#: ../src/f-spot.glade.h:86
msgid "Total original size"
-msgstr ""
+msgstr "ସମୁଦାୟ ପ୍ରକୃତ ଆକାର"
#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
-msgstr ""
+msgstr "ଛୋଟ କରନ୍ତୁ (_i)"
#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
-msgstr ""
+msgstr "ବଡ଼ କରନ୍ତୁ (_o)"
#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
@@ -2171,7 +2240,7 @@ msgstr "ଉଜ୍ଜ୍ବଳତା (_B):"
#: ../src/f-spot.glade.h:93
msgid "_Create Mail"
-msgstr ""
+msgstr "ମେଲ ତିଆରି କରନ୍ତୁ (_C)"
#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
msgid "_Edit"
@@ -2179,11 +2248,11 @@ msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
#: ../src/f-spot.glade.h:98
msgid "_Exposure:"
-msgstr ""
+msgstr "ବିବରଣ (_E):"
#: ../src/f-spot.glade.h:99
msgid "_Flickr"
-msgstr ""
+msgstr "Flickr (_F)"
#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
msgid "_Fullscreen"
@@ -2203,7 +2272,7 @@ msgstr "ରଙ୍ଗ (_H):"
#: ../src/f-spot.glade.h:104
msgid "_Interpolate image on zoom"
-msgstr ""
+msgstr "ଛୋଟବଡ଼ କରିବା ସମୟରେ ଛବିଗୁଡ଼ିକୁ ପ୍ରକ୍ଷେପଣ କରନ୍ତୁ (_I)"
#: ../src/f-spot.glade.h:105
msgid "_New Window"
@@ -2211,11 +2280,11 @@ msgstr "ନୂତନ ୱିଣ୍ଡୋ (_N)"
#: ../src/f-spot.glade.h:106
msgid "_Open album in browser when done uploading"
-msgstr ""
+msgstr "ଧାରଣ କରିସାରିବା ପରେ ଆଲବମକୁ ବ୍ରାଉଜରରେ ଖୋଲନ୍ତୁ (_O)"
#: ../src/f-spot.glade.h:107
msgid "_Open destination when done exporting"
-msgstr ""
+msgstr "ରପ୍ତାନି କରିସାରିବା ପରେ ଲକ୍ଷସ୍ଥଳକୁ ଖୋଲନ୍ତୁ (_O)"
#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
msgid "_Photo"
@@ -2227,7 +2296,7 @@ msgstr "ପରିପୃକ୍ତତା (_S):"
#: ../src/f-spot.glade.h:111
msgid "_Scale photos to no larger than: "
-msgstr ""
+msgstr "ଏହାଠାରୁ ବଡ଼ ହୋଇନଥିବା ଫୋଟଗୁଡ଼ିକୁ ମାପନ୍ତୁ (_S): "
#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
msgid "_Slideshow"
@@ -2235,15 +2304,15 @@ msgstr "ସ୍ଲାଇଡ ପ୍ରଦର୍ଶନ (_S)"
#: ../src/f-spot.glade.h:113
msgid "_Strip metadata"
-msgstr ""
+msgstr "ଅଧିତଥ୍ୟକୁ କାଟନ୍ତୁ (_S)"
#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
msgid "_Tag Name:"
-msgstr ""
+msgstr "ଟ୍ୟାଗ ନାମ (_T):"
#: ../src/f-spot.glade.h:115
msgid "_Tint:"
-msgstr ""
+msgstr "ରଙ୍ଗ (_T):"
#: ../src/f-spot.glade.h:116
msgid "_Toolbar"
@@ -2251,7 +2320,7 @@ msgstr "ସାଧନ ପଟି (_T)"
#: ../src/f-spot.glade.h:117
msgid "_URI:"
-msgstr ""
+msgstr "URI (_U):"
#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
msgid "_View"
@@ -2259,7 +2328,7 @@ msgstr "ଦ୍ରୁଶ୍ଯ (_V)"
#: ../src/f-spot.glade.h:119
msgid "_Virtual Filesystem"
-msgstr ""
+msgstr "ଆଭାସୀ ଫାଇଲ ତନ୍ତ୍ର (_V)"
#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
msgid "and"
@@ -2272,10 +2341,13 @@ msgid ""
"after\n"
"between"
msgstr ""
+"ଠାରେ\n"
+"ପରେ\n"
+"ମଧ୍ଯରେ"
#: ../src/f-spot.glade.h:126
msgid "x"
-msgstr ""
+msgstr "x"
#: ../src/FullScreenView.cs:58
msgid "Hide"
@@ -2295,7 +2367,7 @@ msgstr "ଛବି ସୂଚନା"
#: ../src/FullScreenView.cs:73
msgid "Exit fullscreen"
-msgstr ""
+msgstr "ସମ୍ପୂର୍ଣ୍ଣ ପରଦାରୁ ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
#: ../src/SingleView.cs:101
@@ -2304,15 +2376,15 @@ msgstr "ସ୍ଲାଇଡ଼ ଦୃଶ୍ୟ"
#: ../src/FullScreenView.cs:82
msgid "Start slideshow"
-msgstr ""
+msgstr "ସ୍ଲାଇଡ ଦୃଶ୍ୟ ଆରମ୍ଭ କରନ୍ତୁ"
#: ../src/FullScreenView.cs:128
msgid "Slide transition:"
-msgstr ""
+msgstr "ସ୍ଲାଇଡ ପରିବର୍ତ୍ତନ:"
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
-msgstr ""
+msgstr "ଅଧିକ ତାରିଖ"
#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
msgid "More"
@@ -2320,7 +2392,7 @@ msgstr "ଅଧିକ"
#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
-msgstr ""
+msgstr "ତାରିଖ ସୀମା ଲିଭାନ୍ତୁ (_C)"
#: ../src/Imaging/Exif.cs:228
msgid "Image Directory"
@@ -2348,7 +2420,7 @@ msgstr "ଅଜ୍ଞାତ ବିବରଣୀପଞ୍ଜିକା"
#: ../src/Imaging/ImageFile.cs:116
msgid "Writing to this file format is not supported"
-msgstr ""
+msgstr "ଏହି ଫାଇଲ ଶୈଳୀରେ ଲେଖିବା ସମର୍ଥିତ ନୁହଁ"
#: ../src/Imaging/IptcFile.cs:145
msgid "IPTC Information Interchange Model (IIM) Version number"
@@ -2380,11 +2452,11 @@ msgstr "ସର୍ବାଧିକ ଅତ୍ଯାବଶ୍ଯକତା ଏବଂ
#: ../src/Imaging/IptcFile.cs:159
msgid "The year, month and day (CCYYMMDD) the service sent the material"
-msgstr ""
+msgstr "ବର୍ଷ, ମାସ ଏବଂ ଦିନ (CCYYMMDD) ଏହି ସର୍ଭିସ ବସ୍ତୁ ପଠାଇଥାଏ"
#: ../src/Imaging/IptcFile.cs:161
msgid "The hour, minute and second (HHMMSS) the service sent the material"
-msgstr ""
+msgstr "ଘଣ୍ଟା, ମିନଟ ଏବଂ ସେକଣ୍ଡ (HHMMSS) ସର୍ଭିସ ବସ୍ତୁ ପଠାଇଥାଏ"
#: ../src/Imaging/IptcFile.cs:163
msgid "The character set designation"
@@ -2484,7 +2556,7 @@ msgstr "ଫୋଲଡ଼ରକୁ ମନୋନିତ କରନ୍ତୁ"
#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
-msgstr ""
+msgstr "(କୌଣସି କ୍ୟାମେରା ଚିହ୍ନାହୋଇନାହିଁ)"
#: ../src/ImportCommand.cs:404
#, csharp-format
@@ -2493,11 +2565,11 @@ msgstr "{1} ର {0} ଲୋଡ କରାହେଉଛି"
#: ../src/ImportCommand.cs:470
msgid "Done Loading"
-msgstr ""
+msgstr "ଧାରଣ ସମାପ୍ତ ହୋଇଛି"
#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
-msgstr ""
+msgstr "ଡିରେକ୍ଟୋରୀ ଅବସ୍ଥିତ ନାହିଁ।"
#: ../src/ImportCommand.cs:685
#, csharp-format
@@ -2505,12 +2577,14 @@ msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
"different directory"
msgstr ""
+"ଆପଣ ବାଛିଥିବା ଡିରେକ୍ଟୋରୀ \"{0}\" ଅବସ୍ଥିତ ନାହିଁ। ଦୟାକରି ଭିନ୍ନ "
+"ଏକ ଡିରେକ୍ଟୋରୀ ବାଛନ୍ତୁ"
#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
#: ../src/XmpTagsImporter.cs:89
msgid "Import Tags"
-msgstr ""
+msgstr "ଟ୍ୟାଗଗୁଡ଼ିକୁ ଆମଦାନୀ କରନ୍ତୁ"
#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:84
msgid "Rotate Left"
@@ -2518,7 +2592,7 @@ msgstr "ବାମପଟକୁ ଘୂରାଅ"
#: ../src/ItemAction.cs:80
msgid "Rotate picture left"
-msgstr ""
+msgstr "ଛବିଗୁଡ଼ିକୁ ବାମକୁ ବୁଲାନ୍ତୁ"
#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:89
msgid "Rotate Right"
@@ -2526,19 +2600,19 @@ msgstr "ଡାହାଣପଟକୁ ଘୂରାଅ"
#: ../src/ItemAction.cs:92
msgid "Rotate picture right"
-msgstr ""
+msgstr "ଛବିଗୁଡ଼ିକୁ ଡାହାଣକୁ ବୁଲାନ୍ତୁ"
#: ../src/ItemAction.cs:103
msgid "Next picture"
-msgstr ""
+msgstr "ପରବର୍ତ୍ତି ଛବି"
#: ../src/ItemAction.cs:124
msgid "Previous picture"
-msgstr ""
+msgstr "ପୂର୍ବ ଛବି"
#: ../src/MainWindow.cs:269
msgid "Import new images"
-msgstr ""
+msgstr "ନୂତନ ଛବିକୁ ଆମଦାନୀ କରନ୍ତୁ"
#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
msgid "Browse"
@@ -2546,15 +2620,15 @@ msgstr "ଖୋଜନ୍ତୁ"
#: ../src/MainWindow.cs:289
msgid "Browse many photos simultaneously"
-msgstr ""
+msgstr "ଏକସଙ୍ଗରେ ଅନେକ ଫୋଟକୁ ବ୍ରାଉଜ କରନ୍ତୁ"
#: ../src/MainWindow.cs:293
msgid "Edit Image"
-msgstr ""
+msgstr "ଛବିକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
#: ../src/MainWindow.cs:297
msgid "View and edit a photo"
-msgstr ""
+msgstr "ଗୋଟିଏ ଫୋଟକୁ ଦେଖନ୍ତୁ ଏବଂ ସମ୍ପାଦନ କରନ୍ତୁ"
#: ../src/MainWindow.cs:302 ../src/SingleView.cs:96
msgid "Fullscreen"
@@ -2562,19 +2636,19 @@ msgstr "ସଂପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ୍"
#: ../src/MainWindow.cs:304 ../src/SingleView.cs:98
msgid "View photos fullscreen"
-msgstr ""
+msgstr "ଫୋଟଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ପରଦା ଦେଖନ୍ତୁ"
#: ../src/MainWindow.cs:309 ../src/SingleView.cs:103
msgid "View photos in a slideshow"
-msgstr ""
+msgstr "ଫୋଟଗୁଡ଼ିକୁ ସ୍ଲାଇଡ ଦୃଶ୍ୟରେ ଦେଖନ୍ତୁ"
#: ../src/MainWindow.cs:324
msgid "Previous photo"
-msgstr ""
+msgstr "ପୂର୍ବ ଫୋଟ"
#: ../src/MainWindow.cs:329
msgid "Next photo"
-msgstr ""
+msgstr "ପରବର୍ତ୍ତି ଫୋଟୋ"
#: ../src/MainWindow.cs:1488
msgid "No cameras detected."
@@ -2585,98 +2659,102 @@ msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
msgstr ""
+"F-Spot ଏହି ତନ୍ତ୍ର ସହିତ ସଂଲଗ୍ନ କୌଣସି କ୍ୟାମେରା ଖୋଜିବାରେ ଅସମର୍ଥ। କ୍ୟାମେରାଟି ସଂଯୁକ୍ତ ଅଛି କି ନାହିଁ "
+"ଏବଂ ସେଥିରେ ବିଦ୍ୟୁତ ଶକ୍ତି ଅଛି କି ନାହିଁ ତାହା ଦୁଇଥର ଯାଞ୍ଚ କରନ୍ତୁ"
#: ../src/MainWindow.cs:1528
msgid "Error connecting to camera"
-msgstr ""
+msgstr "କ୍ୟାମେରା ସହିତ ସଂଯୋଗ କରିବାରେ ତ୍ରୁଟି"
#: ../src/MainWindow.cs:1529
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
-msgstr ""
+msgstr "କ୍ୟାମେରା ସହିତ ସଂଯୋଗ କରିବା ସମୟରେ ତ୍ରୁଟି \"{0}\" ଗ୍ରହଣ କରିଛି"
#. Translators, The singular case will never happen here.
#: ../src/MainWindow.cs:1815
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ବଚ୍ଛିତ ଟ୍ୟାଗକୁ ମିଶ୍ରଣ କରନ୍ତୁ"
+msgstr[1] "{0} ବଚ୍ଛିତ ଟ୍ୟାଗଗୁଡ଼ିକୁ ମିଶ୍ରଣ କରିବେ କି?"
#: ../src/MainWindow.cs:1842
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
msgstr ""
+"ଏହି ପ୍ରୟୋଗ ବଚ୍ଛିତ ଟ୍ୟାଗଗୁଡ଼ିକୁ ମିଶ୍ରଣ କରିବ ଏବଂ କୌଣସି ଉପ-ଟ୍ୟାଗକୁ "
+"ଏକକ ଟ୍ୟାଗରେ ମିଶ୍ରଣ କରିବ।"
#: ../src/MainWindow.cs:1844
msgid "_Merge Tags"
-msgstr ""
+msgstr "ଟ୍ୟାଗଗୁଡ଼ିକୁ ମିଶାନ୍ତୁ (_M)"
#: ../src/MainWindow.cs:2049
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} ଫୋଟୋ {1} ରୁ"
+msgstr[1] "{0} ଫୋଟୋଗୁଡ଼ିକ {1} ରୁ"
#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:493
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} ଫୋଟୋ"
+msgstr[1] "{0} ଫୋଟୋଗୁଡ଼ିକ"
#: ../src/MainWindow.cs:2054
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " ({0} ବଚ୍ଛିତ)"
+msgstr[1] " ({0} ବଚ୍ଛିତ)"
#: ../src/MainWindow.cs:2135
msgid "_Ok"
-msgstr ""
+msgstr "Ok (_O)"
#: ../src/MainWindow.cs:2136
msgid "Error Deleting Picture"
-msgstr ""
+msgstr "ଛବି ଅପସାରଣ କରିବା ଦ୍ୱାରା ତ୍ରୁଟି"
#: ../src/MainWindow.cs:2141
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
-msgstr ""
+msgstr "ଏହି ଫାଇଲକୁ ଅପସାରଣ କରିବା ପାଇଁ କୌଣସି ଅନୁମତି ନାହିଁ:{1}{0}"
#: ../src/MainWindow.cs:2145
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
-msgstr ""
+msgstr "ଫାଇଲକୁ ଅପସାରଣ କରିବା ସମୟରେ {0} ପ୍ରକାରର ଗୋଟିଏ ତ୍ରୁଟି ଘଟିଲା:{2}{1}"
#: ../src/MainWindow.cs:2177
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ବଚ୍ଛିତ ଫୋଟକୁ ସବୁଦିନ ପାଇଁ ଅପସାରଣ କରିବେ କି?"
+msgstr[1] "{0} ଟି ବଚ୍ଛିତ ଫୋଟକୁ ସବୁଦିନ ପାଇଁ ଅପସାରଣ କରିବେ କି?"
#: ../src/MainWindow.cs:2181
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural "This deletes all versions of the selected photos from your drive."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଏହା ଆପଣଙ୍କ ଡ୍ରାଇଭରୁ ବଚ୍ଛିତ ଫୋଟର ସମସ୍ତ ସଂସ୍କରଣକୁ ଅପସାରଣ କରିଥାଏ।"
+msgstr[1] "ଏହା ଆପଣଙ୍କ ଡ୍ରାଇଭରୁ ବଚ୍ଛିତ ଫୋଟଗୁଡ଼ିକର ସମସ୍ତ ସଂସ୍କରଣକୁ ଅପସାରଣ କରିଥାଏ।"
#: ../src/MainWindow.cs:2184
msgid "_Delete photo"
msgid_plural "_Delete photos"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଫୋଟୋ ଅପସାରଣ କରନ୍ତୁ (_D)"
+msgstr[1] "ଫୋଟୋଗୁଡ଼ିକୁ ଅପସାରଣ କରନ୍ତୁ (_D)"
#: ../src/MainWindow.cs:2220
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "F-Spot ରୁ ବଚ୍ଛିତ ଫୋଟୋକୁ କାଢ଼ିବେ କି?"
+msgstr[1] "F-Spot ରୁ {0} ଟି ବଚ୍ଛିତ ଫୋଟୋଗୁଡ଼ିକୁ କାଢ଼ିବେ କି?"
#: ../src/MainWindow.cs:2225
msgid ""
@@ -2684,20 +2762,22 @@ msgid ""
"lost. The photos remain on your computer and can be imported into F-Spot "
"again."
msgstr ""
+"ଯଦି ଆପଣ F-Spot ତାଲିକାରୁ ଫୋଟୋଗୁଡ଼ିକୁ କାଢନ୍ତି ତେବେ ସମସ୍ତ ଟ୍ୟାଗ ସୂଚନା ନଷ୍ଟ ହୋଇଯିବ। "
+"ଫୋଟୋଗୁଡ଼ିକ ଆପଣଙ୍କ କମ୍ପୁଟରରେ ରହିଥାଏ ଏବଂ F-Spot ରେ ପୁଣିଥରେ ଆମଦାନୀ କରିପାରିବେ।"
#: ../src/MainWindow.cs:2226
msgid "_Remove from Catalog"
-msgstr ""
+msgstr "ତାଲିକାରୁ କାଢ଼ନ୍ତୁ (_R)"
#: ../src/MainWindow.cs:2289
#, csharp-format
msgid "Delete tag \"{0}\"?"
-msgstr ""
+msgstr "ଟ୍ୟାଗ \"{0}\" କୁ ଅପସାରଣ କରିବେ କି?"
#: ../src/MainWindow.cs:2291
#, csharp-format
msgid "Delete the {0} selected tags?"
-msgstr ""
+msgstr "{0} ବଚ୍ଛିତ ଟ୍ୟାଗଗୁଡ଼ିକୁ ଅପସାରଣ କରିବେ କି?"
#: ../src/MainWindow.cs:2296
msgid "photo"
@@ -2709,19 +2789,19 @@ msgstr[1] "ଫୋଟୋ"
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଯଦି ଆପଣ ଏହି ଟ୍ୟାଗକୁ ଅପସାରଣ କରନ୍ତି, ତେବେ {0} {1} ସହିତ ସଂଗଠନ ନଷ୍ଟ ହୋଇଯିବ।"
+msgstr[1] "ଯଦି ଆପଣ ଏହି ଟ୍ୟାଗଗୁଡ଼ିକୁ ଅପସାରଣ କରନ୍ତି, ତେବେ {0} {1} ସହିତ ସଂଗଠନ ନଷ୍ଟ ହୋଇଯିବ।"
#: ../src/MainWindow.cs:2303
msgid "_Delete tag"
msgid_plural "_Delete tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଟ୍ୟାଗକୁ ଅପସାରଣ କରନ୍ତୁ (_D)"
+msgstr[1] "ଟ୍ୟାଗଗୁଡ଼ିକୁ ଅପସାରଣ କରନ୍ତୁ (_D)"
#. A Category is not empty. Can not delete it.
#: ../src/MainWindow.cs:2317
msgid "Tag is not empty"
-msgstr ""
+msgstr "ଟ୍ୟାଗ ଖାଲି ନାହିଁ"
#: ../src/MainWindow.cs:2318
#, csharp-format
@@ -2729,38 +2809,40 @@ msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
"\"{0}\" first"
msgstr ""
+"ଯେଉଁ ଟ୍ୟାଗ ମଧ୍ଯରେ ଟ୍ୟାଗଗୁଡ଼ିକ ଥାଏ ସେଗୁଡ଼ିକୁ ଅପସାରଣ କରିପାରିବେ ନାହିଁ। ଦୟାକରି \"{0}\" "
+"ମଧ୍ଯରେ ଥିବା ଟ୍ୟାଗଗୁଡ଼ିକୁ ପ୍ରଥମେ ଅପସାରଣ କରନ୍ତୁ"
#: ../src/MainWindow.cs:2750
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ବଚ୍ଛିତ ଫୋଟକୁ ବାମକୁ ବୁଲାନ୍ତୁ"
+msgstr[1] "ବଚ୍ଛିତ ଫୋଟଗୁଡ଼ିକୁ ବାମକୁ ବୁଲାନ୍ତୁ"
#: ../src/MainWindow.cs:2763
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ବଚ୍ଛିତ ଫୋଟକୁ ଡାହାଣକୁ ବୁଲାନ୍ତୁ"
+msgstr[1] "ବଚ୍ଛିତ ଫୋଟଗୁଡ଼ିକୁ ଡାହାଣକୁ ବୁଲାନ୍ତୁ"
#: ../src/MainWindow.cs:2774
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ବଚ୍ଛିତ ଟ୍ୟାଗକୁ ଖୋଜନ୍ତୁ (_S)"
+msgstr[1] "ବଚ୍ଛିତ ଟ୍ୟାଗଗୁଡ଼ିକୁ ଖୋଜନ୍ତୁ (_S)"
#: ../src/MainWindow.cs:2778
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଏହା ସହିତ ବଚ୍ଛିତ ଟ୍ୟାଗକୁ ଖୋଜନ୍ତୁ (_W)"
+msgstr[1] "ଏହା ସହିତ ବଚ୍ଛିତ ଟ୍ୟାଗଗୁଡ଼ିକୁ ଖୋଜନ୍ତୁ (_W)"
#: ../src/MainWindow.cs:2819
msgid "Create New Version?"
msgid_plural "Create New Versions?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ନୂତନ ସଂସ୍କରଣ ନିର୍ମାଣ କରିବେ କି?"
+msgstr[1] "ନୂତନ ସଂସ୍କରଣକୁ ନିର୍ମାଣ କରିବେ କି?"
#: ../src/MainWindow.cs:2821
#, csharp-format
@@ -2771,11 +2853,15 @@ msgid_plural ""
"Before launching {1}, should F-Spot create new versions of the selected "
"photos to preserve the originals?"
msgstr[0] ""
+"{1} କୁ ଆରମ୍ଭ କରିବା ପୂର୍ବରୁ, ପ୍ରକୃତ ଫୋଟୋକୁ ସୁରକ୍ଷିତ କରିବା ପାଇଁ F-Spot ବଚ୍ଛିତ ଫୋଟୋର ନୂତନ "
+"ସଂସ୍କରଣ ନିର୍ମାଣ କରିବା ଉଚିତ କି?"
msgstr[1] ""
+"{1} କୁ ଆରମ୍ଭ କରିବା ପୂର୍ବରୁ, ପ୍ରକୃତ ଫୋଟୋଗୁଡ଼ିକୁ ସୁରକ୍ଷିତ କରିବା ପାଇଁ F-Spot ବଚ୍ଛିତ ଫୋଟୋର ନୂତନ "
+"ସଂସ୍କରଣ ନିର୍ମାଣ କରିବା ଉଚିତ କି?"
#: ../src/MainWindow.cs:2843
msgid "XCF version"
-msgstr ""
+msgstr "XCF ସଂସ୍କରଣ"
#: ../src/MetadataStore.cs:19
msgid "Creator"
@@ -2885,11 +2971,11 @@ msgstr "ଦୃଶ୍ଯର ପ୍ରକାର"
#. items insensitve
#: ../src/PhotoTagMenu.cs:74
msgid "(No Tags)"
-msgstr ""
+msgstr "(କୌଣସି ଟ୍ୟାଗ ନାହିଁ)"
#: ../src/PhotoVersionCommands.cs:58
msgid "Create New Version"
-msgstr ""
+msgstr "ନୂତନ ସଂସ୍କରଣ ନିର୍ମାଣ କରନ୍ତୁ"
#: ../src/PhotoVersionCommands.cs:59
msgid "Name:"
@@ -2897,24 +2983,24 @@ msgstr "ନାମ:"
#: ../src/PhotoVersionCommands.cs:63
msgid "Rename Version"
-msgstr ""
+msgstr "ସଂସ୍କରଣକୁ ପୁନଃ ନାମକରଣ କରନ୍ତୁ"
#: ../src/PhotoVersionCommands.cs:64
msgid "New name:"
-msgstr ""
+msgstr "ନୂତନ ନାମ:"
#: ../src/PhotoVersionCommands.cs:110
msgid "Could not create a new version"
-msgstr ""
+msgstr "ନୂତନ ସଂସ୍କରଣ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
#: ../src/PhotoVersionCommands.cs:111
#, csharp-format
msgid "Received exception \"{0}\". Unable to create version \"{1}\""
-msgstr ""
+msgstr "ବ୍ୟତିକ୍ରମ \"{0}\" ଗ୍ରହଣ ହୋଇଛି। ସଂସ୍କରଣ \"{1}\" ନିର୍ମାଣ କରିବାରେ ଅସମର୍ଥ"
#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
-msgstr ""
+msgstr "ପ୍ରକୃତରେ ଅପସାରଣ କରିବେ କି?"
#: ../src/PhotoVersionCommands.cs:139
msgid "Cancel"
@@ -2927,40 +3013,40 @@ msgstr "ବିଲୋପ କରନ୍ତୁ"
#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
-msgstr ""
+msgstr "ସଂସ୍କରଣ \"{0}\" କୁ ପ୍ରକୃତରେ ଅପସାରଣ କରିବେ କି?"
#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
-msgstr ""
+msgstr "ଗୋଟିଏ ସଂସ୍କରଣକୁ ଅପସାରଣ କରିପାରିଲା ନାହିଁ"
#: ../src/PhotoVersionCommands.cs:155
#, csharp-format
msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
-msgstr ""
+msgstr "ବ୍ୟତିକ୍ରମ \"{0}\" ଗ୍ରହଣ ହୋଇଛି। ସଂସ୍କରଣ \"{1}\" କୁ ଅପସାରଣ କରିବାରେ ଅସମର୍ଥ"
#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
-msgstr ""
+msgstr "ଗୋଟିଏ ସଂସ୍କରଣକୁ ପୁନଃ ନାମକରଣ କରିପାରିଲା ନାହିଁ"
#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
-msgstr ""
+msgstr "ବ୍ୟତିକ୍ରମ \"{0}\" ଗ୍ରହଣ ହୋଇଛି। ସଂସ୍କରଣ \"{1}\" କୁ ପୁନଃ ନାମକରଣ କରିବାରେ ଅସମର୍ଥ"
#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:562
#: ../src/Widgets/InfoBox.cs:564
msgid "(No Edits)"
-msgstr ""
+msgstr "(କୌଣସି ସମ୍ପାଦନ ନାହିଁ)"
#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
-msgstr ""
+msgstr "ଫୋଟଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରିବାରେ ତ୍ରୁଟି"
#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr ""
+msgstr "ବ୍ୟତିକ୍ରମ \"{0}\" ଗ୍ରହଣ ହୋଇଛି। ଫୋଟୋ {1} କୁ ସଂରକ୍ଷଣ କରିବାରେ ଅସମର୍ଥ"
#: ../src/PhotoView.cs:356
msgid "Comment:"
@@ -2976,57 +3062,57 @@ msgstr "ପ୍ରତିଛବି ବିନ୍ୟାସ"
#: ../src/QueryWidget.cs:58
msgid "Find: "
-msgstr ""
+msgstr "ଖୋଜନ୍ତୁ: "
#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
-msgstr ""
+msgstr "ଟ୍ୟାଗହୀନ ଫୋଟୋଗୁଡ଼ିକ"
#: ../src/QueryWidget.cs:71
msgid "Rated photos"
-msgstr ""
+msgstr "ମାନକ ଫୋଟଗୁଡ଼ିକ"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
#: ../src/QueryWidget.cs:80
msgid "Import roll"
-msgstr ""
+msgstr "ନାମାବଳୀ ଆମଦାନୀ କରନ୍ତୁ"
#: ../src/QueryWidget.cs:104
msgid "Clear search"
-msgstr ""
+msgstr "ସନ୍ଧାନକୁ ଲିଭାନ୍ତୁ"
#: ../src/QueryWidget.cs:111
msgid "Refresh search"
-msgstr ""
+msgstr "ସନ୍ଧାନକୁ ସତେଜନ କରନ୍ତୁ"
#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
-msgstr ""
+msgstr "କୌଣସି ସାଦୃଶ୍ୟ ଫୋଟୋ ମିଳିଲା ନାହିଁ"
#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
-msgstr ""
+msgstr "ସନ୍ଧାନ ପଟିକୁ ଲୁଚାନ୍ତୁ (_F)"
#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
-msgstr ""
+msgstr "ସନ୍ଧାନ ପଟିକୁ ଦର୍ଶାନ୍ତୁ (_F)"
#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
msgid "Unable to rotate this type of photo"
-msgstr ""
+msgstr "ଏହିପରି ଫୋଟୋକୁ ବୁଲାଇବାରେ ଅସମର୍ଥ"
#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
-msgstr ""
+msgstr "କେବଳ ପଠନୀୟ ଫାଇଲକୁ ବୁଲାଇବାରେ ଅସମର୍ଥ"
#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
-msgstr ""
+msgstr "ଫୋଟୋଗୁଡ଼ିକୁ ବୁଲାଉଅଛି"
#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
-msgstr ""
+msgstr "ଫୋଟୋଗୁଡ଼ିକୁ ବୁଲାଉଅଛି \"{0}\""
#: ../src/RotateCommand.cs:222
msgid "Directory not found"
@@ -3036,8 +3122,8 @@ msgstr "ଡିରେକ୍ଟୋରୀ ମିଳୁନାହିଁ"
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଫୋଟୋକୁ ବୁଲାଇବାରେ ଅସମର୍ଥ"
+msgstr[1] "{0} ଫୋଟୋଗୁଡ଼ିକୁ ବୁଲାଇବାରେ ଅସମର୍ଥ"
#: ../src/RotateCommand.cs:244
#, csharp-format
@@ -3048,43 +3134,47 @@ msgid_plural ""
"{0} photos could not be rotated because they are on a read only file system "
"or media such as a CDROM. Please check the permissions and try again."
msgstr[0] ""
+"ଫୋଟୋକୁ ବୁଲାଇ ହେବ ନାହିଁ କାରଣ ଏହା ଗୋଟିଏ କେବଳ ପଠନୀୟ ଅଥବା ମେଡିଆ ଫାଇଲତନ୍ତ୍ରରେ ଅଛି "
+"ଯେପରିକି CDROM. ଦୟାକରି ଅନୁମତିଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରନ୍ତୁ ଏବଂ ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।"
msgstr[1] ""
+"{0} ଫୋଟୋଗୁଡ଼ିକୁ ବୁଲାଇ ହେବ ନାହିଁ କାରଣ ଏହା ଗୋଟିଏ କେବଳ ପଠନୀୟ ଅଥବା ମେଡିଆ ଫାଇଲତନ୍ତ୍ରରେ ଅଛି "
+"ଯେପରିକି CDROM. ଦୟାକରି ଅନୁମତିଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରନ୍ତୁ ଏବଂ ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।"
#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
-msgstr ""
+msgstr "ତ୍ରୁଟି \"{0}\" କୁ ଗ୍ରହଣ କରାହୋଇଛି ଯେତେବେଳେ {1} କୁ ବୁଲାଇବା ପାଇଁ ଚେଷ୍ଟା କରାଯାଏ"
#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
-msgstr ""
+msgstr "ଫୋଟୋକୁ ବୁଲାଇବା ସମୟରେ ତ୍ରୁଟି।"
#: ../src/SendEmail.cs:240
msgid "Preparing email"
-msgstr ""
+msgstr "ଇମେଲ ପ୍ରସ୍ତୁତ କରୁଅଛି"
#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
-msgstr ""
+msgstr "ଛବି \"{0}\" କୁ ରପ୍ତାନି କରୁଅଛି"
#: ../src/SendEmail.cs:314
msgid "Error processing image"
-msgstr ""
+msgstr "ଛବିକୁ କାର୍ଯ୍ୟକାରୀ କରିବା ସମୟରେ ତ୍ରୁଟି"
#: ../src/SendEmail.cs:315
#, csharp-format
msgid "An error occured while processing \"{0}\": {1}"
-msgstr ""
+msgstr "\"{0}\" କୁ କାର୍ଯ୍ୟକାରୀ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ଘଟିଲା: {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
msgid "my photos"
-msgstr ""
+msgstr "ମୋର ଫୋଟଗୁଡ଼ିକ"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
-msgstr ""
+msgstr "ଚମକୁଥିବା ଫୋଟକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
#: ../src/Sharpener.cs:102
msgid "Sharpen"
@@ -3104,11 +3194,11 @@ msgstr "ପ୍ରଭାବସୀମା:"
#: ../src/SingleView.cs:86
msgid "Rotate photo left"
-msgstr ""
+msgstr "ଫୋଟକୁ ବାମକୁ ବୁଲାନ୍ତୁ"
#: ../src/SingleView.cs:91
msgid "Rotate photo right"
-msgstr ""
+msgstr "ଫୋଟକୁ ଡାହାଣକୁ ବୁଲାନ୍ତୁ"
#: ../src/SingleView.cs:128
msgid "Folder"
@@ -3120,20 +3210,20 @@ msgstr "ଖୋଲନ୍ତୁ"
#: ../src/SingleView.cs:454
msgid "Set as Background"
-msgstr ""
+msgstr "ପୃଷ୍ଠଭୂମି ଭାବରେ ସେଟ କରନ୍ତୁ"
#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
-msgstr ""
+msgstr "ଏହି ନାମଟି ପୂର୍ବରୁ ବ୍ୟବହାରରେ ଅଛି"
#: ../src/TagCommands.cs:144
msgid "Create New Tag"
-msgstr ""
+msgstr "ନୂତନ ଟ୍ୟାଗ ନିର୍ମାଣ କରନ୍ତୁ"
#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
-msgstr ""
+msgstr "ନୂତନ ଟ୍ୟାଗର ନାମ:"
#: ../src/TagPopup.cs:26
#, csharp-format
@@ -3148,50 +3238,50 @@ msgstr "ନୂତନ ସୂଚକ ନିର୍ମାଣ କରନ୍ତୁ..."
#: ../src/TagPopup.cs:42
msgid "Edit Selected Tag..."
-msgstr ""
+msgstr "ବଚ୍ଛିତ ଟ୍ୟାଗକୁ ସମ୍ପାଦନ କରନ୍ତୁ..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
msgid_plural "Delete Tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଟ୍ୟାଗକୁ ଅପସାରଣ କରନ୍ତୁ"
+msgstr[1] "ଟ୍ୟାଗଗୁଡ଼ିକୁ ଅପସାରଣ କରନ୍ତୁ"
#: ../src/TagPopup.cs:52
msgid "Attach Tag to Selection"
msgid_plural "Attach Tags to Selection"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଟ୍ୟାଗକୁ ଚୟନରେ ଲଗାନ୍ତୁ"
+msgstr[1] "ଟ୍ୟାଗଗୁଡ଼ିକୁ ଚୟନରେ ଲଗାନ୍ତୁ"
#: ../src/TagPopup.cs:56
msgid "Remove Tag From Selection"
msgid_plural "Remove Tags From Selection"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଟ୍ୟାଗକୁ ଚୟନରୁ କାଢ଼ନ୍ତୁ"
+msgstr[1] "ଟ୍ୟାଗଗୁଡ଼ିକୁ ଚୟନରୁ କାଢ଼ନ୍ତୁ"
#: ../src/TagPopup.cs:62
msgid "Merge Tags"
-msgstr ""
+msgstr "ଟ୍ୟାଗଗୁଡ଼ିକୁ ମିଶାନ୍ତୁ"
#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
-msgstr ""
+msgstr "ଟ୍ୟାଗ ହୋଇଥିବା ଫୋଟଗୁଡ଼ିକୁ ଅନ୍ତର୍ଭୁକ୍ତ କରନ୍ତୁ \"{0}\""
#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
-msgstr ""
+msgstr "ଟ୍ୟାଗ ହୋଇଥିବା ଫୋଟୋଗୁଡ଼ିକୁ ବହିର୍ଭୁକ୍ତ କରନ୍ତୁ \"{0}\""
#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
-msgstr ""
+msgstr "ସନ୍ଧାନରୁ କାଢ଼ନ୍ତୁ"
#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ଏହା ସହିତ ଖୋଜନ୍ତୁ (_W)"
+msgstr[1] "ଏହା ସହିତ ଖୋଜନ୍ତୁ (_W)"
#: ../src/TagQueryWidget.cs:114
msgid "All"
@@ -3200,15 +3290,15 @@ msgstr "ସମସ୍ତ"
#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
-msgstr ""
+msgstr "{0} ନୁହଁ"
#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
-msgstr ""
+msgstr "ସେମାନଙ୍କୁ ସନ୍ଧାନ କରିବା ପାଇଁ ଟ୍ୟାଗଗୁଡ଼ିକୁ ଟାଣନ୍ତୁ"
#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
-msgstr ""
+msgstr "ଟ୍ୟାଗକୁ ପୁନଃ ନାମକରଣ କରିବାରେ ତ୍ରୁଟି"
#: ../src/TagStore.cs:203
msgid "Favorites"
@@ -3257,20 +3347,20 @@ msgstr "କିମ୍ବା"
#: ../src/ThumbnailCommand.cs:20
msgid "Updating Thumbnails"
-msgstr ""
+msgstr "ଅଙ୍ଗୁଳି ଚିହ୍ନଗୁଡ଼ିକୁ ଅଦ୍ୟତନ କରୁଅଛି"
#: ../src/ThumbnailCommand.cs:28
#, csharp-format
msgid "Updating picture \"{0}\""
-msgstr ""
+msgstr "ଛବି \"{0}\" କୁ ଅଦ୍ୟତନ କରୁଅଛି"
#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
-msgstr ""
+msgstr "GNOME ପାଇଁ ଫୋଟୋ ପରିଚାଳନା"
#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
-msgstr ""
+msgstr "Copyright © 2003-2009 Novell Inc."
#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
@@ -3278,13 +3368,13 @@ msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri at redhat.com>"
#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
-msgstr ""
+msgstr "F-Spot ୱେବସାଇଟ"
#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
msgid "Shift all photos by {0}"
-msgstr ""
+msgstr "{0} ଦ୍ୱାରା ସମସ୍ତ ଫୋଟୋଗୁଡ଼ିକୁ ପୃଥକ କରନ୍ତୁ"
#: ../src/UI.Dialog/DateRangeDialog.cs:99
msgid "Today"
@@ -3296,40 +3386,40 @@ msgstr "ଗତକାଲି"
#: ../src/UI.Dialog/DateRangeDialog.cs:103
msgid "Last 7 days"
-msgstr ""
+msgstr "ଅନ୍ତିମ 7 ଦିନ"
#: ../src/UI.Dialog/DateRangeDialog.cs:105
msgid "Last 30 days"
-msgstr ""
+msgstr "ଅନ୍ତିମ 30 ଦିନ"
#: ../src/UI.Dialog/DateRangeDialog.cs:107
msgid "Last 90 days"
-msgstr ""
+msgstr "ଅନ୍ତିମ 90 ଦିନ"
#: ../src/UI.Dialog/DateRangeDialog.cs:109
msgid "Last 360 days"
-msgstr ""
+msgstr "ଅନ୍ତିମ 360 ଦିନ"
#: ../src/UI.Dialog/DateRangeDialog.cs:111
msgid "Current Week (Mon-Sun)"
-msgstr ""
+msgstr "ଏହି ସପ୍ତାହ (ସୋମ-ରବି)"
#: ../src/UI.Dialog/DateRangeDialog.cs:113
msgid "Previous Week (Mon-Sun)"
-msgstr ""
+msgstr "ପୂର୍ବ ସପ୍ତାହ (ସୋମ-ରବି)"
#: ../src/UI.Dialog/DateRangeDialog.cs:131
msgid "Customized Range"
-msgstr ""
+msgstr "ପରିସରକୁ ଇଚ୍ଛାମୁତାବକ କରନ୍ତୁ"
#: ../src/UI.Dialog/EditTagIconDialog.cs:46
#, csharp-format
msgid "Edit Icon for Tag {0}"
-msgstr ""
+msgstr "ଟ୍ୟାଗ {0} ପାଇଁ ଚିତ୍ରସଂକେତକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
#: ../src/UI.Dialog/EditTagIconDialog.cs:68
msgid "Select Photo from file"
-msgstr ""
+msgstr "ଫାଇଲରୁ ଫୋଟୋକୁ ବାଛନ୍ତୁ"
#: ../src/UI.Dialog/EditTagIconDialog.cs:90
#, csharp-format
@@ -3341,24 +3431,30 @@ msgid ""
" with this tag. Please tag a photo as '{0}' and return here\n"
" to use it as an icon."
msgstr ""
+"\n"
+"<b>ଫୋଟୋରୁ</b>\n"
+" ଆପଣଙ୍କର ଲାଇବ୍ରେରୀ ଫୋଟୋଗୁଡ଼ିକ ମଧ୍ଯରୁ ଗୋଟିକୁ ଚିତ୍ରସଂକେତ ପରି ଏହି ଟ୍ୟାଗ ପାଇଁ ବ୍ୟବହାର କରନ୍ତୁ।\n"
+" ଯଦିଚ, ଆପଣଙ୍କ ପାଖରେ ପ୍ରଥମେ ଏହି ଟ୍ୟାଗ ସହିତ ସଂଶ୍ଳିଷ୍ଟ ଅତିକମରେ\n"
+" ଗୋଟିଏ ଫୋଟୋ ଥିବା ଉଚିତ।। ଦୟାକରି '{0}' ପରି ଗୋଟିଏ ଫୋଟୋ ଲଗାଇବା ଉଚିତ\n"
+" ଏବଂ ଚିତ୍ର ସଂକେତ ଭାବରେ ବ୍ୟବହାର କରିବା ପାଇଁ ଏଠାରେ ଫେରାନ୍ତୁ।"
#: ../src/UI.Dialog/EditTagIconDialog.cs:168
msgid "Unable to load image"
-msgstr ""
+msgstr "ପ୍ରତିଛବି ଧାରଣ କରିବାରେ ଅସମର୍ଥ"
#: ../src/UI.Dialog/EditTagIconDialog.cs:169
#, csharp-format
msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr ""
+msgstr "\"{0}\" କୁ ଟ୍ୟାଗ ପାଇଁ ଚିତ୍ର ସଂକେତ ଭାବରେ ଧାରଣ କରିବାରେ ଅସମର୍ଥ"
#: ../src/UI.Dialog/EditTagIconDialog.cs:207
#, csharp-format
msgid "Photo {0} of {1}"
-msgstr ""
+msgstr "ଫୋଟୋ {0} ର {1}"
#: ../src/UI.Dialog/ExceptionDialog.cs:24
msgid "F-Spot Encountered a Fatal Error"
-msgstr ""
+msgstr "F-Spot ଗୋଟିଏ ମାରାତ୍ମକ ତ୍ରୁଟିର ସମ୍ମୁଖିନ ହୋଇଛି"
#: ../src/UI.Dialog/ExceptionDialog.cs:60
msgid "Error Details"
@@ -3379,11 +3475,11 @@ msgstr "ତନ୍ତ୍ର ରୂପରେଖ"
#: ../src/UI.Dialog/PreferenceDialog.cs:84
msgid "Standard theme"
-msgstr ""
+msgstr "ମାନକ ପ୍ରସଙ୍ଗ"
#: ../src/UI.Dialog/RepairDbDialog.cs:20
msgid "Error loading database."
-msgstr ""
+msgstr "ତଥ୍ୟାଧାର ଧାରଣ କରିବାରେ ତ୍ରୁଟି।"
#: ../src/UI.Dialog/RepairDbDialog.cs:21
#, csharp-format
@@ -3391,6 +3487,8 @@ msgid ""
"F-Spot encountered an error while loading the photo database. The old "
"database has be moved to {0} and a new database has been created."
msgstr ""
+"ଫୋଟୋ ତଥ୍ୟାଧାର ଧାରଣ କରିବା ସମୟରେ F-Spot ଗୋଟିଏ ତ୍ରୁଟିର ସମ୍ମୁଖିନ ହୋଇଛି। ପୁରୁଣା ତଥ୍ୟାଧାରକୁ "
+"{0} କୁ ଘୁଞ୍ଚାଯାଇଛି ଏବଂ ଗୋଟିଏ ନୂତନ ତଥ୍ୟାଧାର ନିର୍ମାଣ କରାଯାଇଛି।"
#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
msgid "Label"
@@ -3406,7 +3504,7 @@ msgstr "ପୁନଃପ୍ରଚେଷ୍ଟା କରନ୍ତୁ"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
msgid "0000:00:00 00:00:00"
-msgstr ""
+msgstr "0000:00:00 00:00:00"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
msgid "00:00:00"
@@ -3426,11 +3524,11 @@ msgstr "<b>ସନ୍ଦର୍ଭ ଫୋଟୋ</b>"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
msgid "Adjust Time"
-msgstr ""
+msgstr "ସମୟକୁ ସଜାଡନ୍ତୁ"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
msgid "Adjusted date: "
-msgstr ""
+msgstr "ସଜଡ଼ା ଯାଇଥିବା ତାରିଖ: "
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
msgid "Current date:"
@@ -3438,7 +3536,7 @@ msgstr "ପ୍ରଚଳିତ ତାରିଖ:"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
msgid "Space all photos by"
-msgstr ""
+msgstr "ସମସ୍ତ ଫୋଟଗୁଡ଼ିକୁ ଏହା ଦ୍ୱାରା ପୃଥକ କରନ୍ତୁ"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
msgid "difference:"
@@ -3446,7 +3544,7 @@ msgstr "ଭିନ୍ନତା:"
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
msgid "min. Starting at {0}"
-msgstr ""
+msgstr "ମିନଟ। {0} ରେ ଆରମ୍ଭ କରୁଅଛି"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
msgid "<b>End Date</b>"
@@ -3462,19 +3560,19 @@ msgstr "<b>ଆରମ୍ଭ ତାରିଖ</b>"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
msgid "Cancel, do not change the current timeline. "
-msgstr ""
+msgstr "ବାତିଲ, ବର୍ତ୍ତମାନର ସମୟଦାରାକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ ନାହିଁ। "
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
msgid "Only photos taken within these dates will be displayed."
-msgstr ""
+msgstr "କେବଳ ଏହି ତାରିଖ ମଧ୍ଯରେ ନିଆଯାଇଥିବା ଫୋଟୋଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ।"
#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
msgid "Set date range"
-msgstr ""
+msgstr "ତାରିଖ ସୀମା ସେଟ କରନ୍ତୁ"
#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
msgid "<small></small>"
-msgstr ""
+msgstr "<small></small>"
#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
msgid "Edit Tag"
@@ -3506,7 +3604,7 @@ msgstr "<b>ପ୍ରାକଦର୍ଶନ</b>"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
msgid "Design icon from"
-msgstr ""
+msgstr "ଏଥିରୁ ଚିତ୍ରସଂକେତକୁ ରଚନା କରନ୍ତୁ"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
msgid "Edit Tag Icon"
@@ -3514,19 +3612,19 @@ msgstr "ଟ୍ୟାଗ ଚିତ୍ରସଂକେତକୁ ସମ୍ପାଦ
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
msgid "No _image"
-msgstr ""
+msgstr "କୌଣସି ଛବି ନାହିଁ (_i)"
#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
msgid "Photo 0 of 0"
-msgstr ""
+msgstr "ଫୋଟୋ 0 ର 0"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
msgid "Color profile for display:"
-msgstr ""
+msgstr "ଦର୍ଶାଇବା ପାଇଁ ରଙ୍ଗ ରୂପରେଖା:"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
msgid "Color profile for printing:"
-msgstr ""
+msgstr "ମୁଦ୍ରଣ କରିବା ପାଇଁ ରଙ୍ଗ ରୂପରେଖା:"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
msgid "F-Spot Preferences"
@@ -3534,13 +3632,15 @@ msgstr "F-Spot ପସନ୍ଦ"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
msgid "F-Spot appearance:"
-msgstr ""
+msgstr "F-Spot ଦୃଶ୍ୟ:"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
"Inside the image files when possible\n"
"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
+"ସମ୍ଭବ ହେଲେ ପ୍ରତିଛବି ଫାଇଲ ମଧ୍ଯରେ\n"
+"<small>ଅନ୍ୟ ପ୍ରତିଛବି-ସମ୍ପାଦନ ପ୍ରଗ୍ରାମଗୁଡ଼ିକୁ ଅଭିଗମ୍ୟ କରିବା ପାଇଁ ସେମାନଙ୍କୁ ଅନୁମତି ଦିଅନ୍ତୁ।</small>"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
msgid "Select A Folder"
@@ -3548,15 +3648,15 @@ msgstr "ଗୋଟିଏ ଫୋଲଡ଼ରକୁ ମନୋନିତ କରନ୍
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
msgid "Separately from the image files"
-msgstr ""
+msgstr "ପ୍ରତିଛବି ଫାଇଲଗୁଡ଼ିକରୁ ପୃଥକ ଭାବରେ"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
msgid "Store tags and descriptions for photos:"
-msgstr ""
+msgstr "ଫୋଟୋଗୁଡ଼ିକ ପାଇଁ ଟ୍ୟାଗ ଏବଂ ବର୍ଣ୍ଣନା ରଖିଥାଏ:"
#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
msgid "When importing photos, copy them to:"
-msgstr ""
+msgstr "ଫୋଟୋଗୁଡ଼ିକୁ ଆମଦାନି କରିବା ସମୟରେ, ସେମାନଙ୍କୁ ନକଲ କରନ୍ତୁ:"
#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
msgid "<b>Max Rating</b>"
@@ -3568,15 +3668,15 @@ msgstr "<b>ସର୍ବନିମ୍ନ ମାନ୍ୟତା</b>"
#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
msgid "Set Rating Filter"
-msgstr ""
+msgstr "ମାନ୍ୟତା ଛାଣକ ସେଟ କରନ୍ତୁ"
#: ../src/ui/main_window.ui.h:1
msgid "Adjust _Time..."
-msgstr ""
+msgstr "ସମୟ ମେଳାନ୍ତୁ (_T)..."
#: ../src/ui/main_window.ui.h:2
msgid "Arrange _by"
-msgstr ""
+msgstr "ଦ୍ୱାରା ସଜାଡ଼ନ୍ତୁ (_b)"
#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
@@ -3584,7 +3684,7 @@ msgstr "ତାରିଖ ସୁଦ୍ଧା (_D)"
#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
-msgstr ""
+msgstr "ରୋଲ ଆମଦାନୀ କରିବା ଦ୍ୱାରା (_I)"
#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
@@ -3616,7 +3716,7 @@ msgstr "ପୃଷ୍ଠା ବିନ୍ୟାସ (_u)..."
#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
-msgstr ""
+msgstr "ଅଙ୍ଗୁଳି ଚିହ୍ନକୁ ସତେଜନ କରନ୍ତୁ (_f)"
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
@@ -3624,7 +3724,7 @@ msgstr "କାହାକୁ ମନୋନିତ କରନ୍ତୁ ନାହିଁ
#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
-msgstr ""
+msgstr "ମେଲ ଦ୍ୱାରା ପଠାନ୍ତୁ (_M)..."
#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
@@ -3648,15 +3748,15 @@ msgstr "ଦ୍ରୁଶ୍ଯ"
#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
-msgstr ""
+msgstr "ଚୟନରେ ଟ୍ୟାଗ ଲଗାନ୍ତୁ (_A)"
#: ../src/ui/main_window.ui.h:35
msgid "_Clear Rating Filter"
-msgstr ""
+msgstr "ମାନ୍ୟତା ପ୍ରାପ୍ତ ଛାଣକକୁ ଲିଭାନ୍ତୁ (_C)"
#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
-msgstr ""
+msgstr "ରୋଲ ଛାଣକକୁ ଲିଭାନ୍ତୁ (_C)"
#: ../src/ui/main_window.ui.h:38
msgid "_Components"
@@ -3672,7 +3772,7 @@ msgstr "ତାରିଖ (_D)"
#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
-msgstr ""
+msgstr "ବଚ୍ଛିତ ଟ୍ୟାଗକୁ ଅପସାରଣ କରନ୍ତୁ (_D)"
#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
@@ -3688,7 +3788,7 @@ msgstr "କୁ ରପ୍ତାନୀ କରନ୍ତୁ (_E)"
#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
-msgstr ""
+msgstr "ଚିତ୍ରପଟ (_F)"
#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
@@ -3704,11 +3804,11 @@ msgstr "ବଡ (_L)"
#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
-msgstr ""
+msgstr "ଶେଷଥର ଆମଦାନୀ କରାହୋଇଥିବା ରୋଲ (_L)"
#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
-msgstr ""
+msgstr "ଲୋପ (_L)"
#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
@@ -3724,7 +3824,7 @@ msgstr "ମାନ୍ୟତା (_R)"
#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
-msgstr ""
+msgstr "ଚୟନରୁ ଟ୍ୟାଗ କାଢ଼ନ୍ତୁ (_R)"
#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
@@ -3732,7 +3832,7 @@ msgstr "ସଂସ୍କରଣକୁ ପୁନଃନାମକରଣ କରନ୍
#: ../src/ui/main_window.ui.h:62
msgid "_Reverse Order"
-msgstr ""
+msgstr "ଓଲଟା କ୍ରମ (_R)"
#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
@@ -3740,11 +3840,11 @@ msgstr "ପଠାଯାଇଥିବା ରୋଲକୁ ବାଛନ୍ତୁ (_S
#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
-msgstr ""
+msgstr "ତାରିଖ ସୀମା ସେଟ କରନ୍ତୁ (_S)..."
#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
-msgstr ""
+msgstr "ମାନ୍ୟତା ପ୍ରାପ୍ତ ଛାଣକ ସେଟ କରନ୍ତୁ (_S)..."
#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
@@ -3756,7 +3856,7 @@ msgstr "ଛୋଟ (_S)"
#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
-msgstr ""
+msgstr "ଚିତ୍ର ସଂକେତଗୁଡ଼ିକ (_T)"
#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
@@ -3772,7 +3872,7 @@ msgstr "ଉପକରଣଗୁଡିକ (_T)"
#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
-msgstr ""
+msgstr "ଟ୍ୟାଗହୀନ ଫୋଟୋଗୁଡ଼ିକ (_U)"
#: ../src/ui/main_window.ui.h:74
msgid "_Version"
@@ -3780,13 +3880,15 @@ msgstr "ସଂସ୍କରଣ (_V)"
#: ../src/Updater.cs:616
msgid "Updating F-Spot Database"
-msgstr ""
+msgstr "F-Spot ତଥ୍ୟାଧାରକୁ ଅଦ୍ୟତନ କରୁଅଛି"
#: ../src/Updater.cs:617
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
msgstr ""
+"ଆପଣଙ୍କର F-Spot ଗ୍ୟାଲେରୀର ତଥ୍ୟାଧାର ଅଦ୍ୟତିତ ହେବା ପର୍ଯ୍ୟନ୍ତ ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ। ଏହା କିଛି "
+"ସମୟ ନେଇପାରେ।"
#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
#: ../src/Utils/Unix.cs:35
@@ -3802,15 +3904,15 @@ msgstr "ପୃଷ୍ଠା ବ୍ଯବସ୍ଥା"
#: ../src/Widgets/CustomPrintWidget.cs:133
#, csharp-format
msgid "Paper Size: {0} x {1} mm"
-msgstr ""
+msgstr "କାଗଜ ଆକାର: {0} x {1} mm"
#: ../src/Widgets/CustomPrintWidget.cs:130
msgid "Set Page Size and Orientation"
-msgstr ""
+msgstr "ପୃଷ୍ଠା ଆକାର ଏବଂ ଦିଗ ସେଟ କରନ୍ତୁ"
#: ../src/Widgets/CustomPrintWidget.cs:141
msgid "Photos per page"
-msgstr ""
+msgstr "ପ୍ରତି ପୃଷ୍ଠାରେ ଥିବା ଫୋଟସଂଖ୍ୟା"
#: ../src/Widgets/CustomPrintWidget.cs:151
msgid "Repeat"
@@ -3818,7 +3920,7 @@ msgstr "ପୁନର୍ବାର କରନ୍ତୁ"
#: ../src/Widgets/CustomPrintWidget.cs:152
msgid "Print cut marks"
-msgstr ""
+msgstr "କଟା ଚିହ୍ନଗୁଡ଼ିକୁ ମୁଦ୍ରଣ କରନ୍ତୁ"
#: ../src/Widgets/CustomPrintWidget.cs:158
msgid "Photos layout"
@@ -3882,12 +3984,14 @@ msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
msgstr ""
+"ଏହି ଉପକରଣଟି ଗୋଟିଏ ସକ୍ରିୟ ଚୟନ ଆବଶ୍ୟକ କରିଥାଏ। ଦୟାକରି ଫୋଟୋ ପାଇଁ ଗୋଟିଏ ସ୍ଥାନ ନିରୁପଣ "
+"କରନ୍ତୁ ଏବଂ ସେହି ପ୍ରୟୋଗକୁ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ"
#: ../src/Widgets/EditorPage.cs:215
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ସଜଡ଼ାଯାଇଥିବା ଫୋଟୋକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
+msgstr[1] "ସଜଡ଼ାଯାଇଥିବା ଫୋଟୋଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
#: ../src/Widgets/EditorPage.cs:217
#, csharp-format
@@ -3895,6 +3999,8 @@ msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
"JPEG before you can edit them."
msgstr ""
+"ବ୍ୟତିକ୍ରମ \"{0}\" ଗ୍ରହଣ କରିଛି। ମନେରଖନ୍ତୁ ଯେ ଆପଣଙ୍କୁ RAW ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରିବା ପୂର୍ବରୁ "
+"JPEG ରେ ଉନ୍ନତ କରିବାକୁ ହେବ।"
#: ../src/Widgets/Filmstrip.cs:572
msgid "_Horizontal"
@@ -4003,11 +4109,11 @@ msgstr "ଆକାର ଦର୍ଶାନ୍ତୁ"
#: ../src/Widgets/InfoBox.cs:815
msgid "Show Exposure"
-msgstr ""
+msgstr "ବିବରଣ ଦର୍ଶାନ୍ତୁ"
#: ../src/Widgets/InfoBox.cs:824
msgid "Show Focal Length"
-msgstr ""
+msgstr "ନାଭ୍ୟାୟାମ ଦର୍ଶାନ୍ତୁ"
#: ../src/Widgets/InfoBox.cs:833
msgid "Show Camera"
@@ -4023,12 +4129,12 @@ msgstr "ମଧ୍ଯତଥ୍ଯ"
#: ../src/Widgets/MetadataDisplay.cs:104
msgid "Extended Metadata"
-msgstr ""
+msgstr "ଅନୁଲମ୍ବିତ ଅଧିତଥ୍ୟ"
#. clear Extended Metadata
#: ../src/Widgets/MetadataDisplay.cs:392
msgid "No Extended Metadata Available"
-msgstr ""
+msgstr "କୌଣସି ଅନୁଲମ୍ବିତ ଅଧିତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"
#: ../src/Widgets/MetadataDisplay.cs:410
msgid "No active photo"
@@ -4037,11 +4143,11 @@ msgstr "କୌଣସି ସକ୍ରିୟ ଫୋଟୋ ନାହିଁ"
#: ../src/Widgets/MetadataDisplay.cs:412
#, csharp-format
msgid "The photo \"{0}\" does not exist"
-msgstr ""
+msgstr "ଫୋଟୋ \"{0}\" ଅବସ୍ଥିତ ନାହିଁ"
#: ../src/Widgets/MetadataDisplay.cs:415
msgid "No metadata available"
-msgstr ""
+msgstr "କୌଣସି ଅଧିତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"
#: ../src/Widgets/OpenWithMenu.cs:71
msgid "No applications available"
@@ -4066,9 +4172,9 @@ msgstr "ରାଜ୍ଯ"
#. namespace
#: ../tools/f-spot-screensaver.desktop.in.h:1
msgid "Display a slideshow from F-Spot"
-msgstr ""
+msgstr "F-Spot ରୁ ଗୋଟିଏ ସ୍ଲାଇଡ ଦୃଶ୍ୟ ଦର୍ଶାନ୍ତୁ"
#: ../tools/f-spot-screensaver.desktop.in.h:2
msgid "F-Spot photos"
-msgstr ""
+msgstr "F-Spot ଫୋଟୋଗୁଡ଼ିକ"
diff --git a/po/pa.po b/po/pa.po
index 061cc15..826a3d8 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -9,392 +9,1373 @@ msgstr ""
"Project-Id-Version: f-spot.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
"cgi?product=f-spot&component=General\n"
-"POT-Creation-Date: 2009-02-25 15:30+0000\n"
-"PO-Revision-Date: 2009-04-01 07:05+0000\n"
+"POT-Creation-Date: 2009-11-21 19:16+0000\n"
+"PO-Revision-Date: 2009-11-22 11:26+0530\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjab-l10n at list.sf.net>\n"
+"Language-Team: Punjabi/Panjabi <punjab-users at lists.sf.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.0\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "ਵਰਜਨ:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+#| msgid "..."
+msgid "_CD..."
+msgstr "_CD..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "ਤਸਵੀਰਾਂ ਤਬਦੀਲ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "CD ਤੋਂ \"{0}\" ਤਸਵੀਰ ਤਬਦੀਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{1} ਵਿੱਚੋਂ {0}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "ਫੋਟੋ ਭੇਜਣਾ ਮੁਕੰਮਲ"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "ਭੇਜਣਾ ਮੁਕੰਮਲ"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr ""
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>ਫੋਟੋ ਲਿਖੋ</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
#| msgid "Authorize"
-msgid "Author:"
-msgstr "ਲੇਖਕ:"
+msgid "Autorotate"
+msgstr "ਆਟੋਮੈਟਿਕ-ਘੁੰਮਾਓ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-#| msgid "Copyright"
-msgid "Copyright:"
-msgstr "ਕਾਪੀਰਾਈਟ:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "CD ਬਣਾਓ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+#| msgid "Size:"
+msgid "Size"
+msgstr "ਆਕਾਰ"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "ਝਲਕ ਫਾਇਲਾਂ"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "ਨਿਰਯਾਤ"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "ਲਿਖਣ CD"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "ਫੇਸਬੁੱਕ(_a)..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਲਈ ਉਡੀਕ ਜਾਰੀ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "ਐਕਸਪੋਰਟ ਕਰਨ ਲਈ ਬਹੁਤ ਵੱਧ ਚਿੱਤਰ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "ਤਸਵੀਰਾਂ ਅੱਪਲੋਡ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "ਐਲਬਮ ਦਾ ਨਾਂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "ਨਵੀਂ ਐਲਬਮ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
msgstr ""
+"ਨਵੀਂ ਐਲਬਮ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ।\n"
+"\n"
+"{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565, csharp-format
+#| msgid "Uploading picture \"{0}\""
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "ਤਸਵੀਰ \"{0}\" ({2} ਵਿੱਚੋਂ {1}) ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "ਫੇਸਬੁੱਕ ਉੱਤੇ ਅੱਪਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "ਅੱਪਲੋਡ ਮੁਕੰਮਲ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "ਫੇਸਬੁੱਕ ਉੱਤੇ F-ਸਪੋਟ ਗਰੁੱਪ ਵੇਖੋ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਲਈ ਉਡੀਕ ਜਾਰੀ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "ਪਰਮਾਣਿਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+#| msgid "Error connecting to camera"
+msgid "Error logging into Facebook"
+msgstr "ਫੇਸਬੁੱਕ 'ਚ ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+#| msgid "Authorize"
+msgid "Authorizing Session"
+msgstr "ਪ੍ਰਮਾਣਿਤ ਸ਼ੈਸ਼ਨ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "ਸ਼ੈਸ਼ਨ ਸਥਾਪਿਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} ਨੇ ਫੇਸਬੁੱਕ ਵਿੱਚ ਲਾਗਇਨ ਕੀਤਾ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "ਫੇਸਬੁੱਕ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-#| msgid "Operation failed"
-msgid "The installation failed!"
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ!"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "ਤੁਸੀਂ ਲਾਗਇਨ ਨਹੀਂ ਹੋ।"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+#| msgid "C_aption:"
+msgid "Caption"
+msgstr "ਸੁਰਖੀ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+#| msgid "Create New Tag"
+msgid "Create a new album"
+msgstr "ਨਵੀਂ ਐਲਬਮ ਬਣਾਓ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+#| msgid "D_escription:"
+msgid "Description"
+msgstr "ਵੇਰਵਾ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+#| msgid "Export to _Folder..."
+msgid "Export to Facebook"
+msgstr "ਫੇਸਬੁੱਕ ਉੱਤੇ ਐਕਸਪੋਰਟ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+#| msgid "No active photo"
+msgid "In this photo"
+msgstr "ਇਹ ਫੋਟੋ ਵਿੱਚ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+#| msgid "Copy Locat_ion"
+msgid "Location"
+msgstr "ਟਿਕਾਣਾ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+#| msgid "Loading"
+msgid "Login"
+msgstr "ਲਾਗਇਨ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+#| msgid "Logo"
+msgid "Logout"
+msgstr "ਲਾਗਆਉਟ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
+msgid "Name"
+msgstr "ਨਾਂ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "ਲਾਗਇਨ ਨਹੀਂ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+#| msgid "Version:"
+msgid "Permissions:"
+msgstr "ਅਧਿਕਾਰ:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+#| msgid "(Not Connected)"
+msgid "Stay Connected"
+msgstr "ਕੁਨੈਕਟ ਰਹੋ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "ਮੌਜੂਦਾ ਐਲਬਮ ਵਰਤੋਂ"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "ਇਹ ਕੌਣ ਹੈ?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "ਫਲਿੱਕਰ(_F)..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+#| msgid "_Import..."
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "ਪ੍ਰਮਾਣਿਤ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
+#, csharp-format
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-#| msgid "Operation failed"
-msgid "The uninstallation failed!"
-msgstr "ਅਣ-ਇੰਸਟਾਲੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ!"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਮੁਕੰਮਲ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117, csharp-format
+#| msgid "Logging into Flickr.Com"
+msgid "Logging into {0}"
+msgstr "{0} ਵਿੱਚ ਲਾਗਇਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125, csharp-format
+#| msgid "Welcome {0} you are connected to Flickr.Com"
+msgid "Welcome {0} you are connected to {1}"
+msgstr "{0} ਜੀ ਆਇਆਂ ਨੂੰ, ਤੁਸੀਂ {1} ਨਾਲ ਜੁੜ ਗਏ ਹੋ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "ਵੱਖਰੇ ਯੂਜ਼ਰ ਵਜੋਂ ਲਾਗਇਨ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "ਲਾਗ-ਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "{1} ਦੇ {0} ਜਵਾਬ ਦੀ ਉਡੀਕ ਜਾਰੀ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "ਲਾਗ-ਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>ਅਕਾਊਂਟ</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>ਫੋਟੋ</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>ਸਟਾਈਲ</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>ਅਧਿਕਾਰ ਵੇਖੇ ਜਾ ਰਹੇ ਹਨ</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../src/f-spot.glade.h:43
+msgid "Export"
+msgstr "ਐਕਸਪੋਰਟ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+#, fuzzy
+#| msgid "Export to _Web Gallery..."
+msgid "Export tag _hierarchy"
+msgstr "ਵੈੱਬ ਗੈਲਰੀ ਲਈ ਨਿਰਯਾਤ(_W)..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-#| msgid "Operation failed"
-msgid "Installation failed"
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "ਨਿੱਜੀ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-#| msgid "By Extension"
-msgid "Extension"
-msgstr "ਐਕਸ਼ਟੇਸ਼ਨ"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "ਪਬਲਿਕ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-#| msgid "_Version"
-msgid "Version"
-msgstr "ਵਰਜਨ"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "ਸਟਿਰਪ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-#| msgid "dither"
-msgid "Other"
-msgstr "ਹੋਰ"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "ਪਰਿਵਾਰ ਨੂੰ ਵੇਖਾਓ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:9
-#| msgid "Name:"
-msgid "Name"
-msgstr "ਨਾਂ"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "ਦੋਸਤਾਂ ਨੂੰ ਵੇਖਾਓ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "ਐਕਸਪੋਰਟ ਟੈਗ(_E)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "ਮੁੜ-ਆਕਾਰ(_R): "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "ਝਾਤੀ ਵਿੱਚ ਸਮਾਪਤ"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "ਪਿਕਸਲ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+#| msgid "Open _Folder..."
+msgid "F_older..."
+msgstr "ਫੋਲਡਰ(_o)..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "ਐਕਸਪੋਰਟ ਫੋਲਡਰ ਚੁਣੋ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "ਗੈਲਰੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, fuzzy, csharp-format
+#| msgid "Uploading picture \"{0}\""
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "ਗਲਤੀ: ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ; ਅਧੂਰਾ ਛੱਡਿਆ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "ਗਲਤੀ: ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ; ਅਧੂਰਾ ਛੱਡਿਆ"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+msgid "Light"
+msgstr "ਰੌਸ਼ਨੀ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+msgid "Dark"
+msgstr "ਹਨ੍ਹੇਰਾ"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+msgid "Prev"
+msgstr "ਪਿੱਛੇ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "ਇੰਡੈਕਸ"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:64
+#| msgid "_Tags"
+msgid "Tags"
+msgstr "ਟੈਗ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
+#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "ਅੱਗੇ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+msgid "Gallery generated by"
+msgstr "ਗੈਲਰੀ ਬਣਾਈ ਗਈ ਹੈ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+msgid "Show Styles"
+msgstr "ਸਟਾਈਲ ਵੇਖੋ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+msgid "Hide Styles"
+msgstr "ਸਟਾਈਲ ਓਹਲੇ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "ਟੈਗ "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+msgid "Page:"
+msgstr "ਸਫ਼ਾ:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>ਟਿਕਾਣਾ</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>ਐਕਸਪੋਰਟ ਢੰਗ</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "ਵੇਰਵਾ(_e):"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+#| msgid "_Export tags"
+msgid "Export _tags"
+msgstr "ਐਕਸਪੋਰਟ ਟੈਗ(_t)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+#, fuzzy
+#| msgid "_Export tags"
+msgid "Export tag _icons"
+msgstr "ਨਿਰਯਾਤ"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "ਫੋਲਡਰ ਐਕਸਪੋਰਟ"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "ਗੈਲਰੀ ਨਾਂ(_a):"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr ""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "ਫੋਲਡਰ(_F):"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "ਕੇਵਲ ਫਾਇਲਾਂ ਸੰਭਾਲੋ(_S)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+#| msgid "Export to _Web Gallery..."
+msgid "Web _Gallery..."
+msgstr "ਵੈੱਬ ਗੈਲਰੀ(_G)..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "ਗਲਤ URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr ""
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+#| msgid "Error connecting to camera"
+msgid "Error while connecting to Gallery"
+msgstr "ਗੈਲਰੀ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
#, csharp-format
-msgid "Exception occurred: {0}"
+msgid "The following error was encountered while attempting to log in: {0}"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-#| msgid "Page:"
-msgid "Package"
-msgstr "ਪੈਕੇਜ"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "ਇਸ ਨਾਂ ਨਾਲ ਗੈਲਰੀ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(ਸਭ ਤੋਂ ਉੱਤੇ)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+#| msgid "G_allery Name:"
+msgid "Invalid Gallery name"
+msgstr "ਗਲਤ ਗੈਲਰੀ ਨਾਂ"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, fuzzy, csharp-format
+#| msgid "Uploading picture \"{0}\""
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(ਗੈਲਰੀ ਨਹੀਂ)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(ਕੁਨੈਕਟ ਨਹੀਂ)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(ਐਲਬਮ ਨਹੀਂ)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "ਅਕਾਊਂਟ ਨਹੀਂ ਚੁਣਿਆ"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>ਐਲਬਮ</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>ਗੈਲਰੀ</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr "<span weight='bold' size='larger'>ਗੈਲਰੀ ਨਾਲ ਜੁੜਨ ਦੌਰਾਨ ਗਲਤੀ</span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "ਰਿਪੋਜ਼ਟਰੀ(_R)..."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "ਸਭ ਪੈਕੇਜ ਵੇਖੋ"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "ਕੇਵਲ ਨਵੇਂ ਵਰਜਨ ਹੀ ਵੇਖੋ"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "ਕੇਵਲ ਅੱਪਡੇਟ ਹੀ ਵੇਖੋ"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "ਐਲਬਮ ਨਾਂ(_A):"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-#| msgid "Select _All"
-msgid "_Unselect All"
-msgstr "ਸਭ ਅਣ-ਇੰਸਟਾਲ(_U)"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "ਵੇਰਵਾ(_D):"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:110
-msgid "Select _All"
-msgstr "ਸਭ ਚੁਣੋ(_A)"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "ਐਕਸਪੋਰਟ ਕਰਨ ਲਈ ਐਲਬਮ(_E):"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "ਗੈਲਰੀ ਨਾਂ(_G):"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "ਗੈਲਰੀ(_G):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "ਮੁੱਢਲੀ ਐਲਬਮ(_P):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+msgid "_Password:"
+msgstr "ਪਾਸਵਰਡ(_P):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "ਟਾਈਟਲ(_T):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+msgid "_Username:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr ""
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
#, fuzzy
-#| msgid "Downloading Previews"
-msgid "Downloading extensions..."
-msgstr "ਝਲਕ ਡਾਊਨਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+#| msgid "Error while rotating photo."
+msgid "Error while creating new album"
+msgstr "ਗਲਤੀ ਫੋਟੋ."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-#| msgid "Photo Manager"
-msgid "Extension Manager"
-msgstr "ਐਕਸਟੈਨਸ਼ਨ ਮੈਨੇਜਰ"
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "ਪਿਕਾਸਾ-ਵੈੱਬ(_P)..."
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+#| msgid "Error while rotating photo."
+msgid "Error while creating Album"
+msgstr "ਐਲਬਮ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr ""
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} ਭੇਜੇ"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622, csharp-format
+#| msgid "{0} of {1}"
+msgid "{0} of approx. {1}"
+msgstr "{1} ਵਿੱਚੋਂ ਲਗਭਗ {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "ਉਪਲੱਬਧ ਥਾਂ: {0}, {2} ਵਿੱਚ {1} ਵਰਤੀ"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+#| msgid "<b>Exposure</b>"
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>ਪਿਕਾਸਾਵੈੱਬ ਐਕਸਪੋਰਟ</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+#| msgid ""
+#| "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>ਤੁਹਾਡਾ ਗੂਗਲ ਅਕਾਊਂਟ ਲਾਕ ਹੈ</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+#| msgid "Public"
+msgid "Public Album"
+msgstr "ਪਬਲਿਕ ਐਲਬਮ"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+#| msgid "_Album Name:"
+msgid "_Album Title:"
+msgstr "ਐਲਬਮ ਟਾਈਟਲ(_A):"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+#| msgid "Authorize"
+msgid "_Autorotate"
+msgstr "ਆਟੋਮੈਟਿਕ ਘੁੰਮਾਓ(_A)"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
#, fuzzy
-#| msgid "_Print..."
-msgid "_Uninstall..."
-msgstr "ਛਾਪੋ."
+#| msgid "<b>Exposure</b>"
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>ਐਕਸਪੋਜ਼ਰ</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:13
-msgid "Enable"
-msgstr "ਚਾਲੂ"
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+#| msgid "Amount:"
+msgid "_Account:"
+msgstr "ਅਕਾਊਂਟ(_A):"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "ਬੰਦ"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, fuzzy, csharp-format
+#| msgid "Uploading picture \"{0}\""
+msgid "Uploading photo \"{0}\""
+msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:799
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:543
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:694
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:177
-msgid "Error"
-msgstr "ਗਲਤੀ"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+#, fuzzy
+#| msgid "Logging into Flickr.Com"
+msgid "Logging into Tabblo"
+msgstr "Flickr.Com ਵਿੱਚ ਲਾਗ-ਇਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "ਵੇਰਵਾ"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr ""
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+#| msgid "Done Sending Photos"
+msgid "Done sending photos"
+msgstr "ਫੋਟੋ ਭੇਜਣਾ ਮੁਕੰਮਲ"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+#| msgid "Upload Complete"
+msgid "Upload complete"
+msgstr "ਅੱਪਲੋਡ ਮੁਕੰਮਲ"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "ਨਵੀਂ ਰਿਪੋਜ਼ਟਰੀ ਸ਼ਾਮਲ"
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+#, fuzzy
+#| msgid "Compression"
+msgid "Compressed fil_e..."
+msgstr "ਨਪੀੜਨ"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:196
+msgid "No selection available"
+msgstr "ਨਹੀਂ"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
#, fuzzy
-#| msgid "Select the camera from which you want to transfer files"
-msgid "Select the location of the repository you want to register:"
-msgstr "ਚੁਣੋ"
+#| msgid ""
+#| "This tool requires an active selection. Please select a region of the "
+#| "photo and try the operation again"
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr "ਸਰਗਰਮ ਦਾ ਫੋਟੋ ਅਤੇ"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+#| msgid "Select Export Folder"
+msgid "Select export folder"
+msgstr "ਐਕਸਪੋਰਟ ਫੋਲਡਰ ਚੁਣੋ"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+#| msgid "Operation failed"
+msgid "Exporting files"
+msgstr "ਫਾਇਲਾਂ ਐਕਸਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, fuzzy, csharp-format
+#| msgid "Uploading picture \"{0}\""
+msgid "Preparing photo \"{0}\""
+msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+#: ../src/f-spot.glade.h:92
+#| msgid "Create CD"
+msgid "_Create"
+msgstr "ਬਣਾਓ(_C)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+#| msgid "New name:"
+msgid "_File name:"
+msgstr "ਫਾਇਲ ਨਾਂ(_F):"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+#| msgid "C_aption:"
+msgid "_Location:"
+msgstr "ਟਿਕਾਣਾ(_L):"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+#| msgid "G_allery:"
+msgid "_Scale:"
+msgstr "ਸਕੇਲ(_S)"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "ਬੰਦ ਕਰੋ(_C)"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "ਤਸਵੀਰਾਂ ਲਈ ਕਾਰਵਾਈ ਜਾਰੀ..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "ਰੋਕਿਆ"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Hash for Duplicates"
+msgstr "ਡੁਪਲੀਕੇਟ ਲਈ ਹੈਸ਼"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+#| msgid "(No Gallery)"
+msgid "F-Spot Gallery"
+msgstr "ਐਫ-ਸਪੋਟ ਗੈਲਰੀ"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
msgstr ""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-#| msgid "Path"
-msgid "Path:"
-msgstr "ਮਾਰਗ:"
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "ਸਭ ਵੇਖੋ"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-#| msgid "Browse"
-msgid "Browse..."
-msgstr "ਝਲਕ..."
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119, csharp-format
+#| msgid "Edit Photo"
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} ਤਸਵੀਰ"
+msgstr[1] "{0} ਤਸਵੀਰਾਂ"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+#| msgid "Current date:"
+msgid "Current View"
+msgstr "ਮੌਜੂਦਾ ਝਲਕ"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+#| msgid "Delete Tag"
+#| msgid_plural "Delete Tags"
+msgid "Selected"
+msgstr "ਚੁਣੇ"
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+#| msgid "Export to _Web Gallery..."
+msgid "Live Web Gallery"
+msgstr "ਲਾਈਵ ਵੈੱਬ ਗੈਲਰੀ"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
msgstr ""
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
msgstr ""
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
msgstr ""
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
msgstr ""
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "URL ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-ਸਪੋਟ ਲਾਈਵ ਵੈੱਬ ਗੈਲਰੀ"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+#| msgid "G_allery:"
+msgid "Gallery URL:"
+msgstr "ਗੈਲਰੀ URL:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
msgstr ""
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "F-ਸਪੋਟ ਫੋਟੋ ਦਰਸ਼ਕ"
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+#| msgid "C_aption:"
+msgid "Options:"
+msgstr "ਚੋਣਾਂ:"
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "ਤਸਵੀਰ ਦਰਸ਼ਕ"
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+#| msgid "Photo Manager"
+msgid "Photos with a Tag"
+msgstr "ਟੈਗ ਨਾਲ ਫੋਟੋ"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+#| msgid "_Delete photo"
+#| msgid_plural "_Delete photos"
+msgid "Selected Photos"
+msgstr "ਚੁਣੀਆਂ ਫੋਟੋ"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+#| msgid "Sharpen"
+msgid "Share:"
+msgstr "ਸਾਂਝਾ:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+#| msgid "View"
+msgid "Views:"
+msgstr "ਝਲਕ:"
-#: ../f-spot-import.desktop.in.in.h:1 ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "F-ਸਪੋਟ ਫੋਟੋ ਮੈਨੇਜਰ"
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+#| msgid "(None)"
+msgid "none"
+msgstr "ਕੋਈ ਨਹੀਂ"
-#: ../f-spot-import.desktop.in.in.h:2
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr "ਗੈਲਰੀ: {0}, ਫੋਟੋ: {1}, ਆਖਰੀ ਕਲਾਇਟ: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+#| msgid "Gallery generated by"
+msgid "Gallery is inactive"
+msgstr "ਗੈਲਰੀ ਗ਼ੈਰ-ਸਰਗਰਮ ਹੈ"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
#, fuzzy
-#| msgid "Import photos"
-msgid "Import into F-Spot"
-msgstr "ਫੋਟੋ ਅਯਾਤ"
+#| msgid "Merge Tags"
+msgid "Merge Db"
+msgstr "ਮਿਲਾਨ ਟੈਗ"
-#: ../f-spot-import.desktop.in.in.h:3 ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "ਫੋਟੋ ਮੈਨੇਜਰ"
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+#| msgid "Merge the selected tag"
+#| msgid_plural "Merge the {0} selected tags?"
+msgid "Error opening the selected file"
+msgstr "ਚੁਣੀ ਫਾਇਲ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "ਆਪਣੀਆਂ ਫੋਟੋ ਵੇਖੋ, ਸਾਂਝੀਆਂ ਕਰੋ"
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
-#: ../libeog/image-view.c:2124
-msgid "interpolation type"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
msgstr ""
-#: ../libeog/image-view.c:2125
-msgid "the type of interpolation to use"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
msgstr ""
-#: ../libeog/image-view.c:2131 ../libeog/image-view.c:2138
-msgid "check type"
-msgstr "ਜਾਂਚ ਕਿਸਮ"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+#| msgid "Copy file to the Photos folder"
+msgid "Copy images to photos folder"
+msgstr "ਚਿੱਤਰਾਂ ਨੂੰ ਫੋਟੋ ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "ਡਾਟਾਬੇਸ ਟਿਕਾਣਾ:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "ਹਰ ਚੀਜ਼"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+#| msgid "Import"
+msgid "Import:"
+msgstr "ਇੰਪੋਰਟ:"
-#: ../libeog/image-view.c:2132
-msgid "the type of chequering to use"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "ਚਿੱਤਰਾਂ ਨੂੰ ਉਹਨਾਂ ਦੇ ਅਸਲੀ ਟਿਕਾਣੇ ਉੱਤੇ ਰੱਖੋ"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "ਹੋਰ F-ਸਪੋਟ ਭੰਡਾਰ ਨਾਲ ਮਿਲਾਨ"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
msgstr ""
-#: ../libeog/image-view.c:2139
-msgid "the size of chequers to use"
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "ਛੱਡੋ"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
msgstr ""
-#: ../libeog/image-view.c:2145
-msgid "dither"
-msgstr "ਕੰਬਣ"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਸੰਰਚਨਾ"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "ਸਭ ਚਿੱਤਰ"
-#: ../libeog/image-view.c:2146
-msgid "dither type"
-msgstr "ਕੰਬਣ ਕਿਸਮ"
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+#| msgid "_Display:"
+msgid "Delay:"
+msgstr "ਦੇਰੀ:"
-#: ../libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:222
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+#| msgid "_Display:"
+msgid "Display:"
+msgstr "ਵੇਖੋ:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "ਇਸ ਨਾਲ ਟੈਗ ਕੀਤੇ ਚਿੱਤਰ:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "F-ਸਪੋਟ ਨੂੰ ਮੇਰਾ ਸਕਰੀਨ-ਸੇਵਰ ਬਣਾਓ"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+#| msgid "Planar Configuration"
+msgid "Screensaver Configuration"
+msgstr "ਸਕਰੀਨਸੇਵਰ ਸੰਰਚਨਾ"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-ਸਪੋਟ"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-ਸਪੋਟ ਫੋਟੋ ਮੈਨੇਜਰ"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "ਆਪਣੀਆਂ ਫੋਟੋ ਵੇਖੋ, ਸਾਂਝੀਆਂ ਕਰੋ"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "ਫੋਟੋ ਮੈਨੇਜਰ"
+
+#: ../f-spot-import.desktop.in.in.h:3
+#| msgid "Import photos"
+msgid "Import into F-Spot"
+msgstr "F-ਸਪੋਟ ਵਿੱਚ ਇੰਪੋਰਟ ਕਰੋ"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-ਸਪੋਟ ਫੋਟੋ ਦਰਸ਼ਕ"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "ਤਸਵੀਰ ਦਰਸ਼ਕ"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
msgstr "ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ"
-#: ../libfspot/f-jpeg-utils.c:464
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr ""
-#: ../libfspot/f-jpeg-utils.c:472
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
-msgstr "ਕਾਰਵਾਈ ਅਸਫਲ"
+msgstr "ਓਪਰੇਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
@@ -404,16 +1385,10 @@ msgstr "ਝਲਕ"
msgid "Path"
msgstr "ਮਾਰਗ"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:77
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
msgid "File"
msgstr "ਫਾਇਲ"
-#: ../src/CameraFileSelectionDialog.cs:82
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1234
-msgid "Index"
-msgstr "ਇੰਡੈਕਸ"
-
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
msgstr "ਚੁਣੋ ਟੈਗ"
@@ -427,12 +1402,6 @@ msgstr "ਝਲਕ ਡਾਊਨਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
msgid "Downloading Preview of {0}"
msgstr "{0} ਦੀ ਝਲਕ ਡਾਊਨਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../src/CameraFileSelectionDialog.cs:199
-#: ../extensions/Exporters/CDExport/CDExport.cs:246
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
-msgid "Transferring Pictures"
-msgstr "ਤਸਵੀਰਾਂ ਤਬਦੀਲ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
@@ -443,19 +1412,19 @@ msgid "Error transferring file"
msgstr "ਫਾਇਲਾਂ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "ਫਾਇਲਾਂ ਦੀ ਕਾਪੀ ਹੋ ਗਈ ਹੈ"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "ਫਾਇਲਾਂ ਦੀ ਕਾਪੀ ਹੋ ਗਈ ਹੈ"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "ਕੈਮਰੇ ਤੋਂ \"{0}\" ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "ਕੈਮਰਾ"
@@ -463,13 +1432,13 @@ msgstr "ਕੈਮਰਾ"
msgid "Port"
msgstr "ਪੋਰਟ"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:265
#, fuzzy, csharp-format
#| msgid "No matching photos found "
msgid "No photos matching {0} found"
msgstr "ਨਹੀਂ "
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:266
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -477,11 +1446,11 @@ msgid ""
"F-Spot preference dialog."
msgstr ""
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:270
msgid "Search returned no results"
msgstr ""
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:271
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -489,94 +1458,48 @@ msgid ""
msgstr ""
#. Note for translators: Reparented is a picture becoming a version of another one
-#: ../src/Core/Photo.cs:471
+#: ../src/Core/Photo.cs:473
msgid "Reparented"
msgstr ""
-#: ../src/Core/Photo.cs:471
+#: ../src/Core/Photo.cs:473
#, csharp-format
msgid "Reparented ({0})"
msgstr ""
-#: ../src/Core/Photo.cs:490
+#: ../src/Core/Photo.cs:492
#, csharp-format
msgid "Modified"
msgid_plural "Modified ({0})"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ਸੋਧ ਕੀਤੀ"
+msgstr[1] "ਸੋਧੀ ਕੀਤੀ ({0})"
-#: ../src/Core/Photo.cs:509
+#: ../src/Core/Photo.cs:513
#, csharp-format
-#| msgid "Modified in {1}"
-#| msgid_plural "Modified in {1} ({0})"
msgid "Modified in {1}"
-msgstr ""
+msgstr "{1} ਵਿੱਚ ਸੋਧ"
-#: ../src/Core/Photo.cs:509
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr ""
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:667 ../src/f-spot.glade.h:96
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
msgid "Original"
msgstr "ਅਸਲੀ"
-#: ../src/DateCommands.cs:56
-msgid "Today"
-msgstr "ਅੱਜ"
-
-#: ../src/DateCommands.cs:58
-msgid "Yesterday"
-msgstr "ਕੱਲ੍ਹ"
-
-#: ../src/DateCommands.cs:60
-msgid "Last 7 days"
-msgstr "ਪਿਛਲੇ ੭ ਦਿਨ"
-
-#: ../src/DateCommands.cs:62
-msgid "Last 30 days"
-msgstr "ਪਿਛਲੇ ੩੦ ਦਿਨ"
-
-#: ../src/DateCommands.cs:64
-msgid "Last 90 days"
-msgstr "ਪਿਛਲੇ ੯੦ ਦਿਨ"
-
-#: ../src/DateCommands.cs:66
-msgid "Last 360 days"
-msgstr "ਪਿਛਲੇ ੩੬੦ ਦਿਨ"
-
-#: ../src/DateCommands.cs:68
-msgid "Current Week (Mon-Sun)"
-msgstr "ਮੌਜੂਦਾ ਹਫ਼ਤਾ (ਸੋਮ-ਐਤ)"
-
-#: ../src/DateCommands.cs:70
-msgid "Previous Week (Mon-Sun)"
-msgstr "ਪਿਛਲਾ ਹਫ਼ਤਾ (ਸੋਮ-ਐਤ)"
-
-#: ../src/DateCommands.cs:86 ../src/UI.Dialog/ui/PreferenceDialog.glade.h:11
-#| msgid "Load Image"
-msgid "All Images"
-msgstr "ਸਭ ਚਿੱਤਰ"
-
-#: ../src/DateCommands.cs:88
-#| msgid "Custom Rendered"
-msgid "Customized Range"
-msgstr "ਪਸੰਦੀਦਾ ਰੇਜ਼"
-
#: ../src/Editors/AutoStretchEditor.cs:17
-#, fuzzy
#| msgid "Adjust Colors"
msgid "Auto Color"
-msgstr "ਰੰਗ"
+msgstr "ਆਟੋ ਰੰਗ"
#: ../src/Editors/ColorEditor.cs:38
msgid "Adjust Colors"
msgstr "ਰੰਗ ਅਡਜੱਸਟ"
#: ../src/Editors/ColorEditor.cs:41
-#| msgid "Adjust Time"
msgid "Adjust"
msgstr "ਅਡਜੱਸਟ"
@@ -602,7 +1525,7 @@ msgstr "ਵਰਗ"
#: ../src/Editors/CropEditor.cs:42
msgid "Crop"
-msgstr "ਉਭਾਰੋ"
+msgstr "ਕਰੋਪ"
#: ../src/Editors/CropEditor.cs:73
#, fuzzy
@@ -615,14 +1538,13 @@ msgid "No Constraint"
msgstr "ਨਹੀਂ"
#: ../src/Editors/CropEditor.cs:99
-#, fuzzy
#| msgid "Space all photos by"
msgid "Same as photo"
-msgstr "ਥਾਂ ਸਭ"
+msgstr "ਫੋਟੋ ਵਾਂਗ"
#: ../src/Editors/CropEditor.cs:104
msgid "Custom Ratios..."
-msgstr ""
+msgstr "ਕਸਟਮ ਅਨੁਪਾਤ..."
#: ../src/Editors/DesaturateEditor.cs:17
msgid "Desaturate"
@@ -630,7 +1552,7 @@ msgstr "ਅਸੰਤ੍ਰਿਪਤ"
#: ../src/Editors/RedEyeEditor.cs:19
msgid "Red-eye Reduction"
-msgstr ""
+msgstr "ਰੈੱਡ-ਆਈ ਘਟਾਓ"
#: ../src/Editors/RedEyeEditor.cs:21
msgid "Fix!"
@@ -644,95 +1566,533 @@ msgstr ""
msgid "Sepia Tone"
msgstr ""
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
-msgstr ""
+msgstr "ਸਾਫਟ ਫੋਕਸ"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
#, fuzzy
#| msgid "Saturation"
msgid "Straighten"
msgstr "ਸੰਤ੍ਰਿਪਤ"
+#: ../src/FileImportBackend.cs:288
+msgid "Import error"
+msgstr "ਇੰਪੋਰਟ ਗਲਤੀ"
+
+#: ../src/FileImportBackend.cs:289
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "{0}{2}{2}{1} ਇੰਪੋਰਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr ""
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr ""
+
#: ../src/FSpot.addin.xml.h:1
-#, fuzzy
#| msgid "Copy Photo Location"
msgid "Copy Photo Locat_ion"
-msgstr "ਨਕਲ ਤਸਵੀਰ ਸਥਿਤੀ"
+msgstr "ਫੋਟੋ ਟਿਕਾਣਾ ਕਾਪੀ ਕਰੋ(_i)"
#: ../src/FSpot.addin.xml.h:2
-#, fuzzy
#| msgid "Export"
msgid "Export to"
-msgstr "ਨਿਰਯਾਤ"
+msgstr "ਐਕਸਪੋਰਟ"
#: ../src/FSpot.addin.xml.h:3
-#| msgid "Open With"
msgid "Open _With"
msgstr "ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ(_W)"
-#: ../src/FSpot.addin.xml.h:4 ../src/f-spot.glade.h:105
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
-msgstr "ਟੈਗ"
+msgstr "ਟੈਗ ਹਟਾਓ(_o)"
-#: ../src/FSpot.addin.xml.h:5 ../src/SingleView.cs:451
-#: ../src/f-spot.glade.h:107
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
+#: ../src/SingleView.cs:438 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
-msgstr "ਘੁੰਮਾਓ ਖੱਬੇ"
+msgstr "ਘੁੰਮਾਓ ਖੱਬੇ(_L)"
-#: ../src/FSpot.addin.xml.h:6 ../src/SingleView.cs:452
-#: ../src/f-spot.glade.h:108
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:439 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
-msgstr "ਘੁੰਮਾਓ ਸੱਜੇ"
+msgstr "ਘੁੰਮਾਓ ਸੱਜੇ(_R)"
#: ../src/FSpot.addin.xml.h:7
-#| msgid "Toolbar"
msgid "Tools"
msgstr "ਟੂਲ"
-#: ../src/FSpot.addin.xml.h:8 ../src/f-spot.glade.h:143
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
-msgstr "ਟੈਗ"
+msgstr "ਟੈਗ ਨੱਥੀ(_A)"
-#: ../src/FSpot.addin.xml.h:9 ../src/f-spot.glade.h:154
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
-msgstr "ਹਟਾਓ ਵੱਲੋਂ"
+msgstr "ਡਰਾਇਵ ਤੋਂ ਹਟਾਓ(_D)"
-#: ../src/FSpot.addin.xml.h:10 ../src/f-spot.glade.h:186
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
-msgstr "ਹਟਾਓ ਵੱਲੋਂ"
+msgstr "ਕੈਟਾਲਾਗ ਤੋਂ ਹਟਾਓ(_R)"
-#: ../src/FileImportBackend.cs:285
-#| msgid "Import Source:"
-msgid "Import error"
-msgstr "ਇੰਪੋਰਟ ਗਲਤੀ"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:286
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
+
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
+
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
+
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
msgstr ""
-#: ../src/FileImportBackend.cs:287 ../src/UI.Dialog/ThreadProgressDialog.cs:51
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-msgid "Skip"
-msgstr "ਛੱਡੋ"
+#: ../src/f-spot.glade.h:13
+#, fuzzy
+#| msgid "<b>Destination</b>"
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>ਟਿਕਾਣਾ</b>"
-#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
+#: ../src/f-spot.glade.h:15
+#| msgid "<b>Style</b>"
+msgid "<b>Size</b>"
+msgstr "<b>ਆਕਾਰ</b>"
+
+#: ../src/f-spot.glade.h:17
+#| msgid "<b>Gallery</b>"
+msgid "<b>Summary</b>"
+msgstr "<b>ਸੰਖੇਪ</b>"
+
+#: ../src/f-spot.glade.h:18
+#, fuzzy
+#| msgid "<b>Start Date</b>"
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>ਸ਼ੁਰੂ ਮਿਤੀ</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>ਸਭ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਤਸਵੀਰਾਂ ਵੇਖੋ</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>ਚਿੱਟਾ ਸੰਤੁਲਨ(_W)</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
msgstr ""
-#: ../src/FormClient.cs:295
-msgid "Unhandled exception"
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+
+#: ../src/f-spot.glade.h:23
+#| msgid "Set as _Background"
+msgid "As _background"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਵਜੋਂ(_b)"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "ਕਸਟਮ ਰੰਗ ਵਜੋਂ(_c): "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr ""
+
+#: ../src/f-spot.glade.h:26
+#| msgid "Attach Tag"
+msgid "Attach Tags:"
+msgstr "ਟੈਗ ਨੱਥੀ:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "ਨੱਥੀ ਟੈਗ:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:31
+msgid "Camera Selection"
+msgstr "ਕੈਮਰਾ ਚੋਣ"
+
+#: ../src/f-spot.glade.h:32
+#| msgid "Copy file to the Photos folder"
+msgid "Copy files to the Photos folder"
+msgstr "ਫਾਇਲਾਂ ਫੋਟੋ ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
+
+#: ../src/f-spot.glade.h:33
+#| msgid "Create CD"
+msgid "Create Mail"
+msgstr "ਮੇਲ ਬਣਾਓ"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create _icon for this tag when first used"
+msgstr ""
+
+#: ../src/f-spot.glade.h:35
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr ""
+
+#: ../src/f-spot.glade.h:36
+msgid "Detect duplicates"
+msgstr "ਡੁਪਲੀਕੇਟ ਮਿਲੇ"
+
+#: ../src/f-spot.glade.h:37
+#| msgid "Display _Dates"
+msgid "Display File _Names"
+msgstr "ਫਾਇਲ ਨਾਂ ਵੇਖੋ(_N)"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr ""
+
+#: ../src/f-spot.glade.h:39
+msgid "Do not send a mail"
+msgstr "ਮੇਲ ਨਾ ਭੇਜੋ"
+
+#: ../src/f-spot.glade.h:40
+msgid "E-_Mail:"
+msgstr "ਈ-ਮੇਲ(_M):"
+
+#: ../src/f-spot.glade.h:41
+msgid "E_xport titles and comments"
+msgstr "ਟਾਈਟਲ ਅਤੇ ਟਿੱਪਣੀਆਂ ਐਕਸਪੋਰਟ ਕਰੋ(_x)"
+
+#: ../src/f-spot.glade.h:42
+msgid "Estimated new size"
+msgstr "ਅਨੁਮਾਨਿਤ ਨਵਾਂ ਸਾਈਜ਼"
+
+#: ../src/f-spot.glade.h:44
+msgid "Extra large"
+msgstr "ਵੱਡਾ ਆਕਾਰ"
+
+#: ../src/f-spot.glade.h:45
+msgid "F-Spot View"
+msgstr "F-ਸਪੋਟ ਝਲਕ"
+
+#: ../src/f-spot.glade.h:47
+msgid "Filter on selected rolls"
+msgstr ""
+
+#: ../src/f-spot.glade.h:48
+msgid "G_allery:"
+msgstr "ਗੈਲਰੀ(_a):"
+
+#: ../src/f-spot.glade.h:49
+msgid "Gallery"
+msgstr "ਗੈਲਰੀ"
+
+#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "ਇੰਪੋਰਟ"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:52
+msgid "Import Source:"
+msgstr "ਇੰਪੋਰਟ ਸਰੋਤ:"
+
+#: ../src/f-spot.glade.h:53
+#| msgid "Include subdirectories"
+msgid "Include subfolders"
+msgstr "ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ ਸਣੇ"
+
+#: ../src/f-spot.glade.h:54
+#| msgid "Page:"
+msgid "Large"
+msgstr "ਵੱਡਾ"
+
+#: ../src/f-spot.glade.h:55
+msgid "Manage your custom selection ratios"
msgstr ""
+#: ../src/f-spot.glade.h:56
+msgid "Medium"
+msgstr "ਮੱਧਮ"
+
+#: ../src/f-spot.glade.h:58
+#, fuzzy
+#| msgid "Crop photo to selected area"
+msgid "Number of photos in selected rolls:"
+msgstr "ਉਭਾਰੋ ਫੋਟੋ ਖੇਤਰ"
+
+#: ../src/f-spot.glade.h:59
+#| msgid "N_umber of Copies:"
+msgid "Number of pictures"
+msgstr "ਤਸਵੀਰਾਂ ਦੀ ਗਿਣਤੀ"
+
+#: ../src/f-spot.glade.h:60
+msgid "Open _Folder..."
+msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹੋ(_F)..."
+
+#: ../src/f-spot.glade.h:62
+msgid "Original size (possible very large file size)"
+msgstr "ਅਸਲੀ ਆਕਾਰ (ਸੰਭਵ ਤੌਰ ਉੱਤੇ ਵੱਡਾ ਫਾਈਲ ਆਕਾਰ)"
+
+#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:64
+msgid "Pause"
+msgstr "ਵਿਰਾਮ"
+
+#: ../src/f-spot.glade.h:65
+msgid "Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ"
+
+#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "ਪਿੱਛੇ"
+
+#: ../src/f-spot.glade.h:67
+msgid "Repair"
+msgstr "ਰੀਪੇਅਰ"
+
+#: ../src/f-spot.glade.h:70
+msgid "Select Photos to Copy From Camera..."
+msgstr "ਚੁਣੋ ਨਕਲ ਵੱਲੋਂ ਕੈਮਰਾ."
+
+#: ../src/f-spot.glade.h:71
+msgid "Select a Tag..."
+msgstr "ਟੈਗ ਚੁਣੋ..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select the camera from which you want to transfer files"
+msgstr ""
+
+#: ../src/f-spot.glade.h:73
+msgid "Selected Camera: "
+msgstr "ਚੁਣਿਆ ਕੈਮਰਾ: "
+
+#: ../src/f-spot.glade.h:74
+#| msgid "No Constraint"
+msgid "Selection Constraints"
+msgstr ""
+
+#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਸੈੱਟ ਕਰੋ(_B)"
+
+#: ../src/f-spot.glade.h:76
+#| msgid "Space all photos by"
+msgid "Show all photos."
+msgstr "ਸਭ ਫੋਟੋ ਵੇਖੋ"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show or hide the side pane"
+msgstr "ਬਾਹੀ ਵੇਖੋ ਜਾਂ ਓਹਲੇ"
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the toolbar"
+msgstr "ਟੂਲਬਾਰ ਵੇਖੋ ਜਾਂ ਓਹਲੇ"
+
+#: ../src/f-spot.glade.h:79
+msgid "Side _pane"
+msgstr "ਬਾਹੀ(_p)"
+
+#: ../src/f-spot.glade.h:80
+msgid "Small"
+msgstr "ਛੋਟਾ"
+
+#: ../src/f-spot.glade.h:81
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+
+#: ../src/f-spot.glade.h:82
+msgid "Strip image _metadata"
+msgstr "ਸਟਿਰਪ ਚਿੱਤਰ"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:84
+msgid "Te_mp:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:85
+msgid "Tiny"
+msgstr "ਨਿੰਮਾ"
+
+#: ../src/f-spot.glade.h:86
+msgid "Total original size"
+msgstr "ਕੁੱਲ ਅਸਲੀ ਅਕਾਰ"
+
+#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "ਜ਼ੂਮ ਇਨ(_i)"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "ਜ਼ੂਮ ਆਉਟ(_o)"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "ਜ਼ੂਮ ਇਨ"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "ਜ਼ੂਮ ਆਉ"
+
+#: ../src/f-spot.glade.h:91
+msgid "_Brightness:"
+msgstr "ਚਮਕ:"
+
+#: ../src/f-spot.glade.h:93
+#| msgid "Create CD"
+msgid "_Create Mail"
+msgstr "ਮੇਲ ਲਿਖੋ(_C)"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+#| msgid "Edit Tag"
+msgid "_Edit"
+msgstr "ਸੋਧ(_E)"
+
+#: ../src/f-spot.glade.h:98
+#, fuzzy
+#| msgid "Exposure:"
+msgid "_Exposure:"
+msgstr "ਪੱਖ:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "ਫਲਿੱਕਰ(_F)"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "ਪੂਰੀ ਸਕਰੀਨ(_F)"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "ਗੈਲਰੀ(_G)"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+#| msgid "_Hue:"
+msgid "_Help"
+msgstr "ਮੱਦਦ(_H)"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "ਆਭਾ(_H):"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr ""
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "ਨਵੀਂ ਵਿੰਡੋ(_N)"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "ਖੋਲੋ ਐਲਬਮ ਵਿੱਚ ਸਮਾਪਤ"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "ਖੋਲੋ ਸਮਾਪਤ"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+#| msgid "Edit Photo"
+msgid "_Photo"
+msgstr "ਫੋਟੋ(_P)"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "ਸੰਤ੍ਰਿਪਤ(_S):"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "ਮਾਪ ਨਹੀਂ "
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "ਸਲਾਇਡ-ਸ਼ੋ(_S)"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "ਸਟਿਰਪ"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "ਟੈਗ ਨਾਂ(_T):"
+
+#: ../src/f-spot.glade.h:115
+#| msgid "_Title:"
+msgid "_Tint:"
+msgstr ""
+
+#: ../src/f-spot.glade.h:116
+#| msgid "Toolbar"
+msgid "_Toolbar"
+msgstr "ਟੂਲਬਾਰ(_T)"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "ਵੇਖੋ(_V)"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "ਵੁਰਚੁਅਲ ਫਾਇਲ-ਸਿਸਟਮ(_V)"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "ਅਤੇ"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
+
#: ../src/FullScreenView.cs:58
-#| msgid "Hidden"
msgid "Hide"
msgstr "ਓਹਲੇ"
#: ../src/FullScreenView.cs:60
-#| msgid "Toolbar"
msgid "Hide Toolbar"
msgstr "ਟੂਲਬਾਰ ਓਹਲੇ"
@@ -740,7 +2100,7 @@ msgstr "ਟੂਲਬਾਰ ਓਹਲੇ"
msgid "Info"
msgstr "ਜਾਣਕਾਰੀ"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "ਚਿੱਤਰ ਜਾਣਕਾਰੀ"
@@ -748,78 +2108,29 @@ msgstr "ਚਿੱਤਰ ਜਾਣਕਾਰੀ"
msgid "Exit fullscreen"
msgstr "ਪੂਰੀ ਸਕਰੀਨ ਬੰਦ ਕਰੋ"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:319
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "ਸਲਾਇਡ-ਸ਼ੋ"
#: ../src/FullScreenView.cs:82
-#| msgid "Slideshow"
msgid "Start slideshow"
msgstr "ਸਲਾਇਡ-ਸ਼ੋ ਸ਼ੁਰੂ"
#: ../src/FullScreenView.cs:128
-#, fuzzy
#| msgid "_Saturation:"
msgid "Slide transition:"
-msgstr "ਸੰਤ੍ਰਿਪਤ(_S):"
-
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr ""
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr ""
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr ""
-
-#: ../src/GlTransition.cs:174
-#, fuzzy
-#| msgid "Remove Tag"
-msgid "Reveal"
-msgstr "ਟੈਗ ਹਟਾਓ"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr ""
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr ""
-
-#: ../src/GlTransition.cs:370
-#| msgid "Pause"
-msgid "Push"
-msgstr "ਧੱਕੋ"
+msgstr "ਸਲਾਈਡ ਟਰਾਂਸੈਕਸ਼ਨ:"
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "ਹੋਰ ਮਿਤੀਆਂ"
#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "ਹੋਰ ਡਾਇਰੈਕਟਰੀਆਂ"
-
-#: ../src/GroupSelector.cs:63 ../src/GroupSelector.cs:64
msgid "More"
msgstr "ਹੋਰ"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "ਮਹੀਨਾ"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "ਫੋਲਡਰ"
-
-#: ../src/GroupSelector.cs:523 ../src/f-spot.glade.h:190
-msgid "_Reverse Order"
-msgstr "ਉਲਟਕਰਮ ਕ੍ਰਮ"
-
-#: ../src/GroupSelector.cs:529 ../src/f-spot.glade.h:146
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "ਸਾਫ਼ ਮਿਤੀ ਸੀਮਾ"
@@ -847,7 +2158,7 @@ msgstr ""
msgid "Unknown Directory"
msgstr "ਅਣਜਾਣ ਡਾਇਰੈਕਟਰੀ"
-#: ../src/Imaging/ImageFile.cs:81
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr ""
@@ -857,41 +2168,39 @@ msgstr "ਜਾਣਕਾਰੀ ਮਾਡਲ ਵਰਜਨ"
#: ../src/Imaging/IptcFile.cs:147
msgid "OSI Destination routing information"
-msgstr "ਨਿਯਤ ਜਾਣਕਾਰੀ"
+msgstr "OSI ਟਿਕਾਣਾ ਰਾਊਂਟਿੰਗ ਜਾਣਕਾਰੀ"
#: ../src/Imaging/IptcFile.cs:149
msgid "IPTC file format"
-msgstr "ਫਾਰਮਿਟ"
+msgstr "IPTC ਫਾਇਲ ਫਾਰਮੈਟ"
#: ../src/Imaging/IptcFile.cs:151
msgid "Identifies the provider and product"
-msgstr "ਅਤੇ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:153
msgid "A unique number identifying the envelope"
-msgstr "A"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:155
msgid "A unique number"
-msgstr "A"
+msgstr "ਇੱਕ ਵਿਲੱਖਣ ਨੰਬਰ"
#: ../src/Imaging/IptcFile.cs:157
msgid ""
"The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
-msgstr "ਪਹਿਲ ਅਤੇ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:159
-#, fuzzy
#| msgid "The year month and day (CCYYMMDD) the service sent the material"
msgid "The year, month and day (CCYYMMDD) the service sent the material"
-msgstr "ਸਾਲ ਮਹੀਨਾ ਅਤੇ ਦਿਨ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:161
-#, fuzzy
#| msgid ""
#| "The hour minute and second the (HHMMSS+HHMM) the service sent the material"
msgid "The hour, minute and second (HHMMSS) the service sent the material"
-msgstr "ਘੰਟਾ ਅਤੇ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:163
msgid "The character set designation"
@@ -927,7 +2236,7 @@ msgstr "ਇਕਾਈ ਨਾਂ"
#: ../src/Imaging/IptcFile.cs:190
msgid "Status of the objectdata according to the provider"
-msgstr "ਸਥਿਤੀ ਦਾ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:194
msgid "Location within a city or area where the object originates"
@@ -948,72 +2257,66 @@ msgstr "ਪੂਰਾ ਨਾਂ ਦਾ ਦੇਸ਼ ਦਾ ਦਾ"
#: ../src/Imaging/IptcFile.cs:206
msgid ""
"Two or three letter ISO3166 code of the country of the focus of the content"
-msgstr "ਦੋ ਜਾਂ ਦਾ ਦੇਸ਼ ਦਾ ਦਾ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:209
-#, fuzzy
#| msgid "Headline of the content"
msgid "Creator of the content"
-msgstr "ਮੁੱਖ ਸਤਰਾਂ ਦਾ"
+msgstr "ਸਮੱਗਰੀ ਦਾ ਨਿਰਮਾਤਾ"
#: ../src/Imaging/IptcFile.cs:212
msgid "Provider of the object"
-msgstr ""
+msgstr "ਆਬਜੈਕਟ ਦੇਣ ਵਾਲਾ"
#: ../src/Imaging/IptcFile.cs:215
msgid "The title of the author or creator"
-msgstr "ਦਾ ਜਾਂ"
+msgstr "ਲੇਖਕ ਜਾਂ ਨਿਰਮਾਤਾ ਦਾ ਟਾਈਟਲ"
#: ../src/Imaging/IptcFile.cs:218
msgid ""
"The person involved in writing, editing or correcting the object data or "
"caption/abstract"
-msgstr "ਵਿੱਚ ਜਾਂ ਜਾਂ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:222
msgid "Headline of the content"
-msgstr "ਮੁੱਖ ਸਤਰਾਂ ਦਾ"
+msgstr "ਸਮੱਗਰੀ ਦੀ ਸੁਰਖੀ"
#: ../src/Imaging/IptcFile.cs:225
msgid ""
"Instructions from the creator to the receiver not covered by other fields"
-msgstr "ਹਦਾਇਤਾਂ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:228
msgid "Intellectual genre of the object"
-msgstr "ਧੁਨ ਦਾ"
+msgstr ""
#: ../src/Imaging/IptcFile.cs:241
msgid "Unknown IIM DataSet"
msgstr "ਅਣਜਾਣ"
-#: ../src/ImportCommand.cs:47 ../src/SingleView.cs:357
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "ਫੋਲਡਰ ਚੁਣੋ"
#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
-msgstr "ਨਹੀਂ ਕੈਮਰੇ"
+msgstr "(ਕੋਈ ਕੈਮਰਾ ਨਹੀਂ ਮਿਲਿਆ)"
#: ../src/ImportCommand.cs:404
#, csharp-format
msgid "Loading {0} of {1}"
-msgstr ""
+msgstr "{1} ਵਿੱਚ {0} ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
#: ../src/ImportCommand.cs:470
msgid "Done Loading"
msgstr "ਸਮਾਪਤ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../src/ImportCommand.cs:540 ../src/MainWindow.cs:279
-#: ../src/f-spot.glade.h:82
-msgid "Import"
-msgstr "ਅਯਾਤ"
-
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
-msgstr "ਡਾਇਰੈਕਟਰੀ."
+msgstr "ਡਾਇਰੈਕਟਰੀ ਮੌਜੂਦ ਨਹੀਂ।"
-#: ../src/ImportCommand.cs:671
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
@@ -1021,323 +2324,255 @@ msgid ""
msgstr ""
#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:724 ../src/ImportCommand.cs:726
-#: ../src/XmpTagsImporter.cs:88
-#, fuzzy
+#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/XmpTagsImporter.cs:89
#| msgid "Import"
msgid "Import Tags"
-msgstr "ਅਯਾਤ"
+msgstr "ਟੈਗ ਇੰਪੋਰਟ"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:286 ../src/SingleView.cs:86
-#, fuzzy
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
#| msgid "Rotate _Left"
msgid "Rotate Left"
-msgstr "ਘੁੰਮਾਓ ਖੱਬੇ"
+msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
#: ../src/ItemAction.cs:80
-#, fuzzy
#| msgid "Rotate selected photo left"
#| msgid_plural "Rotate selected photos left"
msgid "Rotate picture left"
-msgstr "ਘੁੰਮਾਓ ਫੋਟੋ"
+msgstr "ਤਸਵੀਰ ਖੱਬੇ ਘੁੰਮਾਓ"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:290 ../src/SingleView.cs:91
-#, fuzzy
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
#| msgid "Rotate _Right"
msgid "Rotate Right"
-msgstr "ਘੁੰਮਾਓ ਸੱਜੇ"
+msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
#: ../src/ItemAction.cs:92
-#, fuzzy
#| msgid "Rotate selected photo right"
#| msgid_plural "Rotate selected photos right"
msgid "Rotate picture right"
-msgstr "ਘੁੰਮਾਓ ਫੋਟੋ"
-
-#: ../src/ItemAction.cs:102 ../src/f-spot.glade.h:90
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:999
-msgid "Next"
-msgstr "ਅੱਗੇ"
+msgstr "ਤਸਵੀਰ ਸੱਜੇ ਘੁੰਮਾਓ"
#: ../src/ItemAction.cs:103
-#, fuzzy
#| msgid "Next photo"
msgid "Next picture"
-msgstr "ਅੱਗੇ ਫੋਟੋ"
-
-#: ../src/ItemAction.cs:123 ../src/f-spot.glade.h:103
-msgid "Previous"
-msgstr "ਪਿੱਛੇ"
+msgstr "ਤਸਵੀਰ ਅੱਗੇ"
#: ../src/ItemAction.cs:124
-#, fuzzy
#| msgid "Previous photo"
msgid "Previous picture"
-msgstr "ਪਿੱਛੇ ਫੋਟੋ"
+msgstr "ਤਸਵੀਰ ਪੁੱਛੇ"
-#: ../src/Loupe.cs:62
-msgid "Error saving sharpened photo"
-msgstr "ਗਲਤੀ ਫੋਟੋ"
-
-#: ../src/Loupe.cs:63 ../src/PhotoView.cs:164
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr ""
-
-#: ../src/Loupe.cs:92
-msgid "Sharpen"
-msgstr "ਉਘੜਵਾਂ"
-
-#: ../src/Loupe.cs:102
-msgid "Amount:"
-msgstr "ਮਾਤਰਾ:"
-
-#: ../src/Loupe.cs:103
-msgid "Radius:"
-msgstr "ਅਰਧ-ਵਿਆਸ:"
-
-#: ../src/Loupe.cs:104
-msgid "Threshold:"
-msgstr "ਥਰੈਸ਼ਹੋਲਡ:"
-
-#: ../src/MainWindow.cs:281
+#: ../src/MainWindow.cs:303
msgid "Import new images"
-msgstr ""
+msgstr "ਨਵੇਂ ਚਿੱਤਰ ਇੰਪੋਰਟ ਕਰੋ"
-#: ../src/MainWindow.cs:297 ../src/f-spot.glade.h:49
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "ਝਲਕ"
-#: ../src/MainWindow.cs:301
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
-msgstr "ਝਲਕ"
+msgstr "ਕਈ ਫੋਟੋ ਨਾਲੋ-ਨਾਲ ਵੇਖੋ"
-#: ../src/MainWindow.cs:305
-#, fuzzy
+#: ../src/MainWindow.cs:327
#| msgid "Edit Tag"
msgid "Edit Image"
-msgstr "ਟੈਗ ਸੋਧ"
+msgstr "ਚਿੱਤਰ ਸੋਧ"
-#: ../src/MainWindow.cs:309
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
-msgstr "ਝਾਤੀ ਅਤੇ ਫੋਟੋ"
+msgstr "ਫੋਟੋ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"
-#: ../src/MainWindow.cs:314 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
-msgstr "ਪੂਰੇ ਪਰਦੇ ਉੱਤੇ"
+msgstr "ਪੂਰੀ-ਸਕਰੀਨ"
-#: ../src/MainWindow.cs:316 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
-msgstr "ਝਾਤੀ"
+msgstr "ਫੋਟੋ ਪੂਰੀ ਸਕਰੀਨ ਉੱਤੇ ਵੇਖੋ"
-#: ../src/MainWindow.cs:321 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
-msgstr "ਝਾਤੀ ਵਿੱਚ"
+msgstr "ਫੋਟੋ ਸਲਾਈਡ-ਸ਼ੋ ਵਿੱਚ ਵੇਖੋ"
-#: ../src/MainWindow.cs:336
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
-msgstr "ਪਿੱਛੇ ਫੋਟੋ"
+msgstr "ਫੋਟੋ ਪਿੱਛੇ"
-#: ../src/MainWindow.cs:341
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "ਅੱਗੇ ਫੋਟੋ"
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/MainWindow.cs:354 ../src/Widgets/Sidebar.cs:73
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1168
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1208
-#, fuzzy
-#| msgid "_Tags"
-msgid "Tags"
-msgstr "ਟੈਗ"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/MainWindow.cs:662 ../src/UI.Dialog/AdjustTimeDialog.cs:135
-#: ../src/UI.Dialog/ProgressDialog.cs:92
-#: ../extensions/Exporters/CDExport/CDExport.cs:164
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:783
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{1} ਵਿੱਚੋਂ {0}"
-
-#: ../src/MainWindow.cs:1682
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
-msgstr "ਨਹੀਂ."
+msgstr "ਕੈਮਰਾ ਨਹੀਂ ਮਿਲਿਆ"
-#: ../src/MainWindow.cs:1683
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
-msgstr "ਬਿੰਦੂ ਕੋਈ ਨੱਥੀ ਸਿਸਟਮ ਦੋਹਰਾ ਜਾਂਚ ਸ਼ਾਮਿਲ ਅਤੇ"
+msgstr ""
-#: ../src/MainWindow.cs:1722
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
-msgstr "ਗਲਤੀ"
+msgstr "ਕੈਮਰੇ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../src/MainWindow.cs:1723
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr ""
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:2062
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] ""
msgstr[1] ""
-#: ../src/MainWindow.cs:2089
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
-msgstr "ਅਤੇ ਕੋਈ ਇੱਕਲਾ."
+msgstr ""
-#: ../src/MainWindow.cs:2091
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
-msgstr "ਮਿਲਾਨ ਟੈਗ"
+msgstr "ਟੈਗ ਮਿਲਾਨ(_M)"
-#: ../src/MainWindow.cs:2296
-#, fuzzy, csharp-format
+#: ../src/MainWindow.cs:2080, csharp-format
#| msgid "{0} of {1}"
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
-msgstr[0] "{1} ਵਿੱਚੋਂ {0}"
-msgstr[1] "{1} ਵਿੱਚੋਂ {0}"
+msgstr[0] "{1} ਵਿੱਚੋਂ {0} ਫੋਟੋ"
+msgstr[1] "{1} ਵਿੱਚੋਂ {0} ਫੋਟੋ"
-#: ../src/MainWindow.cs:2298 ../src/SingleView.cs:494
-#, fuzzy, csharp-format
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:480, csharp-format
#| msgid "Edit Photo"
msgid "{0} Photo"
msgid_plural "{0} Photos"
-msgstr[0] "ਸੋਧ ਤਸਵੀਰ"
-msgstr[1] "ਸੋਧ ਤਸਵੀਰ"
+msgstr[0] "{0} ਫੋਟੋ"
+msgstr[1] "{0} ਫੋਟੋ"
-#: ../src/MainWindow.cs:2301
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " ({0} ਚੁਣੀ)"
+msgstr[1] " ({0} ਚੁਣੀਆਂ)"
-#: ../src/MainWindow.cs:2382
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
-msgstr "ਠੀਕ ਹੈ"
+msgstr "ਠੀਕ ਹੈ(_O)"
-#: ../src/MainWindow.cs:2383
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "ਗਲਤੀ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ ਤਸਵੀਰ"
-#: ../src/MainWindow.cs:2388
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr ""
-#: ../src/MainWindow.cs:2392
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr ""
-#: ../src/MainWindow.cs:2424
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] ""
msgstr[1] ""
-#: ../src/MainWindow.cs:2428
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
-msgstr[0] "ਸਭ ਦਾ ਫੋਟੋ."
-msgstr[1] "ਸਭ ਦਾ ਫੋਟੋ."
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/MainWindow.cs:2431
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
-msgstr[0] "ਹਟਾਓ ਫੋਟੋ"
-msgstr[1] "ਹਟਾਓ ਫੋਟੋ"
+msgstr[0] "ਫੋਟੋ ਹਟਾਓ(_D)"
+msgstr[1] "ਫੋਟੋ ਹਟਾਓ(_D)"
-#: ../src/MainWindow.cs:2467
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] ""
msgstr[1] ""
-#: ../src/MainWindow.cs:2472
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
"again."
msgstr ""
-#: ../src/MainWindow.cs:2473
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
-msgstr ""
+msgstr "ਕੈਟਾਲਾਗ ਵਿੱਚੋਂ ਹਟਾਓ(_R)"
-#: ../src/MainWindow.cs:2536
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr ""
-#: ../src/MainWindow.cs:2538
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr ""
-#: ../src/MainWindow.cs:2543
-#, fuzzy
+#: ../src/MainWindow.cs:2327
#| msgid "Next photo"
msgid "photo"
msgid_plural "photos"
-msgstr[0] "ਅੱਗੇ ਫੋਟੋ"
-msgstr[1] "ਅੱਗੇ ਫੋਟੋ"
+msgstr[0] "ਫੋਟੋ"
+msgstr[1] "ਫੋਟੋ"
-#: ../src/MainWindow.cs:2545
-#, fuzzy, csharp-format
+#: ../src/MainWindow.cs:2329, csharp-format
#| msgid "If you delete a tag, all associations with photos are lost."
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
"If you delete these tags, the association with {0} {1} will be lost."
-msgstr[0] "ਹਟਾਓ ਸਭ ਨਾਲ."
-msgstr[1] "ਹਟਾਓ ਸਭ ਨਾਲ."
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/MainWindow.cs:2550
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
-msgstr[0] ""
-msgstr[1] "ਹਟਾਓ"
+msgstr[0] "ਟੈਗ ਹਟਾਓ(_D)"
+msgstr[1] "ਟੈਗ ਹਟਾਓ(_D)"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2564
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "ਟੈਗ ਸ਼ਾਮਿਲ ਖਾਲੀ"
-#: ../src/MainWindow.cs:2565
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
"\"{0}\" first"
msgstr ""
-#: ../src/MainWindow.cs:3008
+#: ../src/MainWindow.cs:2781
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
-msgstr[0] "ਘੁੰਮਾਓ ਫੋਟੋ"
-msgstr[1] "ਘੁੰਮਾਓ ਫੋਟੋ"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/MainWindow.cs:3021
+#: ../src/MainWindow.cs:2794
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "ਘੁੰਮਾਓ ਫੋਟੋ"
msgstr[1] "ਘੁੰਮਾਓ ਫੋਟੋ"
-#: ../src/MainWindow.cs:3029
+#: ../src/MainWindow.cs:2805
#, fuzzy, csharp-format
#| msgid "_Edit Selected Tag..."
msgid "Find _Selected Tag"
@@ -1345,7 +2580,7 @@ msgid_plural "Find _Selected Tags"
msgstr[0] "ਸੋਧ ਚੁਣੇ ਟੈਗ."
msgstr[1] "ਸੋਧ ਚੁਣੇ ਟੈਗ."
-#: ../src/MainWindow.cs:3033
+#: ../src/MainWindow.cs:2809
#, fuzzy, csharp-format
#| msgid "_Edit Selected Tag..."
msgid "Find Selected Tag _With"
@@ -1353,13 +2588,13 @@ msgid_plural "Find Selected Tags _With"
msgstr[0] "ਸੋਧ ਚੁਣੇ ਟੈਗ."
msgstr[1] "ਸੋਧ ਚੁਣੇ ਟੈਗ."
-#: ../src/MainWindow.cs:3071
+#: ../src/MainWindow.cs:2850
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "ਬਣਾਓ ਨਵਾਂ ਵਰਜਨ?"
msgstr[1] "ਬਣਾਓ ਨਵਾਂ ਵਰਜਨ?"
-#: ../src/MainWindow.cs:3073
+#: ../src/MainWindow.cs:2852
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -1370,107 +2605,112 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] "ਪਹਿਲਾਂ ਬਿੰਦੂ ਵਰਜਨ ਦਾ ਫੋਟੋ ਅਸਲੀ?"
-#: ../src/MetadataStore.cs:18
+#: ../src/MainWindow.cs:2874
+#| msgid "Version"
+msgid "XCF version"
+msgstr "XCF ਵਰਜਨ"
+
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "ਨਿਰਮਾਤਾ"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
-msgstr "ਸਿਰਲੇਖ"
+msgstr "ਟਾਈਟਲ"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "ਹੱਕ ਰਾਖਵੇਂ ਹਨ"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "ਵਿਸ਼ਾ ਅਤੇ ਕੀ-ਵਰਡ"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
-msgstr "ਨਪੀੜਨ"
+msgstr "ਕੰਪਰੈਸ਼ਨ"
-#: ../src/MetadataStore.cs:24
+#: ../src/MetadataStore.cs:25
msgid "Planar Configuration"
-msgstr "ਸੰਰਚਨਾ"
+msgstr "ਪਲੇਨਰ ਸੰਰਚਨਾ"
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:27
msgid "Orientation"
msgstr "ਸਥਿਤੀ"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:29
msgid "Photometric Interpretation"
msgstr ""
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:31
msgid "Resolution Unit"
msgstr "ਰੈਜ਼ੋਲੇਸ਼ਨ ਇਕਾਈ"
-#: ../src/MetadataStore.cs:32
+#: ../src/MetadataStore.cs:33
msgid "Exposure Program"
msgstr "ਐਕਸਪੋਜ਼ਰ ਕਾਰਜ"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:35
msgid "Metering Mode"
-msgstr "ਢੰਗ"
+msgstr "ਮਿਣਤੀ ਮੋਡ"
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:37
msgid "Exposure Mode"
-msgstr "ਐਕਸਪੋਜ਼ਰ ਢੰਗ"
+msgstr "ਐਕਸਪੋਜ਼ਰ ਮੋਡ"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:39
msgid "Custom Rendered"
msgstr "ਸੋਧ"
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:41
msgid "Components Configuration"
-msgstr "ਸੰਰਚਨਾ"
+msgstr "ਭਾਗ ਸੰਰਚਨਾ"
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:43
msgid "Light Source"
-msgstr "ਹਲਕਾ ਸਰੋਤ"
+msgstr "ਲਾਈਟ ਸਰੋਤ"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:45
msgid "Sensing Method"
-msgstr "ਢੰਗ"
+msgstr "ਸੈਂਸਿੰਗ ਢੰਗ"
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:47
msgid "Color Space"
msgstr "ਰੰਗ ਥਾਂ"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:49
msgid "White Balance"
msgstr "ਚਿੱਟਾ ਸੰਤੁਲਨ"
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:51
msgid "Focal Plane Resolution Unit"
msgstr "ਰੈਜ਼ੋਲੇਸ਼ਨ ਇਕਾਈ"
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:53
msgid "File Source Type"
msgstr "ਫਾਇਲ ਸਰੋਤ ਕਿਸਮ"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:55
msgid "Scene Capture Type"
-msgstr "ਕਿਸਮ"
+msgstr ""
-#: ../src/MetadataStore.cs:56
+#: ../src/MetadataStore.cs:57
msgid "Gain Control"
msgstr "ਗੇਨ ਕੰਟਰੋਲ"
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:59
msgid "Contrast"
msgstr "ਵੱਖਰੇਵਾਂ"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:61
msgid "Saturation"
msgstr "ਸੰਤ੍ਰਿਪਤ"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:63
msgid "Sharpness"
msgstr "ਤਿੱਖਾਪਨ"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:65
msgid "Scene Type"
msgstr "ਕਿਸਮ"
@@ -1478,7 +2718,7 @@ msgstr "ਕਿਸਮ"
#. items insensitve
#: ../src/PhotoTagMenu.cs:74
msgid "(No Tags)"
-msgstr ""
+msgstr "(ਟੈਗ ਨਹੀਂ)"
#: ../src/PhotoVersionCommands.cs:58
msgid "Create New Version"
@@ -1490,7 +2730,7 @@ msgstr "ਨਾਂ:"
#: ../src/PhotoVersionCommands.cs:63
msgid "Rename Version"
-msgstr ""
+msgstr "ਵਰਜਨ ਨਾਂ-ਬਦਲੋ"
#: ../src/PhotoVersionCommands.cs:64
msgid "New name:"
@@ -1498,7 +2738,7 @@ msgstr "ਨਵਾਂ ਨਾਂ:"
#: ../src/PhotoVersionCommands.cs:110
msgid "Could not create a new version"
-msgstr "ਵਰਜਨ"
+msgstr "ਨਵਾਂ ਵਰਜਨ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ"
#: ../src/PhotoVersionCommands.cs:111
#, csharp-format
@@ -1511,14 +2751,13 @@ msgstr "ਕੀ ਹਟਾਉਣੇ ਹਨ?"
#: ../src/PhotoVersionCommands.cs:139
msgid "Cancel"
-msgstr ""
+msgstr "ਰੱਦ ਕਰੋ"
#: ../src/PhotoVersionCommands.cs:140
-#, fuzzy
#| msgid "Delete Tag"
#| msgid_plural "Delete Tags"
msgid "Delete"
-msgstr "ਟੈਗ ਹਟਾਓ"
+msgstr "ਹਟਾਓ"
#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
@@ -1527,7 +2766,7 @@ msgstr ""
#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
-msgstr "ਹਟਾਓ ਵਰਜਨ"
+msgstr "ਵਰਜਨ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
#: ../src/PhotoVersionCommands.cs:155
#, csharp-format
@@ -1536,116 +2775,117 @@ msgstr ""
#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
-msgstr "ਵਰਜਨ"
+msgstr "ਵਰਜਨ ਨਾਂ ਨਹੀਂ ਬਦਲਿਆ ਜਾ ਸਕਿਆ"
#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr ""
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:549
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
-msgstr "ਨਹੀਂ"
+msgstr "(ਸੋਧ ਨਹੀਂ)"
-#: ../src/PhotoView.cs:163 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
-msgstr "ਗਲਤੀ ਫੋਟੋ"
+msgstr "ਫੋਟੋ ਸੋਧਣ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../src/PhotoView.cs:301
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr ""
+
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "ਟਿੱਪਣੀ:"
-#: ../src/Preferences.cs:147
-#, fuzzy
+#: ../src/Preferences.cs:149
#| msgid "<b>Photos</b>"
msgid "Photos"
-msgstr "<b>ਫੋਟੋ</b>"
+msgstr "ਫੋਟੋ"
-#: ../src/PrintOperation.cs:31
+#: ../src/PrintOperation.cs:32
msgid "Image Settings"
-msgstr ""
+msgstr "ਚਿੱਤਰ ਸੈਟਿੰਗ"
-#: ../src/QueryWidget.cs:47
+#: ../src/QueryWidget.cs:58
msgid "Find: "
msgstr "ਖੋਜ "
-#: ../src/QueryWidget.cs:52
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
-msgstr ""
+msgstr "ਬਿਨ-ਟੈਗ ਫੋਟੋ"
-#: ../src/QueryWidget.cs:60
-#, fuzzy
+#: ../src/QueryWidget.cs:71
#| msgid "No active photo"
msgid "Rated photos"
-msgstr "ਨਹੀਂ ਸਰਗਰਮ ਫੋਟੋ"
+msgstr "ਰੇਟ ਕੀਤੇ ਫੋਟੋ"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:69
-#, fuzzy
+#: ../src/QueryWidget.cs:80
#| msgid "Import"
msgid "Import roll"
-msgstr "ਅਯਾਤ"
+msgstr ""
-#: ../src/QueryWidget.cs:89
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "ਖੋਜ ਸਾਫ਼"
-#: ../src/QueryWidget.cs:96
-#, fuzzy
+#: ../src/QueryWidget.cs:111
#| msgid "Clear search"
msgid "Refresh search"
-msgstr "ਖੋਜ ਸਾਫ਼"
+msgstr "ਖੋਜ ਤਾਜ਼ਾ"
-#: ../src/QueryWidget.cs:98
-#, fuzzy
+#: ../src/QueryWidget.cs:113
#| msgid "No matching photos found "
msgid "No matching photos found"
-msgstr "ਨਹੀਂ "
+msgstr "ਕੋਈ ਮਿਲਦੀ ਫੋਟੋ ਨਹੀਂ ਲੱਭੀ"
-#: ../src/QueryWidget.cs:136
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr ""
-#: ../src/QueryWidget.cs:142
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr ""
-#: ../src/RotateCommand.cs:94 ../src/RotateCommand.cs:109
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
#, fuzzy
#| msgid "Unable to rotate photo"
#| msgid_plural "Unable to rotate {0} photos"
msgid "Unable to rotate this type of photo"
msgstr "ਫੋਟੋ"
-#: ../src/RotateCommand.cs:129
+#: ../src/RotateCommand.cs:131
#, fuzzy
#| msgid "Unable to create temporary file"
msgid "Unable to rotate readonly file"
msgstr "ਆਰਜ਼ੀ ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
-#: ../src/RotateCommand.cs:196
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
-msgstr ""
+msgstr "ਫੋਟੋ ਘੁੰਮਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-#: ../src/RotateCommand.cs:207
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
msgstr ""
-#: ../src/RotateCommand.cs:220
-#, fuzzy
+#: ../src/RotateCommand.cs:222
#| msgid "File not found"
msgid "Directory not found"
-msgstr "ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ"
+msgstr "ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਲੱਭੀ"
-#: ../src/RotateCommand.cs:240
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
msgstr[0] ""
msgstr[1] ""
-#: ../src/RotateCommand.cs:242
+#: ../src/RotateCommand.cs:244
#, csharp-format
msgid ""
"The photo could not be rotated because it is on a read only file system or "
@@ -1656,155 +2896,117 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ../src/RotateCommand.cs:269
+#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
msgstr ""
-#: ../src/RotateCommand.cs:274
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
msgstr "ਗਲਤੀ ਫੋਟੋ."
-#: ../src/SendEmail.cs:239
+#: ../src/SendEmail.cs:240
msgid "Preparing email"
-msgstr ""
+msgstr "ਈਮੇਲ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../src/SendEmail.cs:291
+#: ../src/SendEmail.cs:292
#, fuzzy, csharp-format
#| msgid "Uploading picture \"{0}\""
msgid "Exporting picture \"{0}\""
msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../src/SendEmail.cs:313
-#, fuzzy
+#: ../src/SendEmail.cs:314
#| msgid "Error renaming tag"
msgid "Error processing image"
-msgstr "ਗਲਤੀ"
+msgstr "ਚਿੱਤਰ ਉੱਤੇ ਕਾਰਵਾਈ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../src/SendEmail.cs:314
+#: ../src/SendEmail.cs:315
#, csharp-format
msgid "An error occured while processing \"{0}\": {1}"
msgstr ""
#. Send the mail :)
-#: ../src/SendEmail.cs:329
-#, fuzzy
+#: ../src/SendEmail.cs:330
#| msgid "Import photos"
msgid "my photos"
-msgstr "ਫੋਟੋ ਅਯਾਤ"
+msgstr "ਮੇਰੇ ਫੋਟੋ"
-#: ../src/SingleView.cs:88
-#, fuzzy
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "ਗਲਤੀ ਫੋਟੋ"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "ਉਘੜਵਾਂ"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "ਮਾਤਰਾ:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "ਰੇਡੀਅਸ:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "ਥਰੈਸ਼ਹੋਲਡ:"
+
+#: ../src/SingleView.cs:73
#| msgid "Rotate selected photo left"
#| msgid_plural "Rotate selected photos left"
msgid "Rotate photo left"
-msgstr ""
+msgstr "ਫੋਟੋ ਖੱਬੇ ਘੁੰਮਾਓ"
-#: ../src/SingleView.cs:93
-#, fuzzy
+#: ../src/SingleView.cs:78
#| msgid "Rotate selected photo right"
#| msgid_plural "Rotate selected photos right"
msgid "Rotate photo right"
-msgstr ""
+msgstr "ਫੋਟੋ ਸੱਜੇ ਘੁੰਮਾਓ"
-#. Obsolete, remove after db rev4
-#: ../src/SingleView.cs:128 ../src/UI.Dialog/ui/PreferenceDialog.glade.h:14
-#: ../src/Widgets/MetadataDisplay.cs:221 ../src/Widgets/MetadataDisplay.cs:223
-#, fuzzy
+#: ../src/SingleView.cs:115
#| msgid "_Folder"
msgid "Folder"
msgstr "ਫੋਲਡਰ"
-#: ../src/SingleView.cs:354
-#, fuzzy
+#: ../src/SingleView.cs:341
#| msgid "Open With"
msgid "Open"
-msgstr "ਇਸ ਨਾਲ ਖੋਲੋ"
+msgstr "ਖੋਲ੍ਹੋ"
-#: ../src/SingleView.cs:454
-#, fuzzy
+#: ../src/SingleView.cs:441
#| msgid "Set as _Background"
msgid "Set as Background"
-msgstr "ਸੈਟ ਪਿੱਠਭੂਮੀ"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਸੈੱਟ ਕਰੋ"
-#: ../src/TagCommands.cs:91 ../src/TagCommands.cs:219
-#: ../src/TagSelectionWidget.cs:512
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
-msgstr "ਨਾਂ ਸ਼ਾਮਿਲ ਵਿੱਚ"
+msgstr "ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"
-#: ../src/TagCommands.cs:138
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "ਨਵਾਂ ਟੈਗ ਬਣਾਓ"
-#: ../src/TagCommands.cs:139
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "ਨਾਂ ਦਾ ਨਵਾਂ ਟੈਗ:"
-#: ../src/TagCommands.cs:285
-msgid "Edit Tag"
-msgstr "ਟੈਗ ਸੋਧ"
-
-#: ../src/TagCommands.cs:286
-msgid "Tag Name:"
-msgstr "ਟੈਗ ਨਾਂ:"
-
-#: ../src/TagCommands.cs:402
-#, fuzzy
-#| msgid "Unable to log on"
-msgid "Unable to load image"
-msgstr "ਲਾਗ-ਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
-#: ../src/TagCommands.cs:403
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr ""
-
-#: ../src/TagCommands.cs:447
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr ""
-
-#: ../src/TagCommands.cs:477
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr ""
-
-#: ../src/TagCommands.cs:493
-#, fuzzy
-#| msgid "Select Photos to Copy From Camera..."
-msgid "Select Photo from file"
-msgstr "ਚੁਣੋ ਨਕਲ ਵੱਲੋਂ ਕੈਮਰਾ."
-
-#: ../src/TagCommands.cs:516
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-
-#: ../src/TagPopup.cs:26
-#, fuzzy, csharp-format
+#: ../src/TagPopup.cs:26, csharp-format
#| msgid "Fin_d"
msgid "Find"
msgid_plural "Find"
-msgstr[0] "ਖੋਜ(_d)"
-msgstr[1] "ਖੋਜ(_d)"
+msgstr[0] "ਖੋਜ"
+msgstr[1] "ਖੋਜ"
#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
-#, fuzzy
#| msgid "Create New _Tag..."
msgid "Create New Tag..."
-msgstr "ਨਵਾਂ ਟੈਗ ਬਣਾਓ(_T)..."
+msgstr "ਨਵਾਂ ਟੈਗ ਬਣਾਓ..."
#: ../src/TagPopup.cs:42
-#, fuzzy
#| msgid "_Edit Selected Tag..."
msgid "Edit Selected Tag..."
-msgstr "ਸੋਧ ਚੁਣੇ ਟੈਗ."
+msgstr "ਚੁਣਿਆ ਟੈਗ ਸੋਧੋ..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -1830,2540 +3032,1189 @@ msgstr[1] "ਹਟਾਓ ਟੈਗ ਵੱਲੋਂ ਚੋਣ"
msgid "Merge Tags"
msgstr "ਮਿਲਾਨ ਟੈਗ"
-#: ../src/TagQueryWidget.cs:32
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr ""
-#: ../src/TagQueryWidget.cs:37
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr ""
-#: ../src/TagQueryWidget.cs:42
-#, fuzzy
+#: ../src/TagQueryWidget.cs:44
#| msgid "Remove From Catalog"
msgid "Remove From Search"
-msgstr "ਹਟਾਓ ਵੱਲੋਂ"
+msgstr "ਖੋਜ ਵਿੱਚੋਂ ਹਟਾਓ"
-#: ../src/TagQueryWidget.cs:86
-#, fuzzy, csharp-format
+#: ../src/TagQueryWidget.cs:88, csharp-format
#| msgid "Open With"
msgid "Find _With"
msgid_plural "Find _With"
-msgstr[0] "ਇਸ ਨਾਲ ਖੋਲੋ"
-msgstr[1] "ਇਸ ਨਾਲ ਖੋਲੋ"
+msgstr[0] "ਇਸ ਨਾਲ ਲੱਭੋ(_W)"
+msgstr[1] "ਇਸ ਨਾਲ ਲੱਭੋ(_W)"
-#: ../src/TagQueryWidget.cs:112
+#: ../src/TagQueryWidget.cs:114
msgid "All"
-msgstr ""
+msgstr "ਸਭ"
-#: ../src/TagQueryWidget.cs:147 ../src/Term.cs:592
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
-msgstr ""
+msgstr "{0} ਨਹੀਂ"
-#: ../src/TagQueryWidget.cs:277
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr ""
-#: ../src/TagSelectionWidget.cs:511
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
-msgstr "ਗਲਤੀ"
+msgstr "ਟੈਗ ਨਾਂ-ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../src/TagStore.cs:198
+#: ../src/TagStore.cs:203
msgid "Favorites"
-msgstr ""
+msgstr "ਪਸੰਦੀਦਾ"
-#: ../src/TagStore.cs:203
+#: ../src/TagStore.cs:208
msgid "Hidden"
-msgstr "ਲੁਕਵੀ"
+msgstr "ਲੁਕਵੇਂ"
-#: ../src/TagStore.cs:211
+#: ../src/TagStore.cs:216
msgid "People"
-msgstr ""
+msgstr "ਲੋਕ"
-#: ../src/TagStore.cs:216
+#: ../src/TagStore.cs:221
msgid "Places"
-msgstr ""
+msgstr "ਥਾਵਾਂ"
-#: ../src/TagStore.cs:221
+#: ../src/TagStore.cs:226
msgid "Events"
-msgstr "ਘਟਨਾ"
+msgstr "ਸਮਾਗਮ"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:234 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
-msgstr "(ਕੁਝ ਨਹੀ)"
+msgstr "(ਕੁਝ ਨਹੀਂ)"
#: ../src/Term.cs:298
msgid " and "
-msgstr ""
+msgstr " ਅਤੇ "
#. operators.Add (Catalog.GetString (" && "));
#: ../src/Term.cs:300
-#, fuzzy
#| msgid " "
msgid ", "
-msgstr " "
+msgstr ", "
#: ../src/Term.cs:356
-#, fuzzy
#| msgid "1 of 1"
msgid " or "
-msgstr "1 'ਚੋਂ 1"
+msgstr " ਜਾਂ "
#. OPS The operators we support, case insensitive
#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:380 ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:220
-#, fuzzy
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
#| msgid "Port"
msgid "or"
-msgstr "ਪੋਰਟ"
+msgstr "ਜਾਂ"
-#: ../src/UI.Dialog/AboutDialog.cs:70
-#, fuzzy
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "ਥੰਮਨੇਲ ਅੱਪਡੇਟ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
+
+#: ../src/ThumbnailCommand.cs:28, csharp-format
+#| msgid "Uploading picture \"{0}\""
+msgid "Updating picture \"{0}\""
+msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
#| msgid "Photo Manager"
msgid "Photo management for GNOME"
-msgstr "ਫੋਟੋ ਮੈਨੇਜਰ"
+msgstr "ਗਨੋਮ ਲਈ ਫੋਟੋ ਪਰਬੰਧ"
-#: ../src/UI.Dialog/AboutDialog.cs:71
-#, fuzzy
+#: ../src/UI.Dialog/AboutDialog.cs:77
#| msgid "Copyright 2003-2006 Novell Inc."
-msgid "Copyright © 2003-2008 Novell Inc."
-msgstr "ਹੱਕ ਰਾਖਵੇਂ ਹਨ."
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Copyright © ੨੦੦੩-੨੦੦੯ Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:94
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
-msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam at users.sf.net>"
+msgstr ""
+"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ ੨੦੦੫-੨੦੦੯\n"
+"ਪੰਜਾਬੀ ਓਪਨ ਸੋਰਸ ਟੀਮ"
-#: ../src/UI.Dialog/AboutDialog.cs:99
-#, fuzzy
+#: ../src/UI.Dialog/AboutDialog.cs:105
#| msgid "F-Spot View"
msgid "F-Spot Website"
-msgstr "F-ਸਪੋਟ ਝਲਕ"
+msgstr "F-ਸਪੋਟ ਵੈੱਬਸਾਈਟ"
-#: ../src/UI.Dialog/AdjustTimeDialog.cs:118 ../src/f-spot.glade.h:120
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
msgid "Shift all photos by {0}"
msgstr ""
-#: ../src/UI.Dialog/ExceptionDialog.cs:24
-msgid "F-Spot Encountered a Fatal Error"
-msgstr ""
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:60
-msgid "Error Details"
-msgstr ""
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:104
-msgid "An unhandled exception was thrown: "
-msgstr ""
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:20
-#, fuzzy
-#| msgid "Error renaming tag"
-msgid "Error loading database."
-msgstr "ਗਲਤੀ"
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:21
-#, csharp-format
-msgid ""
-"F-Spot encountered an error while loading the photo database. The old "
-"database has be moved to {0} and a new database has been created."
-msgstr ""
-
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
-msgid "Label"
-msgstr ""
-
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
-msgid "Ratio"
-msgstr ""
-
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
-msgid "Retry"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:1
-msgid "<b>Color Management</b>"
-msgstr "<b>ਰੰਗ ਪਰਬੰਧ</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:2
-#, fuzzy
-#| msgid "<b>Export Method</b>"
-msgid "<b>Import Settings</b>"
-msgstr "<b>ਨਿਰਯਾਤ ਢੰਗ</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:3
-msgid "<b>Metadata</b>"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:4
-msgid "<b>Screensaver</b>"
-msgstr "<b>ਵੇਹਲੇ ਪਰਦਾ</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:5
-#, fuzzy
-#| msgid "<b></b>"
-msgid "<b>Theming</b>"
-msgstr "<b></b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:6
-msgid ""
-"<small><i>Choose the folder where F-Spot should store newly imported photos</"
-"i></small>"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:7
-msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:9
-msgid ""
-"<small><i>While acting as a screensaver, F-Spot can display all of your "
-"images, or a small subset based on tags.</i></small>"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:10
-msgid ""
-"<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:12
-#, fuzzy
-#| msgid "Custom Rendered"
-msgid "Custom Theme"
-msgstr "ਸੋਧ"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:15
-msgid "From List:"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:16
-msgid "From gtkrc File:"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:17
-msgid "Images tagged with:"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:18
-msgid "Make F-Spot your screensaver"
-msgstr ""
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:19 ../src/f-spot.glade.h:102
-msgid "Preferences"
-msgstr "ਮੇਰੀ ਪਸੰਦ"
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "ਅੱਜ"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:20
-#, fuzzy
-#| msgid "Select Folder"
-msgid "Select A Folder"
-msgstr "ਫੋਲਡਰ ਚੁਣੋ"
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "ਕੱਲ੍ਹ"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:21
-#, fuzzy
-#| msgid "Select Folder"
-msgid "Select A gtkrc File"
-msgstr "ਫੋਲਡਰ ਚੁਣੋ"
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "ਪਿਛਲੇ ੭ ਦਿਨ"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:22
-msgid "System Theme"
-msgstr ""
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "ਪਿਛਲੇ ੩੦ ਦਿਨ"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:23
-msgid "Try to use the system display profile"
-msgstr ""
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "ਪਿਛਲੇ ੯੦ ਦਿਨ"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:24
-msgid "Write _metadata to file"
-msgstr "ਲਿਖਣ"
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "ਪਿਛਲੇ ੩੬੦ ਦਿਨ"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:25
-msgid "_Display:"
-msgstr "ਝਲਕ:"
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "ਮੌਜੂਦਾ ਹਫ਼ਤਾ (ਸੋਮ-ਐਤ)"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:26
-#, fuzzy
-#| msgid "_Output:"
-msgid "_Print output:"
-msgstr "ਆਉਟਪੁੱਟ:"
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "ਪਿਛਲਾ ਹਫ਼ਤਾ (ਸੋਮ-ਐਤ)"
-#: ../src/Updater.cs:528
-msgid "Updating F-Spot Database"
-msgstr "ਬਿੰਦੂ ਡਾਟਾਬੇਸ "
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "ਪਸੰਦੀਦਾ ਰੇਜ਼"
-#: ../src/Updater.cs:529
-msgid ""
-"Please wait while your F-Spot gallery's database is updated. This may take "
-"some time."
-msgstr "ਬਿੰਦੂ s ਸ਼ਾਮਿਲ."
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "ਟੈਗ {0} ਤੋਂ ਆਈਕਾਨ ਸੋਧ"
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:35
-msgid "Unable to create temporary file"
-msgstr "ਆਰਜ਼ੀ ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+#| msgid "Select Photos to Copy From Camera..."
+msgid "Select Photo from file"
+msgstr "ਫਾਇਲ ਤੋਂ ਫੋਟੋ ਚੁਣੋ"
-#: ../src/Utils/GnomeUtil.cs:49
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
msgid ""
-"The \"F-Spot Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
msgstr ""
-#: ../src/Widgets/CustomPrintWidget.cs:98
-msgid "Page Setup"
-msgstr ""
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+#| msgid "Unable to log on"
+msgid "Unable to load image"
+msgstr "ਚਿੱਤਰ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-#: ../src/Widgets/CustomPrintWidget.cs:102
-#: ../src/Widgets/CustomPrintWidget.cs:106
-#: ../src/Widgets/CustomPrintWidget.cs:112
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr ""
-
-#: ../src/Widgets/CustomPrintWidget.cs:124
-#, fuzzy
-#| msgid "Photo Manager"
-msgid "Photos per page"
-msgstr "ਫੋਟੋ ਮੈਨੇਜਰ"
-
-#. ppp1.Toggled += TriggerChanged;
-#. ppp2.Toggled += TriggerChanged;
-#. ppp4.Toggled += TriggerChanged;
-#. ppp9.Toggled += TriggerChanged;
-#: ../src/Widgets/CustomPrintWidget.cs:136
-msgid "Repeat"
-msgstr ""
-
-#: ../src/Widgets/CustomPrintWidget.cs:137
-#, fuzzy
-#| msgid "Print crop _marks"
-msgid "Print cut marks"
-msgstr "ਛਾਪੋ"
-
-#: ../src/Widgets/CustomPrintWidget.cs:145
-msgid "Full Page (no margin)"
+msgid "Unable to load \"{0}\" as icon for the tag"
msgstr ""
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Widgets/CustomPrintWidget.cs:149
-#, fuzzy
-#| msgid "Zoom in"
-msgid "Zoom"
-msgstr "ਅਕਾਰ ਵਧਾਓ"
-
-#: ../src/Widgets/CustomPrintWidget.cs:150
-#, fuzzy
-#| msgid "File"
-msgid "Fill"
-msgstr "ਫਾਇਲ"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "{1} ਵਿੱਚੋਂ {0} ਫੋਟੋ"
-#: ../src/Widgets/CustomPrintWidget.cs:151
-msgid "Scaled"
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
msgstr ""
-#: ../src/Widgets/CustomPrintWidget.cs:157
-msgid "White borders"
-msgstr ""
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "ਗਲਤੀ ਵੇਰਵਾ"
-#: ../src/Widgets/CustomPrintWidget.cs:161
-msgid "Custom Text: "
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
msgstr ""
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:71
-#, fuzzy
-#| msgid "Edit Tag"
-msgid "Edit"
-msgstr "ਟੈਗ ਸੋਧ"
+#: ../src/UI.Dialog/PreferenceDialog.cs:53
+#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#| msgid "(None)"
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
-#: ../src/Widgets/EditorPage.cs:201
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:46
-msgid "No selection available"
-msgstr "ਨਹੀਂ"
+#: ../src/UI.Dialog/PreferenceDialog.cs:55
+msgid "System profile"
+msgstr "ਸਿਸਟਮ ਪਰੋਫਾਇਲ"
-#: ../src/Widgets/EditorPage.cs:202
-msgid ""
-"This tool requires an active selection. Please select a region of the photo "
-"and try the operation again"
-msgstr "ਸਰਗਰਮ ਦਾ ਫੋਟੋ ਅਤੇ"
+#: ../src/UI.Dialog/PreferenceDialog.cs:84
+msgid "Standard theme"
+msgstr "ਸਟੈਂਡਰਡ ਥੀਮ"
-#: ../src/Widgets/EditorPage.cs:220
-#| msgid "Error saving adjusted photo"
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+#| msgid "Error renaming tag"
+msgid "Error loading database."
+msgstr "ਡਾਟਾਬੇਸ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../src/Widgets/EditorPage.cs:222
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
#, csharp-format
msgid ""
-"Received exception \"{0}\". Note that you have to develop RAW files into "
-"JPEG before you can edit them."
-msgstr ""
-
-#: ../src/Widgets/FindBar.cs:58
-#, fuzzy
-#| msgid "Find: "
-msgid "Find:"
-msgstr "ਖੋਜ "
-
-#: ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:212
-msgid "and"
-msgstr ""
-
-#: ../src/Widgets/InfoBox.cs:182
-#, fuzzy
-#| msgid "<b>Histogram</b>"
-msgid "Histogram"
-msgstr "<b>ਆਇਤ ਗਰਾਫ</b>"
-
-#: ../src/Widgets/InfoBox.cs:217
-#, fuzzy
-#| msgid "Date:"
-msgid "Date"
-msgstr "ਮਿਤੀ:"
-
-#: ../src/Widgets/InfoBox.cs:220
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:5
-#, fuzzy
-#| msgid "Size:"
-msgid "Size"
-msgstr "ਆਕਾਰ:"
-
-#: ../src/Widgets/InfoBox.cs:223
-#, fuzzy
-#| msgid "Exposure:"
-msgid "Exposure"
-msgstr "ਪੱਖ:"
-
-#: ../src/Widgets/InfoBox.cs:227
-msgid "Focal Length"
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
msgstr ""
-#: ../src/Widgets/InfoBox.cs:233
-#, fuzzy
-#| msgid "File"
-msgid "File Size"
-msgstr "ਫਾਇਲ"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "ਲੇਬਲ"
-#: ../src/Widgets/InfoBox.cs:236
-#, fuzzy
-#| msgid "Loading"
-msgid "Rating"
-msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "ਅਨੁਪਾਤ"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(ਅਣਜਾਣ)"
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr ""
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
-#: ../src/Widgets/InfoBox.cs:558
-msgid "(File read error)"
-msgstr ""
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
-#: ../src/Widgets/InfoBox.cs:603
-#, fuzzy, csharp-format
-#| msgid "Edit Photo"
-msgid "{0} Photos"
-msgstr "ਸੋਧ ਤਸਵੀਰ"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:623
-#, csharp-format
-msgid ""
-"On {0} between \n"
-"{1} and {2}"
-msgstr ""
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>ਕਾਰਵਾਈ</b>"
-#: ../src/Widgets/InfoBox.cs:628
-#, csharp-format
-msgid ""
-"Between {0} \n"
-"and {1}"
-msgstr ""
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>ਹਵਾਲਾ ਤਸਵੀਰ</b>"
-#: ../src/Widgets/InfoBox.cs:655
-#, fuzzy
-#| msgid "File not found"
-msgid "(At least one File not found)"
-msgstr "ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "ਸਮਾਂ ਅਡਜੱਸਟ"
-#: ../src/Widgets/InfoBox.cs:772
-#, fuzzy
-#| msgid "F-Spot Photo Manager"
-msgid "Show Photo Name"
-msgstr "F-ਸਪੋਟ ਫੋਟੋ ਮੈਨੇਜਰ"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "ਮਿਤੀ ਅਡਜੱਸਟ: "
-#: ../src/Widgets/InfoBox.cs:781
-msgid "Show Date"
-msgstr ""
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "ਮੌਜੂਦਾ ਮਿਤੀ:"
-#: ../src/Widgets/InfoBox.cs:790
-#, fuzzy
-#| msgid "Photo _Size:"
-msgid "Show Size"
-msgstr "ਤਸਵੀਰ ਆਕਾਰ(_S):"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "ਥਾਂ ਸਭ"
-#: ../src/Widgets/InfoBox.cs:799
-#, fuzzy
-#| msgid "Exposure:"
-msgid "Show Exposure"
-msgstr "ਪੱਖ:"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "ਅੰਤਰ:"
-#: ../src/Widgets/InfoBox.cs:808
-msgid "Show Focal Length"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
msgstr ""
-#: ../src/Widgets/InfoBox.cs:817
-#, fuzzy
-#| msgid "Camera"
-msgid "Show Camera"
-msgstr "ਕੈਮਰਾ"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>ਅੰਤ ਮਿਤੀ</b>"
-#: ../src/Widgets/InfoBox.cs:826
-msgid "Show File Size"
-msgstr ""
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+#| msgid "<b>Action</b>"
+msgid "<b>Select period</b>"
+msgstr "<b>ਚੁਣਿਆ ਸਮਾਂ</b>"
-#: ../src/Widgets/MetadataDisplay.cs:23
-#, fuzzy
-#| msgid "Metadata Browser"
-msgid "Metadata"
-msgstr "ਮੈਟਾ-ਡਾਟਾ ਝਲਕਾਰਾ"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>ਸ਼ੁਰੂ ਮਿਤੀ</b>"
-#: ../src/Widgets/MetadataDisplay.cs:104
-msgid "Extended Metadata"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
msgstr ""
-#: ../src/Widgets/MetadataDisplay.cs:225
-msgid "Picasaweb"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
msgstr ""
-#: ../src/Widgets/MetadataDisplay.cs:227
-msgid "SmugMug"
-msgstr ""
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+#| msgid "Set Date Range"
+msgid "Set date range"
+msgstr "ਮਿਤੀ ਰੇਜ਼ ਸੈੱਟ ਕਰੋ"
-#: ../src/Widgets/MetadataDisplay.cs:229
-#, fuzzy
-#| msgid "Gallery"
-msgid "Gallery2"
-msgstr "ਗੈਲਰੀ"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:389
-#, fuzzy
-#| msgid "No metadata available"
-msgid "No Extended Metadata Available"
-msgstr "ਨਹੀਂ"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "ਟੈਗ ਸੋਧ"
-#: ../src/Widgets/MetadataDisplay.cs:407
-msgid "No active photo"
-msgstr "ਨਹੀਂ ਸਰਗਰਮ ਫੋਟੋ"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "ਆਈਕਾਨ ਸੋਧ"
-#: ../src/Widgets/MetadataDisplay.cs:409
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr ""
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "ਆਈਕਾਨ(_I):"
-#: ../src/Widgets/MetadataDisplay.cs:412
-msgid "No metadata available"
-msgstr "ਨਹੀਂ"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+#| msgid "<b>From Photo</b>"
+msgid "<b>From External Photo</b>"
+msgstr "<b>ਬਾਹਰੀ ਫੋਟੋ ਤੋਂ</b>"
-#: ../src/Widgets/OpenWithMenu.cs:69
-msgid "No applications available"
-msgstr "ਨਹੀਂ"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>ਤਸਵੀਰ ਤੋਂ</b>"
-#: ../src/Widgets/RatingMenuItem.cs:56
-#, fuzzy
-#| msgid "C_aption:"
-msgid "Rating:"
-msgstr "ਸੁਰਖੀ(_a):"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+#| msgid "<b>Predefined</b>"
+msgid "<b>Predefined icons</b>"
+msgstr "<b>ਪਹਿਲਾਂ-ਪ੍ਰਭਾਸ਼ਿਤ ਆਈਕਾਨ</b>"
-#: ../src/XmpTagsImporter.cs:89
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:6
-#, fuzzy
-#| msgid "Copy Locat_ion"
-msgid "Location"
-msgstr "ਟਿਕਾਣਾ ਨਕਲ(_i)"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>ਝਲਕ</b>"
-#: ../src/XmpTagsImporter.cs:90
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
#, fuzzy
-#| msgid "Contrast"
-msgid "Country"
-msgstr "ਵੱਖਰੇਵਾਂ"
+#| msgid "_Destination Temp"
+msgid "Design icon from"
+msgstr "ਨਿਯਤ ਆਰਜ਼ੀ"
-#: ../src/XmpTagsImporter.cs:91
-msgid "City"
-msgstr ""
-
-#: ../src/XmpTagsImporter.cs:92
-#, fuzzy
-#| msgid "Date:"
-msgid "State"
-msgstr "ਮਿਤੀ:"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "ਟੈਗ ਆਈਕਾਨ ਸੋਧ"
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+#| msgid "No image loaded."
+msgid "No _image"
+msgstr "ਚਿੱਤਰ ਨਹੀਂ(_i)"
-#: ../src/f-spot.glade.h:2
-msgid "0000:00:00 00:00:00"
-msgstr "0000:00:00 00:00:00"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "0 ਵਿੱਚੋਂ 0 ਫੋਟੋ"
-#: ../src/f-spot.glade.h:3
-msgid "00:00:00"
-msgstr "00:00:00"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "ਵੇਖਣ ਲਈ ਰੰਗ ਪਰੋਫਾਇਲ:"
-#: ../src/f-spot.glade.h:4
-msgid "1 of 1"
-msgstr "1 'ਚੋਂ 1"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "ਪਰਿੰਟ ਲਈ ਰੰਗ ਪਰੋਫਾਇਲ:"
-#: ../src/f-spot.glade.h:5
-msgid "1024 px"
-msgstr ""
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+#| msgid "Preferences"
+msgid "F-Spot Preferences"
+msgstr "F-ਸਪੋਟ ਪਸੰਦ"
-#: ../src/f-spot.glade.h:6
-msgid "320 px"
-msgstr ""
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-ਸਪੋਟ ਦਿੱਖ:"
-#: ../src/f-spot.glade.h:7
-msgid "480 px"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
-#: ../src/f-spot.glade.h:8
-msgid "5"
-msgstr "5"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+#| msgid "Select Folder"
+msgid "Select A Folder"
+msgstr "ਫੋਲਡਰ ਚੁਣੋ"
-#: ../src/f-spot.glade.h:9
-msgid "640 px"
-msgstr ""
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ ਤੋਂ ਵੱਖ"
-#: ../src/f-spot.glade.h:10
-msgid "800 px"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
msgstr ""
-#: ../src/f-spot.glade.h:11
-msgid "<b></b>"
-msgstr "<b></b>"
-
-#: ../src/f-spot.glade.h:12
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>ਖਾਤਾ</b>"
-
-#: ../src/f-spot.glade.h:13
-msgid "<b>Action</b>"
-msgstr "<b>ਕਾਰਵਾਈ</b>"
-
-#: ../src/f-spot.glade.h:14
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>ਐਲਬਮ</b>"
-
-#: ../src/f-spot.glade.h:15
-msgid "<b>Co_rrections</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
msgstr ""
-#: ../src/f-spot.glade.h:16
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>ਟਿਕਾਣਾ</b>"
-
-#: ../src/f-spot.glade.h:17
-msgid "<b>End Date</b>"
-msgstr "<b>ਅੰਤ ਮਿਤੀ</b>"
-
-#: ../src/f-spot.glade.h:18
-#, fuzzy
-#| msgid "<b>From Photo</b>"
-msgid "<b>From External Photo</b>"
-msgstr "<b>ਵੱਲੋਂ ਤਸਵੀਰ</b>"
-
-#: ../src/f-spot.glade.h:19
-msgid "<b>From Photo</b>"
-msgstr "<b>ਵੱਲੋਂ ਤਸਵੀਰ</b>"
-
-#: ../src/f-spot.glade.h:20
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>ਗੈਲਰੀ</b>"
-
-#: ../src/f-spot.glade.h:21
-#, fuzzy
-#| msgid "<b>Destination</b>"
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>ਟਿਕਾਣਾ</b>"
-
-#: ../src/f-spot.glade.h:22
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
#, fuzzy
#| msgid "<b>Action</b>"
msgid "<b>Max Rating</b>"
msgstr "<b>ਕਾਰਵਾਈ</b>"
-#: ../src/f-spot.glade.h:23
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
#, fuzzy
#| msgid "<b>Destination</b>"
msgid "<b>Min Rating</b>"
msgstr "<b>ਟਿਕਾਣਾ</b>"
-#: ../src/f-spot.glade.h:24
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
-msgid "<b>Photos</b>"
-msgstr "<b>ਫੋਟੋ</b>"
-
-#: ../src/f-spot.glade.h:25
-msgid "<b>Predefined</b>"
-msgstr "<b>ਪਹਿਲਾਂ-ਪ੍ਰਭਾਸ਼ਿਤ</b>"
-
-#: ../src/f-spot.glade.h:26
-msgid "<b>Preview</b>"
-msgstr "<b>ਝਲਕ</b>"
-
-#: ../src/f-spot.glade.h:27
-msgid "<b>Reference Photo</b>"
-msgstr "<b>ਹਵਾਲਾ ਤਸਵੀਰ</b>"
-
-#: ../src/f-spot.glade.h:28
-#, fuzzy
-#| msgid "<b>Action</b>"
-msgid "<b>Select period</b>"
-msgstr "<b>ਕਾਰਵਾਈ</b>"
-
-#: ../src/f-spot.glade.h:29
-#, fuzzy
-#| msgid "<b>Style</b>"
-msgid "<b>Size</b>"
-msgstr "<b>ਸ਼ੈਲੀ</b>"
-
-#: ../src/f-spot.glade.h:30
-msgid "<b>Start Date</b>"
-msgstr "<b>ਸ਼ੁਰੂ ਮਿਤੀ</b>"
-
-#: ../src/f-spot.glade.h:31
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>ਸ਼ੈਲੀ</b>"
-
-#: ../src/f-spot.glade.h:32
-#, fuzzy
-#| msgid "<b>Gallery</b>"
-msgid "<b>Summary</b>"
-msgstr "<b>ਗੈਲਰੀ</b>"
-
-#: ../src/f-spot.glade.h:33
-#, fuzzy
-#| msgid "<b>Start Date</b>"
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>ਸ਼ੁਰੂ ਮਿਤੀ</b>"
-
-#: ../src/f-spot.glade.h:34
-msgid "<b>View all pictures imported</b>"
-msgstr ""
-
-#: ../src/f-spot.glade.h:35
-msgid "<b>_White Balance</b>"
-msgstr "<b>ਚਿੱਟਾ ਸੰਤੁਲਨ(_W)</b>"
-
-#: ../src/f-spot.glade.h:36
-msgid "<small></small>"
-msgstr "<small></small>"
-
-#: ../src/f-spot.glade.h:37
-msgid ""
-"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
-"disable this for viewing photos, but disabling the interpolation could be "
-"usefull in icon design.</i></small>"
-msgstr ""
-
-#: ../src/f-spot.glade.h:38
-msgid ""
-"<small><i>You can choose how to display transparent parts in images. This "
-"option has no effect on photos, but setting this as check pattern or custom "
-"color could be usefull when viewing icons or other artworks with transparent "
-"parts.</i></small>"
-msgstr ""
-
-#: ../src/f-spot.glade.h:39
-msgid "Adjust Time"
-msgstr "ਸਮਾਂ ਅਨੁਕੂਲ"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "ਰੇਟਿੰਗ ਫਿਲਟਰ ਸੈੱਟ ਕਰੋ"
-#: ../src/f-spot.glade.h:40
-#, fuzzy
+#: ../src/ui/main_window.ui.h:1
#| msgid "Adjust _Time"
msgid "Adjust _Time..."
-msgstr "ਸਮਾਂ ਅਨੁਕੂਲ(_T)"
-
-#: ../src/f-spot.glade.h:41
-msgid "Adjusted date: "
-msgstr "ਮਿਤੀ ਅਨੁਕੂਲ: "
+msgstr "ਸਮਾਂ ਅਡਜੱਸਟ(_T)..."
-#: ../src/f-spot.glade.h:42
+#: ../src/ui/main_window.ui.h:2
msgid "Arrange _by"
msgstr ""
-#: ../src/f-spot.glade.h:43
-#, fuzzy
-#| msgid "Set as _Background"
-msgid "As _background"
-msgstr "ਸੈਟ ਪਿੱਠਭੂਮੀ"
-
-#: ../src/f-spot.glade.h:44
-msgid "As _custom color: "
-msgstr ""
-
-#: ../src/f-spot.glade.h:45
-msgid "As check _pattern"
-msgstr ""
-
-#: ../src/f-spot.glade.h:46
-#, fuzzy
-#| msgid "Attach Tag"
-msgid "Attach Tags:"
-msgstr "ਟੈਗ"
-
-#: ../src/f-spot.glade.h:47
-msgid "Attach tag:"
-msgstr "ਨੱਥੀ ਟੈਗ:"
-
-#: ../src/f-spot.glade.h:48
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-#, fuzzy
-#| msgid "Authorize"
-msgid "Autorotate"
-msgstr "ਪ੍ਰਮਾਣਿਤ"
-
-#: ../src/f-spot.glade.h:50
-#, fuzzy
+#: ../src/ui/main_window.ui.h:4
#| msgid "Display _Dates"
msgid "By _Date"
-msgstr "ਮਿਤੀ ਵੇਖਾਓ(_D)"
+msgstr "ਮਿਤੀ ਰਾਹੀਂ(_D)"
-#: ../src/f-spot.glade.h:51
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
msgstr ""
-#: ../src/f-spot.glade.h:52
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
-msgstr ""
-
-#: ../src/f-spot.glade.h:53
-msgid "CD"
-msgstr "CD"
-
-#: ../src/f-spot.glade.h:54
-msgid "C_ontrast:"
-msgstr ""
-
-#: ../src/f-spot.glade.h:55
-msgid "Camera Selection"
-msgstr "ਕੈਮਰਾ ਚੋਣ"
-
-#: ../src/f-spot.glade.h:56
-msgid "Cancel, do not change the current timeline. "
-msgstr ""
+msgstr "ਰੇਟਿੰਗ ਰਾਹੀਂ(_R)"
-#: ../src/f-spot.glade.h:57
+#: ../src/ui/main_window.ui.h:7
msgid "Copy Locat_ion"
-msgstr "ਟਿਕਾਣਾ ਨਕਲ(_i)"
-
-#: ../src/f-spot.glade.h:58
-#, fuzzy
-#| msgid "Copy file to the Photos folder"
-msgid "Copy files to the Photos folder"
-msgstr "ਫਾਇਲ ਨੂੰ ਫੋਟੋ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ"
+msgstr "ਟਿਕਾਣਾ ਕਾਪੀ ਕਰੋ(_i)"
-#: ../src/f-spot.glade.h:59
-#, fuzzy
-#| msgid "Create CD"
-msgid "Create Mail"
-msgstr "CD ਬਣਾਓ"
-
-#: ../src/f-spot.glade.h:60
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "ਨਵਾਂ ਟੈਗ ਬਣਾਓ(_T)..."
-#: ../src/f-spot.glade.h:61
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "ਨਵਾਂ ਵਰਜਨ ਬਣਾਓ(_N)..."
-#: ../src/f-spot.glade.h:62
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr ""
-
-#: ../src/f-spot.glade.h:63
-msgid "Current date:"
-msgstr "ਮੌਜੂਦਾ ਮਿਤੀ:"
-
-#: ../src/f-spot.glade.h:64
-msgid "Detect duplicates"
-msgstr ""
-
-#: ../src/f-spot.glade.h:65
-#, fuzzy
-#| msgid "Display _Dates"
-msgid "Display File _Names"
-msgstr "ਮਿਤੀ ਵੇਖਾਓ(_D)"
-
-#: ../src/f-spot.glade.h:66
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr ""
-
-#: ../src/f-spot.glade.h:67
-msgid "Do not send a mail"
-msgstr ""
-
-#: ../src/f-spot.glade.h:68
-msgid "E-_Mail:"
-msgstr "ਈ-ਮੇਲ(_M):"
-
-#: ../src/f-spot.glade.h:69
-msgid "E_xport titles and comments"
-msgstr ""
-
-#: ../src/f-spot.glade.h:70
-msgid "Edit Tag Icon"
-msgstr ""
-
-#: ../src/f-spot.glade.h:71
-msgid "Edit icon"
-msgstr "ਆਈਕਾਨ ਸੋਧ"
-
-#: ../src/f-spot.glade.h:72
-msgid "Estimated new size"
-msgstr ""
-
-#: ../src/f-spot.glade.h:73
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
-msgid "Export"
-msgstr "ਨਿਰਯਾਤ"
-
-#: ../src/f-spot.glade.h:74
-msgid "Extra large"
-msgstr ""
-
-#: ../src/f-spot.glade.h:75
-msgid "F-Spot"
-msgstr "F-ਸਪੋਟ"
-
-#: ../src/f-spot.glade.h:76
-msgid "F-Spot View"
-msgstr "F-ਸਪੋਟ ਝਲਕ"
-
-#: ../src/f-spot.glade.h:78
-msgid "Filter on selected rolls"
-msgstr ""
-
-#: ../src/f-spot.glade.h:79
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "ਖੋਜ(_d)"
-#: ../src/f-spot.glade.h:80
-msgid "G_allery:"
-msgstr "ਗੈਲਰੀ(_a):"
-
-#: ../src/f-spot.glade.h:81
-msgid "Gallery"
-msgstr "ਗੈਲਰੀ"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:84
-msgid "Import Source:"
-msgstr "ਅਯਾਤ ਸਰੋਤ:"
-
-#: ../src/f-spot.glade.h:85
-#, fuzzy
-#| msgid "Include subdirectories"
-msgid "Include subfolders"
-msgstr "ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ ਸਣੇ"
-
-#: ../src/f-spot.glade.h:86
-#, fuzzy
-#| msgid "Page:"
-msgid "Large"
-msgstr "ਸਫ਼ਾ:"
-
-#: ../src/f-spot.glade.h:87
-#, fuzzy
+#: ../src/ui/main_window.ui.h:12
#| msgid "By Extension"
msgid "Manage _Extensions"
-msgstr "ਐਕਸ਼ਟੇਸ਼ਨ"
+msgstr "ਇਕਸਟੈਨਸ਼ਨ ਪਰਬੰਧ(_E)"
-#: ../src/f-spot.glade.h:88
-msgid "Manage your custom selection ratios"
-msgstr ""
-
-#: ../src/f-spot.glade.h:89
-msgid "Medium"
-msgstr ""
-
-#: ../src/f-spot.glade.h:91
-#, fuzzy
-#| msgid "No image loaded."
-msgid "No _image"
-msgstr "ਕੋਈ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਹੈ।"
-
-#: ../src/f-spot.glade.h:92
-#, fuzzy
-#| msgid "Crop photo to selected area"
-msgid "Number of photos in selected rolls:"
-msgstr "ਉਭਾਰੋ ਫੋਟੋ ਖੇਤਰ"
-
-#: ../src/f-spot.glade.h:93
-#, fuzzy
-#| msgid "N_umber of Copies:"
-msgid "Number of pictures"
-msgstr "ਨਕਲਾਂ ਦੀ ਗਿਣਤੀ(_U):"
-
-#: ../src/f-spot.glade.h:94
-msgid "Only photos taken within these dates will be displayed."
-msgstr ""
-
-#: ../src/f-spot.glade.h:95
-msgid "Open _Folder..."
-msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹੋ(_F)..."
-
-#: ../src/f-spot.glade.h:97
-msgid "Original size (possible very large file size)"
-msgstr ""
-
-#: ../src/f-spot.glade.h:98
-msgid "P_arent Tag:"
-msgstr ""
-
-#: ../src/f-spot.glade.h:99
+#: ../src/ui/main_window.ui.h:13
msgid "Page Set_up..."
-msgstr ""
-
-#: ../src/f-spot.glade.h:100
-msgid "Pause"
-msgstr "ਵਿਰਾਮ"
+msgstr "ਪੇਜ਼ ਸੈੱਟਅੱਪ(_u)..."
-#: ../src/f-spot.glade.h:101
-msgid "Photo 0 of 0"
-msgstr "0 ਵਿੱਚੋਂ 0 ਫੋਟੋ"
-
-#: ../src/f-spot.glade.h:104
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
-msgstr "ਥੰਮਨੇਲ"
+msgstr "ਥੰਮਨੇਲ ਤਾਜ਼ਾ(_f)"
-#: ../src/f-spot.glade.h:106
-msgid "Repair"
-msgstr ""
-
-#: ../src/f-spot.glade.h:109
-msgid "Select Photos to Copy From Camera..."
-msgstr "ਚੁਣੋ ਨਕਲ ਵੱਲੋਂ ਕੈਮਰਾ."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "ਸਭ ਚੁਣੋ(_A)"
-#: ../src/f-spot.glade.h:111
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
-msgstr "ਚੁਣੋ ਕੋਈ ਨਹੀਂ"
-
-#: ../src/f-spot.glade.h:112
-msgid "Select a Tag..."
-msgstr "ਚੁਣੋ ਟੈਗ."
-
-#: ../src/f-spot.glade.h:113
-msgid "Select the camera from which you want to transfer files"
-msgstr "ਚੁਣੋ"
-
-#: ../src/f-spot.glade.h:114
-msgid "Selected Camera: "
-msgstr "ਚੁਣੇ ਕੈਮਰਾ "
+msgstr "ਚੁਣੋ ਕੋਈ ਨਹੀਂ(_N)"
-#: ../src/f-spot.glade.h:115
-#, fuzzy
-#| msgid "No Constraint"
-msgid "Selection Constraints"
-msgstr "ਨਹੀਂ"
-
-#: ../src/f-spot.glade.h:116
-#, fuzzy
+#: ../src/ui/main_window.ui.h:20
#| msgid "Send _Mail..."
msgid "Send by _Mail..."
-msgstr "ਭੇਜੋ ਪੱਤਰ."
+msgstr "ਮੇਲ ਰਾਹੀਂ ਭੇਜੋ(_M)..."
-#: ../src/f-spot.glade.h:117
-msgid "Set Rating Filter"
-msgstr ""
-
-#: ../src/f-spot.glade.h:118
-msgid "Set as _Background"
-msgstr "ਸੈਟ ਪਿੱਠਭੂਮੀ"
-
-#: ../src/f-spot.glade.h:119
-#, fuzzy
-#| msgid "Set Date Range"
-msgid "Set date range"
-msgstr "ਸੈਟ ਮਿਤੀ ਸੀਮਾ"
-
-#: ../src/f-spot.glade.h:121
-#, fuzzy
-#| msgid "Space all photos by"
-msgid "Show all photos."
-msgstr "ਥਾਂ ਸਭ"
-
-#: ../src/f-spot.glade.h:122
-msgid "Show or hide the side pane"
-msgstr "ਵੇਖਾਓ ਜਾਂ"
-
-#: ../src/f-spot.glade.h:123
-msgid "Show or hide the toolbar"
-msgstr "ਵੇਖਾਓ ਜਾਂ"
-
-#: ../src/f-spot.glade.h:124
-msgid "Side _pane"
-msgstr ""
-
-#: ../src/f-spot.glade.h:125
-#, fuzzy
+#: ../src/ui/main_window.ui.h:22
#| msgid "Display Side_bar"
msgid "Side_bar"
-msgstr "ਬਾਹੀ ਵੇਖਾਓ(_b)"
-
-#: ../src/f-spot.glade.h:126
-msgid "Small"
-msgstr ""
-
-#: ../src/f-spot.glade.h:127
-msgid "Space all photos by"
-msgstr "ਥਾਂ ਸਭ"
-
-#: ../src/f-spot.glade.h:128
-msgid ""
-"Specify if an original size picture should be rotated or not. Smaller sizes "
-"are automatically rotated."
-msgstr ""
+msgstr "ਬਾਹੀ(_b)"
-#: ../src/f-spot.glade.h:129
-msgid "Strip image _metadata"
-msgstr "ਸਟਿਰਪ ਚਿੱਤਰ"
-
-#: ../src/f-spot.glade.h:130
-#, fuzzy
+#: ../src/ui/main_window.ui.h:23
#| msgid "_Tags"
msgid "T_ags"
-msgstr "ਟੈਗ"
-
-#: ../src/f-spot.glade.h:131
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1180
-msgid "Tags: "
-msgstr "ਟੈਗ "
+msgstr "ਟੈਗ(_a)"
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:133
-msgid "Te_mp:"
-msgstr ""
-
-#: ../src/f-spot.glade.h:134
-#, fuzzy
+#: ../src/ui/main_window.ui.h:25
#| msgid "Thumbnail Directory"
msgid "Thumbnail _elements"
-msgstr "ਥੰਮਨੇਲ ਡਾਇਰੈਕਟਰੀ"
+msgstr "ਥੰਮਨੇਲ ਐਲੀਮੈਂਟ(_e)"
-#: ../src/f-spot.glade.h:135
-msgid "Tiny"
-msgstr ""
-
-#: ../src/f-spot.glade.h:136
-#, fuzzy
+#: ../src/ui/main_window.ui.h:26
#| msgid "Toolbar"
msgid "Too_lbar"
-msgstr "ਸੰਦ-ਪੱਟੀ"
+msgstr "ਟੂਲਬਾਰ(_l)"
-#: ../src/f-spot.glade.h:137
-msgid "Total original size"
-msgstr ""
-
-#: ../src/f-spot.glade.h:138
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "ਝਾਤੀ"
-#: ../src/f-spot.glade.h:139
-msgid "Zoom _in"
-msgstr "ਜ਼ੂਮ ਵਿੱਚ"
-
-#: ../src/f-spot.glade.h:140
-msgid "Zoom _out"
-msgstr "ਜ਼ੂਮ"
-
-#: ../src/f-spot.glade.h:141
-msgid "Zoom in"
-msgstr "ਅਕਾਰ ਵਧਾਓ"
-
-#: ../src/f-spot.glade.h:142
-msgid "Zoom out"
-msgstr "ਅਕਾਰ ਘਟਾਓ"
-
-#: ../src/f-spot.glade.h:144
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
-msgstr "ਟੈਗ ਚੋਣ"
+msgstr "ਚੋਣ ਲਈ ਟੈਗ ਨੱਥੀ(_A)"
-#: ../src/f-spot.glade.h:145
-msgid "_Brightness:"
-msgstr "ਚਮਕ:"
-
-#: ../src/f-spot.glade.h:147
-#, fuzzy
+#: ../src/ui/main_window.ui.h:35
#| msgid "_Clear Date Range"
msgid "_Clear Rating Filter"
-msgstr "ਸਾਫ਼ ਮਿਤੀ ਸੀਮਾ"
+msgstr "ਰੇਟਿੰਗ ਫਿਲਟਰ ਸਾਫ਼ ਕਰੋ(_C)"
-#: ../src/f-spot.glade.h:148
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
msgstr ""
-#: ../src/f-spot.glade.h:149
-#, fuzzy
+#: ../src/ui/main_window.ui.h:38
#| msgid "Comment:"
msgid "_Components"
-msgstr "ਟਿੱਪਣੀ:"
+msgstr "ਭਾਗ(_C)"
-#: ../src/f-spot.glade.h:150
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
-msgstr ""
-
-#: ../src/f-spot.glade.h:151
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#, fuzzy
-#| msgid "Create CD"
-msgid "_Create"
-msgstr "CD ਬਣਾਓ"
+msgstr "ਸਮੱਗਰੀ(_C)"
-#: ../src/f-spot.glade.h:152
-#, fuzzy
-#| msgid "Create CD"
-msgid "_Create Mail"
-msgstr "CD ਬਣਾਓ"
-
-#: ../src/f-spot.glade.h:153
-#, fuzzy
+#: ../src/ui/main_window.ui.h:40
#| msgid "Date:"
msgid "_Dates"
-msgstr "ਮਿਤੀ:"
+msgstr "ਮਿਤੀ(_D)"
-#: ../src/f-spot.glade.h:155
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
-msgstr "ਹਟਾਓ ਚੁਣੇ ਟੈਗ"
+msgstr "ਚੁਣੇ ਟੈਗ ਹਟਾਓ(_D)"
-#: ../src/f-spot.glade.h:156
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
-msgstr "ਹਟਾਓ ਵਰਜਨ"
+msgstr "ਵਰਜਨ ਹਟਾਓ(_D)"
-#: ../src/f-spot.glade.h:157
-#, fuzzy
-#| msgid "Edit Tag"
-msgid "_Edit"
-msgstr "ਟੈਗ ਸੋਧ"
-
-#: ../src/f-spot.glade.h:158
+#: ../src/ui/main_window.ui.h:45
msgid "_Edit Selected Tag..."
-msgstr "ਸੋਧ ਚੁਣੇ ਟੈਗ."
-
-#: ../src/f-spot.glade.h:159
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export"
-msgstr "ਨਿਰਯਾਤ"
+msgstr "ਚੁਣੇ ਟੈਗ ਸੋਧ(_E)..."
-#: ../src/f-spot.glade.h:160
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "ਨਿਰਯਾਤ"
-
-#: ../src/f-spot.glade.h:161
-#, fuzzy
+#: ../src/ui/main_window.ui.h:46
#| msgid "_Export"
msgid "_Export to"
-msgstr "ਨਿਰਯਾਤ"
-
-#: ../src/f-spot.glade.h:162
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-msgid "_Export to Album:"
-msgstr "ਨਿਰਯਾਤ ਐਲਬਮ:"
-
-#: ../src/f-spot.glade.h:163
-#, fuzzy
-#| msgid "Exposure:"
-msgid "_Exposure:"
-msgstr "ਪੱਖ:"
+msgstr "ਐਕਸਪੋਰਟ ਕਰੋ(_E)"
-#: ../src/f-spot.glade.h:164
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
-msgstr ""
-
-#: ../src/f-spot.glade.h:165
-msgid "_Flickr"
-msgstr ""
-
-#: ../src/f-spot.glade.h:166
-msgid "_Folder"
-msgstr "ਫੋਲਡਰ"
-
-#: ../src/f-spot.glade.h:167
-msgid "_Fullscreen"
-msgstr "ਪੂਰੇ ਪਰਦੇ ਉੱਤੇ"
-
-#: ../src/f-spot.glade.h:168
-msgid "_Gallery"
-msgstr "ਗੈਲਰੀ"
-
-#: ../src/f-spot.glade.h:169
-#, fuzzy
-#| msgid "_Hue:"
-msgid "_Help"
-msgstr "ਰੰਗਤ:"
+msgstr "ਫਿਲਮਸਟਰਿੱਪ(_F)"
-#: ../src/f-spot.glade.h:170
-#, fuzzy
+#: ../src/ui/main_window.ui.h:50
#| msgid "Hidden"
msgid "_Hidden"
-msgstr "ਲੁਕਵੀ"
-
-#: ../src/f-spot.glade.h:171
-msgid "_Hue:"
-msgstr "ਰੰਗਤ:"
-
-#: ../src/f-spot.glade.h:172
-msgid "_Icon:"
-msgstr "ਆਈਕਾਨ:"
+msgstr "ਲੁਕਵੇਂ(_H)"
-#: ../src/f-spot.glade.h:173
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
-msgstr "ਅਯਾਤ."
+msgstr "ਇੰਪੋਰਟ(_I)..."
-#: ../src/f-spot.glade.h:174
-msgid "_Interpolate image on zoom"
-msgstr ""
-
-#: ../src/f-spot.glade.h:175
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
-msgstr ""
+msgstr "ਵੱਡਾ(_L)"
-#: ../src/f-spot.glade.h:176
+#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
msgstr ""
-#: ../src/f-spot.glade.h:177
+#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
msgstr ""
-#: ../src/f-spot.glade.h:178
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
-msgstr ""
-
-#: ../src/f-spot.glade.h:179
-msgid "_Month"
-msgstr "ਮਹੀਨਾ"
+msgstr "ਮੱਧਮ(_M)"
-#: ../src/f-spot.glade.h:180
-msgid "_New Window"
-msgstr "ਨਵਾਂ ਝਰੋਖਾ"
-
-#: ../src/f-spot.glade.h:181
-msgid "_Open album in browser when done uploading"
-msgstr "ਖੋਲੋ ਐਲਬਮ ਵਿੱਚ ਸਮਾਪਤ"
-
-#: ../src/f-spot.glade.h:182
-msgid "_Open destination when done exporting"
-msgstr "ਖੋਲੋ ਸਮਾਪਤ"
-
-#: ../src/f-spot.glade.h:183
-#, fuzzy
-#| msgid "Edit Photo"
-msgid "_Photo"
-msgstr "ਸੋਧ ਤਸਵੀਰ"
-
-#: ../src/f-spot.glade.h:184
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
-msgstr ""
+msgstr "ਬਾਹਰ(_Q)"
-#: ../src/f-spot.glade.h:185
-#, fuzzy
+#: ../src/ui/main_window.ui.h:58
#| msgid "_Tags"
msgid "_Ratings"
-msgstr "ਟੈਗ"
+msgstr "ਰੇਟਿੰਗ(_R)"
-#: ../src/f-spot.glade.h:187
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
-msgstr "ਹਟਾਓ ਟੈਗ ਵੱਲੋਂ ਚੋਣ"
+msgstr "ਚੋਣ ਤੋਂ ਟੈਗ ਹਟਾਓ(_R)"
-#: ../src/f-spot.glade.h:188
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
-msgstr "ਨਾਂ-ਤਬਦੀਲ ਵਰਜਨ"
+msgstr "ਵਰਜਨ ਨਾਂ-ਬਦਲੋ(_R)"
-#: ../src/f-spot.glade.h:189
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-msgid "_Resize to: "
-msgstr "ਮੁੜ-ਆਕਾਰ "
-
-#: ../src/f-spot.glade.h:191
-msgid "_Saturation:"
-msgstr "ਸੰਤ੍ਰਿਪਤ(_S):"
-
-#: ../src/f-spot.glade.h:192
-msgid "_Scale photos to no larger than: "
-msgstr "ਮਾਪ ਨਹੀਂ "
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "ਉਲਟਕਰਮ ਕ੍ਰਮ(_R)"
-#: ../src/f-spot.glade.h:193
+#: ../src/ui/main_window.ui.h:63
#, fuzzy
#| msgid "Select Export Folder"
msgid "_Select Import Rolls..."
msgstr "ਨਿਰਯਾਤ ਫੋਲਡਰ ਚੁਣੋ"
-#: ../src/f-spot.glade.h:194
+#: ../src/ui/main_window.ui.h:64
#, fuzzy
#| msgid "Set _Date Range..."
msgid "_Set Date Range..."
msgstr "ਸੈਟ ਮਿਤੀ ਸੀਮਾ."
-#: ../src/f-spot.glade.h:195
+#: ../src/ui/main_window.ui.h:65
#, fuzzy
#| msgid "Set _Date Range..."
msgid "_Set Rating filter..."
msgstr "ਸੈਟ ਮਿਤੀ ਸੀਮਾ."
-#: ../src/f-spot.glade.h:196
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "ਉਘੜਵਾਂ."
-#: ../src/f-spot.glade.h:197
-msgid "_Slideshow"
-msgstr "ਸਲਾਇਡ-ਸ਼ੋ"
-
-#: ../src/f-spot.glade.h:198
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
-msgstr ""
+msgstr "ਛੋਟਾ(_S)"
-#: ../src/f-spot.glade.h:199
-msgid "_Strip metadata"
-msgstr "ਸਟਿਰਪ"
-
-#: ../src/f-spot.glade.h:200
-#, fuzzy
+#: ../src/ui/main_window.ui.h:69
#| msgid "_Tags"
msgid "_Tag Icons"
-msgstr "ਟੈਗ"
-
-#: ../src/f-spot.glade.h:201
-msgid "_Tag Name:"
-msgstr "ਟੈਗ ਨਾਂ:"
+msgstr "ਆਈਕਾਨ ਟੈਗ(_T)"
-#: ../src/f-spot.glade.h:202
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
-msgstr "ਟੈਗ"
+msgstr "ਟੈਗ(_T)"
-#: ../src/f-spot.glade.h:203
-#, fuzzy
+#: ../src/ui/main_window.ui.h:71
#| msgid "_Title:"
msgid "_Timeline"
-msgstr "ਸਿਰਲੇਖ:"
+msgstr "ਸਮਾਂ-ਰੇਖਾ(_T)"
-#: ../src/f-spot.glade.h:204
-#, fuzzy
-#| msgid "_Title:"
-msgid "_Tint:"
-msgstr "ਸਿਰਲੇਖ:"
-
-#: ../src/f-spot.glade.h:205
-#, fuzzy
-#| msgid "Toolbar"
-msgid "_Toolbar"
-msgstr "ਸੰਦ-ਪੱਟੀ"
-
-#: ../src/f-spot.glade.h:206
-#, fuzzy
+#: ../src/ui/main_window.ui.h:72
#| msgid "Toolbar"
msgid "_Tools"
-msgstr "ਸੰਦ-ਪੱਟੀ"
-
-#: ../src/f-spot.glade.h:207
-msgid "_URI:"
-msgstr "URI:"
+msgstr "ਟੂਲ(_T)"
-#: ../src/f-spot.glade.h:208
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
-msgstr ""
+msgstr "ਬਿਨ-ਟੈਗ ਫੋਟੋ(_U)"
-#: ../src/f-spot.glade.h:209
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
-msgstr "ਵਰਜਨ"
+msgstr "ਵਰਜਨ(_V)"
-#: ../src/f-spot.glade.h:210
-msgid "_View"
-msgstr "ਝਾਤੀ"
-
-#: ../src/f-spot.glade.h:211
-msgid "_Virtual Filesystem"
-msgstr "ਫਾਇਲਸਿਸਟਮ"
+#: ../src/Updater.cs:616
+msgid "Updating F-Spot Database"
+msgstr "ਬਿੰਦੂ ਡਾਟਾਬੇਸ "
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:214
+#: ../src/Updater.cs:617
msgid ""
-"at\n"
-"after\n"
-"between"
-msgstr ""
-
-#: ../src/f-spot.glade.h:217
-msgid "difference:"
-msgstr ""
-
-#: ../src/f-spot.glade.h:218
-msgid "img_000.jpg"
-msgstr ""
-
-#: ../src/f-spot.glade.h:219
-msgid "min. Starting at {0}"
-msgstr ""
-
-#: ../src/f-spot.glade.h:221
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
-msgid "pixels"
-msgstr "ਪਿਕਸਲ"
-
-#: ../src/f-spot.glade.h:222
-msgid "x"
-msgstr "x"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
msgstr ""
+"F-ਸਪੋਟ ਗੈਲਰੀ ਦੇ ਡਾਟਾਬੇਸ ਨੂੰ ਅੱਪਡੇਟ ਹੋਣ ਤੱਕ ਉਡੀਕੋ ਜੀ। ਇਸ ਨੂੰ ਕੁਝ ਸਮਾਂ ਲੱਗ "
+"ਸਕਦਾ ਹੈ।"
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-#, fuzzy
-#| msgid "Import photos"
-msgid "F-Spot photos"
-msgstr "ਫੋਟੋ ਅਯਾਤ"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "ਆਰਜ਼ੀ ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-#, fuzzy
-#| msgid "..."
-msgid "_CD..."
-msgstr "..."
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "ਪੇਜ਼ ਸੈਟਅੱਪ"
-#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "CD ਤੋਂ \"{0}\" ਤਸਵੀਰ ਤਬਦੀਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:177
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:551
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:702
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
-msgid "Done Sending Photos"
-msgstr "ਫੋਟੋ ਭੇਜਣਾ ਮੁਕੰਮਲ"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
-msgid "Transfer Complete"
-msgstr "ਭੇਜਣਾ ਮੁਕੰਮਲ"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:186
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
-msgid "Error While Transferring"
-msgstr "ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:193
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
-msgid "Error Transferring"
-msgstr "ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:206
-msgid "copying..."
-msgstr ""
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr ""
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>ਫੋਟੋ ਲਿਖੋ</b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:4
-msgid "Create CD"
-msgstr "CD ਬਣਾਓ"
+msgid "Paper Size: {0} x {1} mm"
+msgstr "ਪੇਪਰ ਸਾਈਜ਼: {0} x {1} mm"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:6
-msgid "Size of the exported selection:"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
msgstr ""
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr "ਝਲਕ ਫਾਇਲਾਂ"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:8
-msgid "_Write only these photos to CD"
-msgstr "ਲਿਖਣ CD"
+#: ../src/Widgets/CustomPrintWidget.cs:141
+#| msgid "Photo Manager"
+msgid "Photos per page"
+msgstr "ਪ੍ਰਤੀ ਪੇਜ਼ ਫੋਟੋ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr ""
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "ਰਪੀਟ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
+#: ../src/Widgets/CustomPrintWidget.cs:152
+#| msgid "Print crop _marks"
+msgid "Print cut marks"
msgstr ""
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-#, fuzzy
-#| msgid "_Import..."
-msgid "_Zooomr..."
-msgstr "ਅਯਾਤ."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "ਪ੍ਰਮਾਣਿਤ"
+#: ../src/Widgets/CustomPrintWidget.cs:158
+#| msgid "<b>Photos</b>"
+msgid "Photos layout"
+msgstr "ਫੋਟੋ ਲੇਆਉਟ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
-msgid ""
-"Return to this window after you have finished the authorization process on "
-"{0} and click the \"Complete Authorization\" button below"
-msgstr ""
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "ਪੂਰਾ ਪੇਜ਼ (ਹਾਸ਼ੀਆ ਨਹੀਂ)"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਮੁਕੰਮਲ"
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+#| msgid "Zoom in"
+msgid "Zoom"
+msgstr "ਜ਼ੂਮ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, fuzzy, csharp-format
-#| msgid "Logging into Flickr.Com"
-msgid "Logging into {0}"
-msgstr "Flickr.Com ਵਿੱਚ ਲਾਗ-ਇਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+#: ../src/Widgets/CustomPrintWidget.cs:164
+#| msgid "File"
+msgid "Fill"
+msgstr "ਭਰੋ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr ""
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "ਸਕੇਲ ਕੀਤਾ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, fuzzy, csharp-format
-#| msgid "Welcome {0} you are connected to Flickr.Com"
-msgid "Welcome {0} you are connected to {1}"
-msgstr "{0} ਜੀ ਆਇਆਂ ਨੂੰ, ਤੁਸੀਂ Flickr.Com ਨਾਲ ਜੁੜ ਗਏ ਹੋ"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "ਚਿੱਟਾ ਹਾਸ਼ੀਆ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "ਵੱਖਰੇ ਉਪਭੋਗੀ ਵਾਂਗ ਦਾਖਲ"
+#: ../src/Widgets/CustomPrintWidget.cs:176
+#| msgid "Custom Rendered"
+msgid "Custom Text"
+msgstr "ਪਸੰਦੀਦਾ ਟੈਕਸਟ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr ""
+#: ../src/Widgets/CustomPrintWidget.cs:180
+#| msgid "<b>Photos</b>"
+msgid "Photos infos"
+msgstr "ਫੋਟੋ ਜਾਣਕਾਰੀ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "ਲਾਗ-ਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+#| msgid "New name:"
+msgid "Print file name"
+msgstr "ਫਾਇਲ ਨਾਂ ਛਾਪੋ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "{1} ਦੇ {0} ਜਵਾਬ ਦੀ ਉਡੀਕ ਜਾਰੀ"
+#: ../src/Widgets/CustomPrintWidget.cs:183
+#| msgid "Previous photo"
+msgid "Print photo date"
+msgstr "ਫੋਟੋ ਮਿਤੀ ਛਾਪੋ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:779
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+#: ../src/Widgets/CustomPrintWidget.cs:184
+#| msgid "Previous photo"
+msgid "Print photo time"
+msgstr "ਫੋਟੋ ਸਮਾਂ ਛਾਪੋ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr ""
+#: ../src/Widgets/CustomPrintWidget.cs:185
+#| msgid "Print crop _marks"
+msgid "Print photo tags"
+msgstr "ਫੋਟੋ ਟੈਗ ਛਾਪੋ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:810
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:553
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
-msgid "Upload Complete"
-msgstr "ਅੱਪਲੋਡ ਮੁਕੰਮਲ"
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "ਫੋਟੋ ਟਿੱਪਣੀ ਛਾਪੋ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-msgid "Unable to log on."
-msgstr "ਲਾਗ-ਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
+#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#| msgid "Edit Tag"
+msgid "Edit"
+msgstr "ਸੋਧ"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
-#, csharp-format
+#: ../src/Widgets/EditorPage.cs:197
msgid ""
-"F-Spot was unable to log on to {0}. Make sure you have given the "
-"authentication using {0} web browser interface."
-msgstr ""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:732
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:477
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:598
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
-msgid "Uploading Pictures"
-msgstr "ਤਸਵੀਰਾਂ ਅੱਪਲੋਡ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
msgstr ""
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
-#, fuzzy
-#| msgid "Export to _Web Gallery..."
-msgid "Export tag _hierarchy"
-msgstr "ਵੈੱਬ ਗੈਲਰੀ ਲਈ ਨਿਰਯਾਤ(_W)..."
+#: ../src/Widgets/EditorPage.cs:215
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] ""
+msgstr[1] ""
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+#: ../src/Widgets/EditorPage.cs:217
+#, csharp-format
msgid ""
-"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
-msgstr ""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr ""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "ਨਿੱਜੀ"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "ਸਵਰਜਨਕ"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "ਸਟਿਰਪ"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "ਦਿੱਖ ਵਰਗ"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "ਦਿੱਖ ਮਿੱਤਰ"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-msgid "_View photos in browser when done uploading"
-msgstr "ਝਾਤੀ ਵਿੱਚ ਸਮਾਪਤ"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-#, fuzzy
-#| msgid "Open _Folder..."
-msgid "F_older..."
-msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹੋ(_F)..."
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
-msgid "Select Export Folder"
-msgstr "ਨਿਰਯਾਤ ਫੋਲਡਰ ਚੁਣੋ"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
-msgid "Building Gallery"
-msgstr "ਗੈਲਰੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
-#, fuzzy, csharp-format
-#| msgid "Uploading picture \"{0}\""
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
-msgid "Error: Error while transferring; Aborting"
-msgstr "ਗਲਤੀ: ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ; ਅਧੂਰਾ ਛੱਡਿਆ"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
-msgid "Error: File Already Exists; Aborting"
-msgstr "ਗਲਤੀ: ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ; ਅਧੂਰਾ ਛੱਡਿਆ"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:810
-msgid "Light"
-msgstr ""
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:811
-msgid "Dark"
-msgstr ""
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:991
-msgid "Prev"
-msgstr "ਪਿੱਛੇ"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1103
-msgid "Gallery generated by"
-msgstr "ਗੈਲਰੀ ਬਣਾਈ ਗਈ ਹੈ"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1143
-msgid "Show Styles"
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
msgstr ""
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1144
-msgid "Hide Styles"
-msgstr ""
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "ਹਰੀਜੱਟਲ(_H)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1311
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1444
-msgid "Page:"
-msgstr "ਸਫ਼ਾ:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "ਵਰਟੀਕਲ(_V)"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>ਨਿਰਯਾਤ ਢੰਗ</b>"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr ""
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr ""
+#: ../src/Widgets/FindBar.cs:58
+#| msgid "Find: "
+msgid "Find:"
+msgstr "ਖੋਜ:"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "ਵੇਰਵਾ(_e):"
+#: ../src/Widgets/FolderTreePage.cs:21
+#| msgid "_Folder"
+msgid "Folders"
+msgstr "ਫੋਲਡਰ"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
-#, fuzzy
-#| msgid "_Export tags"
-msgid "Export _tags"
-msgstr "ਨਿਰਯਾਤ"
+#: ../src/Widgets/FolderTreeView.cs:123
+#| msgid "_Virtual Filesystem"
+msgid "Filesystem"
+msgstr "ਫਾਇਲਸਿਸਟਮ"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
-#, fuzzy
-#| msgid "_Export tags"
-msgid "Export tag _icons"
-msgstr "ਨਿਰਯਾਤ"
+#: ../src/Widgets/InfoBox.cs:182
+#| msgid "<b>Histogram</b>"
+msgid "Histogram"
+msgstr "ਹਿਸਟੋਗਰਾਮ"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-msgid "Folder Export"
-msgstr "ਫੋਲਡਰ ਨਿਰਯਾਤ"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "ਵਰਜਨ"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-msgid "G_allery Name:"
-msgstr "ਗੈਲਰੀ ਨਾਂ(_a):"
+#: ../src/Widgets/InfoBox.cs:218
+#| msgid "Date:"
+msgid "Date"
+msgstr "ਮਿਤੀ"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
-msgid "Open _destination when done exporting"
+#: ../src/Widgets/InfoBox.cs:224
+#| msgid "Exposure:"
+msgid "Exposure"
msgstr ""
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-msgid "_Folder:"
-msgstr "ਫੋਲਡਰ:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-msgid "_Save the files only"
-msgstr "ਸੰਭਾਲ"
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "ਫੋਕਲ ਲੰਬਾਈ"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-#, fuzzy
-#| msgid "Export to _Web Gallery..."
-msgid "Web _Gallery..."
-msgstr "ਵੈੱਬ ਗੈਲਰੀ ਲਈ ਨਿਰਯਾਤ(_W)..."
+#: ../src/Widgets/InfoBox.cs:234
+#| msgid "File"
+msgid "File Size"
+msgstr "ਫਾਇਲ ਆਕਾਰ"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:237
+#| msgid "Loading"
+msgid "Rating"
+msgstr "ਰੇਟਿੰਗ"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:393
-msgid "Invalid URL"
-msgstr "ਗਲਤ URL"
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(ਗਲਤ ਫਾਰਮੈਟ)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:394
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "URL URL"
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(ਅਣਜਾਣ)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:404
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:431
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:442
-#, fuzzy
-#| msgid "Error connecting to camera"
-msgid "Error while connecting to Gallery"
-msgstr "ਗਲਤੀ"
+#: ../src/Widgets/InfoBox.cs:561, csharp-format
+#| msgid "(No Edits)"
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(ਇੱਕ ਸੋਧ)"
+msgstr[1] "({0} ਸੋਧਾਂ)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:405
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:432
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:443
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(ਫਾਇਲ ਪੜ੍ਹਨ ਗਲਤੀ)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:419
-msgid "A Gallery with this name already exists"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:620, csharp-format
+#| msgid "Edit Photo"
+msgid "{0} Photos"
+msgstr "{0} ਫੋਟੋ"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:420
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
-"There is already a Gallery with the same name in your registered Galleries. "
-"Please choose a unique name."
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:530
-msgid "(TopLevel)"
+"On {0} between \n"
+"{1} and {2}"
msgstr ""
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:592
-#, fuzzy
-#| msgid "G_allery Name:"
-msgid "Invalid Gallery name"
-msgstr "ਗੈਲਰੀ ਨਾਂ(_a):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:593
+#: ../src/Widgets/InfoBox.cs:645
+#, csharp-format
msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:798
-#, fuzzy, csharp-format
-#| msgid "Uploading picture \"{0}\""
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:826
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:725
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
-msgid "(No Gallery)"
-msgstr "ਨਹੀਂ ਗੈਲਰੀ"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:918
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:848
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(Not Connected)"
-msgstr "ਨਹੀਂ ਜੁੜਿਆ"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:919
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
-msgid "(No Albums)"
-msgstr "ਨਹੀਂ ਐਲਬਮ"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:971
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:914
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
-msgid "No account selected"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr "<span weight='bold' size='larger'>ਗੈਲਰੀ ਨਾਲ ਜੁੜਨ ਦੌਰਾਨ ਗਲਤੀ</span>\n"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-msgid "Export _titles and comments"
-msgstr ""
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
+"Between {0} \n"
+"and {1}"
msgstr ""
+"{0} ਅਤੇ\n"
+"{1} ਵਿੱਚ"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "ਵਿਵਸਥਾ."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-msgid "U_RL:"
-msgstr "U:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-msgid "_Album Name:"
-msgstr "ਐਲਬਮ ਨਾਂ:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "ਵੇਰਵਾ:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-msgid "_Gallery Name:"
-msgstr "ਗੈਲਰੀ ਨਾਂ:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "ਗੈਲਰੀ:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-msgid "_Parent Album:"
-msgstr "ਐਲਬਮ:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
-msgid "_Password:"
-msgstr "ਗੁਪਤ-ਕੋਡ:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-msgid "_Title:"
-msgstr "ਸਿਰਲੇਖ:"
+#: ../src/Widgets/InfoBox.cs:672
+#| msgid "File not found"
+msgid "(At least one File not found)"
+msgstr "(ਇੱਕ ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-msgid "_Username:"
-msgstr "ਉਪਭੋਗੀ ਨਾਂ:"
+#: ../src/Widgets/InfoBox.cs:789
+#| msgid "F-Spot Photo Manager"
+msgid "Show Photo Name"
+msgstr "ਫੋਟੋ ਨਾਂ ਵੇਖੋ"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "ਮਿਤੀ ਵੇਖੋ"
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:807
+#| msgid "Photo _Size:"
+msgid "Show Size"
+msgstr "ਆਕਾਰ ਵੇਖੋ"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+#: ../src/Widgets/InfoBox.cs:816
#, fuzzy
-#| msgid "Error while rotating photo."
-msgid "Error while creating new album"
-msgstr "ਗਲਤੀ ਫੋਟੋ."
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to perform the "
-"requested operation:\n"
-"{0} ({1})"
-msgstr ""
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
-msgstr ""
+#| msgid "Exposure:"
+msgid "Show Exposure"
+msgstr "ਪੱਖ:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:257
-msgid "Too many images to export"
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "ਫੋਕਲ ਲੰਬਾਈ ਵੇਖੋ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:257
-msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
-"selection and try again."
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:834
+#| msgid "Camera"
+msgid "Show Camera"
+msgstr "ਕੈਮਰਾ ਵੇਖੋ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:367
-msgid "You are not logged in."
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "ਫਾਇਲ ਸਾਈਜ਼ ਵੇਖੋ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:322
-msgid "Waiting for authentication"
-msgstr ""
+#: ../src/Widgets/MetadataDisplay.cs:23
+#| msgid "Metadata Browser"
+msgid "Metadata"
+msgstr "ਮੇਟਾਡਾਟਾ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:322
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook. Turn "
-"on the \"Save my login information\" checkbox on Facebook and F-Spot will "
-"log into Facebook automatically from now on."
+#: ../src/Widgets/MetadataDisplay.cs:104
+msgid "Extended Metadata"
msgstr ""
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:328
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:392
#, fuzzy
-#| msgid "Error connecting to camera"
-msgid "Error logging into Facebook"
-msgstr "ਗਲਤੀ"
+#| msgid "No metadata available"
+msgid "No Extended Metadata Available"
+msgstr "ਨਹੀਂ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:328
-msgid ""
-"There was a problem logging into Facebook. Check your credentials and try "
-"again."
-msgstr ""
+#: ../src/Widgets/MetadataDisplay.cs:410
+msgid "No active photo"
+msgstr "ਸਰਗਰਮ ਫੋਟੋ ਨਹੀਂ"
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:341
+#: ../src/Widgets/MetadataDisplay.cs:412
#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr ""
+msgid "The photo \"{0}\" does not exist"
+msgstr "ਫੋਟੋ \"{0}\" ਮੌਜੂਦ ਨਹੀਂ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:491
-msgid "Album must have a name"
-msgstr ""
+#: ../src/Widgets/MetadataDisplay.cs:415
+msgid "No metadata available"
+msgstr "ਮੇਟਾਡਾਟਾ ਉਪਲੱਬਧ ਨਹੀਂ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:491
-msgid "Please name your album or choose an existing album."
-msgstr ""
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਉਪਲੱਬਧ ਨਹੀਂ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:504
-msgid "Creating a new album failed"
-msgstr ""
+#: ../src/Widgets/RatingMenuItem.cs:56
+#| msgid "C_aption:"
+msgid "Rating:"
+msgstr "ਰੇਟਿੰਗ:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:504
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
+#: ../src/XmpTagsImporter.cs:91
+#| msgid "Contrast"
+msgid "Country"
+msgstr "ਦੇਸ਼"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:528
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:661
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
-#, fuzzy, csharp-format
-#| msgid "Uploading picture \"{0}\""
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "ਸ਼ਹਿਰ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:542
-#, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr ""
+#: ../src/XmpTagsImporter.cs:93
+#| msgid "Date:"
+msgid "State"
+msgstr "ਸੂਬਾ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:1
-#, fuzzy
-#| msgid "C_aption:"
-msgid "Caption"
-msgstr "ਸੁਰਖੀ(_a):"
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "F-ਸਪੋਟ ਤੋਂ ਸਲਾਈਡ-ਸ਼ੋ ਵੇਖੋ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:2
-#, fuzzy
-#| msgid "Create New Tag"
-msgid "Create a new album"
-msgstr "ਨਵਾਂ ਟੈਗ ਬਣਾਓ"
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+#| msgid "Import photos"
+msgid "F-Spot photos"
+msgstr "F-ਸਪੋਟ ਫੋਟੋ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:3
-#, fuzzy
-#| msgid "D_escription:"
-msgid "Description"
-msgstr "ਵੇਰਵਾ(_e):"
+#~| msgid "Authorize"
+#~ msgid "Author:"
+#~ msgstr "ਲੇਖਕ:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:4
-#, fuzzy
-#| msgid "Export to _Folder..."
-msgid "Export to Facebook"
-msgstr "ਫੋਲਡਰ ਲਈ ਨਿਰਯਾਤ(_F)..."
+#~| msgid "Copyright"
+#~ msgid "Copyright:"
+#~ msgstr "ਕਾਪੀਰਾਈਟ:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:5
-#, fuzzy
-#| msgid "No active photo"
-msgid "In this photo"
-msgstr "ਨਹੀਂ ਸਰਗਰਮ ਫੋਟੋ"
+#~| msgid "Operation failed"
+#~ msgid "The installation failed!"
+#~ msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ!"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:7
-#, fuzzy
-#| msgid "Loading"
-msgid "Login"
-msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+#~| msgid "Operation failed"
+#~ msgid "The uninstallation failed!"
+#~ msgstr "ਅਣ-ਇੰਸਟਾਲੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ!"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:8
-#, fuzzy
-#| msgid "Logo"
-msgid "Logout"
-msgstr "ਲੋਗੋ"
+#~| msgid "Operation failed"
+#~ msgid "Installation failed"
+#~ msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:10
-msgid "This is who I am"
-msgstr ""
+#~| msgid "By Extension"
+#~ msgid "Extension"
+#~ msgstr "ਐਕਸ਼ਟੇਸ਼ਨ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:11
-msgid "Use an existing album"
-msgstr ""
+#~| msgid "dither"
+#~ msgid "Other"
+#~ msgstr "ਹੋਰ"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:12
-msgid "Who is this?"
-msgstr ""
+#~ msgid "Url"
+#~ msgstr "Url"
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-#, fuzzy
-#| msgid "Compression"
-msgid "Compressed fil_e..."
-msgstr "ਨਪੀੜਨ"
+#~| msgid "Page:"
+#~ msgid "Package"
+#~ msgstr "ਪੈਕੇਜ"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#, fuzzy
-#| msgid ""
-#| "This tool requires an active selection. Please select a region of the "
-#| "photo and try the operation again"
-msgid ""
-"This tool requires an active selection. Please select one or more pictures "
-"and try again"
-msgstr "ਸਰਗਰਮ ਦਾ ਫੋਟੋ ਅਤੇ"
+#~ msgid "_Repositories..."
+#~ msgstr "ਰਿਪੋਜ਼ਟਰੀ(_R)..."
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:63
-#, fuzzy
-#| msgid "Select Export Folder"
-msgid "Select export folder"
-msgstr "ਨਿਰਯਾਤ ਫੋਲਡਰ ਚੁਣੋ"
+#~ msgid "Show all packages"
+#~ msgstr "ਸਭ ਪੈਕੇਜ ਵੇਖੋ"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:101
-#, fuzzy
-#| msgid "Operation failed"
-msgid "Exporting files"
-msgstr "ਕਾਰਵਾਈ ਅਸਫਲ"
+#~ msgid "Show new versions only"
+#~ msgstr "ਕੇਵਲ ਨਵੇਂ ਵਰਜਨ ਹੀ ਵੇਖੋ"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:107
-#, fuzzy, csharp-format
-#| msgid "Uploading picture \"{0}\""
-msgid "Preparing photo \"{0}\""
-msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+#~ msgid "Show updates only"
+#~ msgstr "ਕੇਵਲ ਅੱਪਡੇਟ ਹੀ ਵੇਖੋ"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-#, fuzzy
-#| msgid "New name:"
-msgid "_File name:"
-msgstr "ਨਵਾਂ ਨਾਂ:"
+#~| msgid "Select _All"
+#~ msgid "_Unselect All"
+#~ msgstr "ਸਭ ਅਣ-ਇੰਸਟਾਲ(_U)"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-#, fuzzy
-#| msgid "C_aption:"
-msgid "_Location:"
-msgstr "ਸੁਰਖੀ(_a):"
+#~ msgid "label124"
+#~ msgstr "label124"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
#, fuzzy
-#| msgid "G_allery:"
-msgid "_Scale:"
-msgstr "ਗੈਲਰੀ(_a):"
+#~| msgid "Downloading Previews"
+#~ msgid "Downloading extensions..."
+#~ msgstr "ਝਲਕ ਡਾਊਨਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-#, fuzzy
-#| msgid "Merge Tags"
-msgid "Merge Db"
-msgstr "ਮਿਲਾਨ ਟੈਗ"
+#~| msgid "Photo Manager"
+#~ msgid "Extension Manager"
+#~ msgstr "ਐਕਸਟੈਨਸ਼ਨ ਮੈਨੇਜਰ"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
#, fuzzy
-#| msgid "Merge the selected tag"
-#| msgid_plural "Merge the {0} selected tags?"
-msgid "Error opening the selected file"
-msgstr "ਮਿਲਾਨ"
+#~| msgid "_Print..."
+#~ msgid "_Uninstall..."
+#~ msgstr "ਛਾਪੋ."
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
-#, csharp-format
-msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
+#~ msgid "Enable"
+#~ msgstr "ਚਾਲੂ"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-msgid ""
-"<small><i>Choose the location of the database you want to import from</i></"
-"small>"
-msgstr ""
+#~ msgid "Disable"
+#~ msgstr "ਬੰਦ"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
-"you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already "
-"imported from that database.</i></small>"
-msgstr ""
+#~ msgid "Details"
+#~ msgstr "ਵੇਰਵਾ"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
-msgid ""
-"<small><i>Copy the images locally or keep them where they are. If you chose "
-"the later, be sure that this location will stay accessible from f-spot.</i></"
-"small>"
-msgstr ""
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
-msgid "A Single Import Roll"
-msgstr ""
+#~ msgid "Add New Repository"
+#~ msgstr "ਨਵੀਂ ਰਿਪੋਜ਼ਟਰੀ ਸ਼ਾਮਲ"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
#, fuzzy
-#| msgid "Copy file to the Photos folder"
-msgid "Copy images to photos folder"
-msgstr "ਫਾਇਲ ਨੂੰ ਫੋਟੋ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ"
+#~| msgid "Select the camera from which you want to transfer files"
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "ਚੁਣੋ"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-msgid "Database Location:"
-msgstr ""
+#~ msgid "Url:"
+#~ msgstr "Url:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr ""
+#~| msgid "Path"
+#~ msgid "Path:"
+#~ msgstr "ਮਾਰਗ:"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-#, fuzzy
-#| msgid "Import"
-msgid "Import:"
-msgstr "ਅਯਾਤ"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr ""
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another f-spot collection"
-msgstr ""
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr ""
-
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-
-#: ../extensions/Tools/HashJob/HashJob.cs:53
-msgid ""
-"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
-"needs to analyze your image collection. This is not done by default as it's "
-"time consuming. You can Start or Pause this update process using this dialog."
-msgstr ""
+#~| msgid "Browse"
+#~ msgid "Browse..."
+#~ msgstr "ਝਲਕ..."
-#: ../extensions/Tools/HashJob/HashJob.cs:102
-msgid "Processing images..."
-msgstr ""
+#~ msgid "check type"
+#~ msgstr "ਜਾਂਚ ਕਿਸਮ"
-#: ../extensions/Tools/HashJob/HashJob.cs:108
-msgid "Stopped"
-msgstr ""
+#~ msgid "dither"
+#~ msgstr "ਕੰਬਣ"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr ""
+#~ msgid "dither type"
+#~ msgstr "ਕੰਬਣ ਕਿਸਮ"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
#, fuzzy
-#| msgid "Error while rotating photo."
-msgid "Error while creating Album"
-msgstr "ਗਲਤੀ ਫੋਟੋ."
+#~| msgid "Remove Tag"
+#~ msgid "Reveal"
+#~ msgstr "ਟੈਗ ਹਟਾਓ"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to create an album: {0}"
-msgstr ""
+#~| msgid "Pause"
+#~ msgid "Push"
+#~ msgstr "ਧੱਕੋ"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:621
-#, csharp-format
-msgid "{0} Sent"
-msgstr ""
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:623
-#, fuzzy, csharp-format
-#| msgid "{0} of {1}"
-msgid "{0} of approx. {1}"
-msgstr "{1} ਵਿੱਚੋਂ {0}"
+#~ msgid "More directories"
+#~ msgstr "ਹੋਰ ਡਾਇਰੈਕਟਰੀਆਂ"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:692
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr ""
+#~ msgid "Arrange by _Month"
+#~ msgstr "ਮਹੀਨਾ"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:776
-#, csharp-format
-msgid "Available space: {0}, {1}% used out of {2}"
-msgstr ""
+#~ msgid "Arrange by _Folder"
+#~ msgstr "ਫੋਲਡਰ"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:890
-#, csharp-format
-msgid ""
-"The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images"
-msgstr ""
+#~ msgid "Tag Name:"
+#~ msgstr "ਟੈਗ ਨਾਂ:"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-#, fuzzy
-#| msgid "<b>Exposure</b>"
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>ਐਕਸਪੋਜ਼ਰ</b>"
+#~ msgid "<b>Color Management</b>"
+#~ msgstr "<b>ਰੰਗ ਪਰਬੰਧ</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
#, fuzzy
-#| msgid ""
-#| "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgid ""
-"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr "<span weight='bold' size='larger'>ਗੈਲਰੀ ਨਾਲ ਜੁੜਨ ਦੌਰਾਨ ਗਲਤੀ</span>\n"
+#~| msgid "<b>Export Method</b>"
+#~ msgid "<b>Import Settings</b>"
+#~ msgstr "<b>ਨਿਰਯਾਤ ਢੰਗ</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
+#~ msgid "<b>Screensaver</b>"
+#~ msgstr "<b>ਵੇਹਲੇ ਪਰਦਾ</b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
#, fuzzy
-#| msgid "Public"
-msgid "Public Album"
-msgstr "ਸਵਰਜਨਕ"
+#~| msgid "<b></b>"
+#~ msgid "<b>Theming</b>"
+#~ msgstr "<b></b>"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-#, fuzzy
-#| msgid "_Album Name:"
-msgid "_Album Title:"
-msgstr "ਐਲਬਮ ਨਾਂ:"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
#, fuzzy
-#| msgid "Authorize"
-msgid "_Autorotate"
-msgstr "ਪ੍ਰਮਾਣਿਤ"
+#~| msgid "Select Folder"
+#~ msgid "Select A gtkrc File"
+#~ msgstr "ਫੋਲਡਰ ਚੁਣੋ"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr ""
+#~ msgid "Write _metadata to file"
+#~ msgstr "ਲਿਖਣ"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
#, fuzzy
-#| msgid "<b>Exposure</b>"
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>ਐਕਸਪੋਜ਼ਰ</b>"
+#~| msgid "_Output:"
+#~ msgid "_Print output:"
+#~ msgstr "ਆਉਟਪੁੱਟ:"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
#, fuzzy
-#| msgid "Amount:"
-msgid "_Account:"
-msgstr "ਮਾਤਰਾ:"
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr ""
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:126
-#, fuzzy, csharp-format
-#| msgid "Uploading picture \"{0}\""
-msgid "Uploading photo \"{0}\""
-msgstr "ਤਸਵੀਰ \"{0}\" ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:181
-#, fuzzy
-#| msgid "Logging into Flickr.Com"
-msgid "Logging into Tabblo"
-msgstr "Flickr.Com ਵਿੱਚ ਲਾਗ-ਇਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+#~| msgid "Gallery"
+#~ msgid "Gallery2"
+#~ msgstr "ਗੈਲਰੀ"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:241
-msgid "Obtaining URL for upload"
-msgstr ""
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr ""
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:166
-#, fuzzy
-#| msgid "Done Sending Photos"
-msgid "Done sending photos"
-msgstr "ਫੋਟੋ ਭੇਜਣਾ ਮੁਕੰਮਲ"
+#~ msgid "1 of 1"
+#~ msgstr "1 'ਚੋਂ 1"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:168
-#, fuzzy
-#| msgid "Upload Complete"
-msgid "Upload complete"
-msgstr "ਅੱਪਲੋਡ ਮੁਕੰਮਲ"
+#~ msgid "_Folder"
+#~ msgstr "ਫੋਲਡਰ"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:174
-msgid "Error uploading to Tabblo: "
-msgstr ""
+#~ msgid "_Month"
+#~ msgstr "ਮਹੀਨਾ"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
#, fuzzy
-#| msgid "<b>Account</b>"
-msgid "<b>Tabblo account</b>"
-msgstr "<b>ਖਾਤਾ</b>"
+#~| msgid "<b>Account</b>"
+#~ msgid "<b>Tabblo account</b>"
+#~ msgstr "<b>ਖਾਤਾ</b>"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
#, fuzzy
-#| msgid "<b></b>"
-msgid "<b>{0}</b>."
-msgstr "<b></b>"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
-msgid "A trust error occured while attempting to access"
-msgstr ""
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
-msgid "Abort this session"
-msgstr ""
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
-msgid "Always trust this site's certificate"
-msgstr ""
+#~| msgid "<b></b>"
+#~ msgid "<b>{0}</b>."
+#~ msgstr "<b></b>"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
-msgid "Do you wish to:"
-msgstr ""
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
#, fuzzy
-#| msgid "Error"
-msgid "Trust Error"
-msgstr "ਗਲਤੀ"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
-msgid "Trust the site's certificate this once"
-msgstr ""
-
-#: ../extensions/Editors/BlackoutEditor/BlackoutEditor.cs:18
-msgid "Blackout"
-msgstr ""
-
-#: ../extensions/Editors/BlackoutEditor/BlackoutEditor.cs:26
-msgid "Select the area that you want blacked out."
-msgstr ""
+#~| msgid "Error"
+#~ msgid "Trust Error"
+#~ msgstr "ਗਲਤੀ"
-#: ../extensions/Editors/PixelateEditor/PixelateEditor.cs:18
#, fuzzy
-#| msgid "Private"
-msgid "Pixelate"
-msgstr "ਨਿੱਜੀ"
+#~| msgid "Private"
+#~ msgid "Pixelate"
+#~ msgstr "ਨਿੱਜੀ"
-#: ../extensions/Editors/PixelateEditor/PixelateEditor.cs:26
#, fuzzy
-#| msgid "Select the camera from which you want to transfer files"
-msgid "Select the area that you want pixelated."
-msgstr "ਚੁਣੋ"
+#~| msgid "Select the camera from which you want to transfer files"
+#~ msgid "Select the area that you want pixelated."
+#~ msgstr "ਚੁਣੋ"
#~ msgid "BMP"
#~ msgstr "BMP"
@@ -4504,12 +4355,6 @@ msgstr "ਚੁਣੋ"
#~ msgid "_Border:"
#~ msgstr "ਹਾਸ਼ੀਆ:"
-#~ msgid "_Close"
-#~ msgstr "ਬੰਦ ਕਰੋ"
-
-#~ msgid "_Destination Temp"
-#~ msgstr "ਨਿਯਤ ਆਰਜ਼ੀ"
-
#~ msgid "_Import files after copy"
#~ msgstr "ਅਯਾਤ ਨਕਲ"
diff --git a/po/pl.po b/po/pl.po
index b7f2f5d..3c51647 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,3 @@
-# Translation of f-spot to Polish
-# Copyright (C) 2008 Aviary.pl
-# This file is distributed under the same license as the f-spot package.
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# Aviary.pl
# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
@@ -11,10 +8,10 @@ msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-09 18:52+0100\n"
-"PO-Revision-Date: 2009-03-09 18:51+0100\n"
-"Last-Translator: Tomasz Dominikowski <dominikowski at gmail.com>\n"
-"Language-Team: Aviary.pl <gnomepl at aviary.pl>\n"
+"POT-Creation-Date: 2010-03-08 12:55+0100\n"
+"PO-Revision-Date: 2010-03-08 12:48+0100\n"
+"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
+"Language-Team: Polish <gnomepl at aviary.pl>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,365 +20,1422 @@ msgstr ""
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: Poland\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Wersja:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Przesyłanie zdjęć"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Przesyłanie zdjęcia \"{0}\" na płytę CD"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} z {1}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "Ukończono wysyłanie zdjęć"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Przesyłanie ukończone"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "Błąd podczas przesyłania"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "Błąd podczas przesyłania"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "kopiowanie..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>Istnieją poprzednio zaplanowane elementy do zapisu.</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Zdjęcia do wypalenia</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Automatyczne obracanie"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Utwórz CD"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Rozmiar"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Rozmiar eksportowanego zaznaczenia:"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Przeglądaj wcześniej zaplanowane pliki"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "Wy_eksportuj"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "_Zapisz tylko te zdjęcia na CD"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "Oczekiwanie na upoważnienie"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
+msgstr ""
+"Program F-Spot uruchomi teraz przeglądarkę, aby można było włączyć wybrane "
+"uprawnienia.\n"
+"\n"
+"Kiedy serwis Facebook pokieruje z powrotem do tego programu, proszę nacisnąć "
+"przycisk \"Ok\" poniżej."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "Zbyt wiele obrazów do wyeksportowania"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+"Serwis Facebook zezwala jedynie na {0} fotografii na album. Proszę "
+"ograniczyć wybór i spróbować ponownie."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Wysyłanie zdjęć"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "Album musi mieć nazwę"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "Proszę nazwać album lub wybrać istniejący."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Autor:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "Tworzenie nowego albumu się nie powiodło"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Prawa autorskie:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"Wystąpił błąd podczas tworzenia nowego albumu.\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Zależności rozszerzenia:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Wysyłanie zdjęcia \"{0}\" ({1} z {2})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Wszystkie zarejestrowane repozytoria"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Błąd podczas wysyłania do serwisu Facebook: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Błąd"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Wysyłanie ukończone"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Na pewno przerwać instalację?"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Grupa programu F-Spot w serwisie Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Następujące pakiety zostaną odinstalowane:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Oczekiwanie na uwierzytelnienie"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
msgstr ""
-"Istnieją inne rozszerzenia zależne od poprzednich, które również zostaną "
-"odinstalowane:"
+"Program F-Spot uruchomi teraz przeglądarkę, aby zalogować się w serwisie "
+"Facebook.\n"
+"\n"
+"Kiedy serwis Facebook pokieruje z powrotem do tego programu, proszę nacisnąć "
+"przycisk \"OK\" poniżej. Program F-Spot przechowa sesję w bibliotece gnome-"
+"keyring, jeśli to możliwe, i ponownie użyje jej w przyszłych eksportach do "
+"serwisu Facebook."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Uwierzytelnianie..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Błąd podczas logowania do serwisu Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
msgstr ""
-"Wybrane rozszerzenia nie mogą być zainstalowane z powodu konfliktów "
-"zależności."
+"Wystąpił problem podczas logowania w serwisie Facebook. Proszę sprawdzić "
+"informacje logowania i spróbować ponownie."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Następujące pakiety zostaną zainstalowane:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Upoważnianie sesji"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (w katalogu użytkownika)"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "Ustanowiono sesję, pobieranie informacji o użytkowniku..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Następujące pakiety wymagają odinstalowania:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "Ustanowiono sesję, pobieranie listy przyjaciół..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Następujące zależności nie mogły być rozwiązane:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "Ustanowiono sesję, pobieranie szczegółów przyjaciół..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Instalacja została ukończona pomyślnie."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "Ustanowiono sesję, pobieranie albumów zdjęć..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Instalacja nie powiodła się."
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} jest zalogowany w serwisie Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Instalacja została ukończona z ostrzeżeniami."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Błąd połączenia z serwisem Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Odinstalowanie zostało ukończone pomyślnie."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"Wystąpił błąd podczas pobierania informacji z serwisu Facebook.\n"
+"\n"
+"Komunikat serwisu Facebook: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Użytkownik nie jest zalogowany."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Odinstalowanie nie powiodło się."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Automatyczne potwierdzanie zdjęć"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Odinstalowanie zostało ukończone z ostrzeżeniami."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Nagłówek"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Repozytorium"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Utwórz nowy album"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Instalacja została anulowana"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Opis"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Nie odnaleziono niektórych wymaganych rozszerzeń"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Eksport do serwisu Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Instalacja nie powiodła się"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "Na tym zdjęciu"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Rozszerzenie"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Położenie"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Wersja"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Login"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Inne"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Wyloguj"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:9
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Nazwa"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Adres URL"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Niezalogowany"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Uprawnienia:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Stałe połączenie"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Użycie istniejącego albumu"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Kto to jest?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Upoważnij"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Wystąpił wyjątek: {0}"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"Proszę wrócić do tego okna po ukończeniu procesu upoważnienia w serwisie {0} "
+"i kliknąć poniższy przycisk \"Dokończ upoważnienie\""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Pakiet"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Dokończ upoważnienie"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Instalacja rozszerzenia"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Logowanie do serwisu {0}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Sprawdzanie danych uwierzytelniających..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Witamy {0}, uzyskano połączenie z {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Zalogowanie jako inny użytkownik"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "Wykorzystano {0} dozwolonego ({1}) miesięcznego limitu użytkownika"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Nie można zalogować"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Oczekiwanie na odpowiedź {0} z {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "Wysyłanie zdjęcia \"{0}\""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Błąd podczas wysyłania do {0}: {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "Nie można zalogować."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
msgstr ""
-"<b>Proszę wybrać rozszerzenia do instalacji i kliknąć przycisk Dalej</b>"
+"Program F-Spot nie mógł się zalogować do serwisu {0}. Należy się upewnić, "
+"czy uzyskano uwierzytelnienie w serwisie {0} przy pomocy przeglądarki "
+"internetowej."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Instalacja z:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Konto</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Repozytoria..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Zdjęcia</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Wyświetlanie wszystkich pakietów"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Styl</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Wyświetlanie tylko nowych wersji"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Uprawnienia do oglądania</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Wyświetlanie tylko aktualizacji"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "Wyeksportuj"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "_Odznacz wszystko"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "Eksportowanie _hierarchii etykiet"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:110
-msgid "Select _All"
-msgstr "Z_aznacz wszystko"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"Program F-Spot wymaga upoważnienia do wysyłania zdjęć na konto w serwisie "
+"{0}. Aby uruchomić przeglądarkę internetową i uwierzytelnić program F-Spot, "
+"należy nacisnąć przycisk \"Upoważnij\"."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "Ignorowanie etykiet _najwyższego poziomu"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Postęp całkowity:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Prywatny"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Pobieranie rozszerzeń..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Publiczny"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Menedżer rozszerzeń"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "Usuń _metadane"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Do wykonania tej operacji są wymagane dodatkowe rozszerzenia."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Widoczne dla rodziny"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Zostaną zainstalowane następujące rozszerzenia:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Widoczne dla przyjaciół"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Menedżer rozszerzeń</b></big>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "Wy_eksportuj etykiety"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Obecnie zainstalowane są następujące rozszerzenia:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "_Zmień rozmiar na: "
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "Za_instaluj rozszerzenia..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "_Wyświetl zdjęcia w przeglądarce po ukończeniu wysyłania"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "O_dinstaluj..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "pikseli"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:13
-msgid "Enable"
-msgstr "Aktywne"
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "_Katalog..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Wyłącz"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Wybór katalogu eksportu"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:799
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:543
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:694
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:177
-msgid "Error"
-msgstr "Błąd"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "Budowanie galerii"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Szczegóły"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "Błąd podczas wysyłania zdjęcia \"{0}\" do galerii:{2}{1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Zarządzanie repozytorium rozszerzeń"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "Błąd: błąd podczas przesyłania. Przerywanie"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Dodaj nowe repozytorium"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Błąd: plik już istnieje. Przerywanie"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Proszę wybrać położenie repozytorium do rejestracji:"
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "Jasny"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Zarejestrowanie repozytorium online"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "Ciemny"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Adres URL:"
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "Poprzedni"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Zarejestrowanie lokalnego repozytorium"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Indeks"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Ścieżka:"
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "Etykiety"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Dalej"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "Galeria wygenerowana przez"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "Wyświetl style"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Przeglądaj..."
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "Ukryj style"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Etykiety: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "Strona:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Miejsce docelowe:</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Metoda eksportu</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "_Utwórz galerię używając \"Oryginału\""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "Utwórz _niezależną galerię WWW"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "_Opis:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "Wyeksportuj e_tykiety"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "Wyeksportuj _ikony etykiet"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Eksport katalogów"
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "N_azwa galerii:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "Otwórz miejsce _docelowe po ukończeniu eksportu"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Katalog:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "_Zapisz tylko pliki"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "Web _Gallery..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Nie można połączyć się z galerią w nieznanej wersji.\n"
+"Proszę sprawdzić, czy wersja wtyczki Remote to 1.0.8 lub późniejsza."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "Nieprawidłowy adres URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "Adres URL galerii nie wygląda na prawidłowy adres URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "Błąd podczas łączenia z galerią"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
#, csharp-format
-msgid "(provided by {0})"
-msgstr "(dostarczone przez {0})"
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "Podczas próby logowania napotkano następujący błąd: {0}"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Nie można wczytać wyłączonych rozszerzeń."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "Galeria o tej nazwie już istnieje"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Wczytywanie rozszerzenia {0}"
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+"Istnieje już galeria z tą samą nazwą w zarejestrowanych galeriach "
+"użytkownika. Proszę wybrać unikalną nazwę."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(TopLevel)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "Nieprawidłowa nazwa galerii"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Nazwa galerii zawiera nieprawidłowe znaki.\n"
+"Dopuszczalne są tylko litery, cyfry, - oraz _."
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Wymagane rozszerzenie \"{0}\" jest wyłączone."
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Błąd podczas wysyłania zdjęcia \"{0}\" do galerii: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(brak galerii)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(brak połączenia)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(brak albumów)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Nie wybrano konta"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Album</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Galeria</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Błąd podczas łączenia z galerią</span>\n"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "Wy_eksportuj tytuły i komentarze"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "Otwórz _album w przeglądarce po ukończeniu wysyłania"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Należy upewnić się, że ustawienia tej galerii są prawidłowe."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "Adres U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "Nazwa _albumu:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Opis:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "_Eksport do albumu:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "Nazwa _galerii:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Galeria:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "_Album nadrzędny:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "_Hasło:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Tytuł:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "_Nazwa użytkownika:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "Błąd podczas odczytywania odpowiedzi serwera"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Serwer zwrócił odpowiedź bez zawartości galerii"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "Błąd podczas tworzenia nowego albumu"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Wymagane rozszerzenie \"{0}\" nie jest zainstalowane."
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"Wystąpił następujący błąd podczas próby wykonania żądanego działania:\n"
+"{0} ({1})"
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "Przeglądarka zdjęć F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "Przeglądarka zdjęć"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "Błąd podczas tworzenia albumu"
-#: ../f-spot-import.desktop.in.in.h:1 ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "Menedżer zdjęć F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr "Wystąpił następujący błąd podczas próby utworzenia albumu: {0}"
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "Importowanie do programu F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} wysłano"
-#: ../f-spot-import.desktop.in.in.h:3 ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "Menedżer zdjęć"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} z około {1}"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "Organizowanie i dzielenie się swoimi zdjęciami"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Błąd podczas wysyłania do galerii: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Dostępne miejsce: {0}, {1}% użyto z {2}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"Wybrany album ma limit {0} zdjęć,\n"
+"który zostanie przekroczony z obecnym wyborem {1} zdjęć"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>Eksport do serwisu PicasaWeb</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Konto Google użytkownika jest zablokowane</"
+"span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Należy upewnić się, że ustawienia tej galerii są prawidłowe.\n"
+"Należy wprowadzić litery z wyświetlonego obrazu w polu\n"
+"\"Captcha\". <i>Wielkość liter nie jest rozróżniana</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Album publiczny"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "_Tytuł albumu:"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "_Automatyczne obracanie"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>Eksport do serwisu SmugMug</b>"
-#: ../libeog/image-view.c:2124
-msgid "interpolation type"
-msgstr "typ interpolacji"
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Wysyłanie zdjęcia \"{0}\""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Logowanie w serwisie Tabblo"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Uzyskiwanie adresu URL do wysłania"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "Ukończono wysyłanie zdjęć"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Wysyłanie ukończone"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Błąd podczas wysyłania do serwisu Tabblo: "
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Etykiety programu F-Spot</b>"
-#: ../libeog/image-view.c:2125
-msgid "the type of interpolation to use"
-msgstr "typ wykorzystywanej interpolacji"
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Konto serwisu Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>Etykiety programu F-Spot mogą pomóc śledzić stan eksportu zdjęć. "
+"Przykład: można użyć jednej etykiety dla zdjęć, które dopiero mają zostać "
+"wyeksportowane, a inną dla już wyeksportowanych. Tutaj można kazać "
+"programowi F-Spot automatycznie zastępować te etykiety na odpowiednie.</i></"
+"small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Usunięcie z eksportowanych zdjęć:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Wybierz..."
-#: ../libeog/image-view.c:2131 ../libeog/image-view.c:2138
-msgid "check type"
-msgstr "typ szachownicy"
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Dołączenie do eksportowanych zdjęć:"
-#: ../libeog/image-view.c:2132
-msgid "the type of chequering to use"
-msgstr "typ wykorzystywanej szachownicy"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
-#: ../libeog/image-view.c:2139
-msgid "the size of chequers to use"
-msgstr "rozmiar pól szachownicy"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Wystąpił błąd zaufania podczas próby uzyskania dostępu"
-#: ../libeog/image-view.c:2145
-msgid "dither"
-msgstr "cieniuj"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Przerwij tę sesję"
-#: ../libeog/image-view.c:2146
-msgid "dither type"
-msgstr "typ cieniowania"
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Zawsze ufaj certyfikatowi z tej strony"
-#: ../libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:222
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Co zrobić:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Błąd zaufania"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Zaufaj certyfikatowi z tej strony tylko tym razem"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "Skompr_esowany plik..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "Brak zaznaczenia"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"Narzędzie wymaga aktywnego zaznaczenia. Proszę zaznaczyć fragment jednego "
+"lub więcej zdjęć i spróbować ponownie"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Wybór katalogu eksportu"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Eksportowanie plików"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Przygotowywanie zdjęcia \"{0}\""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "_Utwórz"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "_Nazwa pliku:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Położenie:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Skala:"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"Aby wykryć duplikaty zdjęć zaimportowanych przed wersją 0.5.0, program F-"
+"Spot musi przeanalizować kolekcję obrazów. Operacja nie jest przeprowadzana "
+"domyślnie, ponieważ zabiera wiele czasu. Można rozpocząć lub wstrzymać ten "
+"proces używając tego okna dialogowego."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+"Obecnie {0} zdjęcia wymagają obliczenia sum kontrolnych MD5 i jest {1} "
+"oczekujących zadań"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Zamknij"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "Przetwarzanie obrazów..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "Zatrzymano"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "Sprawdzanie duplikatów..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Galeria programu F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Galeria WWW jest w trybie offline"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Wyświetl wszystko"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} zdjęcie"
+msgstr[1] "{0} zdjęcia"
+msgstr[2] "{0} zdjęć"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Bieżący widok"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Wybrane"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Galeria WWW na żywo"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Galeria jest włączona, dopóki użytkownik jej nie wyłączy lub\n"
+"zamknie program F-Spot. Proszę upewnić się, że lokalni użytkownicy mają do\n"
+"niej dostęp omijając pośrednika HTTP.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Kiedy galeria jest włączona, powyżej znajduje się adres URL, \n"
+"który należy otworzyć na innym komputerze, aby uzyskać dostęp do\n"
+"współdzielonych zdjęć.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Włącza i wyłącza galerię WWW"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Użytkownicy mogą dodawać etykiety"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Skopiuj adres URL do schowka"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "Galeria WWW programu F-Spot na żywo"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "Adres URL galerii:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Ograniczenie liczby współdzielonych zdjęć do"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Opcje:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Zdjęcia z etykietami"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Wybrane zdjęcia"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Współdzielone:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Widoki:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "brak"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galeria: {0}, zdjęcia: {1}, ostatni klient: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Galeria jest nieaktywna"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Połącz bazy danych"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Błąd podczas otwierania wybranego pliku."
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"Wybrany plik nie jest prawidłową lub obsługiwaną bazą danych.\n"
+"\n"
+"Otrzymany wyjątek: \"{0}\"."
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+"<small><i>Proszę wybrać położenie bazy danych, z której należy zaimportować."
+"</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>Proszę wybrać, co należy zaimportować z wybranej bazy danych.\n"
+"\"Tylko nowe rolki\" to inteligentna opcja zapobiegająca ponownemu "
+"zaimportowaniu zdjęć, które zostały zaimportowane podczas poprzedniego "
+"działania.\n"
+"\"Import pojedynczej rolki\" pozwala na wybór, którą rolkę należy "
+"przywrócić.\n"
+"\"Wszystko\" zaimportuje wszystko tworząc duplikaty, jeśli już zaimportowano "
+"z tej bazy danych.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>Skopiowanie obrazów lokalnie lub pozostawienie na swoim miejscu. "
+"Po wybraniu opcji drugiej proszę się upewnić, że to położenie pozostanie "
+"dostępne dla programu F-Spot.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "Import pojedynczej rolki"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Kopiowanie obrazów do katalogu Zdjęcia"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Położenie bazy danych:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Wszystko"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Importowanie:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "Zachowywanie obrazów w ich oryginalnym położeniu"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "Dołączenie innej kolekcji programu F-Spot"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "Tylko nowe rolki"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Pomiń"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>Baza danych odwołuje się do plików zawartych w katalogu <b>{0}</b>.\n"
+" Proszę wybrać ten katalog, aby umożliwić mapowanie.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "Skonfiguruj wygaszacz ekranu"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Wszystkie obrazy"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Opóźnienie:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Ekran:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Obrazy z etykietą:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "Ustaw F-Spot jako wygaszacz ekranu"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Konfiguracja wygaszacza ekranu"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "Menedżer zdjęć F-Spot"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Organizowanie i dzielenie się zdjęciami"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Menedżer zdjęć"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Importowanie do programu F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "Przeglądarka zdjęć F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Przeglądarka zdjęć"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
-msgstr "Plik nie znaleziony"
+msgstr "Plik nie odnaleziony"
-#: ../libfspot/f-jpeg-utils.c:464
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr "Nieznany rodzaj transformacji %d"
-#: ../libfspot/f-jpeg-utils.c:472
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
-msgstr "Operacja nie powiodła się"
+msgstr "Działanie się nie powiodło"
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
@@ -391,16 +1445,10 @@ msgstr "Podgląd"
msgid "Path"
msgstr "Ścieżka"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:77
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Plik"
-#: ../src/CameraFileSelectionDialog.cs:82
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1234
-msgid "Index"
-msgstr "Indeks"
-
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
msgstr "Wybór etykiety"
@@ -414,12 +1462,6 @@ msgstr "Pobieranie podglądów"
msgid "Downloading Preview of {0}"
msgstr "Pobieranie miniaturki {0}"
-#: ../src/CameraFileSelectionDialog.cs:199
-#: ../extensions/Exporters/CDExport/CDExport.cs:246
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
-msgid "Transferring Pictures"
-msgstr "Przesyłanie zdjęć"
-
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
@@ -427,22 +1469,22 @@ msgstr "Kopiowanie pliku {0} z {1}"
#: ../src/CameraFileSelectionDialog.cs:235
msgid "Error transferring file"
-msgstr "Błąd przy przesyłaniu pliku"
+msgstr "Błąd podczas przesyłania pliku"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Kopiowanie plików ukończone"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Pobieranie ukończone"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Kopiowanie plików ukończone"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "Przesyłanie \"{0}\" z aparatu"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Aparat"
@@ -450,12 +1492,12 @@ msgstr "Aparat"
msgid "Port"
msgstr "Port"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
-msgstr "Nie znaleziono zdjęć pasujących do {0}"
+msgstr "Nie odnaleziono zdjęć pasujących do {0}"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -466,11 +1508,11 @@ msgstr ""
"spróbować dodać tę etykietę do zdjęcia lub wybrać inną etykietę\n"
"w oknie preferencji programu F-Spot."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Brak wyników wyszukiwania"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -481,16 +1523,16 @@ msgstr ""
"F-Spot."
#. Note for translators: Reparented is a picture becoming a version of another one
-#: ../src/Core/Photo.cs:471
+#: ../src/Core/Photo.cs:473
msgid "Reparented"
msgstr "Wersja innego zdjęcia"
-#: ../src/Core/Photo.cs:471
+#: ../src/Core/Photo.cs:473
#, csharp-format
msgid "Reparented ({0})"
msgstr "Wersja innego zdjęcia ({0})"
-#: ../src/Core/Photo.cs:490
+#: ../src/Core/Photo.cs:492
#, csharp-format
msgid "Modified"
msgid_plural "Modified ({0})"
@@ -498,65 +1540,25 @@ msgstr[0] "Zmodyfikowane"
msgstr[1] "Zmodyfikowane ({0})"
msgstr[2] "Zmodyfikowane ({0})"
-#: ../src/Core/Photo.cs:509
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Zmodyfikowane w {1}"
-#: ../src/Core/Photo.cs:509
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Zmodyfikowane w {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:667 ../src/f-spot.glade.h:96
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Oryginał"
-#: ../src/DateCommands.cs:56
-msgid "Today"
-msgstr "Dzisiaj"
-
-#: ../src/DateCommands.cs:58
-msgid "Yesterday"
-msgstr "Wczoraj"
-
-#: ../src/DateCommands.cs:60
-msgid "Last 7 days"
-msgstr "Ostatnie 7 dni"
-
-#: ../src/DateCommands.cs:62
-msgid "Last 30 days"
-msgstr "Ostatnie 30 dni"
-
-#: ../src/DateCommands.cs:64
-msgid "Last 90 days"
-msgstr "Ostatnie 90 dni"
-
-#: ../src/DateCommands.cs:66
-msgid "Last 360 days"
-msgstr "Ostatnie 360 dni"
-
-#: ../src/DateCommands.cs:68
-msgid "Current Week (Mon-Sun)"
-msgstr "Aktualny tydzień (Pon-Nie)"
-
-#: ../src/DateCommands.cs:70
-msgid "Previous Week (Mon-Sun)"
-msgstr "Poprzedni tydzień (Pon-Nie)"
-
-#: ../src/DateCommands.cs:86 ../src/UI.Dialog/ui/PreferenceDialog.glade.h:11
-msgid "All Images"
-msgstr "Wszystkie obrazy"
-
-#: ../src/DateCommands.cs:88
-msgid "Customized Range"
-msgstr "Zakres użytkownika"
-
#: ../src/Editors/AutoStretchEditor.cs:17
msgid "Auto Color"
-msgstr "Auto kolor"
+msgstr "Automatyczny kolor"
#: ../src/Editors/ColorEditor.cs:38
msgid "Adjust Colors"
@@ -616,7 +1618,7 @@ msgstr "Redukcja czerwonych oczu"
#: ../src/Editors/RedEyeEditor.cs:21
msgid "Fix!"
-msgstr "Popraw!"
+msgstr "Popraw"
#: ../src/Editors/RedEyeEditor.cs:25
msgid "Select the eyes you wish to fix."
@@ -626,37 +1628,55 @@ msgstr "Proszę wybrać oczy do poprawy."
msgid "Sepia Tone"
msgstr "Tonacja sepii"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Miękki obraz"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Wyprostuj"
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "Błąd importu"
+
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Błąd podczas importowania {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Nie można zapisać plików typu \"{0}\""
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Nieobsłużony wyjątek"
+
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Kop_iuj położenie zdjęcia"
+msgid "Copy Photo"
+msgstr "Skopiuj zdjęcie"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
-msgstr "Eksportuj do"
+msgstr "Wyeksportuj do"
#: ../src/FSpot.addin.xml.h:3
msgid "Open _With"
msgstr "Otwórz _za pomocą"
-#: ../src/FSpot.addin.xml.h:4 ../src/f-spot.glade.h:105
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
msgstr "_Usuń etykietę"
-#: ../src/FSpot.addin.xml.h:5 ../src/SingleView.cs:451
-#: ../src/f-spot.glade.h:107
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Obróć w _lewo"
-#: ../src/FSpot.addin.xml.h:6 ../src/SingleView.cs:452
-#: ../src/f-spot.glade.h:108
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Obróć w _prawo"
@@ -664,40 +1684,458 @@ msgstr "Obróć w _prawo"
msgid "Tools"
msgstr "Narzędzia"
-#: ../src/FSpot.addin.xml.h:8 ../src/f-spot.glade.h:143
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "_Dołącz etykietę"
-#: ../src/FSpot.addin.xml.h:9 ../src/f-spot.glade.h:154
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
msgstr "_Usuń z dysku"
-#: ../src/FSpot.addin.xml.h:10 ../src/f-spot.glade.h:186
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
msgstr "_Usuń z katalogu"
-#: ../src/FileImportBackend.cs:285
-msgid "Import error"
-msgstr "Błąd importu"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:286
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr "Błąd podczas importowania {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
-#: ../src/FileImportBackend.cs:287 ../src/UI.Dialog/ThreadProgressDialog.cs:51
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-msgid "Skip"
-msgstr "Pomiń"
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
-#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "Nie można zapisać plików typu \"{0}\""
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
-#: ../src/FormClient.cs:295
-msgid "Unhandled exception"
-msgstr "Nieobsłużony wyjątek"
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>Ko_rekty</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Interpolacja obrazu</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Rozmiar</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Podsumowanie</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Części przezroczyste</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Wyświetlenie wszystkich zaimportowanych zdjęć</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>_Balans bieli</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr ""
+"<small><i>Opcja ta włącza interpolację powiększonych obrazów. Nie należy jej "
+"wyłączać przy wyświetlaniu zdjęć, ale wyłączenie interpolacji może być "
+"przydatne przy projektowaniu ikon.</i></small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>Można określić, w jaki sposób mają być wyświetlane przezroczyste "
+"fragmenty obrazka. Opcja ta nie ma zastosowania przy zdjęciach, ale "
+"ustawienie jej jako szachownica lub wybrany kolor może być przydatne przy "
+"przeglądaniu ikon lub innych obrazów z przezroczystymi fragmentami.</i></"
+"small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "J_ako tło"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "Jak_o własny kolor: "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "Jako _szachownica"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Dołączenie etykiet:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Dołącz etykietę:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "K_ontrast:"
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Utwórz"
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "Wybór aparatu"
+
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "Kopiowanie plików do katalogu Zdjęcia"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "Utworzenie wiadomości"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr "Utwórz i_konę dla tego znacznika podczas pierwszego użycia"
+
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "Tworzy wiadomość z załączając zaznaczone (i zmniejszone) zdjęcia"
+
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr "Wykrycie duplikatów"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "Wyświetl _nazwy plików"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "Wyświetlanie wyłącznie zdjęć zaimportowanych w określonych rolkach."
+
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "Nie wysyłaj poczty"
+
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "E-_Mail:"
+
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "Wye_ksportuj tytuły i komentarze"
+
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "Szacowany nowy rozmiar"
+
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "Bardzo wielki"
+
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "Podgląd F-Spot"
+
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr "Filtrowanie wybranych rolek"
+
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "G_aleria:"
+
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "Galeria"
+
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Zaimportuj"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "Źródło importu:"
+
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "Dołączenie podkatalogów"
+
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "Wielki"
+
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr "Zarządzanie współczynnikami wyboru użytkownika"
+
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "Średni"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "Liczba zdjęć w wybranych rolkach:"
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "Liczba obrazów"
+
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "Otwórz _katalog..."
+
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "Pierwotny rozmiar (prawdopodobnie bardzo duży rozmiar pliku)"
+
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "Etykieta _nadrzędna:"
+
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "Pauza"
+
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "Preferencje"
+
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Poprzedni"
+
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "Napraw"
+
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr "Wybór zdjęć do skopiowania z aparatu..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "Wybór etykiety..."
+
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "Wybór aparatu, z którego mają zostać przesłane pliki"
+
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "Wybrany aparat: "
+
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "Ograniczenia zaznaczenia"
+
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "Ustaw jako _tapetę"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "Wyświetl wszystkie zdjęcia."
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "Wyświetl lub ukryj pasek boczny"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "Wyświetl lub ukryj pasek narzędzi"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "_Pasek boczny"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "Mały"
+
+#: ../src/f-spot.glade.h:82
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"Proszę określić, czy zdjęcie pierwotnych rozmiarów ma być obrócone. Mniejsze "
+"rozmiary są automatycznie obracane."
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "Usuń _metadane obrazu"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr "Ty_mczasowy:"
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "Bardzo mały"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr "Całkowity rozmiar pierwotny"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "_Powiększ"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "P_omniejsz"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Powiększ"
+
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Pomniejsz"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "Jas_ność:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_Utwórz wiadomość"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "_Edycja"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "_Ekspozycja:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "_Tryb pełnoekranowy"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Galeria"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "Pomo_c"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "_Odcień:"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "_Interpolowanie obrazu podczas powiększenia"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Nowe okno"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "_Otwórz album w przeglądarce po ukończeniu wysyłania"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "_Otwórz miejsce docelowe po ukończeniu eksportu"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Zdjęcie"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "_Nasycenie:"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "_Skaluj zdjęcia do rozmiarów nie większych niż: "
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "_Prezentacja"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "_Usuń metadane"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "_Nazwa etykiety:"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "_Odcień:"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "Pasek _narzędziowy"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "_Widok"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "_Wirtualny system plików"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "i"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"dnia\n"
+"po\n"
+"między"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
#: ../src/FullScreenView.cs:58
msgid "Hide"
@@ -711,7 +2149,7 @@ msgstr "Ukryj pasek narzędzi"
msgid "Info"
msgstr "Informacje"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Informacje o obrazie"
@@ -719,8 +2157,8 @@ msgstr "Informacje o obrazie"
msgid "Exit fullscreen"
msgstr "Opuść tryb pełnoekranowy"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:319
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Prezentacja"
@@ -732,59 +2170,15 @@ msgstr "Uruchom prezentację"
msgid "Slide transition:"
msgstr "Przejście slajdu:"
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "Rozmycie"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "Przeskok"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "Przykrycie"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "Odsłonięcie"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "Zmycie"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "Podział"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "Wypchnięcie"
-
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "Więcej dat"
#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "Więcej katalogów"
-
-#: ../src/GroupSelector.cs:63 ../src/GroupSelector.cs:64
msgid "More"
msgstr "Więcej"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "Ułóż wg _miesięcy"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "Ułóż wg _katalogów"
-
-#: ../src/GroupSelector.cs:523 ../src/f-spot.glade.h:190
-msgid "_Reverse Order"
-msgstr "_Odwrotny porządek"
-
-#: ../src/GroupSelector.cs:529 ../src/f-spot.glade.h:146
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "_Wyczyść zakres dat"
@@ -798,7 +2192,7 @@ msgstr "Katalog miniaturek"
#: ../src/Imaging/Exif.cs:232
msgid "Exif Directory"
-msgstr "Katalog Exif"
+msgstr "Katalog EXIF"
#: ../src/Imaging/Exif.cs:234
msgid "GPS Directory"
@@ -812,7 +2206,7 @@ msgstr "Katalog InterOperability"
msgid "Unknown Directory"
msgstr "Nieznany katalog"
-#: ../src/Imaging/ImageFile.cs:90
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Zapisywanie w tym formacie nie jest obsługiwane"
@@ -822,7 +2216,7 @@ msgstr "Numer wersji IPTC IIM"
#: ../src/Imaging/IptcFile.cs:147
msgid "OSI Destination routing information"
-msgstr "Informacje o routingu do miejsca docelowego OSI"
+msgstr "Informacje o trasowaniu do miejsca docelowego OSI"
#: ../src/Imaging/IptcFile.cs:149
msgid "IPTC file format"
@@ -949,7 +2343,7 @@ msgstr "Intelektualny rodzaj obiektu"
msgid "Unknown IIM DataSet"
msgstr "Nieznany IIM DataSet"
-#: ../src/ImportCommand.cs:47 ../src/SingleView.cs:357
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Wybór katalogu"
@@ -966,29 +2360,23 @@ msgstr "Wczytywanie {0} z {1}"
msgid "Done Loading"
msgstr "Wczytywanie ukończone"
-#: ../src/ImportCommand.cs:540 ../src/MainWindow.cs:279
-#: ../src/f-spot.glade.h:82
-msgid "Import"
-msgstr "Importuj"
-
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "Katalog nie istnieje."
-#: ../src/ImportCommand.cs:671
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
"different directory"
msgstr "Wybrany katalog \"{0}\" nie istnieje. Należy wskazać inny katalog"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:724 ../src/ImportCommand.cs:726
-#: ../src/XmpTagsImporter.cs:88
-msgid "Import Tags"
-msgstr "Etykiety importu"
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
+#: ../src/XmpTagsImporter.cs:89
+msgid "Imported Tags"
+msgstr "Zaimportowane etykiety"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:286 ../src/SingleView.cs:86
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Obróć w lewo"
@@ -996,7 +2384,7 @@ msgstr "Obróć w lewo"
msgid "Rotate picture left"
msgstr "Obraca zdjęcie w lewo"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:290 ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Obróć w prawo"
@@ -1004,113 +2392,59 @@ msgstr "Obróć w prawo"
msgid "Rotate picture right"
msgstr "Obraca zdjęcie w prawo"
-#: ../src/ItemAction.cs:102 ../src/f-spot.glade.h:90
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:999
-msgid "Next"
-msgstr "Dalej"
-
#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "Następne zdjęcie"
-#: ../src/ItemAction.cs:123 ../src/f-spot.glade.h:103
-msgid "Previous"
-msgstr "Poprzedni"
-
#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "Poprzednie zdjęcie"
-#: ../src/Loupe.cs:62
-msgid "Error saving sharpened photo"
-msgstr "Błąd podczas zapisu wyostrzonego zdjęcia"
-
-#: ../src/Loupe.cs:63 ../src/PhotoView.cs:164
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "Otrzymano wyjątek \"{0}\". Nie można zapisać zdjęcia {1}"
-
-#: ../src/Loupe.cs:92
-msgid "Sharpen"
-msgstr "Wyostrz"
-
-#: ../src/Loupe.cs:102
-msgid "Amount:"
-msgstr "Stopień:"
-
-#: ../src/Loupe.cs:103
-msgid "Radius:"
-msgstr "Promień:"
-
-#: ../src/Loupe.cs:104
-msgid "Threshold:"
-msgstr "Próg:"
-
-#: ../src/MainWindow.cs:281
+#: ../src/MainWindow.cs:303
msgid "Import new images"
-msgstr "Importuj nowe obrazy"
+msgstr "Importuje nowe obrazy"
-#: ../src/MainWindow.cs:297 ../src/f-spot.glade.h:49
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Przeglądaj"
-#: ../src/MainWindow.cs:301
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
-msgstr "Przeglądanie wielu zdjęć jednocześnie"
+msgstr "Przegląda wiele zdjęć jednocześnie"
-#: ../src/MainWindow.cs:305
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
-msgstr "Edytuj obraz"
+msgstr "Zmodyfikuj obraz"
-#: ../src/MainWindow.cs:309
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
-msgstr "Przeglądanie i modyfikacja zdjęć"
+msgstr "Przegląda i modyfikuje zdjęcia"
-#: ../src/MainWindow.cs:314 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Tryb pełnoekranowy"
-#: ../src/MainWindow.cs:316 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Wyświetla zdjęcia w trybie pełnoekranowym"
-#: ../src/MainWindow.cs:321 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Wyświetla zdjęcia jako pokaz slajdów"
-#: ../src/MainWindow.cs:336
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Poprzednie zdjęcie"
-#: ../src/MainWindow.cs:341
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Następne zdjęcie"
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/MainWindow.cs:354 ../src/Widgets/Sidebar.cs:73
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1168
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1208
-msgid "Tags"
-msgstr "Etykiety"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/MainWindow.cs:662 ../src/UI.Dialog/AdjustTimeDialog.cs:135
-#: ../src/UI.Dialog/ProgressDialog.cs:92
-#: ../extensions/Exporters/CDExport/CDExport.cs:164
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:783
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} z {1}"
-
-#: ../src/MainWindow.cs:1682
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Nie wykryto żadnych aparatów."
-#: ../src/MainWindow.cs:1683
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -1118,17 +2452,17 @@ msgstr ""
"Program F-Spot nie mógł odnaleźć żadnych podłączonych aparatów. Proszę "
"sprawdzić ponownie, czy aparat jest podłączony i jest zasilany"
-#: ../src/MainWindow.cs:1722
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Błąd podczas łączenia się z aparatem"
-#: ../src/MainWindow.cs:1723
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Podczas łączenia się z aparatem otrzymano błąd \"{0}\""
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:2062
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
@@ -1136,19 +2470,19 @@ msgstr[0] "Połączyć {0} zaznaczoną etykietę?"
msgstr[1] "Połączyć {0} zaznaczone etykiety?"
msgstr[2] "Połączyć {0} zaznaczonych etykiet?"
-#: ../src/MainWindow.cs:2089
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
msgstr ""
-"Ta operacja spowoduje połączenie zaznaczonych etykiet i wszelkich podetykiet "
-"w jedną etykietę."
+"Te działanie spowoduje połączenie zaznaczonych etykiet i wszelkich "
+"podetykiet w jedną etykietę."
-#: ../src/MainWindow.cs:2091
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Połącz etykiety"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
@@ -1156,7 +2490,7 @@ msgstr[0] "{0} zdjęcie z {1}"
msgstr[1] "{0} zdjęcia z {1}"
msgstr[2] "{0} zdjęć z {1}"
-#: ../src/MainWindow.cs:2298 ../src/SingleView.cs:494
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
@@ -1164,7 +2498,7 @@ msgstr[0] "{0} zdjęcie"
msgstr[1] "{0} zdjęcia"
msgstr[2] "{0} zdjęć"
-#: ../src/MainWindow.cs:2301
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
@@ -1172,25 +2506,25 @@ msgstr[0] "({0} zaznaczone)"
msgstr[1] "({0} zaznaczone)"
msgstr[2] "({0} zaznaczonych)"
-#: ../src/MainWindow.cs:2382
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Ok"
-#: ../src/MainWindow.cs:2383
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Błąd podczas usuwania zdjęcia"
-#: ../src/MainWindow.cs:2388
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Brak uprawnień do usunięcia pliku:{1}{0}"
-#: ../src/MainWindow.cs:2392
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Wystąpił błąd {0} podczas usuwania pliku:{2}{1}"
-#: ../src/MainWindow.cs:2424
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
@@ -1198,7 +2532,7 @@ msgstr[0] "Całkowicie usunąć zaznaczone zdjęcie?"
msgstr[1] "Całkowicie usunąć {0} zaznaczone zdjęcia?"
msgstr[2] "Całkowicie usunąć {0} zaznaczonych zdjęć?"
-#: ../src/MainWindow.cs:2428
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
@@ -1206,14 +2540,14 @@ msgstr[0] "Usuwa wszelkie wersje zaznaczonego zdjęcia z dysku."
msgstr[1] "Usuwa wszelkie wersje zaznaczonych zdjęć z dysku."
msgstr[2] "Usuwa wszelkie wersje zaznaczonych zdjęć z dysku."
-#: ../src/MainWindow.cs:2431
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Usuń zdjęcie"
msgstr[1] "_Usuń zdjęcia"
msgstr[2] "_Usuń zdjęcia"
-#: ../src/MainWindow.cs:2467
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
@@ -1221,7 +2555,7 @@ msgstr[0] "Usunąć zaznaczone zdjęcie z programu F-Spot?"
msgstr[1] "Usunąć {0} zaznaczone zdjęcie z programu F-Spot?"
msgstr[2] "Usunąć {0} zaznaczonych zdjęć z programu F-Spot?"
-#: ../src/MainWindow.cs:2472
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -1231,28 +2565,28 @@ msgstr ""
"etykietach. Zdjęcia pozostaną na komputerze i będzie można je ponownie "
"zaimportować do programu F-Spot."
-#: ../src/MainWindow.cs:2473
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Usuń z katalogu"
-#: ../src/MainWindow.cs:2536
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Usunąć etykietę \"{0}\"?"
-#: ../src/MainWindow.cs:2538
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Usunąć {0} zaznaczonych etykiet?"
-#: ../src/MainWindow.cs:2543
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "zdjęcie"
msgstr[1] "zdjęcia"
msgstr[2] "zdjęć"
-#: ../src/MainWindow.cs:2545
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -1261,7 +2595,7 @@ msgstr[0] "Po usunięciu tej etykiety powiązanie z {0} {1} zostanie utracone."
msgstr[1] "Po usunięciu tych etykiet powiązanie z {0} {1} zostanie utracone."
msgstr[2] "Po usunięciu tych etykiet powiązanie z {0} {1} zostanie utracone."
-#: ../src/MainWindow.cs:2550
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Usuń etykietę"
@@ -1269,11 +2603,11 @@ msgstr[1] "_Usuń etykiety"
msgstr[2] "_Usuń etykiety"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2564
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Etykieta nie jest pusta"
-#: ../src/MainWindow.cs:2565
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -1282,21 +2616,21 @@ msgstr ""
"Nie można usunąć etykiet mających podetykiety. Należy najpierw usunąć "
"etykiety pod \"{0}\""
-#: ../src/MainWindow.cs:3008
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Obróć wybrane zdjęcie w lewo"
msgstr[1] "Obróć wybrane zdjęcia w lewo"
msgstr[2] "Obróć wybrane zdjęcia w lewo"
-#: ../src/MainWindow.cs:3021
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Obróć wybrane zdjęcie w prawo"
msgstr[1] "Obróć wybrane zdjęcia w prawo"
msgstr[2] "Obróć wybrane zdjęcia w prawo"
-#: ../src/MainWindow.cs:3029
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
@@ -1304,7 +2638,7 @@ msgstr[0] "Znajdź _zaznaczoną etykietę"
msgstr[1] "Znajdź _zaznaczone etykiety"
msgstr[2] "Znajdź _zaznaczone etykiety"
-#: ../src/MainWindow.cs:3033
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
@@ -1312,14 +2646,14 @@ msgstr[0] "Znajdź zaznaczoną etykietę z_a pomocą"
msgstr[1] "Znajdź zaznaczone etykiety z_a pomocą"
msgstr[2] "Znajdź zaznaczone etykiety z_a pomocą"
-#: ../src/MainWindow.cs:3071
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Utworzyć nową wersję?"
msgstr[1] "Utworzyć nowe wersje?"
msgstr[2] "Utworzyć nowe wersje?"
-#: ../src/MainWindow.cs:3073
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -1337,107 +2671,117 @@ msgstr[2] ""
"Czy przed uruchomieniem programu {1} F-Spot ma utworzyć nowe wersje "
"zaznaczonych zdjęć, by zachować wersje pierwotne?"
-#: ../src/MetadataStore.cs:18
+#: ../src/MainWindow.cs:2882
+msgid "XCF version"
+msgstr "Wersja XCF"
+
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "Twórca"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "Tytuł"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "Prawa autorskie"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "Temat i słowa kluczowe"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "Kompresja"
-#: ../src/MetadataStore.cs:24
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
-msgstr "Konfigruacja planarna"
+msgstr "Konfiguracja planarna"
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Ułożenie"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Interpolacja fotometryczna"
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Jednostka rozdzielczości"
-#: ../src/MetadataStore.cs:32
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Program ekspozycji"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Tryb mierzenia"
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Tryb ekspozycji"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Własne renderowanie"
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
-msgstr "Konfiguracja komponentów"
+msgstr "Konfiguracja składników"
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Źródło światła"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Metoda czujnika"
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Przestrzeń kolorów"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Balans bieli"
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Jednostka rozdzielczości ogniskowej"
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Typ źródła pliku"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Typ ujęcia"
-#: ../src/MetadataStore.cs:56
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Sterowanie wzmocnieniem"
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Nasycenie"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Ostrość"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Typ sceny"
@@ -1465,7 +2809,7 @@ msgstr "Nowa nazwa:"
#: ../src/PhotoVersionCommands.cs:110
msgid "Could not create a new version"
-msgstr "Nie udało się utworzyć nowej wersji"
+msgstr "Nie można utworzyć nowej wersji"
#: ../src/PhotoVersionCommands.cs:111
#, csharp-format
@@ -1491,7 +2835,7 @@ msgstr "Na pewno usunąć wersję \"{0}\"?"
#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
-msgstr "Nie udało się usunąć wersji"
+msgstr "Nie można usunąć wersji"
#: ../src/PhotoVersionCommands.cs:155
#, csharp-format
@@ -1500,92 +2844,99 @@ msgstr "Otrzymano wyjątek \"{0}\". Nie można usunąć wersji \"{1}\""
#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
-msgstr "Nie udało się zmienić nazwy wersji"
+msgstr "Nie można zmienić nazwy wersji"
#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Otrzymano wyjątek \"{0}\". Nie można zmienić nazwy wersji na \"{1}\""
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:549
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(brak modyfikacji)"
-#: ../src/PhotoView.cs:163 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Błąd podczas edycji zdjęcia"
-#: ../src/PhotoView.cs:301
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "Otrzymano wyjątek \"{0}\". Nie można zapisać zdjęcia {1}"
+
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Komentarz:"
-#: ../src/Preferences.cs:147
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Zdjęcia"
-#: ../src/PrintOperation.cs:31
+#: ../src/PrintOperation.cs:32
msgid "Image Settings"
msgstr "Ustawienia obrazu"
-#: ../src/QueryWidget.cs:47
+#: ../src/QueryWidget.cs:58
msgid "Find: "
msgstr "Znajdź: "
-#: ../src/QueryWidget.cs:52
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "Zdjęcia bez etykiet"
-#: ../src/QueryWidget.cs:60
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "Zdjęcia ocenione"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:69
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
msgstr "Zaimportowana rolka"
-#: ../src/QueryWidget.cs:89
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "Wyczyść zaznaczenie"
-#: ../src/QueryWidget.cs:96
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "Odśwież wyszukiwanie"
-#: ../src/QueryWidget.cs:98
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
-msgstr "Nie znaleziono zdjęć pasujących do zapytania"
+msgstr "Nie odnaleziono zdjęć pasujących do zapytania"
-#: ../src/QueryWidget.cs:136
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "Ukryj pasek _wyszukiwania"
-#: ../src/QueryWidget.cs:142
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "Wyświetl pasek _wyszukiwania"
-#: ../src/RotateCommand.cs:94 ../src/RotateCommand.cs:109
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
msgid "Unable to rotate this type of photo"
msgstr "Nie można obrócić tego typu zdjęcia"
-#: ../src/RotateCommand.cs:129
+#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
msgstr "Nie można obrócić pliku tylko do odczytu"
-#: ../src/RotateCommand.cs:196
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
msgstr "Obracanie zdjęć"
-#: ../src/RotateCommand.cs:207
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
msgstr "Obracanie zdjęcia \"{0}\""
-#: ../src/RotateCommand.cs:220
+#: ../src/RotateCommand.cs:222
msgid "Directory not found"
msgstr "Katalog nie został odnaleziony"
-#: ../src/RotateCommand.cs:240
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
@@ -1593,7 +2944,7 @@ msgstr[0] "Nie można obrócić zdjęcia"
msgstr[1] "Nie można obrócić {0} zdjęć"
msgstr[2] "Nie można obrócić {0} zdjęć"
-#: ../src/RotateCommand.cs:242
+#: ../src/RotateCommand.cs:244
#, csharp-format
msgid ""
"The photo could not be rotated because it is on a read only file system or "
@@ -1614,121 +2965,91 @@ msgstr[2] ""
"tylko do odczytu, takim jak CD-ROM. Proszę sprawdzić uprawnienia i spróbować "
"ponownie."
-#: ../src/RotateCommand.cs:269
+#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
msgstr "Otrzymano błąd \"{0}\" podczas próby obrócenia {1}"
-#: ../src/RotateCommand.cs:274
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
msgstr "Błąd podczas obracania zdjęcia."
-#: ../src/SendEmail.cs:239
+#: ../src/SendEmail.cs:240
msgid "Preparing email"
msgstr "Przygotowywanie wiadomości"
-#: ../src/SendEmail.cs:291
+#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
msgstr "Eksportowanie zdjęcia \"{0}\""
-#: ../src/SendEmail.cs:313
+#: ../src/SendEmail.cs:314
msgid "Error processing image"
msgstr "Błąd podczas przetwarzania obrazu"
-#: ../src/SendEmail.cs:314
+#: ../src/SendEmail.cs:315
#, csharp-format
msgid "An error occured while processing \"{0}\": {1}"
msgstr "Wystąpił błąd podczas przetwarzania \"{0}\": {1}"
#. Send the mail :)
-#: ../src/SendEmail.cs:329
-msgid "my photos"
-msgstr "moje zdjęcia"
+#: ../src/SendEmail.cs:330
+msgid "My Photos"
+msgstr "Moje zdjęcia"
-#: ../src/SingleView.cs:88
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Błąd podczas zapisu wyostrzonego zdjęcia"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Wyostrz"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Stopień:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Promień:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Próg:"
+
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Obróć zdjęcie w lewo"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Obróć zdjęcie w prawo"
-#. Obsolete, remove after db rev4
-#: ../src/SingleView.cs:128 ../src/UI.Dialog/ui/PreferenceDialog.glade.h:14
-#: ../src/Widgets/MetadataDisplay.cs:221 ../src/Widgets/MetadataDisplay.cs:223
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Katalog"
-#: ../src/SingleView.cs:354
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Otwórz"
-#: ../src/SingleView.cs:454
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Ustaw jako tapetę"
-#: ../src/TagCommands.cs:91 ../src/TagCommands.cs:219
-#: ../src/TagSelectionWidget.cs:512
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "Ta nazwa jest już używana"
-#: ../src/TagCommands.cs:138
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "Utwórz nową etykietę"
-#: ../src/TagCommands.cs:139
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "Nazwa nowej etykiety:"
-#: ../src/TagCommands.cs:285
-msgid "Edit Tag"
-msgstr "Edytuj etykietę"
-
-#: ../src/TagCommands.cs:286
-msgid "Tag Name:"
-msgstr "Nazwa etykiety:"
-
-#: ../src/TagCommands.cs:402
-msgid "Unable to load image"
-msgstr "Nie można wczytać obrazu"
-
-#: ../src/TagCommands.cs:403
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "Nie można wczytać \"{0}\" jako ikony dla etykiety"
-
-#: ../src/TagCommands.cs:447
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "Zdjęcie {0} z {1}"
-
-#: ../src/TagCommands.cs:477
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "Edytuj ikonę dla etykiety {0}"
-
-#: ../src/TagCommands.cs:493
-msgid "Select Photo from file"
-msgstr "Wybór zdjęcia z pliku"
-
-#: ../src/TagCommands.cs:516
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-"\n"
-"<b>Ze zdjęcia</b>\n"
-"Można użyć jednego ze zdjęć z biblioteki jako ikony dla tej etykiety.\n"
-" Jednakże najpierw co najmniej jedno zdjęcie musi być powiązane\n"
-" z tą etykietą. Proszę oznaczyć zdjęcie etykietą \"{0}\" i wrócić tutaj,\n"
-" aby użyć go jako ikony."
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
@@ -1742,8 +3063,8 @@ msgid "Create New Tag..."
msgstr "Utwórz nową etykietę..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Edytuj zaznaczoną etykietę..."
+msgid "Edit Tag..."
+msgstr "Zmodyfikuj etykietę..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -1770,22 +3091,21 @@ msgstr[2] "Usuń etykiety z zaznaczenia"
msgid "Merge Tags"
msgstr "Połącz etykiety"
-#: ../src/TagQueryWidget.cs:32
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr "Dołączenie zdjęć z etykietą \"{0}\""
-# nieznany kontekst
-#: ../src/TagQueryWidget.cs:37
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr "Wykluczenie zdjęć z etykietą \"{0}\""
-#: ../src/TagQueryWidget.cs:42
+#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
msgstr "Usuń z wyszukiwania"
-#: ../src/TagQueryWidget.cs:86
+#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
@@ -1793,45 +3113,45 @@ msgstr[0] "Z_najdź za pomocą"
msgstr[1] "Z_najdź za pomocą"
msgstr[2] "Z_najdź za pomocą"
-#: ../src/TagQueryWidget.cs:112
+#: ../src/TagQueryWidget.cs:114
msgid "All"
msgstr "Wszystko"
-#: ../src/TagQueryWidget.cs:147 ../src/Term.cs:592
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "Nie {0}"
-#: ../src/TagQueryWidget.cs:277
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr "Należy przeciągnąć etykiety tutaj, aby rozpocząć wyszukiwanie"
-#: ../src/TagSelectionWidget.cs:511
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
-msgstr "Błąd przy zmianie nazwy etykiety"
+msgstr "Błąd podczas zmieniania nazwy etykiety"
-#: ../src/TagStore.cs:198
+#: ../src/TagStore.cs:203
msgid "Favorites"
msgstr "Ulubione"
-#: ../src/TagStore.cs:203
+#: ../src/TagStore.cs:208
msgid "Hidden"
-msgstr "Ukryty"
+msgstr "Ukryte"
-#: ../src/TagStore.cs:211
+#: ../src/TagStore.cs:216
msgid "People"
-msgstr "Ludzie"
+msgstr "Osoby"
-#: ../src/TagStore.cs:216
+#: ../src/TagStore.cs:221
msgid "Places"
msgstr "Miejsca"
-#: ../src/TagStore.cs:221
+#: ../src/TagStore.cs:226
msgid "Events"
msgstr "Zdarzenia"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:234 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(brak)"
@@ -1850,31 +3170,118 @@ msgstr " lub "
#. OPS The operators we support, case insensitive
#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:380 ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:220
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "lub"
-#: ../src/UI.Dialog/AboutDialog.cs:70
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Aktualizowanie miniaturek"
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "Aktualizowanie zdjęcia \"{0}\""
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Zarządzanie zdjęciami dla środowiska GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:71
-msgid "Copyright © 2003-2008 Novell Inc."
-msgstr "Copyright © 2003-2008 Novell Inc."
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:94
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
-msgstr "Aviary.pl <team at aviary.pl>, 2006 - 2009"
+msgstr "Aviary.pl <gnomepl at aviary.pl>, 2006, 2007, 2008, 2009, 2010"
-#: ../src/UI.Dialog/AboutDialog.cs:99
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "Witryna programu F-Spot"
-#: ../src/UI.Dialog/AdjustTimeDialog.cs:118 ../src/f-spot.glade.h:120
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
msgid "Shift all photos by {0}"
msgstr "Przesuń wszystkie zdjęcia o {0}"
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "Dzisiaj"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "Wczoraj"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "Ostatnie 7 dni"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "Ostatnie 30 dni"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "Ostatnie 90 dni"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "Ostatnie 360 dni"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "Aktualny tydzień (Pon-Nie)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "Poprzedni tydzień (Pon-Nie)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "Zakres użytkownika"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Edytuj ikonę dla etykiety {0}"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "Wybór zdjęcia z pliku"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>Ze zdjęcia</b>\n"
+"Można użyć jednego ze zdjęć z biblioteki jako ikony dla tej etykiety.\n"
+" Jednakże najpierw co najmniej jedno zdjęcie musi być powiązane\n"
+" z tą etykietą. Proszę oznaczyć zdjęcie etykietą \"{0}\" i wrócić tutaj,\n"
+" aby użyć go jako ikony."
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Nie można wczytać obrazu"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "Nie można wczytać \"{0}\" jako ikony dla etykiety"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "Zdjęcie {0} z {1}"
+
#: ../src/UI.Dialog/ExceptionDialog.cs:24
msgid "F-Spot Encountered a Fatal Error"
msgstr "Program F-Spot napotkał krytyczny błąd"
@@ -1887,9 +3294,22 @@ msgstr "Szczegóły błędu"
msgid "An unhandled exception was thrown: "
msgstr "Wystąpił nieobsłużony wyjątek:"
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "Brak"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "Profil systemowy"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "Standardowy motyw"
+
#: ../src/UI.Dialog/RepairDbDialog.cs:20
msgid "Error loading database."
-msgstr "Błąd podczas ładowania bazy danych."
+msgstr "Błąd podczas wczytywania bazy danych."
#: ../src/UI.Dialog/RepairDbDialog.cs:21
#, csharp-format
@@ -1908,2761 +3328,692 @@ msgstr "Etykieta"
msgid "Ratio"
msgstr "Proporcje"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Ponów"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:1
-msgid "<b>Color Management</b>"
-msgstr "<b>Zarządzanie kolorami</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:2
-msgid "<b>Import Settings</b>"
-msgstr "<b>Ustawienia importu</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:3
-msgid "<b>Metadata</b>"
-msgstr "<b>Metadane</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:4
-msgid "<b>Screensaver</b>"
-msgstr "<b>Wygaszacz ekranu</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:5
-msgid "<b>Theming</b>"
-msgstr "<b>Temat</b>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:6
-msgid ""
-"<small><i>Choose the folder where F-Spot should store newly imported photos</"
-"i></small>"
-msgstr ""
-"<small><i>Katalog, w którym program F-Spot powinien przechowywać świeżo "
-"zaimportowane zdjęcia</i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:7
-msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr ""
-"<small><i>Opcja ta pozwala na przechowywanie etykiet i opisów\n"
-" wewnątrz obsługiwanych formatów obrazów.</i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:9
-msgid ""
-"<small><i>While acting as a screensaver, F-Spot can display all of your "
-"images, or a small subset based on tags.</i></small>"
-msgstr ""
-"<small><i>Podczas działania jako wygaszacz ekranu program F-Spot może "
-"wyświetlić wszystkie obrazy lub mały podzbiór oparty na etykietach.</i></"
-"small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:10
-msgid ""
-"<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
-msgstr ""
-"<small><i>Aby wczytać nowy motyw należy uruchomić program F-Spot ponownie.</"
-"i></small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:12
-msgid "Custom Theme"
-msgstr "Własny motyw"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:15
-msgid "From List:"
-msgstr "Z listy:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:16
-msgid "From gtkrc File:"
-msgstr "Z pliku gtkrc:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:17
-msgid "Images tagged with:"
-msgstr "Obrazy z etykietą:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:18
-msgid "Make F-Spot your screensaver"
-msgstr "Ustaw F-Spot jako wygaszacz ekranu"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:19 ../src/f-spot.glade.h:102
-msgid "Preferences"
-msgstr "Preferencje"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:20
-msgid "Select A Folder"
-msgstr "Wybór katalogu"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:21
-msgid "Select A gtkrc File"
-msgstr "Wybór pliku gtkrc"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:22
-msgid "System Theme"
-msgstr "Motyw systemowy"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:23
-msgid "Try to use the system display profile"
-msgstr "Próba użycia systemowego profilu wyświetlania"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:24
-msgid "Write _metadata to file"
-msgstr "Zapisz _metadane do pliku"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:25
-msgid "_Display:"
-msgstr "_Ekran:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:26
-msgid "_Print output:"
-msgstr "_Wyjście:"
-
-#: ../src/Updater.cs:528
-msgid "Updating F-Spot Database"
-msgstr "Aktualizowanie bazy danych programu F-Spot"
-
-#: ../src/Updater.cs:529
-msgid ""
-"Please wait while your F-Spot gallery's database is updated. This may take "
-"some time."
-msgstr ""
-"Proszę czekać, trwa aktualizacja bazy danych programu F-Spot. Może to chwilę "
-"potrwać."
-
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:35
-msgid "Unable to create temporary file"
-msgstr "Nie udało się utworzyć pliku tymczasowego"
-
-#: ../src/Utils/GnomeUtil.cs:49
-msgid ""
-"The \"F-Spot Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Nie można znaleźć \"Podręcznika F-Spot\". Proszę sprawdzić kompletność "
-"instalacji programu."
-
-#: ../src/Widgets/CustomPrintWidget.cs:98
-msgid "Page Setup"
-msgstr "Ustawienia strony"
-
-#: ../src/Widgets/CustomPrintWidget.cs:102
-#: ../src/Widgets/CustomPrintWidget.cs:106
-#: ../src/Widgets/CustomPrintWidget.cs:112
-#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr "Rozmiar papieru: {0} x {1} mm"
-
-#: ../src/Widgets/CustomPrintWidget.cs:124
-msgid "Photos per page"
-msgstr "Zdjęć na stronę"
-
-#. ppp1.Toggled += TriggerChanged;
-#. ppp2.Toggled += TriggerChanged;
-#. ppp4.Toggled += TriggerChanged;
-#. ppp9.Toggled += TriggerChanged;
-#: ../src/Widgets/CustomPrintWidget.cs:136
-msgid "Repeat"
-msgstr "Powtórz"
-
-#: ../src/Widgets/CustomPrintWidget.cs:137
-msgid "Print cut marks"
-msgstr "Drukowanie znaczników cięcia"
-
-#: ../src/Widgets/CustomPrintWidget.cs:145
-msgid "Full Page (no margin)"
-msgstr "Cała strona (bez marginesów)"
-
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Widgets/CustomPrintWidget.cs:149
-msgid "Zoom"
-msgstr "Powiększenie"
-
-#: ../src/Widgets/CustomPrintWidget.cs:150
-msgid "Fill"
-msgstr "Wypełnij"
-
-#: ../src/Widgets/CustomPrintWidget.cs:151
-msgid "Scaled"
-msgstr "Przeskalowany"
-
-#: ../src/Widgets/CustomPrintWidget.cs:157
-msgid "White borders"
-msgstr "Białe krawędzie"
-
-#: ../src/Widgets/CustomPrintWidget.cs:161
-msgid "Custom Text: "
-msgstr "Własny tekst: "
-
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:71
-msgid "Edit"
-msgstr "Edycja"
-
-#: ../src/Widgets/EditorPage.cs:201
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:46
-msgid "No selection available"
-msgstr "Brak zaznaczenia"
-
-#: ../src/Widgets/EditorPage.cs:202
-msgid ""
-"This tool requires an active selection. Please select a region of the photo "
-"and try the operation again"
-msgstr ""
-"Narzędzie wymaga aktywnego zaznaczenia. Proszę zaznaczyć fragment zdjęcia i "
-"spróbować ponownie"
-
-#: ../src/Widgets/EditorPage.cs:220
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] "Błąd przy zapisie dostosowanego zdjęcia"
-msgstr[1] "Błąd przy zapisie dostosowanych zdjęć"
-msgstr[2] "Błąd przy zapisie dostosowanych zdjęć"
-
-#: ../src/Widgets/EditorPage.cs:222
-#, csharp-format
-msgid ""
-"Received exception \"{0}\". Note that you have to develop RAW files into "
-"JPEG before you can edit them."
-msgstr ""
-"Otrzymano wyjątek \"{0}\". Uwaga: należy wywołać pliki RAW do formatu JPEG "
-"przed ich edycją."
-
-#: ../src/Widgets/FindBar.cs:58
-msgid "Find:"
-msgstr "Znajdź:"
-
-#: ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:212
-msgid "and"
-msgstr "i"
-
-#: ../src/Widgets/InfoBox.cs:182
-msgid "Histogram"
-msgstr "Histogram"
-
-#: ../src/Widgets/InfoBox.cs:217
-msgid "Date"
-msgstr "Data"
-
-#: ../src/Widgets/InfoBox.cs:220
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:5
-msgid "Size"
-msgstr "Rozmiar"
-
-#: ../src/Widgets/InfoBox.cs:223
-msgid "Exposure"
-msgstr "Ekspozycja"
-
-#: ../src/Widgets/InfoBox.cs:227
-msgid "Focal Length"
-msgstr "Długość ogniskowej"
-
-#: ../src/Widgets/InfoBox.cs:233
-msgid "File Size"
-msgstr "Rozmiar pliku"
-
-#: ../src/Widgets/InfoBox.cs:236
-msgid "Rating"
-msgstr "Ocena"
-
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(nieznany)"
-
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr "(nieprawidłowy format)"
-
-#: ../src/Widgets/InfoBox.cs:558
-msgid "(File read error)"
-msgstr "(Błąd podczas odczytu pliku)"
-
-#: ../src/Widgets/InfoBox.cs:603
-#, csharp-format
-msgid "{0} Photos"
-msgstr "{0} zdjęcia"
-
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:623
-#, csharp-format
-msgid ""
-"On {0} between \n"
-"{1} and {2}"
-msgstr ""
-"Dnia {0} między \n"
-"{1} a {2}"
-
-#: ../src/Widgets/InfoBox.cs:628
-#, csharp-format
-msgid ""
-"Between {0} \n"
-"and {1}"
-msgstr ""
-"Pomiędzy {0}\n"
-"i {1}"
-
-#: ../src/Widgets/InfoBox.cs:655
-msgid "(At least one File not found)"
-msgstr "(Co najmniej jeden plik nie został odnaleziony)"
-
-#: ../src/Widgets/InfoBox.cs:772
-msgid "Show Photo Name"
-msgstr "Nazwa zdjęcia"
-
-#: ../src/Widgets/InfoBox.cs:781
-msgid "Show Date"
-msgstr "Data"
-
-#: ../src/Widgets/InfoBox.cs:790
-msgid "Show Size"
-msgstr "Style"
-
-#: ../src/Widgets/InfoBox.cs:799
-msgid "Show Exposure"
-msgstr "Ekspozycja"
-
-#: ../src/Widgets/InfoBox.cs:808
-msgid "Show Focal Length"
-msgstr "Wyświetlanie długości ogniskowej"
-
-#: ../src/Widgets/InfoBox.cs:817
-msgid "Show Camera"
-msgstr "Aparat"
-
-#: ../src/Widgets/InfoBox.cs:826
-msgid "Show File Size"
-msgstr "Wyświetlanie rozmiaru pliku"
-
-#: ../src/Widgets/MetadataDisplay.cs:23
-msgid "Metadata"
-msgstr "Metadane"
-
-#: ../src/Widgets/MetadataDisplay.cs:104
-msgid "Extended Metadata"
-msgstr "Rozszerzone metadane"
-
-#: ../src/Widgets/MetadataDisplay.cs:225
-msgid "Picasaweb"
-msgstr "Picasaweb"
-
-#: ../src/Widgets/MetadataDisplay.cs:227
-msgid "SmugMug"
-msgstr "SmugMug"
-
-#: ../src/Widgets/MetadataDisplay.cs:229
-msgid "Gallery2"
-msgstr "Gallery2"
-
-#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:389
-msgid "No Extended Metadata Available"
-msgstr "Brak rozszerzonych metadanych"
-
-#: ../src/Widgets/MetadataDisplay.cs:407
-msgid "No active photo"
-msgstr "Brak aktywnych zdjęć"
-
-#: ../src/Widgets/MetadataDisplay.cs:409
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "Zdjęcie \"{0}\" nie istnieje"
-
-#: ../src/Widgets/MetadataDisplay.cs:412
-msgid "No metadata available"
-msgstr "Brak metadanych"
-
-#: ../src/Widgets/OpenWithMenu.cs:69
-msgid "No applications available"
-msgstr "Brak dostępnych programów"
-
-#: ../src/Widgets/RatingMenuItem.cs:56
-msgid "Rating:"
-msgstr "Ocena:"
-
-#: ../src/XmpTagsImporter.cs:89
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:6
-msgid "Location"
-msgstr "Położenie"
-
-#: ../src/XmpTagsImporter.cs:90
-msgid "Country"
-msgstr "Kraj"
-
-#: ../src/XmpTagsImporter.cs:91
-msgid "City"
-msgstr "Miasto"
-
-#: ../src/XmpTagsImporter.cs:92
-msgid "State"
-msgstr "Stan"
-
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/f-spot.glade.h:2
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
msgid "0000:00:00 00:00:00"
msgstr "0000:00:00 00:00:00"
-#: ../src/f-spot.glade.h:3
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
msgid "00:00:00"
msgstr "00:00:00"
-#: ../src/f-spot.glade.h:4
-msgid "1 of 1"
-msgstr "1 z 1"
-
-#: ../src/f-spot.glade.h:5
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/f-spot.glade.h:6
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/f-spot.glade.h:7
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/f-spot.glade.h:8
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
msgid "5"
msgstr "5"
-#: ../src/f-spot.glade.h:9
-msgid "640 px"
-msgstr "640 px"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Czynność</b>"
-#: ../src/f-spot.glade.h:10
-msgid "800 px"
-msgstr "800 px"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Zdjęcie odniesienia</b>"
-#: ../src/f-spot.glade.h:11
-msgid "<b></b>"
-msgstr "<b></b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Dostosowanie czasu"
-#: ../src/f-spot.glade.h:12
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>Konto</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Dostosowana data: "
-#: ../src/f-spot.glade.h:13
-msgid "<b>Action</b>"
-msgstr "<b>Akcja</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Obecna data:"
-#: ../src/f-spot.glade.h:14
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>Album</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Rozstaw wszystkie zdjęcia o"
-#: ../src/f-spot.glade.h:15
-msgid "<b>Co_rrections</b>"
-msgstr "<b>Ko_rekty</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "różnica:"
-#: ../src/f-spot.glade.h:16
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>Miejsce docelowe:</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "minimum, zaczynając od {0}"
-#: ../src/f-spot.glade.h:17
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
msgid "<b>End Date</b>"
msgstr "<b>Data końcowa</b>"
-#: ../src/f-spot.glade.h:18
-msgid "<b>From External Photo</b>"
-msgstr "<b>Z zewnętrznego zdjęcia</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Wybór okresu</b>"
-#: ../src/f-spot.glade.h:19
-msgid "<b>From Photo</b>"
-msgstr "<b>Ze zdjęcia</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Data początkowa</b>"
-#: ../src/f-spot.glade.h:20
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>Galeria</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Anulowanie bez zmiany obecnej osi czasu. "
-#: ../src/f-spot.glade.h:21
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>Interpolacja obrazu</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Wyświetlone zostaną wyłącznie zdjęcia zrobione w tych dniach."
-#: ../src/f-spot.glade.h:22
-msgid "<b>Max Rating</b>"
-msgstr "<b>Maksymalna ocena</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Ustaw zakres dat"
-#: ../src/f-spot.glade.h:23
-msgid "<b>Min Rating</b>"
-msgstr "<b>Minimalna ocena</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#: ../src/f-spot.glade.h:24
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
-msgid "<b>Photos</b>"
-msgstr "<b>Zdjęcia</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Zmodyfikuj etykietę"
-#: ../src/f-spot.glade.h:25
-msgid "<b>Predefined</b>"
-msgstr "<b>Predefiniowany</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Zmodyfikuj ikonę"
-#: ../src/f-spot.glade.h:26
-msgid "<b>Preview</b>"
-msgstr "<b>Podgląd</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Ikona:"
-#: ../src/f-spot.glade.h:27
-msgid "<b>Reference Photo</b>"
-msgstr "<b>Zdjęcie odniesienia</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Z zewnętrznego zdjęcia</b>"
-#: ../src/f-spot.glade.h:28
-msgid "<b>Select period</b>"
-msgstr "<b>Wybór okresu</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Ze zdjęcia</b>"
-#: ../src/f-spot.glade.h:29
-msgid "<b>Size</b>"
-msgstr "<b>Rozmiar</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Predefiniowane ikony</b>"
-#: ../src/f-spot.glade.h:30
-msgid "<b>Start Date</b>"
-msgstr "<b>Data początkowa</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Podgląd</b>"
-#: ../src/f-spot.glade.h:31
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>Styl</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Projekt ikony z"
-#: ../src/f-spot.glade.h:32
-msgid "<b>Summary</b>"
-msgstr "<b>Podsumowanie</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Zmodyfikuj ikonę etykiety"
-#: ../src/f-spot.glade.h:33
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>Części przezroczyste</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Bez _obrazu"
-#: ../src/f-spot.glade.h:34
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>Wyświetlenie wszystkich zaimportowanych zdjęć</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "Zdjęcie 0 z 0"
-#: ../src/f-spot.glade.h:35
-msgid "<b>_White Balance</b>"
-msgstr "<b>Balans bieli</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Profil kolorów dla ekranu:"
-#: ../src/f-spot.glade.h:36
-msgid "<small></small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Profil kolorów do drukowania:"
-#: ../src/f-spot.glade.h:37
-msgid ""
-"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
-"disable this for viewing photos, but disabling the interpolation could be "
-"usefull in icon design.</i></small>"
-msgstr ""
-"<small><i>Opcja ta włącza interpolację powiększonych obrazów. Nie należy jej "
-"wyłączać przy wyświetlaniu zdjęć, ale wyłączenie interpolacji może być "
-"przydatne przy projektowaniu ikon.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "Preferencje programu F-Spot"
-#: ../src/f-spot.glade.h:38
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "Wygląd programu F-Spot:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
-"<small><i>You can choose how to display transparent parts in images. This "
-"option has no effect on photos, but setting this as check pattern or custom "
-"color could be usefull when viewing icons or other artworks with transparent "
-"parts.</i></small>"
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
-"<small><i>Można określić, w jaki sposób mają być wyświetlane przezroczyste "
-"fragmenty obrazka. Opcja ta nie ma zastosowania przy zdjęciach, ale "
-"ustawienie jej jako szachownica lub wybrany kolor może być przydatne przy "
-"przeglądaniu ikon lub innych obrazów z przezroczystymi fragmentami.</i></"
-"small>"
-
-#: ../src/f-spot.glade.h:39
-msgid "Adjust Time"
-msgstr "Dostosowanie czasu"
+"Wewnątrz plików obrazów, kiedy to możliwe\n"
+"<small>Będą dostępne w innych programach do obróbki grafiki.</small>"
-#: ../src/f-spot.glade.h:40
-msgid "Adjust _Time..."
-msgstr "Dostosuj _czas..."
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Wybór katalogu"
-#: ../src/f-spot.glade.h:41
-msgid "Adjusted date: "
-msgstr "Dostosowana data: "
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "Oddzielnie od plików obrazów"
-#: ../src/f-spot.glade.h:42
-msgid "Arrange _by"
-msgstr "Ułóż _wg"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Przechowywanie znaczników i opisów zdjęć:"
-#: ../src/f-spot.glade.h:43
-msgid "As _background"
-msgstr "J_ako tło"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "Podczas importowania zdjęć, kopiowanie ich do:"
-#: ../src/f-spot.glade.h:44
-msgid "As _custom color: "
-msgstr "Jak_o własny kolor: "
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>Maksymalna ocena</b>"
-#: ../src/f-spot.glade.h:45
-msgid "As check _pattern"
-msgstr "Jako _szachownica"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>Minimalna ocena</b>"
-#: ../src/f-spot.glade.h:46
-msgid "Attach Tags:"
-msgstr "Dołączenie etykiet:"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Ustaw filtr oceny"
-#: ../src/f-spot.glade.h:47
-msgid "Attach tag:"
-msgstr "Dołącz etykietę:"
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "Dostosuj _czas..."
-#: ../src/f-spot.glade.h:48
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "Autoobracanie"
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "Ułóż _według"
-#: ../src/f-spot.glade.h:50
+#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
-msgstr "Wg _daty"
+msgstr "Według _daty"
-#: ../src/f-spot.glade.h:51
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
-msgstr "Wg rolki _importowania"
+msgstr "Według rolki _importowania"
-#: ../src/f-spot.glade.h:52
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
-msgstr "Wg _oceny"
+msgstr "Według _oceny"
-#: ../src/f-spot.glade.h:53
-msgid "CD"
-msgstr "CD"
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "Skopiuj"
-#: ../src/f-spot.glade.h:54
-msgid "C_ontrast:"
-msgstr "K_ontrast:"
-
-#: ../src/f-spot.glade.h:55
-msgid "Camera Selection"
-msgstr "Wybór aparatu"
-
-#: ../src/f-spot.glade.h:56
-msgid "Cancel, do not change the current timeline. "
-msgstr "Anulowanie bez zmiany obecnej osi czasu. "
-
-#: ../src/f-spot.glade.h:57
-msgid "Copy Locat_ion"
-msgstr "Skopiuj _położenie"
-
-#: ../src/f-spot.glade.h:58
-msgid "Copy files to the Photos folder"
-msgstr "Kopiowanie plików do katalogu Zdjęcia"
-
-#: ../src/f-spot.glade.h:59
-msgid "Create Mail"
-msgstr "Utwórz wiadomość"
-
-#: ../src/f-spot.glade.h:60
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "Utwórz nową _etykietę..."
-#: ../src/f-spot.glade.h:61
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "Utwórz _nową wersję..."
-#: ../src/f-spot.glade.h:62
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr "Tworzy wiadomość z załączając zaznaczone (i zmniejszone) zdjęcia"
-
-#: ../src/f-spot.glade.h:63
-msgid "Current date:"
-msgstr "Aktualna data:"
-
-#: ../src/f-spot.glade.h:64
-msgid "Detect duplicates"
-msgstr "Wykrycie duplikatów"
-
-#: ../src/f-spot.glade.h:65
-msgid "Display File _Names"
-msgstr "Wyświetl _nazwy plików"
-
-#: ../src/f-spot.glade.h:66
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "Wyświetlanie wyłącznie zdjęć importowanych w określonych rolkach."
-
-#: ../src/f-spot.glade.h:67
-msgid "Do not send a mail"
-msgstr "Nie wysyłaj poczty"
-
-#: ../src/f-spot.glade.h:68
-msgid "E-_Mail:"
-msgstr "E-_Mail:"
-
-#: ../src/f-spot.glade.h:69
-msgid "E_xport titles and comments"
-msgstr "E_ksportuj tytuły i komentarze"
-
-#: ../src/f-spot.glade.h:70
-msgid "Edit Tag Icon"
-msgstr "Modyfikuj ikonę etykiety"
-
-#: ../src/f-spot.glade.h:71
-msgid "Edit icon"
-msgstr "Modyfikuj ikonę"
-
-#: ../src/f-spot.glade.h:72
-msgid "Estimated new size"
-msgstr "Szacowany nowy rozmiar"
-
-#: ../src/f-spot.glade.h:73
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
-msgid "Export"
-msgstr "Eksportuj"
-
-#: ../src/f-spot.glade.h:74
-msgid "Extra large"
-msgstr "Bardzo wielki"
-
-#: ../src/f-spot.glade.h:75
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:76
-msgid "F-Spot View"
-msgstr "Podgląd F-Spot"
-
-#: ../src/f-spot.glade.h:78
-msgid "Filter on selected rolls"
-msgstr "Filtrowanie wybranych rolek"
-
-#: ../src/f-spot.glade.h:79
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "Z_najdź"
-#: ../src/f-spot.glade.h:80
-msgid "G_allery:"
-msgstr "G_aleria:"
-
-#: ../src/f-spot.glade.h:81
-msgid "Gallery"
-msgstr "Galeria"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:84
-msgid "Import Source:"
-msgstr "Źródło importu:"
-
-#: ../src/f-spot.glade.h:85
-msgid "Include subfolders"
-msgstr "Dołączenie podkatalogów"
-
-#: ../src/f-spot.glade.h:86
-msgid "Large"
-msgstr "Wielki"
-
-#: ../src/f-spot.glade.h:87
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
msgstr "Zarządzaj _rozszerzeniami"
-#: ../src/f-spot.glade.h:88
-msgid "Manage your custom selection ratios"
-msgstr "Zarządzanie współczynnikami wyboru użytkownika"
-
-#: ../src/f-spot.glade.h:89
-msgid "Medium"
-msgstr "Średni"
-
-#: ../src/f-spot.glade.h:91
-msgid "No _image"
-msgstr "Bez _obrazu"
-
-#: ../src/f-spot.glade.h:92
-msgid "Number of photos in selected rolls:"
-msgstr "Liczba zdjęć w wybranych rolkach:"
-
-#: ../src/f-spot.glade.h:93
-msgid "Number of pictures"
-msgstr "Liczba obrazów"
-
-#: ../src/f-spot.glade.h:94
-msgid "Only photos taken within these dates will be displayed."
-msgstr "Wyświetlone zostaną wyłącznie zdjęcia zrobione w tych dniach."
-
-#: ../src/f-spot.glade.h:95
-msgid "Open _Folder..."
-msgstr "Otwórz _katalog..."
-
-#: ../src/f-spot.glade.h:97
-msgid "Original size (possible very large file size)"
-msgstr "Pierwotny rozmiar (prawdopodobnie b. duży rozmiar pliku)"
-
-#: ../src/f-spot.glade.h:98
-msgid "P_arent Tag:"
-msgstr "Etykieta _nadrzędna:"
-
-#: ../src/f-spot.glade.h:99
+#: ../src/ui/main_window.ui.h:13
msgid "Page Set_up..."
msgstr "_Ustawienia strony..."
-#: ../src/f-spot.glade.h:100
-msgid "Pause"
-msgstr "Pauza"
-
-#: ../src/f-spot.glade.h:101
-msgid "Photo 0 of 0"
-msgstr "Zdjęcie 0 z 0"
-
-#: ../src/f-spot.glade.h:104
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
msgstr "O_dśwież miniaturkę"
-#: ../src/f-spot.glade.h:106
-msgid "Repair"
-msgstr "Napraw"
-
-#: ../src/f-spot.glade.h:109
-msgid "Select Photos to Copy From Camera..."
-msgstr "Wybór zdjęć do skopiowania z aparatu..."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Z_aznacz wszystko"
-#: ../src/f-spot.glade.h:111
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "_Usuń zaznaczenie"
-#: ../src/f-spot.glade.h:112
-msgid "Select a Tag..."
-msgstr "Wybór etykiety..."
-
-#: ../src/f-spot.glade.h:113
-msgid "Select the camera from which you want to transfer files"
-msgstr "Wybór aparatu, z którego mają zostać przesłane pliki"
-
-#: ../src/f-spot.glade.h:114
-msgid "Selected Camera: "
-msgstr "Wybrany aparat: "
-
-#: ../src/f-spot.glade.h:115
-msgid "Selection Constraints"
-msgstr "Ograniczenia zaznaczenia"
-
-#: ../src/f-spot.glade.h:116
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
msgstr "Wyślij po_cztą..."
-#: ../src/f-spot.glade.h:117
-msgid "Set Rating Filter"
-msgstr "Ustaw filtr oceny"
-
-#: ../src/f-spot.glade.h:118
-msgid "Set as _Background"
-msgstr "Ustaw jako _tapetę"
-
-#: ../src/f-spot.glade.h:119
-msgid "Set date range"
-msgstr "Ustaw zakres dat"
-
-# nieznany kontekst? sądząc po kropce opis przycisku/pozycji menu
-#: ../src/f-spot.glade.h:121
-msgid "Show all photos."
-msgstr "Wyświetla wszystkie zdjęcia."
-
-#: ../src/f-spot.glade.h:122
-msgid "Show or hide the side pane"
-msgstr "Wyświetl lub ukryj pasek boczny"
-
-#: ../src/f-spot.glade.h:123
-msgid "Show or hide the toolbar"
-msgstr "Wyświetl lub ukryj pasek narzędzi"
-
-#: ../src/f-spot.glade.h:124
-msgid "Side _pane"
-msgstr "_Pasek boczny"
-
-#: ../src/f-spot.glade.h:125
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "Panel _boczny"
-#: ../src/f-spot.glade.h:126
-msgid "Small"
-msgstr "Mały"
-
-#: ../src/f-spot.glade.h:127
-msgid "Space all photos by"
-msgstr "Rozstaw wszystkie zdjęcia o"
-
-#: ../src/f-spot.glade.h:128
-msgid ""
-"Specify if an original size picture should be rotated or not. Smaller sizes "
-"are automatically rotated."
-msgstr ""
-"Proszę określić, czy zdjęcie pierwotnych rozmiarów ma być obrócone. Mniejsze "
-"rozmiary są automatycznie obracane."
-
-#: ../src/f-spot.glade.h:129
-msgid "Strip image _metadata"
-msgstr "Usuń _metadane obrazu"
-
-# mo
-#: ../src/f-spot.glade.h:130
+#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
msgstr "E_tykiety"
-#: ../src/f-spot.glade.h:131
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1180
-msgid "Tags: "
-msgstr "Etykiety: "
-
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:133
-msgid "Te_mp:"
-msgstr "Ty_mczasowy:"
-
-#: ../src/f-spot.glade.h:134
+#: ../src/ui/main_window.ui.h:25
msgid "Thumbnail _elements"
msgstr "_Elementy miniatury"
-#: ../src/f-spot.glade.h:135
-msgid "Tiny"
-msgstr "Bardzo mały"
-
-#: ../src/f-spot.glade.h:136
+#: ../src/ui/main_window.ui.h:26
msgid "Too_lbar"
msgstr "Pasek _narzędziowy"
-#: ../src/f-spot.glade.h:137
-msgid "Total original size"
-msgstr "Całkowity rozmiar pierwotny"
-
-#: ../src/f-spot.glade.h:138
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "Widok"
-#: ../src/f-spot.glade.h:139
-msgid "Zoom _in"
-msgstr "_Powiększ"
-
-#: ../src/f-spot.glade.h:140
-msgid "Zoom _out"
-msgstr "P_omniejsz"
-
-#: ../src/f-spot.glade.h:141
-msgid "Zoom in"
-msgstr "Powiększ"
-
-#: ../src/f-spot.glade.h:142
-msgid "Zoom out"
-msgstr "Pomniejsz"
-
-#: ../src/f-spot.glade.h:144
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
msgstr "_Dołącz etykietę do zaznaczenia"
-#: ../src/f-spot.glade.h:145
-msgid "_Brightness:"
-msgstr "Jas_ność:"
-
-#: ../src/f-spot.glade.h:147
+#: ../src/ui/main_window.ui.h:35
msgid "_Clear Rating Filter"
msgstr "Wy_czyść filtr oceny"
-#: ../src/f-spot.glade.h:148
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
msgstr "Wy_czyść filtr rolki"
-#: ../src/f-spot.glade.h:149
+#: ../src/ui/main_window.ui.h:38
msgid "_Components"
-msgstr "_Komponenty"
+msgstr "_Składniki"
-#: ../src/f-spot.glade.h:150
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
-msgstr "_Zawartość"
-
-#: ../src/f-spot.glade.h:151
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-msgid "_Create"
-msgstr "_Utwórz"
-
-#: ../src/f-spot.glade.h:152
-msgid "_Create Mail"
-msgstr "_Utwórz wiadomość"
+msgstr "_Spis treści"
-#: ../src/f-spot.glade.h:153
+#: ../src/ui/main_window.ui.h:40
msgid "_Dates"
msgstr "_Daty"
-#: ../src/f-spot.glade.h:155
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
msgstr "_Usuń zaznaczoną etykietę"
-#: ../src/f-spot.glade.h:156
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
msgstr "_Usuń wersję"
-#: ../src/f-spot.glade.h:157
-msgid "_Edit"
-msgstr "_Edycja"
-
-#: ../src/f-spot.glade.h:158
-msgid "_Edit Selected Tag..."
-msgstr "_Edytuj zaznaczoną etykietę..."
-
-#: ../src/f-spot.glade.h:159
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export"
-msgstr "_Eksportuj"
-
-#: ../src/f-spot.glade.h:160
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "_Eksportuj etykiety"
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "Zmodyfikuj _etykietę..."
-#: ../src/f-spot.glade.h:161
+#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
-msgstr "_Eksportuj do"
+msgstr "Wy_eksportuj do"
-#: ../src/f-spot.glade.h:162
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-msgid "_Export to Album:"
-msgstr "_Eksportuj do albumu:"
-
-#: ../src/f-spot.glade.h:163
-msgid "_Exposure:"
-msgstr "_Ekspozycja:"
-
-#: ../src/f-spot.glade.h:164
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
msgstr "_Klisza"
-#: ../src/f-spot.glade.h:165
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:166
-msgid "_Folder"
-msgstr "Ka_talog"
-
-#: ../src/f-spot.glade.h:167
-msgid "_Fullscreen"
-msgstr "_Tryb pełnoekranowy"
-
-#: ../src/f-spot.glade.h:168
-msgid "_Gallery"
-msgstr "_Galeria"
-
-#: ../src/f-spot.glade.h:169
-msgid "_Help"
-msgstr "Pomo_c"
-
-#: ../src/f-spot.glade.h:170
+#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
-msgstr "_Ukryty"
-
-#: ../src/f-spot.glade.h:171
-msgid "_Hue:"
-msgstr "_Odcień:"
-
-#: ../src/f-spot.glade.h:172
-msgid "_Icon:"
-msgstr "_Ikona:"
+msgstr "_Ukryte"
-#: ../src/f-spot.glade.h:173
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
-msgstr "_Importuj..."
+msgstr "Za_importuj..."
-#: ../src/f-spot.glade.h:174
-msgid "_Interpolate image on zoom"
-msgstr "_Interpolowanie obrazu przy powiększeniu"
-
-#: ../src/f-spot.glade.h:175
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
msgstr "_Duży"
-#: ../src/f-spot.glade.h:176
+#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
msgstr "_Ostatnia importowana rolka"
-#: ../src/f-spot.glade.h:177
+#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
msgstr "_Lupa"
-#: ../src/f-spot.glade.h:178
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
msgstr "Śr_edni"
-#: ../src/f-spot.glade.h:179
-msgid "_Month"
-msgstr "_Miesiąc"
-
-#: ../src/f-spot.glade.h:180
-msgid "_New Window"
-msgstr "_Nowe okno"
-
-#: ../src/f-spot.glade.h:181
-msgid "_Open album in browser when done uploading"
-msgstr "_Otwórz album w przeglądarce po ukończeniu wysyłania"
-
-#: ../src/f-spot.glade.h:182
-msgid "_Open destination when done exporting"
-msgstr "_Otwórz miejsce docelowe po ukończeniu eksportu"
-
-#: ../src/f-spot.glade.h:183
-msgid "_Photo"
-msgstr "_Zdjęcie"
-
-#: ../src/f-spot.glade.h:184
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
msgstr "Za_kończ"
-#: ../src/f-spot.glade.h:185
+#: ../src/ui/main_window.ui.h:58
msgid "_Ratings"
msgstr "_Oceny"
-#: ../src/f-spot.glade.h:187
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
msgstr "_Usuń etykietę z zaznaczenia"
-#: ../src/f-spot.glade.h:188
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
msgstr "_Zmień nazwę wersji"
-#: ../src/f-spot.glade.h:189
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-msgid "_Resize to: "
-msgstr "_Zmień rozmiar na: "
-
-#: ../src/f-spot.glade.h:191
-msgid "_Saturation:"
-msgstr "_Nasycenie:"
-
-#: ../src/f-spot.glade.h:192
-msgid "_Scale photos to no larger than: "
-msgstr "_Skaluj zdjęcia do rozmiarów nie większych niż: "
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "_Odwrotna kolejność"
-#: ../src/f-spot.glade.h:193
+#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
-msgstr "_Wybór rolek importowania..."
+msgstr "_Wybierz rolki importowania..."
-#: ../src/f-spot.glade.h:194
+#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
msgstr "_Ustaw zakres dat..."
-#: ../src/f-spot.glade.h:195
+#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
msgstr "_Ustaw filtr oceny..."
-#: ../src/f-spot.glade.h:196
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "_Wyostrz..."
-#: ../src/f-spot.glade.h:197
-msgid "_Slideshow"
-msgstr "_Prezentacja"
-
-#: ../src/f-spot.glade.h:198
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
msgstr "_Mały"
-#: ../src/f-spot.glade.h:199
-msgid "_Strip metadata"
-msgstr "_Usuń metadane"
-
-#: ../src/f-spot.glade.h:200
+#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
msgstr "Ikony _etykiet"
-#: ../src/f-spot.glade.h:201
-msgid "_Tag Name:"
-msgstr "_Nazwa etykiety:"
-
-#: ../src/f-spot.glade.h:202
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
msgstr "_Etykiety"
-#: ../src/f-spot.glade.h:203
+#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
msgstr "_Oś czasu"
-#: ../src/f-spot.glade.h:204
-msgid "_Tint:"
-msgstr "_Odcień:"
-
-#: ../src/f-spot.glade.h:205
-msgid "_Toolbar"
-msgstr "Pasek _narzędziowy"
-
-#: ../src/f-spot.glade.h:206
+#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
msgstr "_Narzędzia"
-#: ../src/f-spot.glade.h:207
-msgid "_URI:"
-msgstr "_URI:"
-
-#: ../src/f-spot.glade.h:208
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
msgstr "_Zdjęcia bez etykiet"
-#: ../src/f-spot.glade.h:209
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
msgstr "_Wersja"
-#: ../src/f-spot.glade.h:210
-msgid "_View"
-msgstr "_Widok"
-
-#: ../src/f-spot.glade.h:211
-msgid "_Virtual Filesystem"
-msgstr "_Wirtualny system plików"
-
-# at? kontekst?
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:214
-msgid ""
-"at\n"
-"after\n"
-"between"
-msgstr ""
-"dnia\n"
-"po\n"
-"pomiędzy"
-
-#: ../src/f-spot.glade.h:217
-msgid "difference:"
-msgstr "różnica:"
-
-#: ../src/f-spot.glade.h:218
-msgid "img_000.jpg"
-msgstr "img_000.jpg"
-
-#: ../src/f-spot.glade.h:219
-msgid "min. Starting at {0}"
-msgstr "minimum, zaczynając od {0}"
-
-#: ../src/f-spot.glade.h:221
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
-msgid "pixels"
-msgstr "pikseli"
-
-#: ../src/f-spot.glade.h:222
-msgid "x"
-msgstr "x"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "Wyświetlanie prezentacji z programu F-Spot"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "Zdjęcia z programu F-Spot"
-
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_CD..."
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:162
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "Przesyłanie zdjęcia \"{0}\" na płytę CD"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:177
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:551
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:702
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
-msgid "Done Sending Photos"
-msgstr "Ukończono wysyłanie zdjęć"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
-msgid "Transfer Complete"
-msgstr "Przesyłanie ukończone"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:186
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
-msgid "Error While Transferring"
-msgstr "Błąd podczas przesyłania"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:193
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
-msgid "Error Transferring"
-msgstr "Błąd podczas przesyłania"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:206
-msgid "copying..."
-msgstr "kopiowanie..."
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr "<b><i>Istnieją poprzednio zaplanowane elementy do zapisu.</i></b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>Zdjęcia do wypalenia</b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:4
-msgid "Create CD"
-msgstr "Utwórz CD"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:6
-msgid "Size of the exported selection:"
-msgstr "Rozmiar eksportowanego zaznaczenia:"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr "_Przeglądaj wcześniej zaplanowane pliki"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:8
-msgid "_Write only these photos to CD"
-msgstr "_Zapisz tylko te zdjęcia na CD"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-msgid "_Zooomr..."
-msgstr "_Zooomr..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "Autoryzuj"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
-msgid ""
-"Return to this window after you have finished the authorization process on "
-"{0} and click the \"Complete Authorization\" button below"
-msgstr ""
-"Proszę wrócić do tego okna po ukończeniu procesu autoryzacji w serwisie {0} "
-"i kliknąć poniższy przycisk \"Dokończ autoryzację\""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "Dokończ autoryzację"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "Logowanie do serwisu {0}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr "Sprawdzanie danych uwierzytelniających..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "Witamy {0}, uzyskano połączenie z {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "Zalogowanie jako inny użytkownik"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "Wykorzystano {0} dozwolonego ({1}) miesięcznego limitu użytkownika"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "Logowanie nie powiodło się"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "Oczekiwanie na odpowiedź {0} z {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:779
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "Wysyłanie zdjęcia \"{0}\""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "Błąd podczas wysyłania do {0}: {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:810
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:553
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
-msgid "Upload Complete"
-msgstr "Wysyłanie ukończone"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-msgid "Unable to log on."
-msgstr "Logowanie nie powiodło się."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
-#, csharp-format
-msgid ""
-"F-Spot was unable to log on to {0}. Make sure you have given the "
-"authentication using {0} web browser interface."
-msgstr ""
-"Program F-Spot nie mógł się zalogować do serwisu {0}. Należy się upewnić, "
-"czy uzyskano uwierzytelnienie w serwisie {0} przy pomocy przeglądarki "
-"internetowej."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:732
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:477
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:598
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
-msgid "Uploading Pictures"
-msgstr "Wysyłanie zdjęć"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>Uprawnienia do oglądania</b>"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "Eksportowanie _hierarchii etykiet"
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "Aktualizowanie bazy danych programu F-Spot"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+#: ../src/Updater.cs:623
msgid ""
-"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
msgstr ""
-"Program F-Spot wymaga autoryzacji do wysyłania zdjęć na konto w serwisie "
-"{0}. Aby uruchomić przeglądarkę internetową i uwierzytelnić program F-Spot, "
-"należy nacisnąć przycisk \"Autoryzuj\"."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "Ignorowanie etykiet _najwyższego poziomu"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "Prywatny"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "Publiczny"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "Usuń _metadane"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "Widoczne dla rodziny"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "Widoczne dla przyjaciół"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-msgid "_View photos in browser when done uploading"
-msgstr "_Wyświetl zdjęcia w przeglądarce po ukończeniu wysyłania"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "_Katalog..."
+"Proszę czekać, trwa aktualizacja bazy danych programu F-Spot. Może to chwilę "
+"potrwać."
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
-msgid "Select Export Folder"
-msgstr "Wybór katalogu eksportu"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "Nie można utworzyć pliku tymczasowego"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
-msgid "Building Gallery"
-msgstr "Budowanie galerii"
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Ustawienia strony"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "Błąd podczas wysyłania zdjęcia \"{0}\" do galerii:{2}{1}"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
-msgid "Error: Error while transferring; Aborting"
-msgstr "Błąd: błąd podczas przesyłania. Przerywanie"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
-msgid "Error: File Already Exists; Aborting"
-msgstr "Błąd: plik już istnieje; przerywanie"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:810
-msgid "Light"
-msgstr "Jasny"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:811
-msgid "Dark"
-msgstr "Ciemny"
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:991
-msgid "Prev"
-msgstr "Poprzedni"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1103
-msgid "Gallery generated by"
-msgstr "Galeria wygenerowana przez"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1143
-msgid "Show Styles"
-msgstr "Wyświetl style"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1144
-msgid "Hide Styles"
-msgstr "Schowaj style"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1311
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1444
-msgid "Page:"
-msgstr "Strona:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>Metoda eksportu</b>"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr "_Utwórz galerię używając \"Oryginału\""
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr "Utwórz _niezależną galerię WWW"
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Rozmiar papieru: {0} x {1} mm"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "_Opis:"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "Ustawienia rozmiaru i orientacji strony"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
-msgid "Export _tags"
-msgstr "Eksportuj e_tykiety"
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Zdjęć na stronę"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
-msgid "Export tag _icons"
-msgstr "Eksportuj _ikony etykiet"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Powtórz"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-msgid "Folder Export"
-msgstr "Eksport katalogów"
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Drukowanie znaczników cięcia"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-msgid "G_allery Name:"
-msgstr "N_azwa galerii:"
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "Układ zdjęć"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
-msgid "Open _destination when done exporting"
-msgstr "Otwórz miejsce _docelowe po ukończeniu eksportu"
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "Cała strona (bez marginesów)"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-msgid "_Folder:"
-msgstr "_Katalog:"
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Powiększenie"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-msgid "_Save the files only"
-msgstr "_Zapisz tylko pliki"
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Wypełnij"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-msgid "Web _Gallery..."
-msgstr "Web _Gallery..."
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Przeskalowany"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
-msgstr ""
-"Nie można połączyć się z galerią w nieznanej wersji.\n"
-"Proszę sprawdzić, czy wersja wtyczki Remote to 1.0.8 lub późniejsza."
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "Białe krawędzie"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:393
-msgid "Invalid URL"
-msgstr "Nieprawidłowy adres URL"
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Własny tekst"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:394
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "Adres URL galerii nie wygląda na prawidłowy adres URL"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Informacje o zdjęciach"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:404
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:431
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:442
-msgid "Error while connecting to Gallery"
-msgstr "Błąd podczas łączenia z galerią"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "Drukowanie nazw plików"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:405
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:432
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:443
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "Podczas próby logowania napotkano następujący błąd: {0}"
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "Drukowanie dat zdjęć"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:419
-msgid "A Gallery with this name already exists"
-msgstr "Galeria o tej nazwie już istnieje"
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "Drukowanie czasów zdjęć"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:420
-#, csharp-format
-msgid ""
-"There is already a Gallery with the same name in your registered Galleries. "
-"Please choose a unique name."
-msgstr ""
-"Istnieje już galeria z tą samą nazwą w zarejestrowanych galeriach "
-"użytkownika. Proszę wybrać unikalną nazwę."
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "Drukowanie znaczników zdjęć"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:530
-msgid "(TopLevel)"
-msgstr "(TopLevel)"
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "Drukowanie komentarzy zdjęć"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:592
-msgid "Invalid Gallery name"
-msgstr "Niepoprawna nazwa galerii"
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "Edycja"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:593
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
-"Nazwa galerii zawiera błędne znaki.\n"
-"Dopuszczalne są tylko litery, cyfry, - oraz _."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:798
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Błąd podczas wysyłania zdjęcia \"{0}\" do galerii: {1}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:826
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:725
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
-msgid "(No Gallery)"
-msgstr "(brak galerii)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:918
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:848
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(Not Connected)"
-msgstr "(brak połączenia)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:919
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
-msgid "(No Albums)"
-msgstr "(brak albumów)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:971
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:914
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
-msgid "No account selected"
-msgstr "Nie wybrano konta"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
msgstr ""
-"<span weight='bold' size='larger'>Błąd podczas łączenia z galerią</span>\n"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-msgid "Export _titles and comments"
-msgstr "_Eksportuj tytuły i komentarze"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "Otwórz _album w przeglądarce po ukończeniu wysyłania"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "Należy upewnić się, że ustawienia tej galerii są prawidłowe."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-msgid "U_RL:"
-msgstr "Adres U_RL:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-msgid "_Album Name:"
-msgstr "Nazwa _albumu:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "_Opis:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-msgid "_Gallery Name:"
-msgstr "Nazwa _galerii:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "_Galeria:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-msgid "_Parent Album:"
-msgstr "_Album nadrzędny:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
-msgid "_Password:"
-msgstr "_Hasło:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-msgid "_Title:"
-msgstr "_Tytuł:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-msgid "_Username:"
-msgstr "_Nazwa użytkownika:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr "Błąd podczas odczytywania odpowiedzi serwera"
-
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
-msgstr "Serwer zwrócił odpowiedź bez zawartości galerii"
+"Narzędzie wymaga aktywnego zaznaczenia. Proszę zaznaczyć fragment zdjęcia i "
+"spróbować ponownie"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
-msgid "Error while creating new album"
-msgstr "Błąd podczas tworzenia nowego albumu"
+#: ../src/Widgets/EditorPage.cs:216
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Błąd podczas zapisywania dostosowanego zdjęcia"
+msgstr[1] "Błąd podczas zapisywania dostosowanych zdjęć"
+msgstr[2] "Błąd podczas zapisywania dostosowanych zdjęć"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
-"The following error was encountered while attempting to perform the "
-"requested operation:\n"
-"{0} ({1})"
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
msgstr ""
-"Wystąpił następujący błąd podczas próby wykonania żądanej operacji:\n"
-"{0} ({1})"
+"Otrzymano wyjątek \"{0}\". Uwaga: należy wywołać pliki RAW do formatu JPEG "
+"przed ich edycją."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
-msgstr "F_acebook..."
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Poziomo"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:257
-msgid "Too many images to export"
-msgstr "Zbyt wiele obrazów do wyeksportowania"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "Piono_wo"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:257
-msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
-"selection and try again."
-msgstr ""
-"Serwis Facebook zezwala jedynie na 60 fotografii na album. Proszę poprawić "
-"wybór i spróbować ponownie."
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Znajdź:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:367
-msgid "You are not logged in."
-msgstr "Użytkownik nie jest zalogowany."
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "Katalogi"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:322
-msgid "Waiting for authentication"
-msgstr "Oczekiwanie na uwierzytelnienie"
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "System plików"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:322
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook. Turn "
-"on the \"Save my login information\" checkbox on Facebook and F-Spot will "
-"log into Facebook automatically from now on."
-msgstr ""
-"Program F-Spot uruchomi teraz przeglądarkę użytkownika, aby umożliwić "
-"zalogowanie w serwisie Facebook. Proszę zaznaczyć pole wyboru \"Zapamiętaj "
-"mnie\", a program F-Spot będzie logował do serwisu Facebook od tego momentu "
-"automatycznie."
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Histogram"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:328
-msgid "Error logging into Facebook"
-msgstr "Błąd podczas logowania do serwisu Facebook"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Wersja"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:328
-msgid ""
-"There was a problem logging into Facebook. Check your credentials and try "
-"again."
-msgstr ""
-"Wystąpił problem podczas logowania w serwisie Facebook. Proszę sprawdzić "
-"informacje logowania i spróbować ponownie."
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Data"
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:341
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr "{0} {1} jest zalogowany w serwisie Facebook"
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Ekspozycja"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:491
-msgid "Album must have a name"
-msgstr "Album musi mieć nazwę"
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "Długość ogniskowej"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:491
-msgid "Please name your album or choose an existing album."
-msgstr "Proszę nazwać album lub wybrać istniejący."
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Rozmiar pliku"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:504
-msgid "Creating a new album failed"
-msgstr "Tworzenie nowego albumu nie powiodło się"
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Ocena"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:504
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
-"Wystąpił błąd podczas tworzenia nowego albumu.\n"
-"\n"
-"{0}"
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(błędny format)"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:528
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:661
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "Wysyłanie zdjęcia \"{0}\" ({1} z {2})"
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(nieznany)"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:542
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr "Błąd podczas wysyłania do serwisu Facebook: {0}"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:1
-msgid "Caption"
-msgstr "Nagłówek"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:2
-msgid "Create a new album"
-msgstr "Utwórz nową płytę CD-Audio"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:3
-msgid "Description"
-msgstr "Opis"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:4
-msgid "Export to Facebook"
-msgstr "Eksport do serwisu Facebook"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:5
-msgid "In this photo"
-msgstr "Na tym zdjęciu"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:7
-msgid "Login"
-msgstr "Login"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:8
-msgid "Logout"
-msgstr "Wyloguj"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:10
-msgid "This is who I am"
-msgstr "Oto kim jestem"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:11
-msgid "Use an existing album"
-msgstr "Użycie istniejącego albumu"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:12
-msgid "Who is this?"
-msgstr "Kto to jest?"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-msgid "Compressed fil_e..."
-msgstr "Skompr_esowany plik..."
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(jedna modyfikacja)"
+msgstr[1] "({0} modyfikacje)"
+msgstr[2] "({0} modyfikacji)"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-msgid ""
-"This tool requires an active selection. Please select one or more pictures "
-"and try again"
-msgstr ""
-"Narzędzie wymaga aktywnego zaznaczenia. Proszę zaznaczyć fragment jednego "
-"lub więcej zdjęć i spróbować ponownie"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:63
-msgid "Select export folder"
-msgstr "Wybór katalogu eksportu"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:101
-msgid "Exporting files"
-msgstr "Eksportowanie plików"
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(Błąd podczas odczytu pliku)"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:107
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "Przygotowywanie zdjęcia \"{0}\""
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-msgid "_File name:"
-msgstr "_Nazwa pliku:"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-msgid "_Location:"
-msgstr "_Położenie:"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
-msgid "_Scale:"
-msgstr "_Skala:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-msgid "Merge Db"
-msgstr "Połącz bazy danych"
-
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
-msgid "Error opening the selected file"
-msgstr "Błąd podczas otwierania wybranego pliku."
+msgid "{0} Photos"
+msgstr "{0} zdjęcia"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-"Wybrany plik nie jest poprawną lub obsługiwaną bazą danych.\n"
-"\n"
-"Otrzymany wyjątek: \"{0}\"."
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-msgid ""
-"<small><i>Choose the location of the database you want to import from</i></"
-"small>"
-msgstr ""
-"<small><i>Proszę wybrać położenie bazy danych, z której należy importować.</"
-"i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
-"you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already "
-"imported from that database.</i></small>"
-msgstr ""
-"<small><i>Proszę wybrać, co należy importować z wybranej bazy danych.\n"
-"\"Tylko nowe rolki\" to inteligentna opcja zapobiegająca ponownemu "
-"importowaniu zdjęć, które zostały importowane podczas poprzedniej operacji.\n"
-"\"Import pojedynczej rolki\" pozwala na wybór, którą rolkę należy "
-"przywrócić.\n"
-"\"Wszystko\" zaimportuje wszystko tworząc duplikaty, jeśli już importowano z "
-"tej bazy danych.</i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
-msgid ""
-"<small><i>Copy the images locally or keep them where they are. If you chose "
-"the later, be sure that this location will stay accessible from f-spot.</i></"
-"small>"
+"On {0} between \n"
+"{1} and {2}"
msgstr ""
-"<small><i>Skopiowanie obrazów lokalnie lub pozostawienie na swoim miejscu. "
-"Po wybraniu opcji drugiej proszę się upewnić, że to położenie pozostanie "
-"dostępne dla programu F-Spot.</i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
-msgid "A Single Import Roll"
-msgstr "Import pojedynczej rolki"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
-msgid "Copy images to photos folder"
-msgstr "Kopiowanie obrazów do katalogu Zdjęcia"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-msgid "Database Location:"
-msgstr "Położenie bazy danych:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr "Wszystko"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-msgid "Import:"
-msgstr "Importowanie:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr "Zachowywanie obrazów w ich oryginalnym położeniu"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another f-spot collection"
-msgstr "Dołączenie innej kolekcji programu F-Spot"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr "Tylko nowe rolki"
+"Dnia {0} między \n"
+"{1} a {2}"
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-"<big>Baza danych odwołuje się do plików zawartych w katalogu <b>{0}</b>.\n"
-" Proszę wybrać ten katalog, aby umożliwić mapowanie.</big>"
-
-#: ../extensions/Tools/HashJob/HashJob.cs:53
-msgid ""
-"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
-"needs to analyze your image collection. This is not done by default as it's "
-"time consuming. You can Start or Pause this update process using this dialog."
+"Between {0} \n"
+"and {1}"
msgstr ""
-"Aby wykryć duplikaty zdjęć zaimportowanych przed wersją 0.5.0, program F-"
-"Spot musi przeanalizować kolekcję obrazów. Operacja nie jest przeprowadzana "
-"domyślnie, ponieważ zabiera wiele czasu. Można rozpocząć lub wstrzymać ten "
-"proces używając tego okna dialogowego."
-
-#: ../extensions/Tools/HashJob/HashJob.cs:102
-msgid "Processing images..."
-msgstr "Przetwarzanie obrazów..."
-
-#: ../extensions/Tools/HashJob/HashJob.cs:108
-msgid "Stopped"
-msgstr "Zatrzymano"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb..."
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "Błąd podczas tworzenia albumu"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to create an album: {0}"
-msgstr "Podczas próby utworzenia albumu napotkano następujący błąd: {0}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:621
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} wysłano"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:623
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{0} z około {1}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:692
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "Błąd podczas wysyłania do galerii: {0}"
+"Pomiędzy {0}\n"
+"i {1}"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:776
-#, csharp-format
-msgid "Available space: {0}, {1}% used out of {2}"
-msgstr "Dostępne miejsce: {0}, {1}% użyto z {2}"
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(Co najmniej jeden plik nie został odnaleziony)"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:890
-#, csharp-format
-msgid ""
-"The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images"
-msgstr ""
-"Wybrany album ma limit {0} zdjęć,\n"
-"który zostanie przekroczony z obecnym wyborem {1} zdjęć"
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Nazwa zdjęcia"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>Eksport do serwisu PicasaWeb</b>"
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Data"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid ""
-"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr ""
-"<span weight='bold' size='larger'>Konto Google użytkownika jest zablokowane</"
-"span>\n"
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Style"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-"Należy upewnić się, że ustawienia tej galerii są prawidłowe.\n"
-"Należy wprowadzić litery z wyświetlonego obrazu w polu\n"
-"\"Captcha\". <i>Wielkość liter nie jest rozróżniana</i>"
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Ekspozycja"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "Album publiczny"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "Wyświetlanie długości ogniskowej"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "_Tytuł albumu:"
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Aparat"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "_Automatyczne obracanie"
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Wyświetlanie rozmiaru pliku"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr "_Captcha:"
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "Metadane"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>Eksport do serwisu SmugMug</b>"
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "Rozszerzone metadane"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "_Konto:"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "Brak rozszerzonych metadanych"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug..."
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "Brak aktywnych zdjęć"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:126
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
-msgid "Uploading photo \"{0}\""
-msgstr "Wysyłanie zdjęcia \"{0}\""
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:181
-msgid "Logging into Tabblo"
-msgstr "Logowanie w serwisie Tabblo"
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:241
-msgid "Obtaining URL for upload"
-msgstr "Uzyskiwanie adresu URL do wysłania"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr "_Tabblo..."
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:166
-msgid "Done sending photos"
-msgstr "Ukończono wysyłanie zdjęć"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:168
-msgid "Upload complete"
-msgstr "Wysyłanie ukończone"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:174
-msgid "Error uploading to Tabblo: "
-msgstr "Błąd podczas wysyłania do serwisu Tabblo: "
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
-msgid "<b>Tabblo account</b>"
-msgstr "<b>Konto w serwisie Tabblo</b>"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
-msgid "<b>{0}</b>."
-msgstr "<b>{0}</b>."
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
-msgid "A trust error occured while attempting to access"
-msgstr "Wystąpił błąd zaufania podczas próby dostępu"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
-msgid "Abort this session"
-msgstr "Przerwij tę sesję"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
-msgid "Always trust this site's certificate"
-msgstr "Stałe zaufanie certyfikatowi tej witryny"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
-msgid "Do you wish to:"
-msgstr "Zadanie do wykonania:"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
-msgid "Trust Error"
-msgstr "Błąd zaufania"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
-msgid "Trust the site's certificate this once"
-msgstr "Zaufanie certyfikatowi witryny tym razem"
-
-#: ../extensions/Editors/BlackoutEditor/BlackoutEditor.cs:18
-msgid "Blackout"
-msgstr "Zaciemnienie"
-
-#: ../extensions/Editors/BlackoutEditor/BlackoutEditor.cs:26
-msgid "Select the area that you want blacked out."
-msgstr "Proszę zaznaczyć obszar do zaciemnienia."
-
-#: ../extensions/Editors/PixelateEditor/PixelateEditor.cs:18
-msgid "Pixelate"
-msgstr "Pikselizacja"
-
-#: ../extensions/Editors/PixelateEditor/PixelateEditor.cs:26
-msgid "Select the area that you want pixelated."
-msgstr "Proszę zaznaczyć obszar do pikselizacji."
-
-#~ msgid "No image loaded."
-#~ msgstr "Nie wczytano obrazka."
-
-#~ msgid "Can't save non local files."
-#~ msgstr "Nie można zapisać plików nielokalnych."
-
-#~ msgid "Unsupported image type for saving."
-#~ msgstr "Nieobsługiwany rodzaj obrazu do zapisu."
-
-#~ msgid "(File not found)"
-#~ msgstr "(Plik nie znaleziony)"
-
-#~ msgid "<b>Photograph Layout</b>"
-#~ msgstr "<b>Układ zdjęcia</b>"
-
-#~ msgid "<b>Printer Details</b>"
-#~ msgstr "<b>Szczegóły drukarki</b>"
-
-#~ msgid "C_aption:"
-#~ msgstr "P_odpis:"
-
-#~ msgid "Co_nfigure"
-#~ msgstr "Ko_nfiguruj"
-
-#~ msgid "Crop photo to _fit"
-#~ msgstr "Przytnij zdjęcie aby _dopasować"
-
-#~ msgid ""
-#~ "Full Page\n"
-#~ "Standard - 4x6"
-#~ msgstr ""
-#~ "Pełna strona\n"
-#~ "Standard - 4x6"
-
-#~ msgid ""
-#~ "Hairline\n"
-#~ "0.25\"\n"
-#~ "0.5\"\n"
-#~ "1\"\n"
-#~ msgstr ""
-#~ "Cienka linia\n"
-#~ "0.25\"\n"
-#~ "0.5\"\n"
-#~ "1\"\n"
-
-#~ msgid "N_umber of Copies:"
-#~ msgstr "_Liczba kopii:"
-
-#~ msgid ""
-#~ "None\n"
-#~ "Title\n"
-#~ "Filename\n"
-#~ "Date\n"
-#~ "Photo Details"
-#~ msgstr ""
-#~ "Brak\n"
-#~ "Tytuł\n"
-#~ "Nazwa pliku\n"
-#~ "Data\n"
-#~ "Szczegóły zdjęcia"
-
-#~ msgid "P_hoto Source:"
-#~ msgstr "Źródło _zdjęć:"
-
-#~ msgid "Page 1 of 3"
-#~ msgstr "Strona 1 z 3"
-
-#~ msgid "Photo _Size:"
-#~ msgstr "_Rozmiar zdjęcia:"
-
-#~ msgid "Print crop _marks"
-#~ msgstr "Drukuj _znaczniki cięcia"
-
-#~ msgid "Print..."
-#~ msgstr "Drukuj..."
-
-#~ msgid ""
-#~ "Selection\n"
-#~ "Gallery\n"
-#~ "Viewport"
-#~ msgstr ""
-#~ "Zaznaczenie\n"
-#~ "Galeria\n"
-#~ "Okno podglądu"
-
-#~ msgid "Will print using: US Letter size on Generic Postscript"
-#~ msgstr "Wydrukuje wykorzystując: rozmiar US Letter na Generic Postscript"
-
-#~ msgid "_Border:"
-#~ msgstr "_Obramowanie:"
-
-#~ msgid "Available space:"
-#~ msgstr "Dostępna przestrzeń:"
-
-#~ msgid "token"
-#~ msgstr "token"
-
-#~ msgid "BMP"
-#~ msgstr "BMP"
-
-#~ msgid "GIF"
-#~ msgstr "GIF"
-
-#~ msgid "ICO"
-#~ msgstr "ICO"
-
-#~ msgid "JPEG"
-#~ msgstr "JPEG"
-
-#~ msgid "PNG"
-#~ msgstr "PNG"
-
-#~ msgid "PNM"
-#~ msgstr "PNM"
-
-#~ msgid "RAS"
-#~ msgstr "RAS"
-
-#~ msgid "SVG"
-#~ msgstr "SVG"
-
-#~ msgid "TGA"
-#~ msgstr "TGA"
-
-#~ msgid "TIFF"
-#~ msgstr "TIFF"
-
-#~ msgid "XBM"
-#~ msgstr "XBM"
-
-#~ msgid "XPM"
-#~ msgstr "XPM"
-
-#~ msgid "Determine File Type:"
-#~ msgstr "Proszę określić typ pliku:"
-
-#~ msgid "Apply"
-#~ msgstr "Zastosuj"
-
-#~ msgid "Automatically adjust the colors"
-#~ msgstr "Automatycznie dopasowuje kolory"
-
-#~ msgid "Apply straightening to image"
-#~ msgstr "Stosuje prostowanie do obrazu"
-
-#~ msgid "Adjust the angle of the image to straighten the horizon"
-#~ msgstr "Aby wyprostować horyzont, należy dopasować kąt"
-
-#~ msgid "Create a soft focus visual effect"
-#~ msgstr "Tworzy efekt miękkiego obrazu"
-
-#~ msgid "Unsharp Mask"
-#~ msgstr "Maska rozmycia"
-
-#~ msgid "Remove redeye from selected area"
-#~ msgstr "Usuwa efekt czerwonych oczu w zaznaczonym obszarze"
-
-#~ msgid "Select an area to remove redeye"
-#~ msgstr "Proszę zaznaczyć obszar do usuwania efektu czerwonych oczu"
-
-#~ msgid "Constrain the aspect ratio of the selection"
-#~ msgstr "Wymusza określone proporcje zaznaczenia"
-
-#~ msgid "Reduce Red-Eye"
-#~ msgstr "Redukuj efekt czerwonych oczu"
-
-#~ msgid "Convert the photo to black and white"
-#~ msgstr "Zmienia kolory zdjęcia na odcienie szarości"
-
-#~ msgid "Convert the photo to sepia tones"
-#~ msgstr "Zmienia kolory zdjęcia na tonację sepia"
-
-#~ msgid "Allow other programs to manipulate F-Spot"
-#~ msgstr "Zezwolenie na kontrolę programu F-Spot przez inne programy"
-
-#~ msgid ""
-#~ "From Screen\n"
-#~ "Standard RGB"
-#~ msgstr ""
-#~ "Z ekranu\n"
-#~ "Standardowe RGB"
-
-#~ msgid ""
-#~ "Standard RGB\n"
-#~ "Image Profile\n"
-#~ "Custom\n"
-#~ msgstr ""
-#~ "Standardowe RGB\n"
-#~ "Profil obrazka\n"
-#~ "Własny\n"
-
-#~ msgid "Add-in"
-#~ msgstr "Dodatek"
-
-#~ msgid "Export to SmugMug......"
-#~ msgstr "Eksportuj do SmugMug..."
-
-#~ msgid "Exclude"
-#~ msgstr "Pomiń"
-
-#~ msgid "There was an error invoking the external handler"
-#~ msgstr "Podczas uruchamiania zewnętrznego programu wystąpił błąd"
-
-#~ msgid "Received error:{1}\"{0}\"{1}"
-#~ msgstr "Otrzymano błąd:{1}\"{0}\"{1}"
-
-#~ msgid "dialog1"
-#~ msgstr "dialog1"
-
-# programmer's error
-#~ msgid "gtk-about"
-#~ msgstr "O programie"
-
-# programmer's error
-#~ msgid "gtk-close"
-#~ msgstr "Zamknij"
-
-# programmer's error
-#~ msgid "gtk-open"
-#~ msgstr "Otwórz"
-
-# programmer's error
-#~ msgid "gtk-print"
-#~ msgstr "Drukuj"
-
-#~ msgid "<b><span foreground=\"red\">"
-#~ msgstr "<b><span foreground=\"red\">"
-
-#~ msgid "MonoDevelop Package"
-#~ msgstr "Pakiet MonoDevelop"
-
-#~ msgid "MonoDevelop Add-in Manager"
-#~ msgstr "Menedżer dodatków MonoDevelop"
-
-#~ msgid "MonoDevelop"
-#~ msgstr "MonoDevelop"
-
-#~ msgid "Far"
-#~ msgstr "Daleko"
-
-#~ msgid "Restore View"
-#~ msgstr "Przywróć widok"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendarz"
-
-#~ msgid "Unknown destination."
-#~ msgstr "Nieznane miejsce docelowe."
-
-#~ msgid ""
-#~ "When copying files from a camera you must select a valid destination on "
-#~ "the local filesystem"
-#~ msgstr ""
-#~ "Podczas kopiowania zdjęc z aparatu konieczne jest wskazanie prawidłowego "
-#~ "miejsca docelowego w lokalnym systemie plików"
-
-#~ msgid ""
-#~ "Error \"{0}\" while creating directory \"{1}\". Check that the path and "
-#~ "permissions are correct and try again"
-#~ msgstr ""
-#~ "Błąd \"{0}\" podczas tworzenia katalogu \"{1}\". Należy upewnić się, że "
-#~ "ścieżka i uprawnienia są prawidłowe i spróbować ponownie"
-
-#~ msgid "Valid"
-#~ msgstr "Prawidłowy"
-
-#~ msgid ""
-#~ "<small><i>Select the tag you like F-Spot to display images from while "
-#~ "acting as the screensaver</i></small>"
-#~ msgstr ""
-#~ "<small><i>Proszę wybrać etykietę, której program F-Spot ma używać podczas "
-#~ "pracy jako wygaszacz ekranu</i></small>"
-
-#~ msgid "Copy _Files to: "
-#~ msgstr "Skopiuj _pliki do:"
-
-#~ msgid "_Import files after copy"
-#~ msgstr "_Importowanie plików po skopiowaniu"
-
-#~ msgid "_Prefix: "
-#~ msgstr "_Prefiks:"
-
-#~ msgid "_Close"
-#~ msgstr "_Zamknij"
-
-#, fuzzy
-#~ msgid "url"
-#~ msgstr "url"
-
-#, fuzzy
-#~ msgid "captcha_url"
-#~ msgstr "_Captcha"
-
-#, fuzzy
-#~ msgid "By Extension"
-#~ msgstr "Rozszerzenie"
-
-#, fuzzy
-#~ msgid "Unsupported file format."
-#~ msgstr "Nieobsługiwany rodzaj obrazu do zapisu."
-
-#, fuzzy
-#~ msgid "Load Image"
-#~ msgstr "Edytuj obraz"
-
-#, fuzzy
-#~ msgid "Save Image"
-#~ msgstr "Wszystkie obrazy"
-
-#, fuzzy
-#~ msgid "name"
-#~ msgstr "Nazwa"
-
-#, fuzzy
-#~ msgid "version"
-#~ msgstr "Wersja"
-
-#, fuzzy
-#~ msgid "date"
-#~ msgstr "Data"
-
-#, fuzzy
-#~ msgid "size"
-#~ msgstr "Rozmiar"
-
-#, fuzzy
-#~ msgid "Metadata Browser"
-#~ msgstr "Metadane"
-
-#, fuzzy
-#~ msgid "Exported Locations"
-#~ msgstr "Eksportuj _ikony etykiet"
-
-#, fuzzy
-#~ msgid "Apply straightening"
-#~ msgstr "Wyprostuj"
-
-#, fuzzy
-#~ msgid " out of {0}"
-#~ msgstr "Nie {0}"
-
-#, fuzzy
-#~ msgid "Crop photo to selected area"
-#~ msgstr "Przytnij zdjęcie aby _dopasować"
-
-#, fuzzy
-#~ msgid "Adjust the photo colors"
-#~ msgstr "Dopasuj kolory"
-
-#, fuzzy
-#~ msgid "Unrated photos"
-#~ msgstr "Zdjęcia ocenione"
-
-#, fuzzy
-#~ msgid "<b>Color Temperature</b>"
-#~ msgstr "<b>Zarządzanie kolorami</b>"
-
-#, fuzzy
-#~ msgid "<b>Exposure</b>"
-#~ msgstr "<b>Metoda eksportu</b>"
-
-#, fuzzy
-#~ msgid "<b>Histo_gram</b>"
-#~ msgstr "Histogram"
-
-#, fuzzy
-#~ msgid "<b>Interoperability</b>"
-#~ msgstr "<b>Szczegóły drukarki</b>"
-
-#, fuzzy
-#~ msgid "<small> </small>"
-#~ msgstr "<small></small>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<small><i>Enable this option if you want to allow other programs to "
-#~ "import or delete photos and tags over DBus.</i></small>"
-#~ msgstr ""
-#~ "<small><i>Opcja ta pozwala na przechowywanie etykiet i opisów wewnątrz "
-#~ "obsługiwanych formatów obrazów.</i></small>"
-
-#, fuzzy
-#~ msgid "<small>C_ontrast:</small>"
-#~ msgstr "<small></small>"
-
-#, fuzzy
-#~ msgid "<small>Te_mp:</small>"
-#~ msgstr "<small></small>"
-
-#, fuzzy
-#~ msgid "<small>_Brightness:</small>"
-#~ msgstr "<small></small>"
-
-#, fuzzy
-#~ msgid "<small>_Exposure:</small>"
-#~ msgstr "<small></small>"
-
-#, fuzzy
-#~ msgid "<small>_Hue:</small>"
-#~ msgstr "<small></small>"
-
-#, fuzzy
-#~ msgid "<small>_Saturation:</small>"
-#~ msgstr "<small></small>"
-
-#, fuzzy
-#~ msgid "<small>_Tint:</small>"
-#~ msgstr "<small></small>"
-
-#, fuzzy
-#~ msgid "Ad_just Color..."
-#~ msgstr "Dopasuj kolory"
-
-#, fuzzy
-#~ msgid "Adjust Color"
-#~ msgstr "Dopasuj kolory"
-
-#, fuzzy
-#~ msgid "Print"
-#~ msgstr "Drukuj..."
-
-#, fuzzy
-#~ msgid "So_urce Temp"
-#~ msgstr "Typ źródła pliku"
-
-#, fuzzy
-#~ msgid "_Destination Temp"
-#~ msgstr "<b>Miejsce docelowe:</b>"
-
-#, fuzzy
-#~ msgid "_File"
-#~ msgstr "Plik"
-
-#, fuzzy
-#~ msgid "_Metadata Browser"
-#~ msgstr "Metadane"
-
-#, fuzzy
-#~ msgid "_Unrated Photos"
-#~ msgstr "_Zdjęcia bez etykiet"
-
-#, fuzzy
-#~ msgid "Add-in Manager"
-#~ msgstr "Menedżer rozszerzeń"
-
-#, fuzzy
-#~ msgid "F-Spot Add-in Manager"
-#~ msgstr "Menedżer zdjęć F-Spot"
-
-#, fuzzy
-#~ msgid "Export to 23hq..."
-#~ msgstr "Eksportuj do"
-
-#, fuzzy
-#~ msgid "Export to CD..."
-#~ msgstr "Eksportuj do"
-
-#, fuzzy
-#~ msgid "Export to Folder..."
-#~ msgstr "Wybór folderu eksportu"
-
-#, fuzzy
-#~ msgid "Export to PicasaWeb..."
-#~ msgstr "_PicasaWeb..."
-
-#, fuzzy
-#~ msgid "Attach Tag"
-#~ msgstr "_Dołącz etykietę"
-
-#, fuzzy
-#~ msgid "Delete From Drive"
-#~ msgstr "_Usuń z dysku"
-
-#, fuzzy
-#~ msgid "Remove Tag"
-#~ msgstr "_Usuń etykietę"
-
-#, fuzzy
-#~ msgid "Size:"
-#~ msgstr "Rozmiar"
-
-#, fuzzy
-#~ msgid "Include"
-#~ msgstr "Indeks"
-
-#, fuzzy
-#~ msgid "Remove"
-#~ msgstr "_Usuń etykietę"
-
-#, fuzzy
-#~ msgid "Help not found"
-#~ msgstr "Plik nie znaleziony"
-
-#, fuzzy
-#~ msgid "Clea_r Date Range"
-#~ msgstr "_Wyczyść zakres dat"
-
-#, fuzzy
-#~ msgid "Display T_ags"
-#~ msgstr "Wyświetl _nazwy plików"
-
-#, fuzzy
-#~ msgid "Display Too_lbar"
-#~ msgstr "Pasek _narzędziowy"
-
-#, fuzzy
-#~ msgid "gtk-preferences"
-#~ msgstr "Preferencje"
-
-#, fuzzy
-#~ msgid "Edit Photo"
-#~ msgstr "{0} zdjęcie"
+msgid "The photo \"{0}\" does not exist"
+msgstr "Zdjęcie \"{0}\" nie istnieje"
-#, fuzzy
-#~ msgid "Question"
-#~ msgstr "Wersja"
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "Brak metadanych"
-#, fuzzy
-#~ msgid "Near"
-#~ msgstr "Napraw"
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Brak dostępnych programów"
-#, fuzzy
-#~ msgid "Unable to create directory."
-#~ msgstr "Nie udało się utworzyć pliku tymczasowego"
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "Ocena:"
-#, fuzzy
-#~ msgid "Select Destination"
-#~ msgstr "Ograniczenia zaznaczenia"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Kraj"
-#, fuzzy
-#~ msgid "Invalid"
-#~ msgstr "Nieprawidłowy URL"
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "Miasto"
-#, fuzzy
-#~ msgid "E_xport to CD..."
-#~ msgstr "Eksportuj do"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Stan/województwo"
-#, fuzzy
-#~ msgid "_Select Tags..."
-#~ msgstr "Wybór etykiety..."
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Wyświetlanie prezentacji z programu F-Spot"
-#, fuzzy
-#~ msgid "Directory"
-#~ msgstr "Katalog GPS"
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "Zdjęcia programu F-Spot"
diff --git a/po/pt.po b/po/pt.po
index d55666e..24c51dc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,14 +1,14 @@
# f-spot's Portuguese translation.
# Copyright © 2007, 2009 f-spot
# This file is distributed under the same license as the f-spot package.
-# Filipe Gomes <filipefgomes at gmail.com>, 2007, 2009.
#
+# Filipe Gomes <filipefgomes at gmail.com>, 2007, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 16:57+0100\n"
-"PO-Revision-Date: 2009-09-20 16:22+0100\n"
+"POT-Creation-Date: 2010-03-08 01:04+0000\n"
+"PO-Revision-Date: 2010-03-07 15:41+0000\n"
"Last-Translator: Filipe Gomes <filipefgomes at gmail.com>\n"
"Language-Team: Portuguese <gnome_pt at yahoogroups.com>\n"
"MIME-Version: 1.0\n"
@@ -36,14 +36,14 @@ msgstr "A transferir imagem \"{0}\" Para CD"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} de {1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
@@ -92,7 +92,7 @@ msgid "Create CD"
msgstr "Criar CD"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Tamanho"
@@ -110,6 +110,7 @@ msgstr "_Navegar Ficheiro Previamente Agendados"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Exportar"
@@ -140,19 +141,20 @@ msgstr ""
"Assim que for indicado pelo Facebook para voltar a esta aplicação, clique em "
"\"Ok\" em baixo."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
msgstr "Demasiadas imagens para exportar"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"O Facebook permite apenas 60 fotografias por álbum. Por favor refine a sua "
+"O Facebook permite apenas {0} fotografias por álbum. Por favor refine a sua "
"selecção e tente novamente."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -160,19 +162,19 @@ msgstr ""
msgid "Uploading Pictures"
msgstr "A Enviar Imagens"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "O álbum tem de ter um nome"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
msgstr "Por favor nomeie o seu álbum ou escolha um existente."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "Criação de um novo álbum falhou"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -183,30 +185,29 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
msgstr "A enviar imagem \"{0}\" ({1} de {2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
msgstr "Erro ao Enviar para o Facebook: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Erro"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
@@ -214,6 +215,10 @@ msgstr "Erro"
msgid "Upload Complete"
msgstr "Envio Terminado"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Visitar grupo F-Spot no Facebook"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "À espera de autenticação"
@@ -332,8 +337,7 @@ msgid "Logout"
msgstr "Terminar Sessão"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Nome"
@@ -455,6 +459,7 @@ msgstr "<b>Conta</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Fotografias</b>"
@@ -476,7 +481,8 @@ msgstr "<b>Permissões de Visualização</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exportar"
@@ -572,58 +578,58 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Erro: Ficheiro Já Existe; A Abortar"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Claro"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Escuro"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Ant"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Índice"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Etiquetas"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Seguinte"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galeria gerada por"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Apresentar Estilos"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Esconder Estilos"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Etiquetas: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Página:"
@@ -841,6 +847,7 @@ msgstr "Álbum _Pai:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Senha:"
@@ -851,6 +858,7 @@ msgstr "_Título:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Utilizador:"
@@ -1000,12 +1008,72 @@ msgstr "Envio terminado"
msgid "Error uploading to Tabblo: "
msgstr "Erro ao enviar para o Tabblo: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Etiquetas do F-Spot</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Conta Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>As etiquetas do F-Spot podem ajudá-lo o estado da exportação das "
+"fotos. Exemplo: Utilize uma etiqueta para as fotos que pretende exportar, e "
+"outra para as já exportadas. Aqui, pode dizer ao F-Spot para substituir "
+"automaticamente estas etiquetas apropriadamente.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "Rem_over das fotos exportadas:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Seleccionar..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Anexar as fotos exportadas:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Um erro de confiança ocorreu ao tentar o acesso"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Abortar esta sessão"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Confiar sempre no certificado deste sítio"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Deseja:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Erro de Confiança"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Confiar no certificado deste sítio desta vez"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Fich_eiro comprimido..."
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Nenhuma selecção disponível"
@@ -1031,7 +1099,6 @@ msgid "Preparing photo \"{0}\""
msgstr "A preparar fotografia \"{0}\""
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "_Criar"
@@ -1079,8 +1146,8 @@ msgid "Stopped"
msgstr "Parado"
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Procurar Duplicados pelo Hash"
+msgid "Check for Duplicates..."
+msgstr "Procurar por Duplicados..."
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
msgid "F-Spot Gallery"
@@ -1274,7 +1341,7 @@ msgid "New Rolls Only"
msgstr "Apenas Novos Rolos"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:55
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Ignorar"
@@ -1317,26 +1384,31 @@ msgid "Screensaver Configuration"
msgstr "Configuração do Protector de Ecrã"
#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
msgid "F-Spot Photo Manager"
msgstr "Gestor de Fotografias do F-Spot"
-#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot.desktop.in.in.h:3
msgid "Organize, enjoy, and share your photos"
msgstr "Organize, divirta-se e partilhe as suas fotos"
-#: ../f-spot.desktop.in.in.h:3 ../f-spot-import.desktop.in.in.h:3
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
msgid "Photo Manager"
msgstr "Gestor de Fotografias"
-#: ../f-spot-import.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:3
msgid "Import into F-Spot"
msgstr "Importar para o F-Spot"
-#: ../f-spot-view.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:2
msgid "F-Spot Photo Viewer"
msgstr "Visualizador de Fotografias do F-Spot"
-#: ../f-spot-view.desktop.in.in.h:2
+#: ../f-spot-view.desktop.in.in.h:3
msgid "Photo Viewer"
msgstr "Visualizador de Fotografias"
@@ -1353,282 +1425,6 @@ msgstr "Tipo de transformação desconhecida %d"
msgid "Operation failed"
msgstr "Operação falhou"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Pacote"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Instalação de Extensão"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Seleccione as extensões a instalar e clique em Seguinte</b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Instalar de:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Repositórios..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Apresentar todos os pacotes"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Apresentar apenas novas versões"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Apresentar apenas actualizações"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Desseleccionar _Tudo"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Seleccion_ar Tudo"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "etiqueta124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Progresso Geral:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "A transferir extensões..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Gestor de Extensões"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "São necessárias extensões adicionais para realizar esta operação."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "As seguintes extensões serão instaladas:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Gestor de Extensões</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "As seguintes extensões encontram-se actualmente instaladas:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Instalar Extensões..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Desinstalar..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Activar"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Desactivar"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Detalhes"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Gestão do Repositório de Extensões"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Adicionar Novo Repositório"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Seleccione a localização do repositório que deseja registar:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Registrar um repositório on-line"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Registar um repositório local"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Caminho:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Navegar..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Versão:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Dependências da Extensão:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Todos os repositórios registrados"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Tem a certeza que deseja cancelar a instalação?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Os pacotes seguintes serão removidos:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"Existem outras extensões que dependem dos anteriores que também serão "
-"removidas:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr ""
-"As extensões seleccionadas não podem ser instaladas por causa de conflitos "
-"de dependências."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Os pacotes seguintes serão instalados:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (no directório do utilizador)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Os pacotes seguintes precisam de ser removidos:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Não foi possível resolver as dependências seguintes:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "A instalação terminou com sucesso."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Falha na instalação!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "A instalação terminou com avisos."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "A desinstalação terminou com sucesso."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Falha na desinstalação!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "A desinstalação terminou com avisos."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Repositório"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Instalação cancelada"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Algumas das extensões necessárias não foram encontradas"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Falha na instalação"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Extensão"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Versão"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Outro"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Ocorreu uma excepção: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Extensões desactivadas não podem ser carregadas."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "A carregar extensão {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "A extensão necessária '{0}' está desactivada."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "A extensão necessária '{0}' não está instalada."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(fornecido por {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Visualizar"
@@ -1637,7 +1433,7 @@ msgstr "Visualizar"
msgid "Path"
msgstr "Caminho"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Ficheiro"
@@ -1676,7 +1472,7 @@ msgstr "Cópia de Ficheiros Concluída"
msgid "Transferring \"{0}\" from camera"
msgstr "A transferir \"{0}\" da câmara"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Câmara"
@@ -1684,12 +1480,12 @@ msgstr "Câmara"
msgid "Port"
msgstr "Porto"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Nenhuma fotografia correspondendo a {0} encontrada"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1700,11 +1496,11 @@ msgstr ""
"adicionar a etiqueta a algumas fotografias ou seleccionar\n"
"uma etiqueta diferente no diálogo preferências do F-Spot."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "A pesquisa não devolveu resultados"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1731,19 +1527,19 @@ msgid_plural "Modified ({0})"
msgstr[0] "Modificado"
msgstr[1] "({0}) Modificados"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Modificado em {1}"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Modificado em {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:666 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Original"
@@ -1819,19 +1615,19 @@ msgstr "Seleccione os olhos a corrigir"
msgid "Sepia Tone"
msgstr "Tom Sépia"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Foco Suave"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Endireitar"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Erro ao importar"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Erro ao importar {0}{2}{2}{1}"
@@ -1846,8 +1642,8 @@ msgid "Unhandled exception"
msgstr "Excepção não tratada"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Copiar Local_ização da Foto"
+msgid "Copy Photo"
+msgstr "Copiar Foto"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1861,13 +1657,13 @@ msgstr "Abrir _Com"
msgid "Rem_ove Tag"
msgstr "Rem_over Etiqueta"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:453 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Rodar para a _Esquerda"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:454 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Rodar para a Di_reita"
@@ -1994,182 +1790,186 @@ msgid "C_ontrast:"
msgstr "C_ontraste:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "C_riar"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Selecção de Câmara"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Copiar ficheiros para a pasta Fotografias"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Criar E-mail"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Criar um _ícone para esta etiqueta na primeira utilização"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr ""
"Criar um e-mail com as fotos seleccionadas (possivelmente redimensionadas) "
"anexadas"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Detectar duplicados"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Apresentar _Nome dos Ficheiros"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr "Apresentar apenas fotos que foram importadas em Rolos especificos"
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Não enviar e-mail"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "E-_Mail:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "E_xportar títulos e comentários"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Novo tamanho estimado"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Muito grande"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "Vista do F-Spot"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Filtrar rolos seleccionados"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_aleria:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galeria"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Importar"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Importar Fonte:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Incluir subpastas"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Grande"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Gerir os seus rácios de selecção personalizados"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Médio"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Número de fotos nos rolos seleccionados:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Número de imagens"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Abrir _Pasta..."
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Tamanho original (possivelmente tamanhos muito grandes)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Etiquet_a Mãe:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pausar"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Preferências"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Anterior"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Reparar"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Seleccione Fotos para Copiar da Câmara..."
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Seleccionar uma Etiqueta..."
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Seleccione a câmara de onde quer transferir os ficheiros"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Câmara Seleccionada: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Restrições da Selecção"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Definir como _Fundo"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Apresentar todas as fotografias."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Apresentar ou esconder o painel lateral"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Apresentar ou esconder a barra de ferramentas"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "_Painel lateral"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Pequeno"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
@@ -2177,40 +1977,40 @@ msgstr ""
"Especificar se uma imagem de tamanho original deve ser rodada ou não. "
"Tamanhos menores são automaticamente rodados."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Limpar _metadados da imagem"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Te_mperatura:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Minúsculo"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Tamanho total original"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "Aprox_imar"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "Afasta_r"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Aumentar zoom"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Reduzir zoom"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Brilho:"
@@ -2337,7 +2137,7 @@ msgstr "Esconder Barra de Ferramentas"
msgid "Info"
msgstr "Info"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Informação da Imagem"
@@ -2345,8 +2145,8 @@ msgstr "Informação da Imagem"
msgid "Exit fullscreen"
msgstr "Sair do modo de ecrã completo"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Apresentação"
@@ -2394,7 +2194,7 @@ msgstr "Diretório InterOperability"
msgid "Unknown Directory"
msgstr "Directório Desconhecido"
-#: ../src/Imaging/ImageFile.cs:116
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "A escrita neste formato de ficheiro não é suportada"
@@ -2533,7 +2333,7 @@ msgstr "Género intelectual do objecto"
msgid "Unknown IIM DataSet"
msgstr "IIM DataSet Desconhecido"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:359
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Seleccionar Pasta"
@@ -2563,13 +2363,12 @@ msgstr ""
"O directório que seleccionou \"{0}\" não existe. Por favor escolha um "
"directório diferente"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Importar Etiquetas"
+msgid "Imported Tags"
+msgstr "Etiquetas Importadas"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:86
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Rodar para a Esquerda"
@@ -2577,7 +2376,7 @@ msgstr "Rodar para a Esquerda"
msgid "Rotate picture left"
msgstr "Rodar imagem para a esquerda"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Rodar para a Direita"
@@ -2593,51 +2392,51 @@ msgstr "Próxima Imagem"
msgid "Previous picture"
msgstr "Imagem anterior"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importar imagens novas"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Navegar"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Navegar em várias fotos simultaneamente"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Editar Imagem"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Ver e editar uma fotografia"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Ecrã Completo"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Ver fotos em ecrã completo"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Ver fotos numa apresentação"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Fotografia anterior"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Próxima fotografia"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Nenhuma câmara detectada."
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2645,24 +2444,24 @@ msgstr ""
"O F-Spot foi incapaz de encontrar câmaras ligadas a este sistema. Verifique "
"que a câmara está ligada e tem alimentação"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Erro ao ligar-se à câmara"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Erro recebido \"{0}\" ao ligar à câmara"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Juntar a etiqueta seleccionada"
msgstr[1] "Juntar as {0} etiquetas seleccionadas?"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2670,77 +2469,77 @@ msgstr ""
"Esta operação vai juntar as etiquetas seleccionadas e quaisquer sub-"
"etiquetas numa só."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Juntar Etiquetas"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "Fotografia {0} de {1}"
msgstr[1] "{0} Fotografias de {1}"
-#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:495
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} Fotografia"
msgstr[1] "{0} Fotografias"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] "({0} seleccionado)"
msgstr[1] "({0} seleccionados)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Ok"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Erro ao Apagar Imagem"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Sem permissão para apagar o ficheiro:{1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Um erro do tipo {0} ocorreu ao apagar o ficheiro:{2}{1}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Apagar a fotografia seleccionada permanentemente?"
msgstr[1] "Apagar as {0} fotografias seleccionadas permanentemente?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
msgstr[0] "Isto apaga todas as versões da foto seleccionada do disco."
msgstr[1] "Isto apaga todas as versões das fotos seleccionadas do disco."
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Apagar fotografia"
msgstr[1] "_Apagar fotografias"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Remover a fotografia seleccionada do F-Spot?"
msgstr[1] "Remover as {0} fotografias seleccionadas do F-Spot?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2750,27 +2549,27 @@ msgstr ""
"etiquetas serão perdidas. As fotografias permanecem no seu computador podem "
"ser importadas para o F-Spot de novo."
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Remover do Catálogo"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Apagar etiqueta \"{0}\"?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Apagar as {0} etiquetas seleccionadas?"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "Fotos"
msgstr[1] "fotos"
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -2778,18 +2577,18 @@ msgid_plural ""
msgstr[0] "Se apagar esta etiqueta, a associação com {0} {1} será perdida."
msgstr[1] "Se apagar estas etiquetas, a associação com {0} {1} será perdida."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Apagar Etiqueta"
msgstr[1] "_Apagar Etiquetas"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Etiqueta não está vazia"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2798,39 +2597,39 @@ msgstr ""
"Incapaz de apagar etiquetas que contêm etiquetas. Por favor apague as "
"etiquetas dentro de \"{0}\" primeiro"
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Rodar a fotografia seleccionada para a esquerda"
msgstr[1] "Rodar as fotografias seleccionadas para a esquerda"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Rodar a fotografia seleccionada para a direita"
msgstr[1] "Rodar as fotografias seleccionadas para a direita"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Procurar a Etiqueta Seleccionada"
msgstr[1] "Procurar as Etiquetas _Seleccionadas"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Procurar Etiqueta Seleccionada Com"
msgstr[1] "Procurar Etiquetas Seleccionadas _Com"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Criar Nova Versão?"
msgstr[1] "Criar Novas Versões?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2845,7 +2644,7 @@ msgstr[1] ""
"Antes de iniciar {1}, deverá o F-Spot criar novas versões das fotos "
"seleccionadas para preservar as originais?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "Versão XCF"
@@ -2869,87 +2668,93 @@ msgstr "Assunto e Palavras-chave"
msgid "Compression"
msgstr "Compressão"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Configuração de Planificação"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientação"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Interpretação Fotométrica"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Unidade de Resolução"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Programa de Exposição"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Modo de Medida"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Tempo de Exposição"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Renderização Personalizada"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Configuração dos Componentes"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Fonte de Luz"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Método Sensor"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Espaço de Cores"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Equilíbrio Branco"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Unidade de Resolução do Plano Focal"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Tipo de Origem do Ficheiro"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Tipo de Captura da Cena"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Controlo de Ganho"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Contraste"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Saturação"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Acuidade"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Tipo da Cena"
@@ -3019,26 +2824,26 @@ msgstr "Incapaz de renomear uma versão"
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Recebida excepção \"{0}\". Incapaz de renomear versão para \"{1}\""
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:554
-#: ../src/Widgets/InfoBox.cs:556
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Sem Edições)"
-#: ../src/PhotoView.cs:169 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Erro ao editar fotografia"
-#: ../src/PhotoView.cs:170 ../src/Sharpener.cs:73
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "Excepção \"{0}\" recebida. Não foi possível guardar foto {1}"
-#: ../src/PhotoView.cs:359
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Comentário:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Fotos"
@@ -3159,8 +2964,8 @@ msgstr "Ocorreu um erro ao processar \"{0}\": {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "as minhas fotos"
+msgid "My Photos"
+msgstr "As Minhas Fotos"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3182,23 +2987,23 @@ msgstr "Raio:"
msgid "Threshold:"
msgstr "Limiar:"
-#: ../src/SingleView.cs:88
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Rodar foto para a esquerda"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Rodar foto para a direita"
-#: ../src/SingleView.cs:130
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Pasta"
-#: ../src/SingleView.cs:356
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Abrir"
-#: ../src/SingleView.cs:456
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Definir como Fundo"
@@ -3227,8 +3032,8 @@ msgid "Create New Tag..."
msgstr "Criar Nova Etiqueta..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Editar Etiqueta Seleccionada..."
+msgid "Edit Tag..."
+msgstr "Editar Etiqueta..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3311,7 +3116,7 @@ msgid "Events"
msgstr "Eventos"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Nenhum)"
@@ -3344,19 +3149,19 @@ msgstr "A Actualizar Miniaturas"
msgid "Updating picture \"{0}\""
msgstr "A actualizar imagem \"{0}\""
-#: ../src/UI.Dialog/AboutDialog.cs:71
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Gestor de Fotografias para o GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:72
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:95
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr "Filipe Gomes <filipefgomes at gmail.com>"
-#: ../src/UI.Dialog/AboutDialog.cs:100
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "Página Web do F-Spot"
@@ -3454,16 +3259,16 @@ msgstr "Detalhes do Erro"
msgid "An unhandled exception was thrown: "
msgstr "Uma excepção não manipulada foi lançada: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Nenhum"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Perfil do sistema"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Tema padrão"
@@ -3488,7 +3293,7 @@ msgstr "Etiqueta"
msgid "Ratio"
msgstr "Rácio"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Tentar Novamente"
@@ -3681,8 +3486,8 @@ msgid "By _Rating"
msgstr "Por _Classificação"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Copiar Local_ização"
+msgid "Copy"
+msgstr "Copiar"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3692,10 +3497,6 @@ msgstr "Criar Nova E_tiqueta..."
msgid "Create _New Version..."
msgstr "Criar _Nova Versão..."
-#: ../src/ui/main_window.ui.h:10
-msgid "F-Spot"
-msgstr "F-Spot"
-
#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "Pr_ocurar"
@@ -3712,6 +3513,10 @@ msgstr "Config_uração de Página..."
msgid "Re_fresh Thumbnail"
msgstr "Actuali_zar Miniatura"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Seleccion_ar Tudo"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "Seleccionar _Nenhum"
@@ -3774,8 +3579,8 @@ msgid "_Delete Version"
msgstr "A_pagar Versão"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Editar Etiqueta Seleccionada..."
+msgid "_Edit Tag..."
+msgstr "_Editar Etiqueta..."
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
@@ -3873,11 +3678,11 @@ msgstr "Fotos sem Etiq_ueta"
msgid "_Version"
msgstr "_Versão"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "A Actualizar Base de Dados do F-Spot"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -3970,11 +3775,11 @@ msgstr "Imprimir etiquetas da foto"
msgid "Print photo comment"
msgstr "Imprimir comentário da foto"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Editar"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -3982,13 +3787,13 @@ msgstr ""
"Esta ferramenta necessita de uma selecção activa. Por favor seleccione uma "
"região da foto e tente esta operação novamente"
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Erro ao guardar fotografia ajustada"
msgstr[1] "Erro ao guardar fotografias ajustadas"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
@@ -4009,7 +3814,7 @@ msgstr "_Vertical"
msgid "Find:"
msgstr "Procurar:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Pastas"
@@ -4021,53 +3826,58 @@ msgstr "Sistema de Ficheiros"
msgid "Histogram"
msgstr "Histograma"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Versão"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Data"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Exposição"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Distância Focal"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Tamanho do Ficheiro"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Classificação"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Desconhecido)"
-
-#: ../src/Widgets/InfoBox.cs:419
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(formato errado)"
-#: ../src/Widgets/InfoBox.cs:552
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Desconhecido)"
+
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
msgstr[0] "(Uma Edição)"
msgstr[1] "({0} Edições)"
-#: ../src/Widgets/InfoBox.cs:566
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(Erro na leitura do ficheiro)"
-#: ../src/Widgets/InfoBox.cs:611
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} Fotos"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:631
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -4076,7 +3886,7 @@ msgstr ""
"Em {0} entre \n"
"{1} e {2}"
-#: ../src/Widgets/InfoBox.cs:636
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -4085,61 +3895,61 @@ msgstr ""
"Entre {0} \n"
"e {1}"
-#: ../src/Widgets/InfoBox.cs:663
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(Pelo menos um Ficheiro não encontrado)"
-#: ../src/Widgets/InfoBox.cs:780
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Apresentar Nome da Foto"
-#: ../src/Widgets/InfoBox.cs:789
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Apresentar Data"
-#: ../src/Widgets/InfoBox.cs:798
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Apresentar Tamanho"
-#: ../src/Widgets/InfoBox.cs:807
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Apresentar Exposição"
-#: ../src/Widgets/InfoBox.cs:816
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Apresentar Distância Focal"
-#: ../src/Widgets/InfoBox.cs:825
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Apresentar Câmara"
-#: ../src/Widgets/InfoBox.cs:834
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Apresentar Tamanho do Ficheiro"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metadados"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Metadados Extendidos"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Nenhuns Metadados Extendidos disponíveis"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Nenhuma fotografia activa"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "A fotografia \"{0}\" não existe"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Nenhuns metadados disponíveis"
@@ -4172,54 +3982,211 @@ msgstr "Exibe uma apresentação de diapositivos do F-Spot"
msgid "F-Spot photos"
msgstr "Fotografias do F-Spot"
-#~| msgid "<b>Import Settings</b>"
-#~ msgid "<b>F-Spot tags</b>"
-#~ msgstr "<b>Etiquetas do F-Spot</b>"
+#~ msgid "Package"
+#~ msgstr "Pacote"
+
+#~ msgid "Extension Installation"
+#~ msgstr "Instalação de Extensão"
+
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Seleccione as extensões a instalar e clique em Seguinte</b>"
+
+#~ msgid "Install from:"
+#~ msgstr "Instalar de:"
+
+#~ msgid "_Repositories..."
+#~ msgstr "_Repositórios..."
+
+#~ msgid "Show all packages"
+#~ msgstr "Apresentar todos os pacotes"
+
+#~ msgid "Show new versions only"
+#~ msgstr "Apresentar apenas novas versões"
+
+#~ msgid "Show updates only"
+#~ msgstr "Apresentar apenas actualizações"
+
+#~ msgid "_Unselect All"
+#~ msgstr "Desseleccionar _Tudo"
+
+#~ msgid "label124"
+#~ msgstr "etiqueta124"
+
+#~ msgid "Overall Progress:"
+#~ msgstr "Progresso Geral:"
+
+#~ msgid "Downloading extensions..."
+#~ msgstr "A transferir extensões..."
+
+#~ msgid "Extension Manager"
+#~ msgstr "Gestor de Extensões"
+
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "São necessárias extensões adicionais para realizar esta operação."
+
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "As seguintes extensões serão instaladas:"
+
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Gestor de Extensões</b></big>"
+
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "As seguintes extensões encontram-se actualmente instaladas:"
+
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Instalar Extensões..."
-#~ msgid "<b>Tabblo account</b>"
-#~ msgstr "<b>Conta Tabblo</b>"
+#~ msgid "_Uninstall..."
+#~ msgstr "_Desinstalar..."
+
+#~ msgid "Enable"
+#~ msgstr "Activar"
+
+#~ msgid "Disable"
+#~ msgstr "Desactivar"
+
+#~ msgid "Details"
+#~ msgstr "Detalhes"
+
+#~ msgid "Extension Repository Management"
+#~ msgstr "Gestão do Repositório de Extensões"
+
+#~ msgid "Add New Repository"
+#~ msgstr "Adicionar Novo Repositório"
+
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Seleccione a localização do repositório que deseja registar:"
+
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registrar um repositório on-line"
+
+#~ msgid "Url:"
+#~ msgstr "Url:"
+
+#~ msgid "Register a local repository"
+#~ msgstr "Registar um repositório local"
+
+#~ msgid "Path:"
+#~ msgstr "Caminho:"
+
+#~ msgid "Browse..."
+#~ msgstr "Navegar..."
+
+#~ msgid "Version:"
+#~ msgstr "Versão:"
+
+#~ msgid "Author:"
+#~ msgstr "Autor:"
+
+#~ msgid "Copyright:"
+#~ msgstr "Copyright:"
+
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Dependências da Extensão:"
+
+#~ msgid "All registered repositories"
+#~ msgstr "Todos os repositórios registrados"
+
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Tem a certeza que deseja cancelar a instalação?"
+
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Os pacotes seguintes serão removidos:"
+
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Existem outras extensões que dependem dos anteriores que também serão "
+#~ "removidas:"
#~ msgid ""
-#~ "<small><i>F-Spot tags can help you track the export status of photos. "
-#~ "Example: Use one tag for the photos that you plan to export, and another "
-#~ "one for those already exported. Here, you can tell F-Spot to "
-#~ "automatically replace these tags as appropriate.</i></small>"
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
#~ msgstr ""
-#~ "<small><i>As etiquetas do F-Spot podem ajudá-lo o estado da exportação "
-#~ "das fotos. Exemplo: Utilize uma etiqueta para as fotos que pretende "
-#~ "exportar, e outra para as já exportadas. Aqui, pode dizer ao F-Spot para "
-#~ "substituir automaticamente estas etiquetas apropriadamente.</i></small>"
+#~ "As extensões seleccionadas não podem ser instaladas por causa de "
+#~ "conflitos de dependências."
+
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Os pacotes seguintes serão instalados:"
+
+#~ msgid " (in user directory)"
+#~ msgstr " (no directório do utilizador)"
+
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Os pacotes seguintes precisam de ser removidos:"
+
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Não foi possível resolver as dependências seguintes:"
+
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "A instalação terminou com sucesso."
+
+#~ msgid "The installation failed!"
+#~ msgstr "Falha na instalação!"
+
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "A instalação terminou com avisos."
+
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "A desinstalação terminou com sucesso."
+
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Falha na desinstalação!"
+
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "A desinstalação terminou com avisos."
+
+#~ msgid "Repository"
+#~ msgstr "Repositório"
+
+#~ msgid "Installation cancelled"
+#~ msgstr "Instalação cancelada"
+
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Algumas das extensões necessárias não foram encontradas"
+
+#~ msgid "Installation failed"
+#~ msgstr "Falha na instalação"
+
+#~ msgid "Extension"
+#~ msgstr "Extensão"
+
+#~ msgid "Other"
+#~ msgstr "Outro"
+
+#~ msgid "Url"
+#~ msgstr "Url"
-#~ msgid "Rem_ove from exported photos:"
-#~ msgstr "Rem_over das fotos exportadas:"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Ocorreu uma excepção: {0}"
-#~| msgid "Select a Tag..."
-#~ msgid "Select..."
-#~ msgstr "Seleccionar..."
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Extensões desactivadas não podem ser carregadas."
-#~ msgid "_Attach to exported photos:"
-#~ msgstr "_Anexar as fotos exportadas:"
+#~ msgid "Loading {0} extension"
+#~ msgstr "A carregar extensão {0}"
-#~ msgid "<b>{0}</b>."
-#~ msgstr "<b>{0}</b>."
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "A extensão necessária '{0}' está desactivada."
-#~ msgid "A trust error occured while attempting to access"
-#~ msgstr "Um erro de confiança ocorreu ao tentar o acesso"
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "A extensão necessária '{0}' não está instalada."
-#~ msgid "Abort this session"
-#~ msgstr "Abortar esta sessão"
+#~ msgid "(provided by {0})"
+#~ msgstr "(fornecido por {0})"
-#~ msgid "Always trust this site's certificate"
-#~ msgstr "Confiar sempre no certificado deste sítio"
+#~ msgid "my photos"
+#~ msgstr "as minhas fotos"
-#~ msgid "Do you wish to:"
-#~ msgstr "Deseja:"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Editar Etiqueta Seleccionada..."
-#~ msgid "Trust Error"
-#~ msgstr "Erro de Confiança"
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Copiar Local_ização"
-#~ msgid "Trust the site's certificate this once"
-#~ msgstr "Confiar no certificado deste sítio desta vez"
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Editar Etiqueta Seleccionada..."
#~ msgid "Dissolve"
#~ msgstr "Dissolver"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 38a4f56..35fb37a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,18 +5,19 @@
# Vladimir Melo <vmelo at gnome.org>, 2007, 2008, 2009.
# Og Maciel <ogmaciel at gnome.org>, 2007-2009.
# Amadeu A. Barbosa Júnior <amadeu at gmail.com>, 2008.
-# Michel Recondo <mrecondo at gmail.com>, 2008.
+# Michel Recondo <mrecondo at gmail.com>, 2008-2009
# Enrico Nicoletto <liverig at gmail.com>, 2009.
# Eduardo Brasil <eduebrasil at gmail.com>, 2009.
# Leonardo Ferreira Fontenelle <leonardof at gnome.org>, 2009.
# Jonh Wendell <jwendell at gnome.org>, 2009.
+# André Gondim <andregondim at ubuntu.com>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-27 11:12-0300\n"
-"PO-Revision-Date: 2009-08-27 11:11-0300\n"
-"Last-Translator: Jonh Wendell <jwendell at gnome.org>\n"
+"POT-Creation-Date: 2010-04-15 13:38-0400\n"
+"PO-Revision-Date: 2010-04-15 14:28-0300\n"
+"Last-Translator: Vladimir Melo <vmelo at gnome.org>\n"
"Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +35,7 @@ msgstr "_CD..."
#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
#: ../src/CameraFileSelectionDialog.cs:199
msgid "Transferring Pictures"
-msgstr "Transferindo fotos"
+msgstr "Transferindo figuras"
#: ../extensions/Exporters/CDExport/CDExport.cs:218
#, csharp-format
@@ -46,26 +47,26 @@ msgstr "Transferindo figura \"{0}\" para CD"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} de {1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
msgid "Done Sending Photos"
-msgstr "Envio de fotos completo"
+msgstr "Envio de fotos concluído"
#: ../extensions/Exporters/CDExport/CDExport.cs:235
#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
msgid "Transfer Complete"
-msgstr "Transferência completa"
+msgstr "Transferência concluída"
#: ../extensions/Exporters/CDExport/CDExport.cs:242
#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
@@ -102,7 +103,7 @@ msgid "Create CD"
msgstr "Criar CD"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Tamanho"
@@ -120,6 +121,7 @@ msgstr "_Navegar nos arquivos agendados anteriormente"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Exportar"
@@ -150,19 +152,20 @@ msgstr ""
"Quando você tiver sido orientado pelo Facebook a retornar ao aplicativo, "
"clique \"OK\" abaixo."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
msgstr "Imagens demais para exportar"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
+"Facebook only permits {0} photographs per album. Please refine your "
"selection and try again."
msgstr ""
-"O Facebook permite apenas 60 fotografias por álbum. Por favor refine a sua "
+"O Facebook permite apenas {0} fotografias por álbum. Por favor refine a sua "
"seleção e tente novamente."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -170,19 +173,19 @@ msgstr ""
msgid "Uploading Pictures"
msgstr "Enviando figuras"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "O álbum precisa ter um nome"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
msgstr "Por favor, dê um nome para o seu álbum ou escolha um álbum existente."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "A criação do novo álbum falhou"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -193,36 +196,39 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "Enviando foto \"{0}\" ({1} de {2})"
+msgstr "Enviando figura \"{0}\" ({1} de {2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
msgstr "Erro ao enviar para Facebook: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Erro"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
msgid "Upload Complete"
-msgstr "Envio completo"
+msgstr "Envio concluído"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Visitar o grupo do F-Spot no Facebook"
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
@@ -343,8 +349,7 @@ msgid "Logout"
msgstr "Encerra sessão"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Nome"
@@ -466,6 +471,7 @@ msgstr "<b>Conta</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
msgstr "<b>Fotos</b>"
@@ -481,13 +487,14 @@ msgstr "<b>Estilo</b>"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
msgid "<b>Viewing permissions</b>"
-msgstr "<b>Permissões de exibição</b>"
+msgstr "<b>Permissões de visão</b>"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exportar"
@@ -507,7 +514,7 @@ msgstr ""
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
msgid "Ignore _top level tags"
-msgstr "Ignorar as _etiquetas de maior nível"
+msgstr "Ignorar as e_tiquetas de maior nível"
#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
msgid "Private"
@@ -572,7 +579,7 @@ msgstr "Montando galeria"
#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
#, csharp-format
msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "Erro ao enviar foto \"{0}\" para o Gallery:{2}{1}"
+msgstr "Erro ao enviar figura \"{0}\" para o Gallery:{2}{1}"
#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
msgid "Error: Error while transferring; Aborting"
@@ -583,58 +590,58 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Erro: o arquivo já existe; abortando"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Claro"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Escuro"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Ant"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Índice"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Etiquetas"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
msgid "Next"
msgstr "Próxima"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galeria criada por"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Mostrar estilos"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Ocultar estilos"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Etiquetas: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Página:"
@@ -756,7 +763,7 @@ msgstr ""
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
#, csharp-format
msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Erro ao enviar foto \"{0}\" para Galeria: {1}"
+msgstr "Erro ao enviar figura \"{0}\" para Galeria: {1}"
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
@@ -853,6 +860,7 @@ msgstr "Álbum _pai:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Senha:"
@@ -863,6 +871,7 @@ msgstr "_Título:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "Nome do _usuário:"
@@ -930,7 +939,7 @@ msgid ""
"The selected album has a limit of {0} pictures,\n"
"which would be passed with the current selection of {1} images"
msgstr ""
-"O álbum selecionado possui um limite de {0} fotos,\n"
+"O álbum selecionado possui um limite de {0} figuras,\n"
"que poderá ser ultrapassado com a seleção atual de {1} imagens"
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
@@ -1003,22 +1012,83 @@ msgstr "_Tabblo..."
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
msgid "Done sending photos"
-msgstr "Envio de fotos completo"
+msgstr "Envio de fotos concluído"
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
msgid "Upload complete"
-msgstr "Envio completo"
+msgstr "Envio concluído"
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
msgid "Error uploading to Tabblo: "
msgstr "Erro ao enviar para Tabblo: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Etiquetas do F-Spot</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Conta do Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>As etiquetas do F-Spot podem ajudá-lo a acompanhar o status de "
+"exportação das fotos. Exemplo: Use uma etiqueta para as fotos que você "
+"pretende exportar, e outra para aquelas que já exportou. Aqui, você pode "
+"dizer ao F-Spot para substituir automaticamente estas etiquetas conforme o "
+"caso.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "Rem_ove das fotos exportadas:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Selecionar..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Anexar às fotos exportadas:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Um erro de confiança ocorreu ao tentar acessar"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Abortar esta sessão"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Sempre confiar no certificado deste site"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Você deseja:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Erro de confiança"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Confiar no certificado do site dessa vez"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Arquivo _comprimido"
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Nenhuma seleção disponível"
@@ -1028,7 +1098,7 @@ msgid ""
"and try again"
msgstr ""
"Esta ferramenta requer uma seleção ativa. Por favor, selecione uma ou mais "
-"fotos e tente novamente"
+"figuras e tente novamente"
#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
msgid "Select export folder"
@@ -1044,7 +1114,6 @@ msgid "Preparing photo \"{0}\""
msgstr "Preparando foto \"{0}\""
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "_Criar"
@@ -1066,11 +1135,23 @@ msgid ""
"needs to analyze your image collection. This is not done by default as it's "
"time consuming. You can Start or Pause this update process using this dialog."
msgstr ""
-"Para detectar imagens duplicadas que você importou antes da versão 0.5.0, o "
+"Para detectar figuras duplicadas que você importou antes da versão 0.5.0, o "
"F-Spot precisa analisar a sua coleção de imagens. Isto não é feito por "
"padrão pelo consumo de tempo. Você pode Iniciar ou Pausar este processo de "
"atualização usando este diálogo."
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+"Você atualmente tem {0} fotos que precisam de cálculo md5, e {1} trabalhos "
+"pendentes"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Fechar"
+
#: ../extensions/Tools/HashJob/HashJob.cs:102
msgid "Processing images..."
msgstr "Processando imagens..."
@@ -1079,6 +1160,117 @@ msgstr "Processando imagens..."
msgid "Stopped"
msgstr "Parado"
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "Verificar duplicidades..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Galeria do F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "A galeria da web parece estar desconectada agora"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Mostrar todas"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} foto"
+msgstr[1] "{0} fotos"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Visão atual"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Selecionada"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Galeria Live da Web"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>A galeria fica ativa até você desativá-la ou fechar o\n"
+"F-Spot. Assegure que os visualizadores locais a acessam repassando o proxy "
+"HTTP.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Quando a galeria estiver ativa, abaixo estará o URL que você "
+"precisa para acessar \n"
+"em outro computador as fotos compartilhadas.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Ativa e desativa a galeria da web"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Permitir que visualizadores adicionem etiquetas"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Copiar URL para área de transferência"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "Galeria Live da Web do F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL da galeria:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Número limite de fotos compartilhadas para"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Opções:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Fotos com uma etiqueta"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Fotos selecionadas"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Compartilhar:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Visões:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "nenhuma"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galeria: {0}, Fotos: {1}, Último cliente: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "A galeria está inativa"
+
#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
msgid "Merge Db"
msgstr "Mesclar Db"
@@ -1165,7 +1357,7 @@ msgid "New Rolls Only"
msgstr "Apenas rolos novos"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:51
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Ignorar"
@@ -1209,26 +1401,31 @@ msgid "Screensaver Configuration"
msgstr "Configuração da proteção de tela"
#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
msgid "F-Spot Photo Manager"
msgstr "Gerenciador de fotos F-Spot"
-#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot.desktop.in.in.h:3
msgid "Organize, enjoy, and share your photos"
msgstr "Organize, compartilhe e divirta-se com suas fotos"
-#: ../f-spot.desktop.in.in.h:3 ../f-spot-import.desktop.in.in.h:3
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
msgid "Photo Manager"
msgstr "Gerenciador de fotos"
-#: ../f-spot-import.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:3
msgid "Import into F-Spot"
msgstr "Importar para o F-Spot"
-#: ../f-spot-view.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:2
msgid "F-Spot Photo Viewer"
msgstr "Visualizador de fotos F-Spot"
-#: ../f-spot-view.desktop.in.in.h:2
+#: ../f-spot-view.desktop.in.in.h:3
msgid "Photo Viewer"
msgstr "Visualizador de fotos"
@@ -1245,285 +1442,6 @@ msgstr "Tipo de transformação %d desconhecido"
msgid "Operation failed"
msgstr "Falha na operação"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Pacote F-Spot"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Instalação de extensão"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Selecione as extensões a serem instaladas e clique em Avançar</b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Instalar de:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Repositórios..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Mostrar todos os pacotes"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Mostrar apenas novas versões"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Mostrar apenas atualizações"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Desmarcar T_odos"
-
-# "Todos" porque refere-se aos pacotes de instalação
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Selecionar _todos"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Progresso total:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Descarregando extensões..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Gerenciador de extensões"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Extensões adicionais são requeridas para executar essa operação."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "As seguintes extensões serão instaladas:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Gerenciador de Extensões do F-Spot</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "As seguintes extensões estão instaladas atualmente:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Instalar extensões..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Desinstalar..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Habilitar"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Desabilitar"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Detalhes"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Gerenciamento dos repositórios de extensões"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Adicionar novo repositório"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Selecione a localização do repositório que quer registrar:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Registrar um repositório on-line"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "URL:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Registrar um repositório local"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Caminho:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Navegar..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Versão:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Autor:"
-
-# No VP mantém-se a o original
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Dependências da extensão:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Todos os repositórios registrados"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Tem certeza que quer cancelar a instalação?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Os seguintes pacotes serão desinstalados:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr ""
-"Existem outras extensões que dependem das anteriores que também serão "
-"desinstaladas:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr ""
-"Não foi possível instalar as extensões selecionadas por causa de conflitos "
-"de dependências."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Os seguintes pacotes serão instalados:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (no diretório do usuário)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Os seguintes pacotes precisam ser desinstalados:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Não foi possível resolver as seguintes dependências:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Instalação realizada com sucesso."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Falha na instalação!"
-
-# Nos diálogos não há nada referente a visualizar os warnings então omiti sua tradução.
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Instalação realizada com sucesso."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Desinstalação realizada com sucesso."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Falha na desinstalação!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Desinstalação realizada com sucesso."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Repositório"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Instalação cancelada"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Algumas das extensões necessárias não foram localizadas"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Falha na instalação"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Extensão"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Versão"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Outros"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "URL"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Ocorreu uma exceção: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Extensões desabilitadas não podem ser carregadas."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Carregando {0} extensão"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "A extensão requerida \"{0}\" está desabilitada."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "A extensão requerida \"{0}\" não está instalada."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(fornecido por {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Visualização"
@@ -1532,7 +1450,7 @@ msgstr "Visualização"
msgid "Path"
msgstr "Caminho"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Arquivo"
@@ -1559,19 +1477,19 @@ msgid "Error transferring file"
msgstr "Erro ao transferir o arquivo"
#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Download Complete"
+msgstr "Download concluído"
+
+#: ../src/CameraFileSelectionDialog.cs:244
msgid "Done Copying Files"
msgstr "Cópia de arquivos pronta"
-#: ../src/CameraFileSelectionDialog.cs:246
-msgid "Download Complete"
-msgstr "Download completo"
-
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "Transferindo \"{0}\" da câmera"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:230
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Câmera"
@@ -1579,12 +1497,12 @@ msgstr "Câmera"
msgid "Port"
msgstr "Porta"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Não foi localizada foto correspondendo a {0}"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1595,11 +1513,11 @@ msgstr ""
"a etiqueta a algumas fotos ou selecione uma etiqueta diferente no\n"
"diálogo de preferência do F-Spot."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Nenhum resultado encontrado"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1627,19 +1545,19 @@ msgid_plural "Modified ({0})"
msgstr[0] "Modificado"
msgstr[1] "({0}) modificados"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Modificado em {1}"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Modificado em {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:666 ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Original"
@@ -1715,19 +1633,19 @@ msgstr "Seleciona os olhos que quer corrigir."
msgid "Sepia Tone"
msgstr "Tom de sépia"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Foco suave"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Retificar"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Erro de importação"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Erro ao importar {0}{2}{2}{1}"
@@ -1742,8 +1660,8 @@ msgid "Unhandled exception"
msgstr "Exceção sem tratamento"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Copiar Locali_zação da foto"
+msgid "Copy Photo"
+msgstr "Copiar foto"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1757,13 +1675,13 @@ msgstr "Abrir c_om"
msgid "Rem_ove Tag"
msgstr "Rem_over etiqueta"
-#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:453 ../src/ui/main_window.ui.h:16
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Girar à _esquerda"
-#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:454 ../src/ui/main_window.ui.h:17
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Girar à _direita"
@@ -1833,7 +1751,7 @@ msgstr "<b>Partes transparentes</b>"
#: ../src/f-spot.glade.h:19
msgid "<b>View all pictures imported</b>"
-msgstr "<b>Ver todas as fotos importadas</b>"
+msgstr "<b>Ver todas as figuras importadas</b>"
#: ../src/f-spot.glade.h:20
msgid "<b>_White Balance</b>"
@@ -1890,224 +1808,228 @@ msgid "C_ontrast:"
msgstr "C_ontraste:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Criar"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Seleção de câmera"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Copiar arquivos para pasta Photos"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Criar e-mail"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Criar ícone para esta etiqueta ao _usá-la pela primeira vez"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr ""
"Cria um e-mail com as fotos selecionadas (possivelmente redimensionadas) em "
"anexo"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Detectar duplicatas"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Exibir nomes de _arquivos"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr ""
"Exibir apenas aquelas fotos que foram importadas em rolos especificados."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Não enviar um e-mail"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "E-_mail:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "E_xportar títulos e comentários"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Novo tamanho estimado"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Muito grande"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
-msgstr "Visualização do F-Spot"
+msgstr "Visão do F-Spot"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Filtrar rolos selecionados"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_aleria:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galeria"
-#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Importar"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Fonte da importação:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Incluir subpastas"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Grande"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Gerenciar as suas proporções de seleção personalizadas"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Médio"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Número de fotos nos rolos selecionados:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
-msgstr "Número de fotos"
+msgstr "Número de figuras"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Abrir _pasta..."
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Tamanho original (tamanho de arquivo muito grande possível)"
-#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "Etiquet_a principal:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Pausar"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Preferências"
-#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Anterior"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Reparar"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Selecione fotos para copiar da câmera..."
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Selecionar uma etiqueta..."
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Selecione a câmera da qual deseja transferir arquivos"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Câmera selecionada: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Restrições de seleção"
-#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Definir como plano de _fundo"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Mostrar todas as fotos."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Mostra ou oculta a barra lateral"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Mostra ou oculta a barra de ferramentas"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "_Painel lateral"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Pequeno"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid ""
"Specify if an original size picture should be rotated or not. Smaller sizes "
"are automatically rotated."
msgstr ""
-"Especifica se uma foto de tamanho original deve ser girada ou não. Tamanhos "
-"menores são automaticamente girados."
+"Especifica se uma figura de tamanho original deve ser girada ou não. "
+"Tamanhos menores são automaticamente girados."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Descartar _metadados"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Te_mp:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Minúsculo"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Tamanho original total"
-#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "_Ampliar"
-#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "Red_uzir"
-#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Amplia"
-#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Reduz"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Brilho:"
@@ -2234,7 +2156,7 @@ msgstr "Ocultar barra de ferramentas"
msgid "Info"
msgstr "Informações"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:200
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Informações da imagem"
@@ -2242,8 +2164,8 @@ msgstr "Informações da imagem"
msgid "Exit fullscreen"
msgstr "Sair da tela cheia"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:103
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Apresentação"
@@ -2291,7 +2213,7 @@ msgstr "Diretório InterOperability"
msgid "Unknown Directory"
msgstr "Diretório desconhecido"
-#: ../src/Imaging/ImageFile.cs:113
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Não há suporte de gravação para este tipo de arquivo"
@@ -2429,7 +2351,7 @@ msgstr "O gênero intelectual do objeto"
msgid "Unknown IIM DataSet"
msgstr "Conjunto de dados IIM desconhecido"
-#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:359
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Selecionar pasta"
@@ -2446,11 +2368,11 @@ msgstr "Carregando {0} de {1}"
msgid "Done Loading"
msgstr "Carregamento pronto"
-#: ../src/ImportCommand.cs:683
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "O diretório não existe."
-#: ../src/ImportCommand.cs:684
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
@@ -2459,81 +2381,80 @@ msgstr ""
"O diretório selecionado \"{0}\" não existe. Por favor, escolha um diretório "
"diferente"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Importar etiquetas"
+msgid "Imported Tags"
+msgstr "Etiquetas importadas"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:86
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Girar à esquerda"
#: ../src/ItemAction.cs:80
msgid "Rotate picture left"
-msgstr "Gira a foto à esquerda"
+msgstr "Gira a figura à esquerda"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:91
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Girar à direita"
#: ../src/ItemAction.cs:92
msgid "Rotate picture right"
-msgstr "Gira a foto à direita"
+msgstr "Gira a figura à direita"
#: ../src/ItemAction.cs:103
msgid "Next picture"
-msgstr "Próxima foto"
+msgstr "Próxima figura"
#: ../src/ItemAction.cs:124
msgid "Previous picture"
-msgstr "Foto anterior"
+msgstr "Figura anterior"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importar novas imagens"
-#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Navegar"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Navega em várias fotos simultaneamente"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Editar imagem"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Vê e edita uma foto"
-#: ../src/MainWindow.cs:302 ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Tela cheia"
-#: ../src/MainWindow.cs:304 ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Vê fotos em tela cheia"
-#: ../src/MainWindow.cs:309 ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Vê fotos em uma apresentação de slides"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Foto anterior"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Próxima foto"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Nenhuma câmera detectada."
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -2541,24 +2462,24 @@ msgstr ""
"O F-Spot não foi capaz de localizar qualquer câmera anexada a este sistema. "
"Confira novamente se a câmera está conectada e ligada"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Erro ao conectar a câmera"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Erro recebido \"{0}\" ao conectar à câmera"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Mesclar a etiqueta selecionada"
msgstr[1] "Mesclar as {0} etiquetas selecionadas?"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
@@ -2566,77 +2487,77 @@ msgstr ""
"Esta operação mesclará as etiquetas selecionadas e quaisquer sub-etiquetas "
"numa única etiqueta."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Mesclar etiquetas"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} foto de {1}"
msgstr[1] "{0} fotos de {1}"
-#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:495
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} foto"
msgstr[1] "{0} fotos"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} selecionada)"
msgstr[1] " ({0} selecionadas)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Ok"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Erro ao excluir figura"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Não há permissão para excluir o arquivo:{1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Um erro de tipo {0} ocorreu ao excluir o arquivo:{2}{1}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Remover a foto selecionada permanentemente?"
msgstr[1] "Remover as {0} fotos selecionadas permanentemente?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
msgstr[0] "Isso exclui todas as versões da foto selecionada de sua unidade."
msgstr[1] "Isso exclui todas as versões das fotos selecionadas de sua unidade."
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Excluir foto"
msgstr[1] "_Excluir fotos"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Remover a foto selecionada do F-Spot?"
msgstr[1] "Remover as {0} fotos selecionadas do F-Spot?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -2646,27 +2567,27 @@ msgstr ""
"etiqueta são perdidas. As fotos continuam em seu computador e poderão ser "
"importadas ao F-Spot novamente."
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "_Remover do catálogo"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Excluir etiqueta \"{0}\"?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Excluir as {0} etiquetas selecionadas?"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "foto"
msgstr[1] "fotos"
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
@@ -2676,18 +2597,18 @@ msgstr[0] ""
msgstr[1] ""
"Se você excluir estas etiqueta, as associações com {0} {1} serão perdidas."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Excluir etiqueta"
msgstr[1] "_Excluir etiquetas"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "A etiqueta não está vazia"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -2696,39 +2617,39 @@ msgstr ""
"Não é possível excluir etiquetas que contenham outras etiquetas. Por favor, "
"exclua as etiquetas sob \"{0}\" primeiro"
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Girar foto selecionada à esquerda"
msgstr[1] "Girar fotos selecionadas à esquerda"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Girar foto selecionada à direita"
msgstr[1] "Girar fotos selecionadas à direita"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
-msgstr[0] "_Localizar etiqueta selecionada"
-msgstr[1] "_Localizar etiquetas selecionadas"
+msgstr[0] "Localizar etiqueta _selecionada"
+msgstr[1] "Localizar etiquetas _selecionadas"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
-msgstr[0] "_Localizar etiqueta selecionada com"
-msgstr[1] "Localizar etiquetas _selecionadas com"
+msgstr[0] "Localizar etiqueta selecionada _com"
+msgstr[1] "Localizar etiquetas selecionadas _com"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Criar nova versão?"
msgstr[1] "criar novas versões?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -2743,7 +2664,7 @@ msgstr[1] ""
"Antes de iniciar {1}, o F-Spot deve criar novas versões das fotos "
"selecionadas para preservar as originais?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "Versão XCF"
@@ -2767,87 +2688,93 @@ msgstr "Assunto e palavras-chave"
msgid "Compression"
msgstr "Compressão"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Configuração planar"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientação"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Interpretação fotométrica"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Unidade de resolução"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Programa de exposição"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Modo de medição"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Modo de exposição"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Processamento personalizado"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Configuração de componentes"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Fonte de luz"
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Modo de sensibilidade"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Espaço de cores"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Equilíbrio de branco"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Unidade de resolução plana focal"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Tipo de fonte de arquivo"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Tipo de captura de cena"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Controle de ganho"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Contraste"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Saturação"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Nitidez"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Tipo de cena"
@@ -2918,26 +2845,26 @@ msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr ""
"Exceção \"{0}\" recebida. Não foi possível renomear versão para \"{1}\""
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:554
-#: ../src/Widgets/InfoBox.cs:556
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Sem edições)"
-#: ../src/PhotoView.cs:169 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Erro ao editar foto"
-#: ../src/PhotoView.cs:170 ../src/Sharpener.cs:73
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "Exceção \"{0}\" recebida. Não foi possível salvar foto {1}"
-#: ../src/PhotoView.cs:359
+#: ../src/PhotoView.cs:357
msgid "Comment:"
msgstr "Comentário:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Fotos"
@@ -3043,7 +2970,7 @@ msgstr "Preparando e-mail"
#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
-msgstr "Exportando foto \"{0}\""
+msgstr "Exportando figura \"{0}\""
#: ../src/SendEmail.cs:314
msgid "Error processing image"
@@ -3056,8 +2983,8 @@ msgstr "Ocorreu um erro ao processar \"{0}\": {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "minhas fotos"
+msgid "My Photos"
+msgstr "Minhas fotos"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3079,23 +3006,23 @@ msgstr "Raio:"
msgid "Threshold:"
msgstr "Limiar:"
-#: ../src/SingleView.cs:88
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Gira foto à esquerda"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Gira foto à direita"
-#: ../src/SingleView.cs:130
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Pasta"
-#: ../src/SingleView.cs:356
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Abrir"
-#: ../src/SingleView.cs:456
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Definir como plano de fundo"
@@ -3124,8 +3051,8 @@ msgid "Create New Tag..."
msgstr "Criar nova etiqueta..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Editar etiqueta selecionada..."
+msgid "Edit Tag..."
+msgstr "Editar etiqueta..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3181,7 +3108,7 @@ msgstr "Não {0}"
#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
-msgstr "Arraste as etiquetas e solte-as aqui pesquisar por elas"
+msgstr "Arraste as etiquetas e solte-as aqui para pesquisar por elas"
#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
@@ -3208,7 +3135,7 @@ msgid "Events"
msgstr "Eventos"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Nenhum)"
@@ -3241,15 +3168,15 @@ msgstr "Atualizando miniaturas"
msgid "Updating picture \"{0}\""
msgstr "Atualizando figura \"{0}\""
-#: ../src/UI.Dialog/AboutDialog.cs:71
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Gerenciador de fotos do GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:72
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:95
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"Raphael Higino <In memoriam>\n"
@@ -3262,7 +3189,7 @@ msgstr ""
"Leonardo Ferreira Fontenelle <leonardof at gnome.org>\n"
"Jonh Wendell <wendell at bani.com.br>"
-#: ../src/UI.Dialog/AboutDialog.cs:100
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "Site do F-Spot"
@@ -3360,16 +3287,16 @@ msgstr "Detalhes de erro"
msgid "An unhandled exception was thrown: "
msgstr "Ocorreu uma exceção sem tratamento: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Nenhum"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Perfil do sistema"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Tema padrão"
@@ -3394,7 +3321,7 @@ msgstr "Rótulo"
msgid "Ratio"
msgstr "Proporção"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Repetir"
@@ -3587,8 +3514,8 @@ msgid "By _Rating"
msgstr "Por a_valiação"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Copiar local_ização"
+msgid "Copy"
+msgstr "Copiar"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3598,10 +3525,6 @@ msgstr "Criar nova e_tiqueta..."
msgid "Create _New Version..."
msgstr "Criar _nova versão..."
-#: ../src/ui/main_window.ui.h:10
-msgid "F-Spot"
-msgstr "F-Spot"
-
#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "_Localizar"
@@ -3618,6 +3541,11 @@ msgstr "C_onfigurar página..."
msgid "Re_fresh Thumbnail"
msgstr "Atualizar _miniatura"
+# "Todos" porque refere-se aos pacotes de instalação
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Selecionar _todos"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "_Limpar seleção"
@@ -3632,7 +3560,7 @@ msgstr "_Barra lateral"
#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
-msgstr "Eti_quetas"
+msgstr "Etiquet_as"
# Refere-se aos elementos apresentados abaixo de cada miniatura, como ícone da tag e data.
#: ../src/ui/main_window.ui.h:25
@@ -3659,10 +3587,6 @@ msgstr "_Limpar filtro de avaliações"
msgid "_Clear Roll Filter"
msgstr "_Limpar filtro de rolo"
-#: ../src/ui/main_window.ui.h:37
-msgid "_Close"
-msgstr "_Fechar"
-
# Talvez usar "Disposição" como no nautilus
#: ../src/ui/main_window.ui.h:38
msgid "_Components"
@@ -3685,12 +3609,12 @@ msgid "_Delete Version"
msgstr "E_xcluir versão"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Editar etiqueta selecionada..."
+msgid "_Edit Tag..."
+msgstr "_Editar etiqueta..."
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
-msgstr "E_xportar para"
+msgstr "_Exportar para"
#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
@@ -3710,7 +3634,7 @@ msgstr "_Grande"
#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
-msgstr "Úl_timo rolo importado"
+msgstr "Ú_ltimo rolo importado"
#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
@@ -3746,7 +3670,7 @@ msgstr "_Selecionar rolos importados..."
#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
-msgstr "Definir intervalo de _datas..."
+msgstr "Definir intervalo de data_s..."
#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
@@ -3762,11 +3686,11 @@ msgstr "_Pequeno"
#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
-msgstr "Ícones de _etiqueta"
+msgstr "Ícones de e_tiqueta"
#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
-msgstr "Eti_quetas"
+msgstr "Etique_tas"
#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
@@ -3774,7 +3698,7 @@ msgstr "Linha do _tempo"
#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
-msgstr "_Ferramentas"
+msgstr "Ferramen_tas"
#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
@@ -3784,11 +3708,11 @@ msgstr "Importar fotos _não etiquetadas"
msgid "_Version"
msgstr "_Versão"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "Atualizando o banco de dados do f-Spot"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -3881,11 +3805,11 @@ msgstr "Imprime as etiquetas da foto"
msgid "Print photo comment"
msgstr "Imprime o comentário da foto"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Editar"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
"This tool requires an active selection. Please select a region of the photo "
"and try the operation again"
@@ -3893,13 +3817,13 @@ msgstr ""
"Esta ferramenta requer uma seleção ativa. Por favor, selecione uma região da "
"foto e tente a operação novamente"
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Erro ao salvar foto ajustada"
msgstr[1] "Erro ao salvar fotos ajustadas"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
"Received exception \"{0}\". Note that you have to develop RAW files into "
@@ -3920,7 +3844,7 @@ msgstr "_Vertical"
msgid "Find:"
msgstr "Localizar:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Pastas"
@@ -3932,53 +3856,58 @@ msgstr "Sistema de arquivos"
msgid "Histogram"
msgstr "Histograma"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Versão"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Data"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Exposição"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Comprimento focal"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Tamanho do arquivo"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Avaliação:"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Desconhecido)"
-
-#: ../src/Widgets/InfoBox.cs:419
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
msgid "(wrong format)"
msgstr "(formato incorreto)"
-#: ../src/Widgets/InfoBox.cs:552
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Desconhecido)"
+
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
msgstr[0] "(Uma edição)"
msgstr[1] "({0} edições)"
-#: ../src/Widgets/InfoBox.cs:566
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(Erro ao ler o arquivo)"
-#: ../src/Widgets/InfoBox.cs:611
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} Fotos"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:631
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -3987,7 +3916,7 @@ msgstr ""
"Em {0} entre \n"
"{1} e {2}"
-#: ../src/Widgets/InfoBox.cs:636
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -3996,61 +3925,61 @@ msgstr ""
"Entre {0} \n"
"e {1}"
-#: ../src/Widgets/InfoBox.cs:663
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(Ao menos um arquivo não foi localizado)"
-#: ../src/Widgets/InfoBox.cs:780
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Mostrar nome da foto"
-#: ../src/Widgets/InfoBox.cs:789
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Mostrar data"
-#: ../src/Widgets/InfoBox.cs:798
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Mostrar tamanho"
-#: ../src/Widgets/InfoBox.cs:807
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Mostrar exposição"
-#: ../src/Widgets/InfoBox.cs:816
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Mostrar comprimento focal"
-#: ../src/Widgets/InfoBox.cs:825
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Mostrar câmera"
-#: ../src/Widgets/InfoBox.cs:834
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Mostrar tamanho do arquivo"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metadados"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Metadados estendidos"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Nenhum metadado estendido disponível"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Nenhuma foto ativa"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "A foto \"{0}\" não existe"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Nenhum metadado disponível"
@@ -4083,513 +4012,152 @@ msgstr "Exiba uma apresentação de slides do F-Spot"
msgid "F-Spot photos"
msgstr "Fotos do F-Spot"
-#~ msgid "Dissolve"
-#~ msgstr "Dissolver"
-
-#~ msgid "Flip"
-#~ msgstr "Virar"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Editar etiqueta selecionada..."
-#~ msgid "Cover"
-#~ msgstr "Cobertura"
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Editar etiqueta selecionada..."
-#~ msgid "Reveal"
-#~ msgstr "Revelar"
+#~ msgid "Package"
+#~ msgstr "Pacote F-Spot"
-#~ msgid "Wipe"
-#~ msgstr "Limpar"
+#~ msgid "Extension Installation"
+#~ msgstr "Instalação de extensão"
-#~ msgid "Split"
-#~ msgstr "Dividir"
-
-#~ msgid "Push"
-#~ msgstr "Pressionar"
-
-#~ msgid "More directories"
-#~ msgstr "Mais diretórios"
-
-#~ msgid "Arrange by _Month"
-#~ msgstr "Organizar por _mês"
-
-#~ msgid "Arrange by _Folder"
-#~ msgstr "Organizar por _pasta"
-
-#~ msgid "Tag Name:"
-#~ msgstr "Nome de etiqueta:"
-
-#~ msgid "<b>Color Management</b>"
-#~ msgstr "<b>Gerenciamento de cor</b>"
-
-#~ msgid "<b>Import Settings</b>"
-#~ msgstr "<b>Configurações de importação</b>"
-
-#~ msgid "<b>Metadata</b>"
-#~ msgstr "<b>Metadados</b>"
-
-#~ msgid "<b>Screensaver</b>"
-#~ msgstr "<b>Proteção de tela</b>"
-
-#~ msgid "<b>Theming</b>"
-#~ msgstr "<b>Temas</b>"
-
-#~ msgid ""
-#~ "<small><i>Choose the folder where F-Spot should store newly imported "
-#~ "photos</i></small>"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
#~ msgstr ""
-#~ "<small><i>Escolha a pasta onde o F-Spot deve armazenar as fotos "
-#~ "importadas mais recentes</i></small>"
+#~ "<b>Selecione as extensões a serem instaladas e clique em Avançar</b>"
-#~ msgid ""
-#~ "<small><i>Enable this option to store tags and descriptions inside \n"
-#~ "supported image formats.</i></small>"
-#~ msgstr ""
-#~ "<small><i>Habilite esta opção para armazenar etiquetas e descrições \n"
-#~ "dentro dos formatos de imagem com suporte.</i></small>"
+#~ msgid "Install from:"
+#~ msgstr "Instalar de:"
-#~ msgid ""
-#~ "<small><i>While acting as a screensaver, F-Spot can display all of your "
-#~ "images, or a small subset based on tags.</i></small>"
-#~ msgstr ""
-#~ "<small><i>Ao funcionar como protetor de tela, o F-spot pode exibir todas "
-#~ "as suas imagens, ou um pequeno subconjunto baseado em etiquetas.</i></"
-#~ "small>"
+#~ msgid "_Repositories..."
+#~ msgstr "_Repositórios..."
-#~ msgid ""
-#~ "<small><i>You'll have to restart F-Spot to load the new theme.</i></small>"
-#~ msgstr ""
-#~ "<small><i>Você precisa reiniciar o F-Spot para carregar o novo tema.</i></"
-#~ "small>"
+#~ msgid "Show all packages"
+#~ msgstr "Mostrar todos os pacotes"
-#~ msgid "Custom Theme"
-#~ msgstr "Tema personalizado"
+#~ msgid "Show new versions only"
+#~ msgstr "Mostrar apenas novas versões"
-#~ msgid "From List:"
-#~ msgstr "Da lista"
+#~ msgid "Show updates only"
+#~ msgstr "Mostrar apenas atualizações"
-#~ msgid "From gtkrc File:"
-#~ msgstr "Do arquivo gtkrc:"
+#~ msgid "_Unselect All"
+#~ msgstr "Desmarcar T_odos"
-#~ msgid "Select A gtkrc File"
-#~ msgstr "Selecionar um arquivo gtkrc"
+#~ msgid "label124"
+#~ msgstr "label124"
-#~ msgid "Try to use the system display profile"
-#~ msgstr "Tente usar o perfil de exibição do sistema"
+#~ msgid "Overall Progress:"
+#~ msgstr "Progresso total:"
-#~ msgid "Write _metadata to file"
-#~ msgstr "Gravar _metadados para arquivo"
+#~ msgid "Downloading extensions..."
+#~ msgstr "Descarregando extensões..."
-#~ msgid "_Print output:"
-#~ msgstr "_Saída de impressão:"
+#~ msgid "Extension Manager"
+#~ msgstr "Gerenciador de extensões"
-#~ msgid "Blackout"
-#~ msgstr "Escurecer"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "Extensões adicionais são requeridas para executar essa operação."
-#~ msgid "Select the area that you want blacked out."
-#~ msgstr "Seleciona a área em que você deseja escurecer."
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "As seguintes extensões serão instaladas:"
-#~ msgid "Pixelate"
-#~ msgstr "Pincelada"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Gerenciador de extensões do F-Spot</b></big>"
-#~ msgid "Select the area that you want pixelated."
-#~ msgstr "Seleciona a área que você deseja pincelar."
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "As seguintes extensões estão instaladas atualmente:"
-#~ msgid "Create p_hotomosaic"
-#~ msgstr "Criar _mosaico de fotos"
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Instalar extensões..."
-#~| msgid "No metadata available"
-#~ msgid "Metapixel not available"
-#~ msgstr "Metapixel não disponível"
+#~ msgid "_Uninstall..."
+#~ msgstr "_Desinstalar..."
-#~ msgid ""
-#~ "The metapixel executable was not found in path. Please check that you "
-#~ "have it installed and that you have permissions to execute it"
-#~ msgstr ""
-#~ "O executável metapixel não foi encontrado. Por favor, verifique se ele "
-#~ "está instalado e se há permissão para executá-lo."
+#~ msgid "Enable"
+#~ msgstr "Habilitar"
-#~ msgid "No photos for the selection"
-#~ msgstr "Nenhuma foto para a seleção"
+#~ msgid "Disable"
+#~ msgstr "Desabilitar"
-#~ msgid "The tags selected provided no pictures. Please select different tags"
-#~ msgstr ""
-#~ "As etiquetas selecionadas não definem qualquer imagem. Por favor, "
-#~ "selecione etiquetas diferentes"
+#~ msgid "Details"
+#~ msgstr "Detalhes"
-#~ msgid "Creating miniatures"
-#~ msgstr "Criando miniaturas"
+#~ msgid "Extension Repository Management"
+#~ msgstr "Gerenciamento dos repositórios de extensões"
-#~ msgid "Creating photomosaics"
-#~ msgstr "Criando fotomosaicos"
+#~ msgid "Add New Repository"
+#~ msgstr "Adicionar novo repositório"
-#~ msgid "Processing \"{0}\""
-#~ msgstr "Processando \"{0}\""
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Selecione a localização do repositório que quer registrar:"
-# Uma pesquisa na web não deu suporte à idéia de que PhotoMosaics seja uma
-# marca.
-#~ msgid "PhotoMosaics generated!"
-#~ msgstr "Fotomosaicos gerados!"
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registrar um repositório on-line"
-#~ msgid "PhotoMosaic"
-#~ msgid_plural "PhotoMosaic ({0})"
-#~ msgstr[0] "Fotomosaico"
-#~ msgstr[1] "Fotomosaico ({0})"
+#~ msgid "Url:"
+#~ msgstr "URL:"
-#~ msgid "Create photo_wall"
-#~ msgstr "Criar _parede de fotos"
+#~ msgid "Register a local repository"
+#~ msgstr "Registrar um repositório local"
-# PictureTile é o nome de uma extensão para o F-Spot
-#~ msgid "PictureTile not available"
-#~ msgstr "PictureTile não disponível"
+#~ msgid "Path:"
+#~ msgstr "Caminho:"
-#~ msgid ""
-#~ "The picturetile.pl executable was not found in path. Please check that "
-#~ "you have it installed and that you have permissions to execute it"
-#~ msgstr ""
-#~ "O executável picturetile.pl não foi encontrado. Por favor, verifique se "
-#~ "ele está instalado e se há permissão para executá-lo"
+#~ msgid "Browse..."
+#~ msgstr "Navegar..."
-#~ msgid "Preparing selected pictures"
-#~ msgstr "Preparando imagens selecionadas"
+#~ msgid "Version:"
+#~ msgstr "Versão:"
-#~ msgid "PhotoWall generated!"
-#~ msgstr "Parede de fotos gerada!"
+#~ msgid "Author:"
+#~ msgstr "Autor:"
-#~ msgid ""
-#~ "Your photo wall have been generated and imported in F-Spot. Select the "
-#~ "last roll to see it"
-#~ msgstr ""
-#~ "Sua parede de fotos foi gerada e importada pelo F-Spot. Selecione o "
-#~ "último rolo para vê-la."
+#~ msgid "Copyright:"
+#~ msgstr "Copyright:"
-#~ msgid "Error importing photowall"
-#~ msgstr "Erro ao importar parede de fotos"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Dependências da extensão:"
-#~ msgid ""
-#~ "An error occurred while importing the newly generated photowall to F-Spot"
-#~ msgstr "Ocorreu um erro ao importar o novo photowall gerado para o F-Spot"
+#~ msgid "All registered repositories"
+#~ msgstr "Todos os repositórios registrados"
-#~ msgid "<b>F-Spot tags</b>"
-#~ msgstr "<b>Etiquetas do F-Spot</b>"
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Tem certeza que quer cancelar a instalação?"
-#~ msgid "<b>Tabblo account</b>"
-#~ msgstr "<b>Conta Tabblo</b>"
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Os seguintes pacotes serão desinstalados:"
#~ msgid ""
-#~ "<small><i>F-Spot tags can help you track the export status of photos. "
-#~ "Example: Use one tag for the photos that you plan to export, and another "
-#~ "one for those already exported. Here, you can tell F-Spot to "
-#~ "automatically replace these tags as appropriate.</i></small>"
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
#~ msgstr ""
-#~ "<small><i>As etiquetas do F-Spot podem ajudá-lo a acompanhar o status de "
-#~ "exportação de fotos. Exemplo: Utilize uma etiqueta para as fotos que você "
-#~ "planeja exportar e outra para aquelas já exportadas. Aqui, você pode "
-#~ "dizer ao F-Spot para substituir essas etiquetas conforme necessário.</i></"
-#~ "small>"
-
-#~ msgid "Rem_ove from exported photos:"
-#~ msgstr "Rem_over das fotos exportadas:"
-
-#~ msgid "Select..."
-#~ msgstr "Selecionar..."
-
-#~ msgid "_Attach to exported photos:"
-#~ msgstr "_Anexar às fotos exportadas:"
-
-#~ msgid "<b>{0}</b>."
-#~ msgstr "<b>{0}</b>"
-
-#~ msgid "A trust error occured while attempting to access"
-#~ msgstr "Ocorreu um erro de confiança ao acessar"
-
-#~ msgid "Abort this session"
-#~ msgstr "Interromper esta sessão"
-
-#~ msgid "Always trust this site's certificate"
-#~ msgstr "Sempre confiar neste certificador"
-
-#~ msgid "Do you wish to:"
-#~ msgstr "Você gostaria de:"
-
-#~ msgid "Trust Error"
-#~ msgstr "Erro de confiança"
-
-#~ msgid "Trust the site's certificate this once"
-#~ msgstr "Confiar neste certificador apenas esta vez"
-
-#~ msgid ""
-#~ "The \"F-Spot Manual\" could not be found. Please verify that your "
-#~ "installation has been completed successfully."
-#~ msgstr ""
-#~ "Não foi possível localizar o \"Manual do F-Spot\". Por favor, verifique "
-#~ "se sua instalação foi concluída com sucesso."
-
-#~ msgid "Picasaweb"
-#~ msgstr "Picasaweb"
-
-#~ msgid "SmugMug"
-#~ msgstr "SmugMug"
-
-# Gallery2 é o nome de uma biblioteca/programa
-#~ msgid "Gallery2"
-#~ msgstr "Gallery2"
-
-#~ msgid "1 of 1"
-#~ msgstr "1 de 1"
-
-#~ msgid "_Folder"
-#~ msgstr "_Pasta"
-
-#~ msgid "_Month"
-#~ msgstr "_Mês"
-
-#~ msgid "img_000.jpg"
-#~ msgstr "img_000.jpg"
+#~ "Existem outras extensões que dependem das anteriores que também serão "
+#~ "desinstaladas:"
#~ msgid ""
-#~ "F-Spot will now launch your browser so that you can log into Facebook. "
-#~ "Turn on the \"Save my login information\" checkbox on Facebook and F-Spot "
-#~ "will log into Facebook automatically from now on."
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
#~ msgstr ""
-#~ "O F-Spot irá executar seu navegador para que você possa iniciar uma "
-#~ "sessão no Facebook. Ligue a opção \"Mantenha-me conectado\" no Facebook e "
-#~ "o F-Spot irá iniciar a sessão do Facebook automaticamente a partir de "
-#~ "agora."
-
-#~ msgid "This is who I am"
-#~ msgstr "Este sou eu"
-
-#~ msgid "interpolation type"
-#~ msgstr "tipo de interpolação"
-
-#~ msgid "the type of interpolation to use"
-#~ msgstr "o tipo de interpolação para uso"
-
-#~ msgid "check type"
-#~ msgstr "tipo de verificação"
-
-#~ msgid "the type of chequering to use"
-#~ msgstr "o tipo de verificação usado"
-
-#~ msgid "the size of chequers to use"
-#~ msgstr "o tamanho dos verificadores usados"
-
-#~ msgid "dither"
-#~ msgstr "dither"
-
-#~ msgid "dither type"
-#~ msgstr "tipo de dither"
+#~ "Não foi possível instalar as extensões selecionadas por causa de "
+#~ "conflitos de dependências."
-#~ msgid "Available space:"
-#~ msgstr "Espaço disponível:"
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Os seguintes pacotes serão instalados:"
-#~ msgid "No image loaded."
-#~ msgstr "Nenhuma imagem carregada."
+#~ msgid " (in user directory)"
+#~ msgstr " (no diretório do usuário)"
-#~ msgid "Can't save non local files."
-#~ msgstr "Não é possível salvar arquivos não locais."
-
-#~ msgid "Unsupported image type for saving."
-#~ msgstr "Não há suporte a gravação para esse tipo de imagem."
-
-#~ msgid "(File not found)"
-#~ msgstr "(Arquivo não localizado)"
-
-#~ msgid "<b>Photograph Layout</b>"
-#~ msgstr "<b>Disposição da fotografia</b>"
-
-#~ msgid "<b>Printer Details</b>"
-#~ msgstr "<b>Detalhes da impressora</b>"
-
-#~ msgid "C_aption:"
-#~ msgstr "_Rótulo:"
-
-#~ msgid "Co_nfigure"
-#~ msgstr "Co_nfigurar"
-
-#~ msgid "Crop photo to _fit"
-#~ msgstr "Cortar foto para _caber"
-
-#~ msgid ""
-#~ "Full Page\n"
-#~ "Standard - 4x6"
-#~ msgstr ""
-#~ "Página inteira\n"
-#~ "Padrão - 4x6"
-
-#~ msgid ""
-#~ "Hairline\n"
-#~ "0.25\"\n"
-#~ "0.5\"\n"
-#~ "1\"\n"
-#~ msgstr ""
-#~ "Fio de cabelo\n"
-#~ "0.25\"\n"
-#~ "0.5\"\n"
-#~ "1\"\n"
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Os seguintes pacotes precisam ser desinstalados:"
-#~ msgid "N_umber of Copies:"
-#~ msgstr "Núm_ero de cópias:"
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Não foi possível resolver as seguintes dependências:"
-#~ msgid ""
-#~ "None\n"
-#~ "Title\n"
-#~ "Filename\n"
-#~ "Date\n"
-#~ "Photo Details"
-#~ msgstr ""
-#~ "Nenhum\n"
-#~ "Título\n"
-#~ "Nome do arquivo\n"
-#~ "Data\n"
-#~ "Detalhes da foto"
-
-#~ msgid "P_hoto Source:"
-#~ msgstr "Fonte de _foto:"
-
-#~ msgid "Page 1 of 3"
-#~ msgstr "Página 1 de 3"
-
-#~ msgid "Photo _Size:"
-#~ msgstr "_Tamanho da foto:"
-
-#~ msgid "Print crop _marks"
-#~ msgstr "Imprimir _marcas de corte"
-
-#~ msgid "Print..."
-#~ msgstr "Imprimir..."
-
-#~ msgid ""
-#~ "Selection\n"
-#~ "Gallery\n"
-#~ "Viewport"
-#~ msgstr ""
-#~ "Seleção\n"
-#~ "Galeria\n"
-#~ "Porta de visualização"
-
-#~ msgid "Will print using: US Letter size on Generic Postscript"
-#~ msgstr "Imprimir usando: tamanho Carta dos EUA em Postscript Genérica"
-
-#~ msgid "_Border:"
-#~ msgstr "_Borda:"
-
-#~ msgid "Metadata Browser"
-#~ msgstr "Navegador de metadados"
-
-#~ msgid "Exported Locations"
-#~ msgstr "Localizações exportadas"
-
-#~ msgid ""
-#~ "From Screen\n"
-#~ "Standard RGB"
-#~ msgstr ""
-#~ "Da tela\n"
-#~ "RGB padrão"
-
-#~ msgid ""
-#~ "Standard RGB\n"
-#~ "Image Profile\n"
-#~ "Custom\n"
-#~ msgstr ""
-#~ "RGB padrão\n"
-#~ "Perfil da Imagem\n"
-#~ "Personalizado\n"
-
-#~ msgid "Automatically adjust the colors"
-#~ msgstr "Ajusta as cores automaticamente"
-
-#~ msgid "Apply straightening"
-#~ msgstr "Aplica retificação"
-
-#~ msgid "Apply straightening to image"
-#~ msgstr "Aplica retificação à imagem"
-
-#~ msgid "Adjust the angle of the image to straighten the horizon"
-#~ msgstr "Ajusta o ângulo da imagem para retificar o horizonte"
-
-#~ msgid "Create a soft focus visual effect"
-#~ msgstr "Cria um efeito visual de foco suave"
-
-#~ msgid "Crop photo to selected area"
-#~ msgstr "Cortar foto para ajustar à área selecionada"
-
-#~ msgid "Remove redeye from selected area"
-#~ msgstr "Remover olho vermelho da área selecionada"
-
-#~ msgid "Select an area to remove redeye"
-#~ msgstr "Selecione uma área para remover o olho vermelho"
-
-#~ msgid "Constrain the aspect ratio of the selection"
-#~ msgstr "Comprimir a taxa de proporção da seleção"
-
-#~ msgid "Reduce Red-Eye"
-#~ msgstr "Reduzir Olho Vermelho"
-
-#~ msgid "Adjust the photo colors"
-#~ msgstr "Ajustar as cores das fotos"
-
-#~ msgid "Convert the photo to black and white"
-#~ msgstr "Converte a foto para preto e branco"
-
-#~ msgid "Convert the photo to sepia tones"
-#~ msgstr "Converte a foto para tons de sépia"
-
-#~ msgid "Exif"
-#~ msgstr "Exif"
-
-#~ msgid "<b>Color Temperature</b>"
-#~ msgstr "<b>Temperatura da Cor</b>"
-
-#~ msgid "<b>Exposure</b>"
-#~ msgstr "<b>Exposição</b>"
-
-#~ msgid "<b>Histo_gram</b>"
-#~ msgstr "<b>Histo_grama</b>"
-
-#~ msgid "<small> </small>"
-#~ msgstr "<small> </small>"
-
-#~ msgid "<small>C_ontrast:</small>"
-#~ msgstr "<small>C_ontraste:</small>"
-
-#~ msgid "<small>Te_mp:</small>"
-#~ msgstr "<small>Tem_peratura:</small>"
-
-#~ msgid "<small>_Brightness:</small>"
-#~ msgstr "<small>_Brilho:</small>"
-
-#~ msgid "<small>_Exposure:</small>"
-#~ msgstr "<small>_Exposição:</small>"
-
-#~ msgid "<small>_Hue:</small>"
-#~ msgstr "<small>_Matiz:</small>"
-
-#~ msgid "<small>_Saturation:</small>"
-#~ msgstr "<small>_Saturação:</small>"
-
-#~ msgid "<small>_Tint:</small>"
-#~ msgstr "<small>_Tonalidade:</small>"
-
-#~ msgid "Ad_just Color..."
-#~ msgstr "A_justar Cor..."
-
-#~ msgid "Adjust Color"
-#~ msgstr "Ajustar Cor"
-
-#~ msgid "Reset"
-#~ msgstr "Redefinir"
-
-#~ msgid "So_urce Temp"
-#~ msgstr "Temperat_ura de Fonte"
-
-#~ msgid "<b>Interoperability</b>"
-#~ msgstr "<b>Interoperabilidade</b>"
-
-#~ msgid ""
-#~ "<small><i>Enable this option if you want to allow other programs to "
-#~ "import or delete photos and tags over DBus.</i></small>"
-#~ msgstr ""
-#~ "<small><i>Habilite esta opção para permitir outros programas importarem "
-#~ "ou excluírem fotos e etiquetas através do DBus.</i></small>"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Instalação realizada com sucesso."
-#~ msgid "Allow other programs to manipulate F-Spot"
-#~ msgstr "Permitir que outros programas manipulem o F-Spot"
+#~ msgid "The installation failed!"
+#~ msgstr "Falha na instalação!"
diff --git a/po/ro.po b/po/ro.po
new file mode 100644
index 0000000..dc42d08
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,4228 @@
+# Romanian translation for f-spot
+# Copyright (c) 2006 Rosetta Contributors and Canonical Ltd 2006
+# This file is distributed under the same license as the f-spot package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2006.
+# Lucian Adrian Grijincu <lucian.grijincu at gmail.com>, 2009
+msgid ""
+msgstr ""
+"Project-Id-Version: f-spot\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-"
+"spot&component=General\n"
+"POT-Creation-Date: 2009-11-23 22:55+0000\n"
+"PO-Revision-Date: 2009-11-29 04:24+0300\n"
+"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu at gmail.com>\n"
+"Language-Team: Romanian GNOME Team <gnomero-list at lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Virtaal 0.4.0\n"
+"X-Launchpad-Export-Date: 2009-11-28 23:20+0000\n"
+"100 > 19) || ((n % 100 == 0) && (n != 0))) ? 2: 1))\n"
+
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Se transferă imaginile"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Se transferă imaginea „{0}” către CD"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} din {1}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "S-a terminat trimiterea fotografiilor"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Transfer încheiat"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "S-a produs o eroare în timpul transferului"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "S-a produs o eroare la transfer"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "se copiază..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>Există elemente planificate anterior pentru scriere</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Fotografii de scris</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Autorotește"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Creare CD"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Dimensiune"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Dimensiunea selecției exportate:"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Navigați prin fișierele programate anterior"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Exportă"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "_Scrie doar aceste fotografii pe CD"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "Se așteaptă autorizarea"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
+msgstr ""
+"F-Spot va lansa un navigator în care puteți activa permisiunile pe care "
+"tocmai le-ați selectat.\n"
+"\n"
+"De îndată ce sunteți direcționați de Facebook să vă întoarceți la această "
+"aplicație, apăsați pe „Ok” mai jos."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "Prea multe imagini de exportat"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+"Facebook permite numai {0} fotografii într-un album. Refaceți selecția și "
+"încercați din nou."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Se trimit fotografiile"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "Albumul trebuie să aibă un nume"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "Numiți albumul sau alegeți un album existent."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "Crearea unui nou album a eșuat"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"S-a produs o eroare în timpul creării albumului nou.\n"
+"{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Se trimite fotografia „{0}” ({1} din {2})"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Eroare la încărcarea pe Facebook: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Eroare"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Încărcare finalizată"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Vizitați grupul F-Spot pe Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Se așteaptă autentificarea"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"F-Spot va porni acum navigatorul web pentru a vă putea autentifica pe "
+"Facebook.\n"
+"\n"
+"După ce Facebook vă indică să vă întoarceți la aplicație, apăsați pe butonul "
+"„OK” mai jos. F-spot va ține minte sesiunea dumneavoastră în inelul de chei "
+"din Gnome, dacă e posibil, și o va folosi în exporturile viitoare către "
+"Facebook."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Autentificare..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Eroare la autentificarea pe Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr ""
+"Există o problemă la autentificarea pe Facebook. Verificați datele de "
+"autentificare și încercați din nou."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Se autorizează sesiunea"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "Sesiune stabilită, se aduc datele despre utilizator..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "Sesiune stabilită, se aduce lista de prieteni..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "Sesiune stabilită, se aduc detaliile despre prieteni..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "Sesiune stabilită, se aduc albumele foto..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} este autentificat pe Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Eroare de conectare la Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"S-a produs o eroare în timpul descărcării informațiilor dumneavoastră de pe "
+"Facebook.\n"
+"\n"
+"Facebook a comunicat: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Nu sunteți autentificat."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Confirmă automat fotografiile"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Titlu"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Creează un album nou"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Descriere"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Export către Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "În această fotografie"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Locație"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Autentificare"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Ieșire"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
+msgid "Name"
+msgstr "Nume"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Nu sunteți autentificat"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Permisiuni:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Rămâi conectat"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Folosește un album existent"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Cine este?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Autorizează"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
+#, csharp-format
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"Reveniți la această fereastră după ați parcurs procesul de autorizare pentru "
+"{0} și apăsați pe butonul „Trimite autorizarea” aflat mai jos."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Trimite autorizarea"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Se conectează la {0}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Se verifică datele..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Bine ați venit {0}, sunteți conectat la {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Autentificare ca alt utilizator"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "Utilizați {0} din cota lunară permisă de {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Nu se poate realiza conectarea"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Se așteaptă răspunsul {0} din {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "Se trimite fotografia „{0}”"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "S-a produs o eroare la trimiterea către {0}: {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "Nu se poate realiza conectarea"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"F-Spot nu se poate conecta la {0}. Asigurați-vă că ați dat autorizarea "
+"utilizând interfața navigatorului de internet {0}."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Cont</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Fotografii</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Stil</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Permisiuni de vizualizare</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../src/f-spot.glade.h:43
+msgid "Export"
+msgstr "Exportă"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "Exportă ierar_hia etichetelor"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"F-Spot solicită autorizare pentru a trimite fotografiile dumneavoastră în "
+"contul {0}. Apăsați pe butonul „Autorizează” pentru a deschide un navigator "
+"de internet și a autoriza F-Spot să realizeze operația. "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "Ignoră _etichetele de nivel superior"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Personale"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Publice"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "Șterge _metadate"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Vizibile familiei"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Vizibile prietenilor"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "_Exportă etichete"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "Redimensionea_ză la: "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "_Arată fotografiile în navigator după terminarea transferului"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "pixeli"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "D_osar..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Alege dosarul în care se exportă"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "Creare galerie"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "S-a produs o eroare la trimiterea fotografiei „{0}” în galeria: {2}{1}"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "S-a produs o eroare la trimitere; Operație abandonată"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Eroare: Fișierul există deja; Operație abandonată"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+msgid "Light"
+msgstr "Luminos"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+msgid "Dark"
+msgstr "Întunecat"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+msgid "Prev"
+msgstr "Prec"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Index"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:64
+msgid "Tags"
+msgstr "Etichete"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
+#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Următoarea"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+msgid "Gallery generated by"
+msgstr "Galerie generată de"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+msgid "Show Styles"
+msgstr "Arată stilurile"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+msgid "Hide Styles"
+msgstr "Ascunde stilurile"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Etichete: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+msgid "Page:"
+msgstr "Pagina:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Destinație</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Metodă de export</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "Creează _galerie utilizând „Original”"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "Creează galerie _web independentă"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "D_escriere:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "Exportă e_tichetele"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "Exportă _iconițele etichetelor"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Exportă dosarul"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "Nume g_alerie:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "Deschide _destinația după terminarea transferului"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "D_osar:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "_Salvează numai fișierele"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "_Galerie web..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Nu se poate realiza conectarea la o galerie pentru care nu este cunoscută "
+"versiunea.\n"
+"Verificați dacă aveți instalat modulul Remote 1.0.8 sau mai nou."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "URL nevalid"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "Legătura de internet a galeriei nu pare a fi o legătură validă"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "S-a produs o eroare în timpul conectării la galerie"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "S-a produs următoarea eroare în timpul conectării: {0}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "Există deja o galerie cu acest nume"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+"Există deja o galerie cu același nume în galeriile definite de "
+"dumneavoastră. Alegeți un alt nume."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(Nivel superior)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "Nume de galerie nevalid"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Numele galeriei conține caractere nepermise.\n"
+"Sunt acceptate doar litere, numere, „-” și „_”"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Eroare la trimiterea fotografiei „{0}” către galerie: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(Galerie inexistentă)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(Neconectat)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(Albume inexistente)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Nu ați ales niciun cont"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Album</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Galerie</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Eroare în timpul conectării la galerie</"
+"span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "Exportă _titluri și comentarii"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "Deschide _albumul în navigator după trimitere"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Verificați dacă configurările pentru această galerie sunt corecte."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "Nume _album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Descriere:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "_Exportă către album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "Nume _galerie:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Galerie:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "Album _părinte:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+msgid "_Password:"
+msgstr "_Parolă:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Titlu:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+msgid "_Username:"
+msgstr "Nume _utilizator:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "Eroare la citirea răspunsului primit de la server"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Serverul a returnat un răspuns incomplet, fără conținutul galeriei"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "Eroare la crearea albumului nou"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"În timpul execuției operației solicitate a apărut următoarea eroare:\n"
+"{0} ({1})"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "S-a produs o eroare în timpul creării albumului"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr ""
+"În timpul încercării de creare a unui album nou s-a produs următoarea "
+"eroare: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} trimise"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} din aprox. {1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Eroare la trimiterea către galeria: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Spațiu disponibil: {0}, {1}% utilizați din {2}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"Albumul ales are o limită de {0} fotografii,\n"
+"care va fi depășită prin selecția curentă de {1} imagini."
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>Exportă către PicasaWeb</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Contul dumneavoastră de pe Google este "
+"blocat</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Verificați dacă configurările pentru această galerie sunt corecte.\n"
+"Introduceți literele care sunt arătate în imaginea din\n"
+"câmpul „Captcha”. <i>Literele sunt insensibile la majuscule</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Album public"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "Titlu _album:"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "Rotire _automată"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>Export către SmugMug</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Cont:"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Se trimite fotografia „{0}”"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Conectare la Tabblo"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Se obține legătura pentru trimitere"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "S-a încheiat trimiterea fotografiilor"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Trimitere încheiată"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Eroare la trimiterea către Tabblo: "
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "Fiși_er arhivat..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:196
+msgid "No selection available"
+msgstr "Nicio selecție disponibilă"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"Acest utilitar solicită o selecție activă. Alegeți una sau mai multe "
+"fotografii și încercați din nou"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Alegeți dosarul în care se exportă"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Se exportă fișiere"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Se pregătește fotografia „{0}”"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+#: ../src/f-spot.glade.h:92
+msgid "_Create"
+msgstr "_Creează"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "Nume _fișier:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Locație:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Scalare:"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"Pentru a detecta duplicatele în fotografiile importate înainte de 0.5.0, F-"
+"Spot trebuie să analizeze colecția dumneavoastră de imagini. Această acțiune "
+"nu este realizată implicit și este mare consumatoare de timp. Puteți porni "
+"sau pune pauză procesului de actualizare folosind acest dialog."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+"În acest moment aveți {0} fotografii pentru care se calculează md5 și {1} "
+"sarcini în așteptare"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "În_chide"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "Se procesează imaginile..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "Oprit"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Hash for Duplicates"
+msgstr "Calculează sume de dispersie pentru a detecta duplicatele"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Galerie F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Galeria web pare să nu fie conectată la internet acum"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Arată tot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} fotografie"
+msgstr[1] "{0} fotografii"
+msgstr[2] "{0} de fotografii"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Vizualizarea curentă"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Selectat"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Galerie web Live"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Galeria rămâne activă până când sau o dezactivați sau închideți\n"
+"F-Spot. Aveți grijă ca vizitatorii locali să o acceseze ocolind proxyul HTTP."
+"</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Când galeria este activă, trebuie să deschideți URL-ul de mai "
+"sus \n"
+"pe un alt calculator pentru a putea accesa fotografiile partajate.</i></"
+"small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Activează și dezactivează galeria web"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Permite vizitatorilor să adauge etichete"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Copiază URL-ul în clipboard"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "Galerie web Live F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL galerie:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Limitează numărul de fotografii partajate la"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Opțiuni:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Fotografii cu o etichetă"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Fotografii selectate"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Partajează:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Vizualizări:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "niciuna"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galerie: {0}, Fotografii: {1}, Ultimul client: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Galeria este inactivă"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Combină bazele de date"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Eroare la deschiderea fișierului selectat"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"Fișierul selectat nu este unul valid sau recunoscut de baza de date.\n"
+"\n"
+"S-a primit excepția „{0}”."
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+"<small><i>Arătați locația bazei de date pe care doriți să o importați</i></"
+"small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>Alegeți ce doriți să importați din baza de date selectată.\n"
+"„Numai seturi noi” este opțiunea inteligentă care evită reimportarea "
+"fotografiilor care au fost importate într-o sesiune anterioară.\n"
+"„Un singur set” vă permite să alegeți setul pe care-l doriți combinat.\n"
+"„Totul” va importa toate fotografiile, creând duplicate în cazul în care ați "
+"importat deja fișiere din baza de date respectivă.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>Copiază imaginile local sau păstrează-le acolo unde sunt. Dacă "
+"alegeți ultima opțiune, asigurați-vă că locul va fi accesibil programului f-"
+"spot.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "Un singur set de importat"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Copiază imaginile în dosarul fotografiilor"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Locația bazei de date"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Tot"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Importă:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "Păstrează imaginile în locația originală"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "Combinați altă colecție F-Spot"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "Numai seturi noi"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Omite"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>Baza de date face trimitere la fișiere conținute în dosarul <b>{0}</"
+"b>.\n"
+" Selectați acel dosar pentru a putea realiza maparea.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "Configurează economizorul de ecran"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Toate imaginile"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Întârziere:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Afișaj:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Imagini etichetate cu:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "Folosește F-Spot ca economizor de ecran"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Configurație economizor de ecran"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "Manager Foto F-Spot"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Organizați, priviți și partajați fotografii"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Manager Foto"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Importă în F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "Vizualizatorul de fotografii F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Vizualizator de fotografii"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
+msgid "File not found"
+msgstr "Fișierul nu a fost găsit"
+
+#: ../lib/libfspot/f-jpeg-utils.c:464
+#, c-format
+msgid "Unknown transform type %d"
+msgstr "Tip de transformare necunoscut %d"
+
+#: ../lib/libfspot/f-jpeg-utils.c:472
+msgid "Operation failed"
+msgstr "Operațiune eșuată"
+
+#: ../src/CameraFileSelectionDialog.cs:76
+msgid "Preview"
+msgstr "Previzualizare"
+
+#: ../src/CameraFileSelectionDialog.cs:78
+msgid "Path"
+msgstr "Cale"
+
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
+msgid "File"
+msgstr "Fișier"
+
+#: ../src/CameraFileSelectionDialog.cs:102
+msgid "Select Tag"
+msgstr "Selectare etichetă"
+
+#: ../src/CameraFileSelectionDialog.cs:138
+msgid "Downloading Previews"
+msgstr "Se descarcă previzualizările"
+
+#: ../src/CameraFileSelectionDialog.cs:148
+#, csharp-format
+msgid "Downloading Preview of {0}"
+msgstr "Se descarcă previzualizarea pentru {0}"
+
+#: ../src/CameraFileSelectionDialog.cs:220
+#, csharp-format
+msgid "Copying file {0} of {1}"
+msgstr "Copiere fișier {0} din {1}"
+
+#: ../src/CameraFileSelectionDialog.cs:235
+msgid "Error transferring file"
+msgstr "Eroare transferare fișier"
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Download Complete"
+msgstr "Descărcare completă"
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Terminat copiere fișiere"
+
+#: ../src/CameraFileSelectionDialog.cs:268
+#, csharp-format
+msgid "Transferring \"{0}\" from camera"
+msgstr "Se transferă „{0}” de la cameră"
+
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
+msgid "Camera"
+msgstr "Cameră foto"
+
+#: ../src/CameraSelectionDialog.cs:30
+msgid "Port"
+msgstr "Port"
+
+#: ../src/Core/App.cs:265
+#, csharp-format
+msgid "No photos matching {0} found"
+msgstr "Nu s-au găsit fotografii care să se potrivească cu {0}"
+
+#: ../src/Core/App.cs:266
+#, csharp-format
+msgid ""
+"The tag \"{0}\" is not applied to any photos. Try adding\n"
+"the tag to some photos or selecting a different tag in the\n"
+"F-Spot preference dialog."
+msgstr ""
+"Eticheta „{0}” nu este aplicată niciunei fotografii. Încercați să adăugați\n"
+"eticheta unor fotografii sau să alegeți o altă etichetă din\n"
+"dialogul de preferințe F-Spot."
+
+#: ../src/Core/App.cs:270
+msgid "Search returned no results"
+msgstr "Căutarea nu a dat rezultate"
+
+#: ../src/Core/App.cs:271
+msgid ""
+"The tag F-Spot is looking for does not exist. Try\n"
+"selecting a different tag in the F-Spot preference\n"
+"dialog."
+msgstr ""
+"Eticheta pe care o caută F-Spot nu există. Încercați\n"
+"să alegeți o altă etichetă din fereastra de \n"
+"preferințe F-Spot"
+
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Core/Photo.cs:473
+msgid "Reparented"
+msgstr "Reversionat"
+
+#: ../src/Core/Photo.cs:473
+#, csharp-format
+msgid "Reparented ({0})"
+msgstr "Reversionat ({0})"
+
+#: ../src/Core/Photo.cs:492
+#, csharp-format
+msgid "Modified"
+msgid_plural "Modified ({0})"
+msgstr[0] "Modificată"
+msgstr[1] "Modificate ({0})"
+msgstr[2] "Modificate ({0})"
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1}"
+msgstr "Modificată în {1}"
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1} ({0})"
+msgstr "Modificată în {1} ({0})"
+
+#. Note that the original version is never stored in the photo_versions table in the
+#. database.
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
+msgid "Original"
+msgstr "Original"
+
+#: ../src/Editors/AutoStretchEditor.cs:17
+msgid "Auto Color"
+msgstr "Culoare automată"
+
+#: ../src/Editors/ColorEditor.cs:38
+msgid "Adjust Colors"
+msgstr "Ajustare culori"
+
+#: ../src/Editors/ColorEditor.cs:41
+msgid "Adjust"
+msgstr "Ajustează"
+
+#: ../src/Editors/CropEditor.cs:35
+msgid "4 x 3 (Book)"
+msgstr "4 x 3 (Carte)"
+
+#: ../src/Editors/CropEditor.cs:36
+msgid "4 x 6 (Postcard)"
+msgstr "4 x 6 (Carte poștală)"
+
+#: ../src/Editors/CropEditor.cs:37
+msgid "5 x 7 (L, 2L)"
+msgstr "5 x 7 (L, 2L)"
+
+#: ../src/Editors/CropEditor.cs:38
+msgid "8 x 10"
+msgstr "8 x 10"
+
+#: ../src/Editors/CropEditor.cs:39
+msgid "Square"
+msgstr "Pătrat"
+
+#: ../src/Editors/CropEditor.cs:42
+msgid "Crop"
+msgstr "Decupează"
+
+#: ../src/Editors/CropEditor.cs:73
+msgid "Select the area that needs cropping."
+msgstr "Selectați zona care trebuie tăiată."
+
+#: ../src/Editors/CropEditor.cs:98
+msgid "No Constraint"
+msgstr "Nicio restricție"
+
+#: ../src/Editors/CropEditor.cs:99
+msgid "Same as photo"
+msgstr "La fel ca fotografia"
+
+#: ../src/Editors/CropEditor.cs:104
+msgid "Custom Ratios..."
+msgstr "Proporții personalizate..."
+
+#: ../src/Editors/DesaturateEditor.cs:17
+msgid "Desaturate"
+msgstr "Desaturează"
+
+#: ../src/Editors/RedEyeEditor.cs:19
+msgid "Red-eye Reduction"
+msgstr "Elimină efectul de „ochi roșii”"
+
+#: ../src/Editors/RedEyeEditor.cs:21
+msgid "Fix!"
+msgstr "Repară!"
+
+#: ../src/Editors/RedEyeEditor.cs:25
+msgid "Select the eyes you wish to fix."
+msgstr "Alegeți ochii pe care doriți să-i reparați."
+
+#: ../src/Editors/SepiaEditor.cs:17
+msgid "Sepia Tone"
+msgstr "Tonuri sepia"
+
+#: ../src/Editors/SoftFocusEditor.cs:32
+msgid "Soft Focus"
+msgstr "Focalizează ușor"
+
+#: ../src/Editors/TiltEditor.cs:30
+msgid "Straighten"
+msgstr "Îndreaptă"
+
+#: ../src/FileImportBackend.cs:288
+msgid "Import error"
+msgstr "Eroare importare"
+
+#: ../src/FileImportBackend.cs:289
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Eroare la importarea {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Fișierele de tip „{0}” nu pot fi salvate"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Excepție netratată"
+
+#: ../src/FSpot.addin.xml.h:1
+msgid "Copy Photo Locat_ion"
+msgstr "Copiază locaț_ia fotografiei"
+
+#: ../src/FSpot.addin.xml.h:2
+msgid "Export to"
+msgstr "Exportă către"
+
+#: ../src/FSpot.addin.xml.h:3
+msgid "Open _With"
+msgstr "Deschide _cu"
+
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
+msgid "Rem_ove Tag"
+msgstr "În_lătură eticheta"
+
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
+#: ../src/SingleView.cs:438 ../src/ui/main_window.ui.h:16
+msgid "Rotate _Left"
+msgstr "Rotește la _stânga"
+
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:439 ../src/ui/main_window.ui.h:17
+msgid "Rotate _Right"
+msgstr "Rotește la _dreapta"
+
+#: ../src/FSpot.addin.xml.h:7
+msgid "Tools"
+msgstr "Unelte"
+
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
+msgid "_Attach Tag"
+msgstr "_Atașează etichetă"
+
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
+msgid "_Delete From Drive"
+msgstr "Ș_terge de pe disc"
+
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
+msgid "_Remove From Catalog"
+msgstr "Ște_rge din catalog"
+
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
+
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
+
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
+
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>Co_recții</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Interpolare imagine</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Dimensiune</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Sumar</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Părți transparente</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Afișează toate fotografiile importate</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>_Balans de alb</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr ""
+"<small><i>Activați această opțiune pentru a permite interpolarea imaginilor "
+"mărite. Nu ar trebui să o dezactivați pentru vizualizarea fotografiilor, dar "
+"dezactivarea interpolării poate fi utilă la realizarea iconițelor.</i></"
+"small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>Puteți alege cum vor fi afișate părțile transparente ale "
+"imaginilor. Această opțiune nu are efect asupra fotografiilor, dar "
+"configurarea opțiunii ca model mozaic sau culoare personalizată poate fi "
+"utilă la vizualizarea iconițelor sau a altor elemente de design care conțin "
+"părți transparente. </i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "Ca _fundal"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "Ca o _culoare personalizată: "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "Ca _model mozaic"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Atașează etichete:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Atașează etichetă:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "C_ontrast:"
+
+#: ../src/f-spot.glade.h:31
+msgid "Camera Selection"
+msgstr "Selecția cameră"
+
+#: ../src/f-spot.glade.h:32
+msgid "Copy files to the Photos folder"
+msgstr "Copiază fișierele în dosarul Fotografii"
+
+#: ../src/f-spot.glade.h:33
+msgid "Create Mail"
+msgstr "Creează mail"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create _icon for this tag when first used"
+msgstr "Creează _iconiță pentru această etichetă la prima utilizare"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr ""
+"Creează un email cu fotografia selectată (posibil redimensionată) atașată"
+
+#: ../src/f-spot.glade.h:36
+msgid "Detect duplicates"
+msgstr "Detectează duplicate"
+
+#: ../src/f-spot.glade.h:37
+msgid "Display File _Names"
+msgstr "Afișează _numele fișierelor"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr ""
+"Afișează numai fotografiile care au fost importate în seturile specificate."
+
+#: ../src/f-spot.glade.h:39
+msgid "Do not send a mail"
+msgstr "Nu trimite email"
+
+#: ../src/f-spot.glade.h:40
+msgid "E-_Mail:"
+msgstr "E-_Mail:"
+
+#: ../src/f-spot.glade.h:41
+msgid "E_xport titles and comments"
+msgstr "E_xportă titluri și comentarii"
+
+#: ../src/f-spot.glade.h:42
+msgid "Estimated new size"
+msgstr "Dimensiune nouă estimată"
+
+#: ../src/f-spot.glade.h:44
+msgid "Extra large"
+msgstr "Foarte mare"
+
+#: ../src/f-spot.glade.h:45
+msgid "F-Spot View"
+msgstr "Vizualizare F-Spot"
+
+#: ../src/f-spot.glade.h:47
+msgid "Filter on selected rolls"
+msgstr "Filtru pe set selectat"
+
+#: ../src/f-spot.glade.h:48
+msgid "G_allery:"
+msgstr "G_alerie:"
+
+#: ../src/f-spot.glade.h:49
+msgid "Gallery"
+msgstr "Galerie"
+
+#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Import"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:52
+msgid "Import Source:"
+msgstr "Importă sursă:"
+
+#: ../src/f-spot.glade.h:53
+msgid "Include subfolders"
+msgstr "Include subdirectoare"
+
+#: ../src/f-spot.glade.h:54
+msgid "Large"
+msgstr "Mare"
+
+#: ../src/f-spot.glade.h:55
+msgid "Manage your custom selection ratios"
+msgstr "Administrați proporțiile selectate personalizat"
+
+#: ../src/f-spot.glade.h:56
+msgid "Medium"
+msgstr "Mediu"
+
+#: ../src/f-spot.glade.h:58
+msgid "Number of photos in selected rolls:"
+msgstr "Număr de fotografii în seturile selectate:"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of pictures"
+msgstr "Număr de imagini"
+
+#: ../src/f-spot.glade.h:60
+msgid "Open _Folder..."
+msgstr "Deschide _dosar..."
+
+#: ../src/f-spot.glade.h:62
+msgid "Original size (possible very large file size)"
+msgstr "Dimensiune originală (posibil fișier de dimensiune foarte mare)"
+
+#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "Etichetă _părinte:"
+
+#: ../src/f-spot.glade.h:64
+msgid "Pause"
+msgstr "Pauză"
+
+#: ../src/f-spot.glade.h:65
+msgid "Preferences"
+msgstr "Preferințe"
+
+#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Precedenta"
+
+#: ../src/f-spot.glade.h:67
+msgid "Repair"
+msgstr "Repară"
+
+#: ../src/f-spot.glade.h:70
+msgid "Select Photos to Copy From Camera..."
+msgstr "Selectați fotografiile care vor fi copiate din aparatul foto..."
+
+#: ../src/f-spot.glade.h:71
+msgid "Select a Tag..."
+msgstr "Selectați o etichetă..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select the camera from which you want to transfer files"
+msgstr "Selectați aparatul foto din care doriți să transferați fișiere"
+
+#: ../src/f-spot.glade.h:73
+msgid "Selected Camera: "
+msgstr "Aparat foto selectat: "
+
+#: ../src/f-spot.glade.h:74
+msgid "Selection Constraints"
+msgstr "Condiționări selecție"
+
+#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "Definește ca _fundal"
+
+#: ../src/f-spot.glade.h:76
+msgid "Show all photos."
+msgstr "Arată toate fotografiile."
+
+#: ../src/f-spot.glade.h:77
+msgid "Show or hide the side pane"
+msgstr "Afișează sau ascunde panoul lateral"
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the toolbar"
+msgstr "Afișează sau ascunde bara de unelte"
+
+#: ../src/f-spot.glade.h:79
+msgid "Side _pane"
+msgstr "_Panou lateral"
+
+#: ../src/f-spot.glade.h:80
+msgid "Small"
+msgstr "Mic"
+
+#: ../src/f-spot.glade.h:81
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"Specificați dacă o imagine de dimensiune originală ar trebui rotită sau nu. "
+"Imaginile de dimensiuni mai mici sunt rotite automat."
+
+#: ../src/f-spot.glade.h:82
+msgid "Strip image _metadata"
+msgstr "Șterge _metadate din imagine"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:84
+msgid "Te_mp:"
+msgstr "Te_mp:"
+
+#: ../src/f-spot.glade.h:85
+msgid "Tiny"
+msgstr "Foarte mic"
+
+#: ../src/f-spot.glade.h:86
+msgid "Total original size"
+msgstr "Totalizare dimensiune originală"
+
+#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "Măr_ire"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "Micș_orare"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Mărește"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Micșorează"
+
+#: ../src/f-spot.glade.h:91
+msgid "_Brightness:"
+msgstr "_Luminozitate:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_Creează email"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "_Editare"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "_Expunere:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "_Afișare pe tot ecranul"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Galerie"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "_Ajutor"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "_Nuanță:"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "_Interpolează imaginea la zoom"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "Fereastră _nouă"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "_Deschide albumul în navigator după trimitere"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "_Deschide destinația după exportare"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Fotografie"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "_Saturație:"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "_Scalează fotografiile la o dimensiune maximă de: "
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "_Diapozitive"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "Șterge _metadate"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "Nume e_tichetă:"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "_Nuanță:"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "Bară de unel_te"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "_Vizualizare"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "Sistem _virtual de fișiere"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "și"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"la\n"
+"după\n"
+"între"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
+
+#: ../src/FullScreenView.cs:58
+msgid "Hide"
+msgstr "Ascunde"
+
+#: ../src/FullScreenView.cs:60
+msgid "Hide Toolbar"
+msgstr "Ascunde bara de unelte"
+
+#: ../src/FullScreenView.cs:66
+msgid "Info"
+msgstr "Informații"
+
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
+msgid "Image Information"
+msgstr "Informații imagine"
+
+#: ../src/FullScreenView.cs:73
+msgid "Exit fullscreen"
+msgstr "Ieșire din mod pe tot ecranul"
+
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
+msgid "Slideshow"
+msgstr "Diapozitive"
+
+#: ../src/FullScreenView.cs:82
+msgid "Start slideshow"
+msgstr "Pornire prezentare diapozitive"
+
+#: ../src/FullScreenView.cs:128
+msgid "Slide transition:"
+msgstr "Tranziție diapozitive:"
+
+#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
+msgid "More dates"
+msgstr "Mai multe date"
+
+#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
+msgid "More"
+msgstr "Mai mult"
+
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
+msgid "_Clear Date Range"
+msgstr "_Curăță intervalul de timp"
+
+#: ../src/Imaging/Exif.cs:228
+msgid "Image Directory"
+msgstr "Dosar imagini"
+
+#: ../src/Imaging/Exif.cs:230
+msgid "Thumbnail Directory"
+msgstr "Dosar miniaturi"
+
+#: ../src/Imaging/Exif.cs:232
+msgid "Exif Directory"
+msgstr "Dosar Exif"
+
+#: ../src/Imaging/Exif.cs:234
+msgid "GPS Directory"
+msgstr "Dosar GPS"
+
+#: ../src/Imaging/Exif.cs:236
+msgid "InterOperability Directory"
+msgstr "Dosar InterOperabilitate"
+
+#: ../src/Imaging/Exif.cs:238
+msgid "Unknown Directory"
+msgstr "Dosar necunoscut"
+
+#: ../src/Imaging/ImageFile.cs:117
+msgid "Writing to this file format is not supported"
+msgstr "Acest format de fișier nu poate fi scris"
+
+#: ../src/Imaging/IptcFile.cs:145
+msgid "IPTC Information Interchange Model (IIM) Version number"
+msgstr "Număr versiune pentru modelul de interschimbare informații (IIM) IPTC"
+
+#: ../src/Imaging/IptcFile.cs:147
+msgid "OSI Destination routing information"
+msgstr "Informații rutare destinație OSI"
+
+#: ../src/Imaging/IptcFile.cs:149
+msgid "IPTC file format"
+msgstr "Format fișier IPTC"
+
+#: ../src/Imaging/IptcFile.cs:151
+msgid "Identifies the provider and product"
+msgstr "Identifică furnizorul și produsul"
+
+#: ../src/Imaging/IptcFile.cs:153
+msgid "A unique number identifying the envelope"
+msgstr "Un număr unic de identificare al plicului"
+
+#: ../src/Imaging/IptcFile.cs:155
+msgid "A unique number"
+msgstr "Număr unic"
+
+#: ../src/Imaging/IptcFile.cs:157
+msgid ""
+"The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
+msgstr ""
+"Prioritate de manevrare a plicurilor între 1 (cel mai urgent) și 9 (mai "
+"puțin urgent)"
+
+#: ../src/Imaging/IptcFile.cs:159
+msgid "The year, month and day (CCYYMMDD) the service sent the material"
+msgstr "Anul, luna și ziua (AAAALLZZ) la care serviciul a trimis materialul"
+
+#: ../src/Imaging/IptcFile.cs:161
+msgid "The hour, minute and second (HHMMSS) the service sent the material"
+msgstr "Ora, minutul și secunda (OOMMSS) la care serviciul a trimis materialul"
+
+#: ../src/Imaging/IptcFile.cs:163
+msgid "The character set designation"
+msgstr "Desemnarea setului de caractere"
+
+#: ../src/Imaging/IptcFile.cs:165
+msgid "External globally unique object identifier"
+msgstr "Identificator extern unic global pentru obiect"
+
+#: ../src/Imaging/IptcFile.cs:170
+msgid "Abstract Relationship Method (ARM) identifier"
+msgstr "Identificator Abstract Relationship Method (ARM)"
+
+#: ../src/Imaging/IptcFile.cs:172
+msgid "Abstract Relationship Method (ARM) version number."
+msgstr "Număr versiune Abstract Relationship Method (ARM)"
+
+#: ../src/Imaging/IptcFile.cs:175
+msgid "Number identifying the IIM version this application record uses"
+msgstr "Număr de identificare al versiunii IIM utilizată de această aplicație"
+
+#: ../src/Imaging/IptcFile.cs:177
+msgid "Object type reference"
+msgstr "Referință tip obiect"
+
+#: ../src/Imaging/IptcFile.cs:182
+msgid "Object attribute reference"
+msgstr "Referință atribut obiect"
+
+#: ../src/Imaging/IptcFile.cs:188 ../src/Imaging/IptcFile.cs:192
+msgid "Object name"
+msgstr "Nume obiect"
+
+#: ../src/Imaging/IptcFile.cs:190
+msgid "Status of the objectdata according to the provider"
+msgstr "Statut al datelor obiect asigurat de furnizor"
+
+#: ../src/Imaging/IptcFile.cs:194
+msgid "Location within a city or area where the object originates"
+msgstr ""
+"Locația din interiorul unui oraș sau al unei arii din care provine obiectul"
+
+#: ../src/Imaging/IptcFile.cs:197
+msgid "Name of the city the content is focussing on"
+msgstr "Numele orașului despre care vorbește conținutul"
+
+#: ../src/Imaging/IptcFile.cs:200
+msgid "Copyright information for"
+msgstr "Informații referitoare la drepturile de autor pentru"
+
+#: ../src/Imaging/IptcFile.cs:203
+msgid "Full name of the country of the focus of the content"
+msgstr "Numele complet al țării despre care vorbește conținutul"
+
+#: ../src/Imaging/IptcFile.cs:206
+msgid ""
+"Two or three letter ISO3166 code of the country of the focus of the content"
+msgstr ""
+"Două sau trei litere conforme codului ISO3166 ale țării despre care vorbește "
+"conținutul"
+
+#: ../src/Imaging/IptcFile.cs:209
+msgid "Creator of the content"
+msgstr "Autorul conținutului"
+
+#: ../src/Imaging/IptcFile.cs:212
+msgid "Provider of the object"
+msgstr "Furnizorul obiectului"
+
+#: ../src/Imaging/IptcFile.cs:215
+msgid "The title of the author or creator"
+msgstr "Titlul autorului sau creatorului"
+
+#: ../src/Imaging/IptcFile.cs:218
+msgid ""
+"The person involved in writing, editing or correcting the object data or "
+"caption/abstract"
+msgstr ""
+"Persoana implicată în scrierea, editarea sau corectarea datelor obiect sau a "
+"părților acestuia"
+
+#: ../src/Imaging/IptcFile.cs:222
+msgid "Headline of the content"
+msgstr "Rezumatul conținutului"
+
+#: ../src/Imaging/IptcFile.cs:225
+msgid ""
+"Instructions from the creator to the receiver not covered by other fields"
+msgstr ""
+"Instrucțiuni ale creatorului, care nu se regăsesc în alte câmpuri, pentru "
+"destinatar"
+
+#: ../src/Imaging/IptcFile.cs:228
+msgid "Intellectual genre of the object"
+msgstr "Genul obiectului"
+
+#: ../src/Imaging/IptcFile.cs:241
+msgid "Unknown IIM DataSet"
+msgstr "Set date IIM necunoscut"
+
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
+msgid "Select Folder"
+msgstr "Selectare dosar"
+
+#: ../src/ImportCommand.cs:259
+msgid "(No Cameras Detected)"
+msgstr "(Nu s-a detectat nicio cameră)"
+
+#: ../src/ImportCommand.cs:404
+#, csharp-format
+msgid "Loading {0} of {1}"
+msgstr "Se încarcă {0} din {1}"
+
+#: ../src/ImportCommand.cs:470
+msgid "Done Loading"
+msgstr "Încărcare terminată"
+
+#: ../src/ImportCommand.cs:684
+msgid "Directory does not exist."
+msgstr "Dosarul nu există."
+
+#: ../src/ImportCommand.cs:685
+#, csharp-format
+msgid ""
+"The directory you selected \"{0}\" does not exist. Please choose a "
+"different directory"
+msgstr "Dosarul „{0}” pe care l-ați selectat nu există. Alegeți un alt dosar"
+
+#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
+#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
+#: ../src/XmpTagsImporter.cs:89
+msgid "Import Tags"
+msgstr "Etichete utilizate la import"
+
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
+msgid "Rotate Left"
+msgstr "Rotire la stânga"
+
+#: ../src/ItemAction.cs:80
+msgid "Rotate picture left"
+msgstr "Rotește fotografia spre dreapta"
+
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
+msgid "Rotate Right"
+msgstr "Rotire la dreapta"
+
+#: ../src/ItemAction.cs:92
+msgid "Rotate picture right"
+msgstr "Rotește fotografia spre dreapta"
+
+#: ../src/ItemAction.cs:103
+msgid "Next picture"
+msgstr "Următoarea fotografie"
+
+#: ../src/ItemAction.cs:124
+msgid "Previous picture"
+msgstr "Fotografia precedentă"
+
+#: ../src/MainWindow.cs:303
+msgid "Import new images"
+msgstr "Importă imagini noi"
+
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
+msgid "Browse"
+msgstr "Navigare"
+
+#: ../src/MainWindow.cs:323
+msgid "Browse many photos simultaneously"
+msgstr "Căutați printre mai multe fotografii simultan"
+
+#: ../src/MainWindow.cs:327
+msgid "Edit Image"
+msgstr "Editare imagine"
+
+#: ../src/MainWindow.cs:331
+msgid "View and edit a photo"
+msgstr "Afișează și editează o fotografie"
+
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
+msgid "Fullscreen"
+msgstr "Pe tot ecranul"
+
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
+msgid "View photos fullscreen"
+msgstr "Afișează fotografiile pe tot ecranul"
+
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
+msgid "View photos in a slideshow"
+msgstr "Afișează fotografiile ca prezentare de diapozitive"
+
+#: ../src/MainWindow.cs:358
+msgid "Previous photo"
+msgstr "Fotografia precedentă"
+
+#: ../src/MainWindow.cs:363
+msgid "Next photo"
+msgstr "Fotografia următoare"
+
+#: ../src/MainWindow.cs:1518
+msgid "No cameras detected."
+msgstr "Nu s-a detectat nicio cameră foto"
+
+#: ../src/MainWindow.cs:1519
+msgid ""
+"F-Spot was unable to find any cameras attached to this system. Double check "
+"that the camera is connected and has power"
+msgstr ""
+"F-Spot nu a putut detecta nicio cameră foto conectată la acest sistem. "
+"Verificați încă o dată dacă aveți camera conectată și dacă ea este "
+"alimentată."
+
+#: ../src/MainWindow.cs:1558
+msgid "Error connecting to camera"
+msgstr "Eroare la conectarea camerei foto"
+
+#: ../src/MainWindow.cs:1559
+#, csharp-format
+msgid "Received error \"{0}\" while connecting to camera"
+msgstr "În timpul conectării la camera foto s-a primit eroarea „{0}”"
+
+#. Translators, The singular case will never happen here.
+#: ../src/MainWindow.cs:1846
+#, csharp-format
+msgid "Merge the selected tag"
+msgid_plural "Merge the {0} selected tags?"
+msgstr[0] "Combină eticheta selectată"
+msgstr[1] "Combin cele {0} etichete selectate?"
+msgstr[2] "Combin cele {0} de etichete selectate?"
+
+#: ../src/MainWindow.cs:1873
+msgid ""
+"This operation will merge the selected tags and any sub-tags into a single "
+"tag."
+msgstr ""
+"Această operație va combina etichetele selectate și toate sub-etichetele "
+"într-o singură etichetă."
+
+#: ../src/MainWindow.cs:1875
+msgid "_Merge Tags"
+msgstr "Co_mbină etichete"
+
+#: ../src/MainWindow.cs:2080
+#, csharp-format
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] "Fotografia {0} din {1}"
+msgstr[1] "{0} fotografii din {1}"
+msgstr[2] "{0} de fotografii din {1}"
+
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:480
+#, csharp-format
+msgid "{0} Photo"
+msgid_plural "{0} Photos"
+msgstr[0] "Fotografia {0}"
+msgstr[1] "{0} fotografii"
+msgstr[2] "{0} de fotografii"
+
+#: ../src/MainWindow.cs:2085
+#, csharp-format
+msgid " ({0} selected)"
+msgid_plural " ({0} selected)"
+msgstr[0] " {0} selectată"
+msgstr[1] " {0} selectate"
+msgstr[2] " {0} selectate"
+
+#: ../src/MainWindow.cs:2166
+msgid "_Ok"
+msgstr "_Ok"
+
+#: ../src/MainWindow.cs:2167
+msgid "Error Deleting Picture"
+msgstr "Eroare la ștergerea fotografiei"
+
+#: ../src/MainWindow.cs:2172
+#, csharp-format
+msgid "No permission to delete the file:{1}{0}"
+msgstr "Nu aveți permisiunea de a șterge fișierul: {1}{0}"
+
+#: ../src/MainWindow.cs:2176
+#, csharp-format
+msgid "An error of type {0} occurred while deleting the file:{2}{1}"
+msgstr "La ștergerea fișierului {2}{1} s-a produs o eroare de tipul {0}"
+
+#: ../src/MainWindow.cs:2208
+#, csharp-format
+msgid "Delete the selected photo permanently?"
+msgid_plural "Delete the {0} selected photos permanently?"
+msgstr[0] "Ștergeți definitiv fotografia selectată?"
+msgstr[1] "Ștergeți definitiv cele {0} fotografii?"
+msgstr[2] "Ștergeți definitiv cele {0} de fotografii?"
+
+#: ../src/MainWindow.cs:2212
+msgid "This deletes all versions of the selected photo from your drive."
+msgid_plural ""
+"This deletes all versions of the selected photos from your drive."
+msgstr[0] ""
+"Aceasta va șterge de pe disc toate versiunile fotografiei selectate."
+msgstr[1] ""
+"Aceasta va șterge de pe disc toate versiunile fotografiilor selectate."
+msgstr[2] ""
+"Aceasta va șterge de pe disc toate versiunile fotografiilor selectate."
+
+#: ../src/MainWindow.cs:2215
+msgid "_Delete photo"
+msgid_plural "_Delete photos"
+msgstr[0] "Ște_rge fotografia"
+msgstr[1] "Ște_rge fotografiile"
+msgstr[2] "Ște_rge fotografiile"
+
+#: ../src/MainWindow.cs:2251
+#, csharp-format
+msgid "Remove the selected photo from F-Spot?"
+msgid_plural "Remove the {0} selected photos from F-Spot?"
+msgstr[0] "Ștergeți din F-Spot fotografia selectată?"
+msgstr[1] "Ștergeți din F-Spot cele {0} fotografii selectate?"
+msgstr[2] "Ștergeți din F-Spot cele {0} de fotografii selectate?"
+
+#: ../src/MainWindow.cs:2256
+msgid ""
+"If you remove photos from the F-Spot catalog all tag information will be "
+"lost. The photos remain on your computer and can be imported into F-Spot "
+"again."
+msgstr ""
+"Dacă ștergeți fotografii din catalogul F-Spot, toate informațiile de pe "
+"etichete se vor pierde. Fotografiile rămân în calculator și pot fi importate "
+"din nou în F-Spot."
+
+#: ../src/MainWindow.cs:2257
+msgid "_Remove from Catalog"
+msgstr "Ș_terge din catalog"
+
+#: ../src/MainWindow.cs:2320
+#, csharp-format
+msgid "Delete tag \"{0}\"?"
+msgstr "Ștergeți eticheta „{0}”?"
+
+#: ../src/MainWindow.cs:2322
+#, csharp-format
+msgid "Delete the {0} selected tags?"
+msgstr "Ștergeți cele {0} etichete selectate?"
+
+#: ../src/MainWindow.cs:2327
+msgid "photo"
+msgid_plural "photos"
+msgstr[0] "fotografie"
+msgstr[1] "fotografii"
+msgstr[2] "de fotografii"
+
+#: ../src/MainWindow.cs:2329
+#, csharp-format
+msgid "If you delete this tag, the association with {0} {1} will be lost."
+msgid_plural ""
+"If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] ""
+"Dacă ștergeți această etichetă, asocierea cu {0} {1} va fi pierdută."
+msgstr[1] ""
+"Dacă ștergeți aceste etichete, asocierile cu {0} {1} vor fi pierdute."
+msgstr[2] ""
+"Dacă ștergeți aceste etichete, asocierile cu {0} {1} vor fi pierdute."
+
+#: ../src/MainWindow.cs:2334
+msgid "_Delete tag"
+msgid_plural "_Delete tags"
+msgstr[0] "Ște_rge etichetă"
+msgstr[1] "Ște_rge etichete"
+msgstr[2] "Ște_rge etichete"
+
+#. A Category is not empty. Can not delete it.
+#: ../src/MainWindow.cs:2348
+msgid "Tag is not empty"
+msgstr "Eticheta părinte nu este goală"
+
+#: ../src/MainWindow.cs:2349
+#, csharp-format
+msgid ""
+"Can not delete tags that have tags within them. Please delete tags under "
+"\"{0}\" first"
+msgstr ""
+"Nu pot șterge etichete care conțin alte etichete. Ștergeți mai întâi "
+"etichetele conținute de „{0}”"
+
+#: ../src/MainWindow.cs:2781
+msgid "Rotate selected photo left"
+msgid_plural "Rotate selected photos left"
+msgstr[0] "Rotește fotografia selectată către stânga"
+msgstr[1] "Rotește fotografiile selectate către stânga"
+msgstr[2] "Rotește fotografiile selectate către stânga"
+
+#: ../src/MainWindow.cs:2794
+msgid "Rotate selected photo right"
+msgid_plural "Rotate selected photos right"
+msgstr[0] "Rotește fotografia selectată către dreapta"
+msgstr[1] "Rotește fotografiile selectate către dreapta"
+msgstr[2] "Rotește fotografiile selectate către dreapta"
+
+#: ../src/MainWindow.cs:2805
+#, csharp-format
+msgid "Find _Selected Tag"
+msgid_plural "Find _Selected Tags"
+msgstr[0] "Caută _eticheta selectată"
+msgstr[1] "Caută _etichetele selectate"
+msgstr[2] "Caută _etichetele selectate"
+
+#: ../src/MainWindow.cs:2809
+#, csharp-format
+msgid "Find Selected Tag _With"
+msgid_plural "Find Selected Tags _With"
+msgstr[0] "Caută eticheta selectată _cu"
+msgstr[1] "Caută etichetele selectate _cu"
+msgstr[2] "Caută etichetele selectate _cu"
+
+#: ../src/MainWindow.cs:2850
+msgid "Create New Version?"
+msgid_plural "Create New Versions?"
+msgstr[0] "Creez versiune nouă?"
+msgstr[1] "Creez versiuni noi?"
+msgstr[2] "Creez versiuni noi?"
+
+#: ../src/MainWindow.cs:2852
+#, csharp-format
+msgid ""
+"Before launching {1}, should F-Spot create a new version of the selected "
+"photo to preserve the original?"
+msgid_plural ""
+"Before launching {1}, should F-Spot create new versions of the selected "
+"photos to preserve the originals?"
+msgstr[0] ""
+"Înainte de a lansa {1}, doriți ca F-Spot să creeze o versiune nouă a "
+"fotografiei selectate, pentru a păstra originalul nemodificat?"
+msgstr[1] ""
+"Înainte de a lansa {1}, doriți ca F-Spot să creeze versiuni noi ale "
+"fotografiilor selectate, pentru a păstra originalele nemodificate?"
+msgstr[2] ""
+"Înainte de a lansa {1}, doriți ca F-Spot să creeze versiuni noi ale "
+"fotografiilor selectate, pentru a păstra originalele nemodificate?"
+
+#: ../src/MainWindow.cs:2874
+msgid "XCF version"
+msgstr "versiune XCF"
+
+#: ../src/MetadataStore.cs:19
+msgid "Creator"
+msgstr "Realizat de"
+
+#: ../src/MetadataStore.cs:20
+msgid "Title"
+msgstr "Titlu"
+
+#: ../src/MetadataStore.cs:21
+msgid "Copyright"
+msgstr "Drepturi de autor"
+
+#: ../src/MetadataStore.cs:22
+msgid "Subject and Keywords"
+msgstr "Subiect și cuvinte cheie"
+
+#: ../src/MetadataStore.cs:23
+msgid "Compression"
+msgstr "Compresie"
+
+#: ../src/MetadataStore.cs:25
+msgid "Planar Configuration"
+msgstr "Configurație plană"
+
+#: ../src/MetadataStore.cs:27
+msgid "Orientation"
+msgstr "Orientare"
+
+#: ../src/MetadataStore.cs:29
+msgid "Photometric Interpretation"
+msgstr "Interpretare fotometrică"
+
+#: ../src/MetadataStore.cs:31
+msgid "Resolution Unit"
+msgstr "Unitate pentru rezoluție"
+
+#: ../src/MetadataStore.cs:33
+msgid "Exposure Program"
+msgstr "Program de expunere"
+
+#: ../src/MetadataStore.cs:35
+msgid "Metering Mode"
+msgstr "Metoda de măsură"
+
+#: ../src/MetadataStore.cs:37
+msgid "Exposure Mode"
+msgstr "Mod expunere"
+
+#: ../src/MetadataStore.cs:39
+msgid "Custom Rendered"
+msgstr "Randare personalizată"
+
+#: ../src/MetadataStore.cs:41
+msgid "Components Configuration"
+msgstr "Configurație componente"
+
+#: ../src/MetadataStore.cs:43
+msgid "Light Source"
+msgstr "Sursa de lumină"
+
+#: ../src/MetadataStore.cs:45
+msgid "Sensing Method"
+msgstr "Metodă de analiză"
+
+#: ../src/MetadataStore.cs:47
+msgid "Color Space"
+msgstr "Spațiu de culoare"
+
+#: ../src/MetadataStore.cs:49
+msgid "White Balance"
+msgstr "Balanță de alb"
+
+#: ../src/MetadataStore.cs:51
+msgid "Focal Plane Resolution Unit"
+msgstr "Unitate rezoluție plan focal"
+
+#: ../src/MetadataStore.cs:53
+msgid "File Source Type"
+msgstr "Tip fișier sursă"
+
+#: ../src/MetadataStore.cs:55
+msgid "Scene Capture Type"
+msgstr "Tip captură peisaj"
+
+#: ../src/MetadataStore.cs:57
+msgid "Gain Control"
+msgstr "Control amplificare"
+
+#: ../src/MetadataStore.cs:59
+msgid "Contrast"
+msgstr "Contrast"
+
+#: ../src/MetadataStore.cs:61
+msgid "Saturation"
+msgstr "Saturație"
+
+#: ../src/MetadataStore.cs:63
+msgid "Sharpness"
+msgstr "Claritate"
+
+#: ../src/MetadataStore.cs:65
+msgid "Scene Type"
+msgstr "Tip peisaj"
+
+#. Fixme this should really set parent menu
+#. items insensitve
+#: ../src/PhotoTagMenu.cs:74
+msgid "(No Tags)"
+msgstr "(Fără etichetă)"
+
+#: ../src/PhotoVersionCommands.cs:58
+msgid "Create New Version"
+msgstr "Crează o versiune nouă"
+
+#: ../src/PhotoVersionCommands.cs:59
+msgid "Name:"
+msgstr "Nume:"
+
+#: ../src/PhotoVersionCommands.cs:63
+msgid "Rename Version"
+msgstr "Redenumire versiune"
+
+#: ../src/PhotoVersionCommands.cs:64
+msgid "New name:"
+msgstr "Nume nou:"
+
+#: ../src/PhotoVersionCommands.cs:110
+msgid "Could not create a new version"
+msgstr "Nu s-a putut crea o versiune nouă"
+
+#: ../src/PhotoVersionCommands.cs:111
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to create version \"{1}\""
+msgstr "S-a primit excepția „{0}”. Nu se poate crea versiunea „{1}”."
+
+#: ../src/PhotoVersionCommands.cs:138
+msgid "Really Delete?"
+msgstr "Ștergeți definitiv?"
+
+#: ../src/PhotoVersionCommands.cs:139
+msgid "Cancel"
+msgstr "Renunță"
+
+#: ../src/PhotoVersionCommands.cs:140
+msgid "Delete"
+msgstr "Șterge"
+
+#: ../src/PhotoVersionCommands.cs:144
+#, csharp-format
+msgid "Really delete version \"{0}\"?"
+msgstr "Ștergeți definitiv versiunea „{0}”?"
+
+#: ../src/PhotoVersionCommands.cs:154
+msgid "Could not delete a version"
+msgstr "Nu se poate șterge o versiune"
+
+#: ../src/PhotoVersionCommands.cs:155
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
+msgstr "S-a primit excepția „{0}”. Nu se poate șterge versiunea „{1}”"
+
+#: ../src/PhotoVersionCommands.cs:196
+msgid "Could not rename a version"
+msgstr "Nu se poate redenumi o versiune"
+
+#: ../src/PhotoVersionCommands.cs:197
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
+msgstr "S-a primit excepția „{0}”. Versiunea nu poate fi redenumită ca „{1}”"
+
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
+msgid "(No Edits)"
+msgstr "(Fără modificări)"
+
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
+msgid "Error editing photo"
+msgstr "Eroare la editarea fotografiei"
+
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "S-a primit excepția „{0}”. Fotografia {1} nu poate fi salvată."
+
+#: ../src/PhotoView.cs:356
+msgid "Comment:"
+msgstr "Comentariu:"
+
+#: ../src/Preferences.cs:149
+msgid "Photos"
+msgstr "Fotografii"
+
+#: ../src/PrintOperation.cs:32
+msgid "Image Settings"
+msgstr "Preferințe imagine"
+
+#: ../src/QueryWidget.cs:58
+msgid "Find: "
+msgstr "Caută: "
+
+#: ../src/QueryWidget.cs:63
+msgid "Untagged photos"
+msgstr "Fotografii fără etichete"
+
+#: ../src/QueryWidget.cs:71
+msgid "Rated photos"
+msgstr "Fotografii cu apreciere"
+
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/QueryWidget.cs:80
+msgid "Import roll"
+msgstr "Seturi de importat"
+
+#: ../src/QueryWidget.cs:104
+msgid "Clear search"
+msgstr "Resetează căutarea"
+
+#: ../src/QueryWidget.cs:111
+msgid "Refresh search"
+msgstr "Caută din nou"
+
+#: ../src/QueryWidget.cs:113
+msgid "No matching photos found"
+msgstr "Nu au fost găsite fotografii care corespund căutării"
+
+#: ../src/QueryWidget.cs:155
+msgid "Hide _Find Bar"
+msgstr "Ascunde bara „_Caută”"
+
+#: ../src/QueryWidget.cs:161
+msgid "Show _Find Bar"
+msgstr "Arată bara „_Caută”"
+
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
+msgid "Unable to rotate this type of photo"
+msgstr "Acest tip de fotografie nu poate fi rotit"
+
+#: ../src/RotateCommand.cs:131
+msgid "Unable to rotate readonly file"
+msgstr "Fișierul cu proprietăți care nu permit editarea nu poate fi rotit"
+
+#: ../src/RotateCommand.cs:198
+msgid "Rotating photos"
+msgstr "Rotire fotografii"
+
+#: ../src/RotateCommand.cs:209
+#, csharp-format
+msgid "Rotating photo \"{0}\""
+msgstr "Se rotește fotografia „{0}”"
+
+#: ../src/RotateCommand.cs:222
+msgid "Directory not found"
+msgstr "Dosarul nu a fost găsit"
+
+#: ../src/RotateCommand.cs:242
+#, csharp-format
+msgid "Unable to rotate photo"
+msgid_plural "Unable to rotate {0} photos"
+msgstr[0] "Fotografia nu poate fi rotită"
+msgstr[1] "{0} fotografii nu pot fi rotite"
+msgstr[2] "{0} de fotografii nu pot fi rotite"
+
+#: ../src/RotateCommand.cs:244
+#, csharp-format
+msgid ""
+"The photo could not be rotated because it is on a read only file system or "
+"media such as a CDROM. Please check the permissions and try again."
+msgid_plural ""
+"{0} photos could not be rotated because they are on a read only file system "
+"or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] ""
+"Fotografia nu poate fi rotită deoarece se află pe un sistem de fișiere cu "
+"permisiunea doar citire sau pe un mediu cum ar fi CD-ROM. Verificați "
+"permisiunile și încercați din nou."
+msgstr[1] ""
+"{0} fotografii nu pot fi rotite deoarece se află pe un sistem de fișiere cu "
+"permisiunea doar citire sau pe un mediu cum ar fi CD-ROM. Verificați "
+"permisiunile și încercați din nou."
+msgstr[2] ""
+"{0} de fotografii nu pot fi rotite deoarece se află pe un sistem de fișiere "
+"cu permisiunea doar citire sau pe un mediu cum ar fi CD-ROM. Verificați "
+"permisiunile și încercați din nou."
+
+#: ../src/RotateCommand.cs:271
+#, csharp-format
+msgid "Received error \"{0}\" while attempting to rotate {1}"
+msgstr "La încercarea de a roti {1} s-a primit eroarea „{0}”"
+
+#: ../src/RotateCommand.cs:276
+msgid "Error while rotating photo."
+msgstr "Eroare la rotirea fotografiei"
+
+#: ../src/SendEmail.cs:240
+msgid "Preparing email"
+msgstr "Se pregătește emailul"
+
+#: ../src/SendEmail.cs:292
+#, csharp-format
+msgid "Exporting picture \"{0}\""
+msgstr "Se exportă fotografia „{0}”"
+
+#: ../src/SendEmail.cs:314
+msgid "Error processing image"
+msgstr "Eroare la procesarea imaginii"
+
+#: ../src/SendEmail.cs:315
+#, csharp-format
+msgid "An error occured while processing \"{0}\": {1}"
+msgstr "S-a produs o eroare în timpul procesării „{0}”: {1}"
+
+#. Send the mail :)
+#: ../src/SendEmail.cs:330
+msgid "my photos"
+msgstr "fotografiile mele"
+
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Eroare la salvarea fotografiei cu claritatea îmbunătățită"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Accentuează claritatea"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Cantitate:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Raza:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Prag:"
+
+#: ../src/SingleView.cs:73
+msgid "Rotate photo left"
+msgstr "Rotește fotografia la stânga"
+
+#: ../src/SingleView.cs:78
+msgid "Rotate photo right"
+msgstr "Rotește fotografia la dreapta"
+
+#: ../src/SingleView.cs:115
+msgid "Folder"
+msgstr "Dosar"
+
+#: ../src/SingleView.cs:341
+msgid "Open"
+msgstr "Deschide"
+
+#: ../src/SingleView.cs:441
+msgid "Set as Background"
+msgstr "Utilizează ca fundal"
+
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
+msgid "This name is already in use"
+msgstr "Acest nume este folosit deja"
+
+#: ../src/TagCommands.cs:144
+msgid "Create New Tag"
+msgstr "Creare etichetă nouă"
+
+#: ../src/TagCommands.cs:145
+msgid "Name of New Tag:"
+msgstr "Numele etichetei noi:"
+
+#: ../src/TagPopup.cs:26
+#, csharp-format
+msgid "Find"
+msgid_plural "Find"
+msgstr[0] "Caută"
+msgstr[1] "Caută"
+msgstr[2] "Caută"
+
+#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
+msgid "Create New Tag..."
+msgstr "Creează etichetă nouă..."
+
+#: ../src/TagPopup.cs:42
+msgid "Edit Selected Tag..."
+msgstr "Modifică eticheta selectată..."
+
+#: ../src/TagPopup.cs:46
+msgid "Delete Tag"
+msgid_plural "Delete Tags"
+msgstr[0] "Șterge eticheta"
+msgstr[1] "Șterge etichetele"
+msgstr[2] "Șterge etichetele"
+
+#: ../src/TagPopup.cs:52
+msgid "Attach Tag to Selection"
+msgid_plural "Attach Tags to Selection"
+msgstr[0] "Aplică eticheta selecției"
+msgstr[1] "Aplică etichetele selecției"
+msgstr[2] "Aplică etichetele selecției"
+
+#: ../src/TagPopup.cs:56
+msgid "Remove Tag From Selection"
+msgid_plural "Remove Tags From Selection"
+msgstr[0] "Șterge eticheta din selecție"
+msgstr[1] "Șterge etichetele din selecție"
+msgstr[2] "Șterge etichetele din selecție"
+
+#: ../src/TagPopup.cs:62
+msgid "Merge Tags"
+msgstr "Combină etichetele"
+
+#: ../src/TagQueryWidget.cs:34
+#, csharp-format
+msgid "Include Photos Tagged \"{0}\""
+msgstr "Include fotografiile etichetate „{0}”"
+
+#: ../src/TagQueryWidget.cs:39
+#, csharp-format
+msgid "Exclude Photos Tagged \"{0}\""
+msgstr "Exclude fotografiile etichetate „{0}”"
+
+#: ../src/TagQueryWidget.cs:44
+msgid "Remove From Search"
+msgstr "Șterge din căutare"
+
+#: ../src/TagQueryWidget.cs:88
+#, csharp-format
+msgid "Find _With"
+msgid_plural "Find _With"
+msgstr[0] "Caută _cu"
+msgstr[1] "Caută _cu"
+msgstr[2] "Caută _cu"
+
+#: ../src/TagQueryWidget.cs:114
+msgid "All"
+msgstr "Toate"
+
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
+#, csharp-format
+msgid "Not {0}"
+msgstr "Fără {0}"
+
+#: ../src/TagQueryWidget.cs:278
+msgid "Drag tags here to search for them"
+msgstr "Trage etichetele aici pentru a realiza căutarea"
+
+#: ../src/TagSelectionWidget.cs:497
+msgid "Error renaming tag"
+msgstr "Eroare redenumire etichetă"
+
+#: ../src/TagStore.cs:203
+msgid "Favorites"
+msgstr "Favorite"
+
+#: ../src/TagStore.cs:208
+msgid "Hidden"
+msgstr "Ascunse"
+
+#: ../src/TagStore.cs:216
+msgid "People"
+msgstr "Persoane"
+
+#: ../src/TagStore.cs:221
+msgid "Places"
+msgstr "Locuri"
+
+#: ../src/TagStore.cs:226
+msgid "Events"
+msgstr "Evenimente"
+
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
+msgid "(None)"
+msgstr "(Niciuna)"
+
+#: ../src/Term.cs:298
+msgid " and "
+msgstr " și "
+
+#. operators.Add (Catalog.GetString (" && "));
+#: ../src/Term.cs:300
+msgid ", "
+msgstr ", "
+
+#: ../src/Term.cs:356
+msgid " or "
+msgstr " sau "
+
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
+msgid "or"
+msgstr "sau"
+
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Actualizare miniaturi"
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "Se actualizează fotografia „{0}”"
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
+msgid "Photo management for GNOME"
+msgstr "Administrator de fotografii pentru GNOME"
+
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Drepturi de autor © 2003-2009 Novell Inc."
+
+#: ../src/UI.Dialog/AboutDialog.cs:100
+msgid "translator-credits"
+msgstr ""
+"Lucian Adrian Grijincu\n"
+"\n"
+"Launchpad Contributions:\n"
+" Cosmin https://launchpad.net/~cosminonofre\n"
+" Doru Horișco https://launchpad.net/~doruhushhush\n"
+" Ionuț Jula https://launchpad.net/~ionutjula\n"
+" Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu\n"
+" Manuel R. Ciosici https://launchpad.net/~manuelciosici\n"
+" Riddick https://launchpad.net/~riddickbb\n"
+" marianvasile https://launchpad.net/~marianvasile-upcmail"
+
+#: ../src/UI.Dialog/AboutDialog.cs:105
+msgid "F-Spot Website"
+msgstr "Pagina web F-Spot"
+
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
+#, csharp-format
+msgid "Shift all photos by {0}"
+msgstr "Deplasează toate fotografiile cu {0}"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "Astăzi"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "Ieri"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "Ultimele 7 zile"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "Ultimele 30 de zile"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "Ultimele 90 de zile"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "Ultimele 360 de zile"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "Săptămâna curentă (Lu-Du)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "Săptămâna trecută (Lu-Du)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "Perioadă personalizată"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Modifică iconița pentru eticheta {0}"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "selectează fotografia din fișier"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>Din fotografie</b>\n"
+" Puteți utiliza una din fotografiile din colecție ca iconiță pentru această "
+"etichetă.\n"
+" Însă trebuie să aveți asociată cu această etichetă\n"
+" cel puțin o fotografie. Etichetați o fotografie ca „{0}” și reveniți aici\n"
+" pentru a o folosi ca iconiță."
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Nu se poate încărca imaginea"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "Nu se poate încărca „{0}” ca iconiță pentru etichetă"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "Fotografia {0} din {1}"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
+msgstr "S-a produs o eroare majoră în F-Spot"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "Detalii eroare"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr "S-a produs o excepție nerecunoscută: "
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:53
+#: ../src/UI.Dialog/PreferenceDialog.cs:71
+msgid "None"
+msgstr "Niciunul"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:55
+msgid "System profile"
+msgstr "Profil sistem"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:84
+msgid "Standard theme"
+msgstr "Temă standard"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "Eroare la încărcarea bazei de date."
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#, csharp-format
+msgid ""
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
+msgstr ""
+"S-a produs o eroare la încărcarea bazei de date cu fotografii de către F-"
+"Spot. Baza de date veche a fost mutată în {0} și a fost creată o bază de "
+"date nouă."
+
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "Etichetă"
+
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "Raport"
+
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "Încearcă din nou"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Acțiune</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Fotografia de referință</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Configurează data"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Data modificată: "
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Data curentă:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Depărtați toate fotografiile cu"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "diferență:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "min. Începe la {0}"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>Se termină la data</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Alegeți perioada</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Se începe la data</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Anulează, nu se modifică selecția cronologică curentă. "
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Se vor afișa numai fotografiile realizate între aceste date."
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Configurați intervalul de timp"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Editare etichetă"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Modifică iconița"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Iconiță:"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Din altă fotografie</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Din fotografie</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Iconițe predefinite</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Previzualizare</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Creează iconiță din"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Modifică iconița etichetei"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Fără _imagine"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "Fotografia 0 din 0"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Profil de culoare pentru ecran"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Profil de culoare pentru tipărire"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "Preferințe F-Spot"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "Aspect F-Spot"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+"În cazul fișierelor imagine, când este posibil\n"
+"<small>permite vizibilitate față de alte programe pentru editare imagini.</"
+"small>"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Selectați un dosar"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "Separat față de fișiere imagine"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Păstrează etichetele și descrierile pentru fotografii:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "Copiază fotografiile importate în:"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>Apreciere maximă</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>Apreciere minimă</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Configurează filtru de apreciere"
+
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "Reglează timp_ul..."
+
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "Aranjează _după"
+
+#: ../src/ui/main_window.ui.h:4
+msgid "By _Date"
+msgstr "După _dată"
+
+#: ../src/ui/main_window.ui.h:5
+msgid "By _Import Roll"
+msgstr "După setul _importat"
+
+#: ../src/ui/main_window.ui.h:6
+msgid "By _Rating"
+msgstr "După ap_reciere"
+
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy Locat_ion"
+msgstr "Copiază locaț_ia"
+
+#: ../src/ui/main_window.ui.h:8
+msgid "Create New _Tag..."
+msgstr "Creează e_tichetă nouă..."
+
+#: ../src/ui/main_window.ui.h:9
+msgid "Create _New Version..."
+msgstr "Creează versiune _nouă..."
+
+#: ../src/ui/main_window.ui.h:11
+msgid "Fin_d"
+msgstr "_Căutare"
+
+#: ../src/ui/main_window.ui.h:12
+msgid "Manage _Extensions"
+msgstr "Gestionează _extensii"
+
+#: ../src/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "Opți_uni pagină..."
+
+#: ../src/ui/main_window.ui.h:14
+msgid "Re_fresh Thumbnail"
+msgstr "Actualizează _miniaturi"
+
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "_Selectează tot"
+
+#: ../src/ui/main_window.ui.h:19
+msgid "Select _None"
+msgstr "_Fără selecție"
+
+#: ../src/ui/main_window.ui.h:20
+msgid "Send by _Mail..."
+msgstr "Trimite prin e_mail..."
+
+#: ../src/ui/main_window.ui.h:22
+msgid "Side_bar"
+msgstr "_Bară laterală"
+
+#: ../src/ui/main_window.ui.h:23
+msgid "T_ags"
+msgstr "E_tichete"
+
+#: ../src/ui/main_window.ui.h:25
+msgid "Thumbnail _elements"
+msgstr "_Elemente miniatură"
+
+#: ../src/ui/main_window.ui.h:26
+msgid "Too_lbar"
+msgstr "Bară de _unelte"
+
+#: ../src/ui/main_window.ui.h:27
+msgid "View"
+msgstr "Vizualizare"
+
+#: ../src/ui/main_window.ui.h:33
+msgid "_Attach Tag to Selection"
+msgstr "_Aplică eticheta la selecție"
+
+#: ../src/ui/main_window.ui.h:35
+msgid "_Clear Rating Filter"
+msgstr "_Curăță filtrul de apreciere"
+
+#: ../src/ui/main_window.ui.h:36
+msgid "_Clear Roll Filter"
+msgstr "Ș_terge filtrul de seturi"
+
+#: ../src/ui/main_window.ui.h:38
+msgid "_Components"
+msgstr "_Componente"
+
+#: ../src/ui/main_window.ui.h:39
+msgid "_Contents"
+msgstr "_Conținut"
+
+#: ../src/ui/main_window.ui.h:40
+msgid "_Dates"
+msgstr "_Date"
+
+#: ../src/ui/main_window.ui.h:42
+msgid "_Delete Selected Tag"
+msgstr "Ș_terge eticheta selectată"
+
+#: ../src/ui/main_window.ui.h:43
+msgid "_Delete Version"
+msgstr "Ș_terge versiunea"
+
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Selected Tag..."
+msgstr "_Modifică eticheta selectată..."
+
+#: ../src/ui/main_window.ui.h:46
+msgid "_Export to"
+msgstr "_Exportă către"
+
+#: ../src/ui/main_window.ui.h:47
+msgid "_Filmstrip"
+msgstr "Dia_film"
+
+#: ../src/ui/main_window.ui.h:50
+msgid "_Hidden"
+msgstr "_Ascuns"
+
+#: ../src/ui/main_window.ui.h:51
+msgid "_Import..."
+msgstr "_Importă..."
+
+#: ../src/ui/main_window.ui.h:52
+msgid "_Large"
+msgstr "_Mare"
+
+#: ../src/ui/main_window.ui.h:53
+msgid "_Last Import Roll"
+msgstr "U_ltimul set importat"
+
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr "_Lupă"
+
+#: ../src/ui/main_window.ui.h:55
+msgid "_Medium"
+msgstr "M_ediu"
+
+#: ../src/ui/main_window.ui.h:57
+msgid "_Quit"
+msgstr "Ieși_re"
+
+#: ../src/ui/main_window.ui.h:58
+msgid "_Ratings"
+msgstr "Ap_reciere"
+
+#: ../src/ui/main_window.ui.h:60
+msgid "_Remove Tag From Selection"
+msgstr "Ș_terge eticheta aplicată selecției"
+
+#: ../src/ui/main_window.ui.h:61
+msgid "_Rename Version"
+msgstr "Re_denumește versiunea"
+
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "Ordine _inversă"
+
+#: ../src/ui/main_window.ui.h:63
+msgid "_Select Import Rolls..."
+msgstr "_Selectează seturi de importat..."
+
+#: ../src/ui/main_window.ui.h:64
+msgid "_Set Date Range..."
+msgstr "_Configurează intervalul calendaristic..."
+
+#: ../src/ui/main_window.ui.h:65
+msgid "_Set Rating filter..."
+msgstr "_Configurează filtrul de apreciere..."
+
+#: ../src/ui/main_window.ui.h:66
+msgid "_Sharpen..."
+msgstr "Inten_sifică claritatea..."
+
+#: ../src/ui/main_window.ui.h:68
+msgid "_Small"
+msgstr "Mi_c"
+
+#: ../src/ui/main_window.ui.h:69
+msgid "_Tag Icons"
+msgstr "Iconițe _etichete"
+
+#: ../src/ui/main_window.ui.h:70
+msgid "_Tags"
+msgstr "E_tichete"
+
+#: ../src/ui/main_window.ui.h:71
+msgid "_Timeline"
+msgstr "_Cronologie"
+
+#: ../src/ui/main_window.ui.h:72
+msgid "_Tools"
+msgstr "_Unelte"
+
+#: ../src/ui/main_window.ui.h:73
+msgid "_Untagged Photos"
+msgstr "Fotografii _fără etichetă"
+
+#: ../src/ui/main_window.ui.h:74
+msgid "_Version"
+msgstr "_Versiune"
+
+#: ../src/Updater.cs:616
+msgid "Updating F-Spot Database"
+msgstr "Se actualizează baza de date F-Spot"
+
+#: ../src/Updater.cs:617
+msgid ""
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
+msgstr ""
+"Așteptați actualizarea galeriilor din baza de date F-Spot. Această acțiune "
+"poate dura mai mult timp."
+
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "Nu s-a putut crea un fișier temporar"
+
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Configurare pagină"
+
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Dimensiune pagină: {0} x {1} mm"
+
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "Configurează dimensiune pagină și orientare"
+
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Fotografii pe pagină"
+
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Repetă"
+
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Tipărește margini de tăiere"
+
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "Aspect fotografie"
+
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "Pagină plină (fără margini)"
+
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Umple"
+
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Scalat"
+
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "Margini albe"
+
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Text personalizat"
+
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Informații fotografie"
+
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "Tipărește nume fișier"
+
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "Tipărește data fotografiei"
+
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "Tipărește ora fotografiei"
+
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "Tipărește etichetele fotografiei"
+
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "Tipărește comentariile"
+
+#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:62
+msgid "Edit"
+msgstr "Editează"
+
+#: ../src/Widgets/EditorPage.cs:197
+msgid ""
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
+msgstr ""
+"Această unealtă necesită selectarea unei zone. Selectați o regiune a "
+"fotografiei și acționați unealta din nou."
+
+#: ../src/Widgets/EditorPage.cs:215
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Eroare la salvarea fotografiei retușate"
+msgstr[1] "Eroare la salvarea fotografiilor retușate"
+msgstr[2] "Eroare la salvarea fotografiilor retușate"
+
+#: ../src/Widgets/EditorPage.cs:217
+#, csharp-format
+msgid ""
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
+msgstr ""
+"S-a primit eroarea „{0}”. Luați aminte că trebuie să transformați fișierele "
+"RAW în format JPEG înainte de a le edita."
+
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Orizontal"
+
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "_Vertical"
+
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Caută:"
+
+#: ../src/Widgets/FolderTreePage.cs:21
+msgid "Folders"
+msgstr "Dosare"
+
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Sistem de fișiere"
+
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Histogramă"
+
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Versiune"
+
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Dată"
+
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Expunere"
+
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "Distanță focală"
+
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Dimensiune fișier"
+
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Apreciere"
+
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(format incorect)"
+
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Necunoscut)"
+
+#: ../src/Widgets/InfoBox.cs:561
+#, csharp-format
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(o modificare)"
+msgstr[1] "({0} modificări)"
+msgstr[2] "({0} de modificări)"
+
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(Eroare la citirea fișierului)"
+
+#: ../src/Widgets/InfoBox.cs:620
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0} fotografii"
+
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"La {0} între \n"
+"{1} și {2}"
+
+#: ../src/Widgets/InfoBox.cs:645
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"Între {0} \n"
+"și {1}"
+
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(Cel puțin un fișier nu a fost găsit)"
+
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Arată numele fișierului"
+
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Arată data"
+
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Arată dimensiunea"
+
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Arată expunerea"
+
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "Arată distanța focală"
+
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Arată aparatul foto"
+
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Arată mărimea fișierului"
+
+#: ../src/Widgets/MetadataDisplay.cs:23
+msgid "Metadata"
+msgstr "Metadate"
+
+#: ../src/Widgets/MetadataDisplay.cs:104
+msgid "Extended Metadata"
+msgstr "Metadate extinse"
+
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:392
+msgid "No Extended Metadata Available"
+msgstr "Nu sunt disponibile metadate extinse"
+
+#: ../src/Widgets/MetadataDisplay.cs:410
+msgid "No active photo"
+msgstr "Nicio fotografie selectată"
+
+#: ../src/Widgets/MetadataDisplay.cs:412
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "Fotografia „{0}” nu există"
+
+#: ../src/Widgets/MetadataDisplay.cs:415
+msgid "No metadata available"
+msgstr "Nu există metadate disponibile"
+
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Nu există aplicații disponibile"
+
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "Apreciere:"
+
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Țară"
+
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "Oraș"
+
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Județ"
+
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Prezentare diapozitive din F-Spot"
+
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "Fotografii F-Spot"
+
+#~ msgid "<b>F-Spot tags</b>"
+#~ msgstr "<b>Etichete F-Spot</b>"
+
+#~ msgid "<b>Tabblo account</b>"
+#~ msgstr "<b>Cont Tabblo</b>"
+
+#~ msgid ""
+#~ "<small><i>F-Spot tags can help you track the export status of photos. "
+#~ "Example: Use one tag for the photos that you plan to export, and another "
+#~ "one for those already exported. Here, you can tell F-Spot to "
+#~ "automatically replace these tags as appropriate.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Etichetele F-Spot vă ajută la urmărirea stării fotografiilor "
+#~ "exportate. Exemplu: utilizați o etichetă pentru fotografiile pe care "
+#~ "plănuiți să le exportați și alta pentru cele exportate deja. Apoi puteți "
+#~ "cere programului F-Spot să înlocuiască etichetele în funcție de starea "
+#~ "fotografiilor.</i></small>"
+
+#~ msgid "Rem_ove from exported photos:"
+#~ msgstr "Șterge din f_otografiile exportate:"
+
+#~ msgid "Select..."
+#~ msgstr "Alege..."
+
+#~ msgid "_Attach to exported photos:"
+#~ msgstr "_Adaugă la fotografiile exportate:"
+
+#~ msgid "<b>{0}</b>."
+#~ msgstr "<b>{0}</b>."
+
+#~ msgid "A trust error occured while attempting to access"
+#~ msgstr "S-a produs o eroare de certificare în timpul încercării de accesare"
+
+#~ msgid "Abort this session"
+#~ msgstr "Termină această sesiune"
+
+#~ msgid "Always trust this site's certificate"
+#~ msgstr "Acceptă întotdeauna certificatul acestui site"
+
+#~ msgid "Do you wish to:"
+#~ msgstr "Doriți să:"
+
+#~ msgid "Trust Error"
+#~ msgstr "Eroare de certificare"
+
+#~ msgid "Trust the site's certificate this once"
+#~ msgstr "Acceptați certificatul acestui site o sigură dată"
+
+#~ msgid "Package"
+#~ msgstr "Pachet"
+
+#~ msgid "Extension Installation"
+#~ msgstr "Instalare extensie"
+
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr ""
+#~ "<b>Selectați extensiile ce vor fi instalate și apăsați pe „Următorul”</b>"
+
+#~ msgid "Install from:"
+#~ msgstr "Instalează din:"
+
+#~ msgid "_Repositories..."
+#~ msgstr "A_rhive software..."
+
+#~ msgid "Show all packages"
+#~ msgstr "Afișează toate pachetele"
+
+#~ msgid "Show new versions only"
+#~ msgstr "Afișează doar versiunile noi"
+
+#~ msgid "Show updates only"
+#~ msgstr "Afișează doar actualizările"
+
+#~ msgid "_Unselect All"
+#~ msgstr "_Deselectează tot"
+
+#~ msgid "label124"
+#~ msgstr "eticheta124"
+
+#~ msgid "Overall Progress:"
+#~ msgstr "Progres general:"
+
+#~ msgid "Downloading extensions..."
+#~ msgstr "Se descarcă extensiile..."
+
+#~ msgid "Extension Manager"
+#~ msgstr "Manager extensie"
+
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr ""
+#~ "Pentru a executa această operație sunt necesare extensii suplimentare."
+
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Vor fi instalate următoarele extensii:"
+
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Manager extensii</b></big>"
+
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Extensiile următoare sunt deja instalate:"
+
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Instalare extensii..."
+
+#~ msgid "_Uninstall..."
+#~ msgstr "De_zinstalează..."
+
+#~ msgid "Enable"
+#~ msgstr "Activează"
+
+#~ msgid "Disable"
+#~ msgstr "Dezactivează"
+
+#~ msgid "Details"
+#~ msgstr "Detalii"
+
+#~ msgid "Extension Repository Management"
+#~ msgstr "Management al surselor de extensii"
+
+#~ msgid "Add New Repository"
+#~ msgstr "Adaugați o sursă nouă"
+
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Selectați locația sursei pe care doriți să o adăugați:"
+
+#~ msgid "Register an on-line repository"
+#~ msgstr "Adăugați o sursă on-line:"
+
+#~ msgid "Url:"
+#~ msgstr "Url:"
+
+#~ msgid "Register a local repository"
+#~ msgstr "Adăugați o sursă locală"
+
+#~ msgid "Path:"
+#~ msgstr "Cale:"
+
+#~ msgid "Browse..."
+#~ msgstr "Navigare..."
+
+#~ msgid "Version:"
+#~ msgstr "Versiune:"
+
+#~ msgid "Author:"
+#~ msgstr "Autor:"
+
+#~ msgid "Copyright:"
+#~ msgstr "Drepturi de autor:"
+
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Dependențe ale extensiei:"
+
+#~ msgid "All registered repositories"
+#~ msgstr "Toate depozitele înregistrate"
+
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Sigur doriți anularea instalării?"
+
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Următoarele pachete vor fi dezinstalate:"
+
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Există deja alte extensii ce depind de primele, care la rândul lor vor fi "
+#~ "dezinstalate:"
+
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Extensiile selectate nu pot fi instalate deoarece există conflicte de "
+#~ "dependențe."
+
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Următoarele pachete vor fi instalate:"
+
+#~ msgid " (in user directory)"
+#~ msgstr " (în dosarul utilizatorului)"
+
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Următoarele pachete trebuie dezinstalate:"
+
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Următoarele dependențe nu au putut fi rezolvate:"
+
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Instalarea a fost efectuată cu succes."
+
+#~ msgid "The installation failed!"
+#~ msgstr "Instalare eșuată!"
+
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Instalarea s-a finalizat cu atenționări."
+
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Dezinstalarea s-a încheiat cu succes."
+
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Dezinstalarea a eșuat!"
+
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Dezinstalarea s-a finalizat cu atenționări."
+
+#~ msgid "Repository"
+#~ msgstr "Sursă software"
+
+#~ msgid "Installation cancelled"
+#~ msgstr "Instalare anulată"
+
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "O parte din extensiile necesare nu au fost găsite"
+
+#~ msgid "Installation failed"
+#~ msgstr "Instalare eșuată"
+
+#~ msgid "Extension"
+#~ msgstr "Extensie"
+
+#~ msgid "Other"
+#~ msgstr "Altele"
+
+#~ msgid "Url"
+#~ msgstr "Url"
+
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "A apărut o excepție: {0}"
+
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Extensiile dezactivate nu pot fi încărcate."
+
+#~ msgid "Loading {0} extension"
+#~ msgstr "Se încarcă extensia {0}"
+
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Extensia necesară „{0}” este dezactivată."
+
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Extensia necesară „{0}” nu este instalată."
+
+#~ msgid "(provided by {0})"
+#~ msgstr "(furnizat de către {0})"
+
+#~ msgid "Choose destination directory"
+#~ msgstr "Alegeți dosarul destinație"
+
+#~ msgid "Target location:\t"
+#~ msgstr "Locație țintă:\t"
diff --git a/po/sl.po b/po/sl.po
index d49bfa9..21cc632 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,4175 +1,4272 @@
-# Andrej Žnidaršič <andrej.znidarsic at gmail.com>, 2009"
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: f-spot\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&component=General\n"
-"POT-Creation-Date: 2009-09-17 11:15+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Andrej Žnidaršič <andrej.znidarsic at gmail.com>\n"
-"Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
-
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_CD ..."
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:162
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
-#: ../src/CameraFileSelectionDialog.cs:199
-msgid "Transferring Pictures"
-msgstr "Prenos slik"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:218
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "Prenašanje slike \"{0}\" na CD"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../extensions/Exporters/CDExport/CDExport.cs:220
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638
-#: ../src/UI.Dialog/AdjustTimeDialog.cs:129
-#: ../src/UI.Dialog/ProgressDialog.cs:92
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} od {1}"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
-msgid "Done Sending Photos"
-msgstr "Napaka med pošiljanjem fotografij"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:235
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
-msgid "Transfer Complete"
-msgstr "Prenos končan"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:242
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
-msgid "Error While Transferring"
-msgstr "Napaka med prenosom"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:250
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
-msgid "Error Transferring"
-msgstr "Napaka prenosa"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:263
-msgid "copying..."
-msgstr "kopiranje ..."
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr "<b><i>Obstaja nekaj razporejenih datotek za zapis</i></b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>Fotografije za peko</b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-#: ../src/f-spot.glade.h:28
-msgid "Autorotate"
-msgstr "Samodejno vrtenje"
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
-msgid "Create CD"
-msgstr "Ustvari CD"
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
-msgid "Size"
-msgstr "Velikost"
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
-msgid "Size of the exported selection:"
-msgstr "Velikost "
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr "_Brskaj po datotekah, ki so bile v razporedu"
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-#: ../src/f-spot.glade.h:95
-msgid "_Export"
-msgstr "_Izvoz"
-
-#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
-msgid "_Write only these photos to CD"
-msgstr "_Zapeči samo te fotografije na CD"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
-msgstr "F_acebook ..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
-msgid "Waiting for authorization"
-msgstr "Čakanje na overitev"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
-msgid ""
-"F-Spot will now launch your browser so that you can enable the permission you just selected.\n"
-"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok\" below."
-msgstr ""
-"Program bo zagnal vaš brskalnik, zato da lahko preko spleta omogočite dovoljenja, ki ste jih izbrali.\n"
-"\n"
-"Ko bo Facebook zahteval vrnitev k programu, kliknite \"v redu\"."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
-msgid "Too many images to export"
-msgstr "Določenih je preveč slik za izvoz"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
-msgid "Facebook only permits 60 photographs per album. Please refine your selection and try again."
-msgstr "Facebook omogoča samo 60 fotografij na album. Treba je izpopolniti izbiro in poskusiti ponovno. "
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
-msgid "Uploading Pictures"
-msgstr "Nalaganje slik"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
-msgid "Album must have a name"
-msgstr "Album mora imeti ime"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
-msgid "Please name your album or choose an existing album."
-msgstr "Treba je poimenovati album ali izbrati obstoječi album."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
-msgid "Creating a new album failed"
-msgstr "Ustvarjanje novega albuma je spodletelo"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
-"Med ustvarjanjem novega albuma je prišlo do napake.\n"
-"\n"
-"{0}"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "Nalaganje slike \"{0}\" ({1} od {2})"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
-#, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr "Napaka pri nalaganju na Facebook: {0}"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-msgid "Error"
-msgstr "Napaka"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
-msgid "Upload Complete"
-msgstr "Nalaganje končano"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
-msgid "Waiting for authentication"
-msgstr "Čakanje na overitev"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook.\n"
-"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok\" below. F-Spot will cache your session in gnome-keyring, if possible, and re-use it on future Facebook exports."
-msgstr ""
-"Program F-Spot bo zagnal brskalnik za prijavo v Facebook.\n"
-"\n"
-"Ko vas Facebook usmeri v vrnitev v ta program, kliknite \"Ok\" spodaj. F-Spot bo, če bo mogoče, vašo sejo shranil v gnome-keyring in jo ponovno uporabil pri prihodnjih izvozih v Facebook"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
-msgid "Authenticating..."
-msgstr "Overjanje ..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
-msgid "Error logging into Facebook"
-msgstr "Napaka med prijavljanjem v Facebook"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
-msgid "There was a problem logging into Facebook. Check your credentials and try again."
-msgstr "Prišlo je do težav med prijavljanjem v Facebook. Preverite vaše geslo in poskusite ponovno. "
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
-msgid "Authorizing Session"
-msgstr "Pooblaščanje seje"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
-msgid "Session established, fetching user info..."
-msgstr "Seja zagnana, pridobivanje podrobnosti o uporabniku ..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
-msgid "Session established, fetching friend list..."
-msgstr "Seja zagnana, pridobivanje seznama prijateljev ..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
-msgid "Session established, fetching friend details..."
-msgstr "Seja zagnana, pridobivanje podrobnosti o prijateljih ..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
-msgid "Session established, fetching photo albums..."
-msgstr "Seja zagnana, pridobivanje albumov fotografij ..."
-
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr "{0} {1} je prijavljen v Facebook"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
-msgid "Facebook Connection Error"
-msgstr "Napaka povezovanja s Facebook-om"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
-#, csharp-format
-msgid ""
-"There was an error when downloading your information from Facebook.\n"
-"\n"
-"Facebook said: {0}"
-msgstr ""
-"Prišlo je do napake med nalaganjem vaših podrobnosti s Facebook-a.\n"
-"\n"
-"Javljena napaka: {0}"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
-msgid "You are not logged in."
-msgstr "Niste prijavljeni."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
-msgid "Auto-confirm Photos"
-msgstr "Samodejno potrjevanje fotografij"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
-msgid "Caption"
-msgstr "Napis"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
-msgid "Create a new album"
-msgstr "Ustvari nov album"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
-msgid "Description"
-msgstr "Opis"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
-msgid "Export to Facebook"
-msgstr "Izvozi v Facebook"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
-msgid "In this photo"
-msgstr "Na tej fotografiji"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
-#: ../src/XmpTagsImporter.cs:90
-msgid "Location"
-msgstr "Mesto"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
-msgid "Login"
-msgstr "Prijava"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
-msgid "Logout"
-msgstr "Odjava"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
-msgid "Name"
-msgstr "Ime"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
-msgid "Not logged in"
-msgstr "Ni prijavljen"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
-msgid "Permissions:"
-msgstr "Dovoljenja:"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
-msgid "Stay Connected"
-msgstr "Ostani povezan"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
-msgid "Use an existing album"
-msgstr "Uporabi obstoječi album"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
-msgid "Who is this?"
-msgstr "Kdo je to?"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq ..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr ..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-msgid "_Zooomr..."
-msgstr "_Zooomr ..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "Pooblasti"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
-msgid "Return to this window after you have finished the authorization process on {0} and click the \"Complete Authorization\" button below"
-msgstr "Po končanem postopku pooblastitve na {0} se je je potrebno vrniti v to okno in klikniti gumb \"Končanje pooblastitve\" spodaj"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "Končanje pooblastitve"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "Prijavljanje v {0}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr "Preverjanje gesla ..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "Dobrodošli {0}, povezani ste na {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "Vpis kot drug uporabnik"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "Uporabljene {0} dovoljene {1} mesečne kvote."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "Ni se mogoče prijaviti"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "Čakanje na odziv {0} od {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "Nalaganje slike \"{0}\""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "Napaka med nalaganjem k {0}: {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-msgid "Unable to log on."
-msgstr "Ni se mogoče prijaviti."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
-#, csharp-format
-msgid "F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."
-msgstr "Ni se mogoče prijaviti na {0}. Prepričajte se, da ste dali pooblastitev z uporabno {0} vmesnika spletnega brskalnika."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-#: ../src/f-spot.glade.h:8
-msgid "<b>Account</b>"
-msgstr "<b>Račun</b>"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../src/f-spot.glade.h:14
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
-msgid "<b>Photos</b>"
-msgstr "<b>Fotografije</b>"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-#: ../src/f-spot.glade.h:16
-msgid "<b>Style</b>"
-msgstr "<b>Slog</b>"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>Dovoljenja za ogled</b>"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
-msgid "Export"
-msgstr "Izvoz"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "Izvoz _hierarhije značk"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
-msgid "F-Spot needs your authorization in order to upload photos to your {0} account. Press the \"Authorize\" button to open a web browser and give F-Spot the authorization. "
-msgstr "F-Spot potrebuje pooblastitev za nalaganje fotografij na vaš {0} račun. Pritisnite gumb \"Pooblastitev\" za odprtje spletnega brskalnika in pooblastitev F-Spot-a"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "Prezri značke _zgornjih ravni"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "Zasebno"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "Javno"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "Odstrani _metapodatke"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "Vidno družini"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "Vidno prijateljem"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../src/f-spot.glade.h:96
-msgid "_Export tags"
-msgstr "Izvoz znač_k"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-#: ../src/f-spot.glade.h:109
-msgid "_Resize to: "
-msgstr "Sp_rememba velikosti v:"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-msgid "_View photos in browser when done uploading"
-msgstr "Ogled fotografij _v brskalniku po končanem nalaganju"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
-#: ../src/f-spot.glade.h:125
-msgid "pixels"
-msgstr "točke"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "_Mapo ..."
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
-msgid "Select Export Folder"
-msgstr "Izbiranje izvozne mape"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
-msgid "Building Gallery"
-msgstr "Gradnja Galerije"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "Napaka med nalaganjem slike \"{0}\" v galerijo: {2}{1}"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
-msgid "Error: Error while transferring; Aborting"
-msgstr "Napaka: napaka med prenosom; preklicano"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
-msgid "Error: File Already Exists; Aborting"
-msgstr "Napaka: datoteka že obstaja; preklicano"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
-msgid "Light"
-msgstr "Svetlo"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
-msgid "Dark"
-msgstr "Temno"
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
-msgid "Prev"
-msgstr "Prejšnja"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
-#: ../src/CameraFileSelectionDialog.cs:82
-msgid "Index"
-msgstr "Kazalo"
-
-#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342
-#: ../src/Widgets/Sidebar.cs:64
-msgid "Tags"
-msgstr "Značke"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57
-#: ../src/ItemAction.cs:102
-msgid "Next"
-msgstr "Naslednja"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
-msgid "Gallery generated by"
-msgstr "Galerija ustvarjena od"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
-msgid "Show Styles"
-msgstr "Prikaži sloge"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
-msgid "Hide Styles"
-msgstr "Skrij sloge"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
-#: ../src/ui/main_window.ui.h:24
-msgid "Tags: "
-msgstr "Značke:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
-msgid "Page:"
-msgstr "Stran:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-#: ../src/f-spot.glade.h:11
-msgid "<b>Destination</b>"
-msgstr "<b>Cilj</b>"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>Metoda Izvoza</b>"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr "Ustvarjanje galerije z uporabo \"Originala\""
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr "Ustvarjanje samostojne spletne _galerije"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "Op_is:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
-msgid "Export _tags"
-msgstr "Izvoz z_načk"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
-msgid "Export tag _icons"
-msgstr "Izvoz _ikon značk"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-msgid "Folder Export"
-msgstr "Izvoz Mape"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-msgid "G_allery Name:"
-msgstr "Ime G_alerije:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
-msgid "Open _destination when done exporting"
-msgstr "O_dpiranje cilja po končanem izvažanju"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-msgid "_Folder:"
-msgstr "_Mapa:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-msgid "_Save the files only"
-msgstr "_Shrani samo datoteke"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-msgid "Web _Gallery..."
-msgstr "Spletno _Galerijo ..."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
-msgstr ""
-"Ni se mogoče povezati z galerijo neznane različice.\n"
-"Naložiti je potrebno vstavek Remote različice 1.0.8. ali kasnejše"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
-msgid "Invalid URL"
-msgstr "Neveljaven URL"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "URL galerije ni veljaven URL"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
-msgid "Error while connecting to Gallery"
-msgstr "Med povezovanjem z Galerijo je prišlo do napake"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "Med poskusom prijave je prišlo do sledeče napake: {0}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
-msgid "A Gallery with this name already exists"
-msgstr "Galerija s tem imenom že obstaja"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
-#, csharp-format
-msgid "There is already a Gallery with the same name in your registered Galleries. Please choose a unique name."
-msgstr "Galerija s tem imenom že obstaja v registriranih galerijah. Potrebno je izbrati edinstveno ime."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
-msgid "(TopLevel)"
-msgstr "Vrhnja raven"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
-msgid "Invalid Gallery name"
-msgstr "Neveljavno ime Galerije"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
-"Ime galerije vsebuje neveljavne znake.\n"
-"Dovoljene so samo črke, številke ter - in _"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Napaka med nalaganjem slike \"{0}\" v galerijo: {1}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
-msgid "(No Gallery)"
-msgstr "(Ni Galerije)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(Not Connected)"
-msgstr "(Ni Povezave)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
-msgid "(No Albums)"
-msgstr "(Ni Albumov)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
-msgid "No account selected"
-msgstr "Noben račun ni bil izbran"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-#: ../src/f-spot.glade.h:9
-msgid "<b>Album</b>"
-msgstr "<b>Album</b>"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-#: ../src/f-spot.glade.h:12
-msgid "<b>Gallery</b>"
-msgstr "<b>Galerija</b>"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr "<span weight='bold' size='larger'>Napaka med povezovanjem z Galerijo</span>\n"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-msgid "Export _titles and comments"
-msgstr "Izvoz naslovov in komen_tarjev"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "Odpiranje _albuma v brskalniku po končanem nalaganju"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "Potrebno je potrditi, da so nastavitve za to galerijo pravilne."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-msgid "U_RL:"
-msgstr "U_RL:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-msgid "_Album Name:"
-msgstr "Ime _albuma:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "O_pis:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-#: ../src/f-spot.glade.h:97
-msgid "_Export to Album:"
-msgstr "Iz_voz v album:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-msgid "_Gallery Name:"
-msgstr "Ime _Galerije:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-msgid "_Gallery:"
-msgstr "_Galerija:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-msgid "_Parent Album:"
-msgstr "_Starševski album:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-msgid "_Password:"
-msgstr "_Geslo:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-msgid "_Title:"
-msgstr "_Naslov:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-msgid "_Username:"
-msgstr "_Uporabniško ime:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr "Napaka med branjem odziva strežnika"
-
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
-msgstr "Strežnik je vrnil odgovor brez vsebine Galerije"
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
-msgid "Error while creating new album"
-msgstr "Napaka med ustvarjanjem novega albuma"
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to perform the requested operation:\n"
-"{0} ({1})"
-msgstr ""
-"Med poskusom izvajanja zahtevane operacije je prišlo do sledeče napake:\n"
-"{0} ({1})"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb ..."
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "Napaka med ustvarjanjem albuma"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid "The following error was encountered while attempting to create an album: {0}"
-msgstr "Med poskusom ustvarjanja albuma je prišlo do sledeče napake: {0}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} Poslanih"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{0} od približno {1}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "Napaka med nalaganjem v Galerijo: {0}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
-#, csharp-format
-msgid "Available space: {0}, {1}% used out of {2}"
-msgstr "Prostor na voljo: {0}, uporabljenih {1}% od {2}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
-#, csharp-format
-msgid ""
-"The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images"
-msgstr ""
-"Izbrani album ima mejo {0} fotografij,\n"
-"čemur bi zadostovala trenutna izbira {1} slik"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>PicasaWeb Izvoz</b>"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr "<span weight='bold' size='larger'>Vaš Google račun je zaklenjen</span>\n"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-"Potrdite, da so nastavitve za to galerijo ustrezne.\n"
-"Vnesite črke, kot so prikazane na sliki v polju 'Captcha'\n"
-"<i>Velikost črk ni pomembna</i>"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "Javni Album"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "Naslov _Albuma:"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "S_amodejno vrtenje"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr "_Captcha:"
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug ..."
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>SmugMug izvoz</b>"
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "_Račun:"
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
-#, csharp-format
-msgid "Uploading photo \"{0}\""
-msgstr "Nalaganje fotografije \"{0}\""
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
-msgid "Logging into Tabblo"
-msgstr "Prijavljanje v Tabblo"
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
-msgid "Obtaining URL for upload"
-msgstr "Pridobivanje URL-ja za nalaganje"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr "_Tabblo ..."
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
-msgid "Done sending photos"
-msgstr "Pošiljanje fotografij je končano"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
-msgid "Upload complete"
-msgstr "Nalaganje je končano"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
-msgid "Error uploading to Tabblo: "
-msgstr "Napaka med nalaganjem v Tabblo:"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-msgid "Compressed fil_e..."
-msgstr "Stisnjena datot_eka ..."
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
-msgid "No selection available"
-msgstr "Na voljo ni nobene izbire"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
-msgid "This tool requires an active selection. Please select one or more pictures and try again"
-msgstr "To orodje zahteva dejavno izbiro. Potrebno je izbrati eno ali več slik in poskusiti ponovno."
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
-msgid "Select export folder"
-msgstr "Izbor mape za izvoz"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
-msgid "Exporting files"
-msgstr "Izvoz datotek"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
-#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "Pripravljanje fotografije \"{0}\""
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
-msgid "_Create"
-msgstr "_Ustvari"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-msgid "_File name:"
-msgstr "_Ime datoteke"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-msgid "_Location:"
-msgstr "_Mesto:"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
-msgid "_Scale:"
-msgstr "_Merilo:"
-
-#: ../extensions/Tools/HashJob/HashJob.cs:53
-msgid "In order to detect duplicates on pictures you imported before 0.5.0, F-Spot needs to analyze your image collection. This is not done by default as it's time consuming. You can Start or Pause this update process using this dialog."
-msgstr "Za zaznavo dvojnikov slik, ki so bile uvožene pred 0.5.0, mora F-spot analizirati zbirko slik. To ni storjeno samodejno, ker vzame veliko časa. S tem pogovornim oknom se lahko proces posodabljanja zažene ali začasno zaustavi."
-
-#: ../extensions/Tools/HashJob/HashJob.cs:59
-#, csharp-format
-msgid "You currently have {0} photos needing md5 calculation, and {1} pending jobs"
-msgstr "Trenutno imate {0} fotografij, ki potrebujejo md5 izračun in {1} čakajočih služb"
-
-#: ../extensions/Tools/HashJob/HashJob.cs:75
-#: ../src/ui/main_window.ui.h:37
-msgid "_Close"
-msgstr "_Zapri"
-
-#: ../extensions/Tools/HashJob/HashJob.cs:102
-msgid "Processing images..."
-msgstr "Obdelava slik ..."
-
-#: ../extensions/Tools/HashJob/HashJob.cs:108
-msgid "Stopped"
-msgstr "Ustavljeno"
-
-#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Zaznaj dvojnike"
-
-#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
-msgid "F-Spot Gallery"
-msgstr "F-Spot galerija"
-
-#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
-msgid "The web gallery seems to be offline now"
-msgstr "Kaže da je spletna galerija trenutno nepovezana"
-
-#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
-msgid "Show All"
-msgstr "Prikaži vse"
-
-#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
-#, csharp-format
-msgid "{0} photo"
-msgid_plural "{0} photos"
-msgstr[0] "{0} fotografij"
-msgstr[1] "{0} fotografija"
-msgstr[2] "{0} fotografiji"
-msgstr[3] "{0} fotografije"
-
-#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
-msgid "Current View"
-msgstr "Trenuten pogled"
-
-#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
-msgid "Selected"
-msgstr "Izbranih"
-
-#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
-msgid "Live Web Gallery"
-msgstr "Live spletna galerija"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
-msgid ""
-"<small><i>The gallery stays active until you either deactivate it or close\n"
-"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
-msgstr ""
-"<small><i>Galerija ostane aktivna do njene deaktivacije ali izhoda iz F-Spot.\n"
-"Prepričajte se, da krajevni obiskovalci pri dostopu obidejo HTTP posrednik.</i></small>"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
-msgid ""
-"<small><i>When the gallery is active, above is the URL you need to open \n"
-"on another computer to access the shared photos.</i></small>"
-msgstr ""
-"<small><i>Ko je galerija aktivna, je za dostop do deljenih fotografij\n"
-"na drugih računalnikih potreben URL zgoraj.</i></small>"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
-msgid "Activates and deactivates the web gallery"
-msgstr "Aktivira in deaktivira spletno galerijo"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
-msgid "Allow viewers to add tags"
-msgstr "Dovoli dodajanje značk obiskovalcem"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
-msgid "Copy URL to clipboard"
-msgstr "Kopiraj URL v odložišče"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
-msgid "F-Spot Live Web Gallery"
-msgstr "F-Spot Live spletna galerija"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
-msgid "Gallery URL:"
-msgstr "URL Galerije:"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
-msgid "Limit number of shared photos to"
-msgstr "Omejitev števila deljenih fotografij na"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
-msgid "Options:"
-msgstr "Možnosti:"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
-msgid "Photos with a Tag"
-msgstr "Fotografija z značko"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
-msgid "Selected Photos"
-msgstr "Izbrane fotografije"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
-msgid "Share:"
-msgstr "Souporaba:"
-
-#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
-msgid "Views:"
-msgstr "Ogledi:"
-
-#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
-msgid "none"
-msgstr "brez"
-
-#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
-#, csharp-format
-msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
-msgstr "Galerija {0}, fotografij {1}, zadnji odjemalec: {3}"
-
-#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
-msgid "Gallery is inactive"
-msgstr "Galerija je neaktivna"
-
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-msgid "Merge Db"
-msgstr "Združi baze podatkov"
-
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
-msgid "Error opening the selected file"
-msgstr "Napaka med odpiranjem izbrane datoteke"
-
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
-#, csharp-format
-msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-"Izbrana datoteka ni veljavna ali podprta podatkovna zbirka.\n"
-"\n"
-"Prejeta je bila izjema \"{0}\"."
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-msgid "<small><i>Choose the location of the database you want to import from</i></small>"
-msgstr "<small><i>Izbira mesta baze podatkov za uvažanje</i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already imported from that database.</i></small>"
-msgstr ""
-"<small><i>Izbira uvoza iz izbrane baze podatkov.\n"
-"\"Samo novi zvitki\" je pametna možnost, ki se bo izognila ponovnemu uvažanju že uvoženih fotografij.\n"
-"\"Posamezni uvozni zvitek\" omogoča izbiro zvitka za združevanje.\n"
-"\"Vse\" uvozi vse in ustvari dvojnike, če so bile fotografije iz te baze podatkov že uvožene.</i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
-msgid "<small><i>Copy the images locally or keep them where they are. If you chose the later, be sure that this location will stay accessible from f-spot.</i></small>"
-msgstr "<small><i>Krajevno kopiranje slik ali izbira njihovega trenutnega mesta. V slednjem primeru se je potrebno prepričati, da bo ta lokacija ostala dostopna iz f-spot-a.</i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
-msgid "A Single Import Roll"
-msgstr "Posamezen uvozni zvitek"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
-msgid "Copy images to photos folder"
-msgstr "Kopiranje slik v mapo fotografij"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-msgid "Database Location:"
-msgstr "Mesto podatkovne zbirke:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr "Vse"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-msgid "Import:"
-msgstr "Uvoz:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr "Obdrži slike na njihovem originalnem mestu"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another F-Spot collection"
-msgstr "Združitev druge F-Spot zbirke"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr "Samo novi zvitki"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:55
-msgid "Skip"
-msgstr "Preskoči"
-
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-"<big>Podatkovna zbirka se navezuje na datoteke v mapi <b>{0}</b>.\n"
-"Izbrati je treba mapo za mapiranje.</big>"
-
-#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
-msgid "Configure Screensaver"
-msgstr "Nastavi ohranjevalnik zaslona"
-
-#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
-#: ../src/UI.Dialog/DateRangeDialog.cs:129
-msgid "All Images"
-msgstr "Vse slike"
-
-#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
-msgid "Delay:"
-msgstr "Zamik:"
-
-#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
-msgid "Display:"
-msgstr "Zaslon:"
-
-#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
-msgid "Images tagged with:"
-msgstr "Slike označene z:"
-
-#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
-msgid "Make F-Spot my screensaver"
-msgstr "Naredi F-spot moj ohranjevalnik zaslona"
-
-#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
-msgid "Screensaver Configuration"
-msgstr "Nastavitve ohranjevalnika zaslona"
-
-#: ../f-spot.desktop.in.in.h:1
-#: ../f-spot-import.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "F-spot upravljalnik fotografij"
-
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "Urejajte, uživajte in delite vaše fotografije."
-
-#: ../f-spot.desktop.in.in.h:3
-#: ../f-spot-import.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "Upravljalnik fotografij"
-
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "Uvoz v F-Spot"
-
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "F-_Spot ogledovalec fotografij"
-
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "Ogledovalec fotografij"
-
-#: ../lib/libfspot/f-jpeg-utils.c:441
-#: ../src/RotateCommand.cs:224
-msgid "File not found"
-msgstr "Datoteke ni mogoče najti"
-
-#: ../lib/libfspot/f-jpeg-utils.c:464
-#, c-format
-msgid "Unknown transform type %d"
-msgstr "Neznana vrsta pretvorbe %d"
-
-#: ../lib/libfspot/f-jpeg-utils.c:472
-msgid "Operation failed"
-msgstr "Dejanje ni uspelo"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paket"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Namestitev razširitev"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Izberite razširitve za namestitev in kliknite Naprej</b> "
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Nameščanje iz: "
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "Sk_ladišča ..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Prikaži vse pakete"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Prikaži le nove različice"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Prikaži le posodobitve"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "_Prekliči izbor vsega"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Izberi _vse"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "oznaka123"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Skupni napredek:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Prenašanje razširitev ..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Upravljalnik razširitev"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Dodatne razširitve so potrebne za izvajanja dejanja."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Nameščene bodo sledeče razširitve:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Upravljalnik razširitev</b></big> "
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Trenutno so nameščene sledeče razširitve:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Namesti razširitve ..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Odstrani ..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Omogoči"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Onemogoči"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Upravljanje skladišča razširitev"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Dodajanje novega skladišča"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Izbor mesta skladišča za registracijo:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Registracija spletnega skladišča"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Registracija krajevnega skladišča."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Pot:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Prebrskaj ..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Različica:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Avtor:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Avtorske pravice:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Odvisnosti razširitve:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Vsa registrirana skladišča"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Ali ste prepričani, da želite preklicati namestitev?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Sledeči paketi bodo odstranjeni:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid "There are other extensions that depend on the previous ones which will also be uninstalled:"
-msgstr "Druge razširitve so odvisne od prejšnjih in bodo tudi odstranjene:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid "The selected extensions can't be installed because there are dependency conflicts."
-msgstr "Izbrane razširitve ne morejo biti nameščene zaradi spora odvisnosti."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Nameščeni bodo sledeči paketi:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr "(v uporabnikovi mapi)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Odstranjeni bodo sledeči paketi:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Ni bilo zadoščeno sledečim odvisnostim:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Namestitev je uspešno končana."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Namestitev je spodletela!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Namestitev je zaključena z opozorili."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Odstranjevanje namestitve je bilo uspešno zaključeno."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Odstranjevanje namestitve je spodletelo!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Odstranjevanje namestitve je bilo zaključeno z opozorili."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Skladišče"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Namestitev je bila preklicana"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Nekaj zahtevanih razširitev ni bilo najdenih"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Namestitev ni uspela"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Razširitev"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Različica"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Ostalo"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Prišlo je do izjemne napake: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Onemogočene razširitve ne morejo biti naložene."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Nalaganje razširitve {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Zahtevana razširitev '{0}' je onemogočena."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Zahtevana razširitev '{0}' ni nameščena."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(ponudnik {0})"
-
-#: ../src/CameraFileSelectionDialog.cs:76
-msgid "Preview"
-msgstr "Predogled"
-
-#: ../src/CameraFileSelectionDialog.cs:78
-msgid "Path"
-msgstr "Pot"
-
-#: ../src/CameraFileSelectionDialog.cs:80
-#: ../src/f-spot.glade.h:46
-msgid "File"
-msgstr "Datoteka"
-
-#: ../src/CameraFileSelectionDialog.cs:102
-msgid "Select Tag"
-msgstr "Izbor značke"
-
-#: ../src/CameraFileSelectionDialog.cs:138
-msgid "Downloading Previews"
-msgstr "Nalaganje predogledov"
-
-#: ../src/CameraFileSelectionDialog.cs:148
-#, csharp-format
-msgid "Downloading Preview of {0}"
-msgstr "Nalaganje predogleda {0}"
-
-#: ../src/CameraFileSelectionDialog.cs:220
-#, csharp-format
-msgid "Copying file {0} of {1}"
-msgstr "Kopiranje datoteke {0} od {1}"
-
-#: ../src/CameraFileSelectionDialog.cs:235
-msgid "Error transferring file"
-msgstr "Napaka med prenosom datoteke"
-
-#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Download Complete"
-msgstr "Prenos končan"
-
-#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Kopiranje datotek končano"
-
-#: ../src/CameraFileSelectionDialog.cs:268
-#, csharp-format
-msgid "Transferring \"{0}\" from camera"
-msgstr "Prenašanje \"{0}\" s fotoaparata"
-
-#: ../src/CameraSelectionDialog.cs:29
-#: ../src/Widgets/InfoBox.cs:230
-msgid "Camera"
-msgstr "Fotoaparat"
-
-#: ../src/CameraSelectionDialog.cs:30
-msgid "Port"
-msgstr "Vrata"
-
-#: ../src/Core.cs:203
-#, csharp-format
-msgid "No photos matching {0} found"
-msgstr "Fotografije, ki se ujema z {0}, ni bilo mogoče najti"
-
-#: ../src/Core.cs:204
-#, csharp-format
-msgid ""
-"The tag \"{0}\" is not applied to any photos. Try adding\n"
-"the tag to some photos or selecting a different tag in the\n"
-"F-Spot preference dialog."
-msgstr ""
-"Značka \"{0}\" ni uporabljena. Poskusite z dodajanjem\n"
-"značke fotografijam ali izberite drugo značko v\n"
-"pogovornem oknu F-Spot nastavitev."
-
-#: ../src/Core.cs:208
-msgid "Search returned no results"
-msgstr "Iskanje ni vrnilo rezultatov"
-
-#: ../src/Core.cs:209
-msgid ""
-"The tag F-Spot is looking for does not exist. Try\n"
-"selecting a different tag in the F-Spot preference\n"
-"dialog."
-msgstr ""
-"Značka, ki jo išče F-Spot, ne obstaja. Poskusite\n"
-"z izborom druge značke v pogovornem oknu \n"
-"F-Spot nastavitev."
-
-#. Note for translators: Reparented is a picture becoming a version of another one
-#: ../src/Core/Photo.cs:473
-msgid "Reparented"
-msgstr "Različica slike "
-
-#: ../src/Core/Photo.cs:473
-#, csharp-format
-msgid "Reparented ({0})"
-msgstr "Različica slike ({0})"
-
-#: ../src/Core/Photo.cs:492
-#, csharp-format
-msgid "Modified"
-msgid_plural "Modified ({0})"
-msgstr[0] "Spremenjenih ({0})"
-msgstr[1] "Spremenjena ({0})"
-msgstr[2] "Spremenjeni ({0})"
-msgstr[3] "Spremenjene ({0})"
-
-#: ../src/Core/Photo.cs:511
-#, csharp-format
-msgid "Modified in {1}"
-msgstr "Spremenjena v {1}"
-
-#: ../src/Core/Photo.cs:511
-#, csharp-format
-msgid "Modified in {1} ({0})"
-msgstr "Spremenjena v {1} ({0})"
-
-#. Note that the original version is never stored in the photo_versions table in the
-#. database.
-#: ../src/Core/Photo.cs:666
-#: ../src/f-spot.glade.h:61
-msgid "Original"
-msgstr "Original"
-
-#: ../src/Editors/AutoStretchEditor.cs:17
-msgid "Auto Color"
-msgstr "Samodejna barva"
-
-#: ../src/Editors/ColorEditor.cs:38
-msgid "Adjust Colors"
-msgstr "Prilagajanje barv"
-
-#: ../src/Editors/ColorEditor.cs:41
-msgid "Adjust"
-msgstr "Prilagodi"
-
-#: ../src/Editors/CropEditor.cs:35
-msgid "4 x 3 (Book)"
-msgstr "4 x 3 (knjiga)"
-
-#: ../src/Editors/CropEditor.cs:36
-msgid "4 x 6 (Postcard)"
-msgstr "4 x 6 (razglednica)"
-
-#: ../src/Editors/CropEditor.cs:37
-msgid "5 x 7 (L, 2L)"
-msgstr "5 x 7 (L, 2L)"
-
-#: ../src/Editors/CropEditor.cs:38
-msgid "8 x 10"
-msgstr "8 x 10"
-
-#: ../src/Editors/CropEditor.cs:39
-msgid "Square"
-msgstr "Kvadrat"
-
-#: ../src/Editors/CropEditor.cs:42
-msgid "Crop"
-msgstr "Obrezovanje"
-
-#: ../src/Editors/CropEditor.cs:73
-msgid "Select the area that needs cropping."
-msgstr "Izbor območja za obrez"
-
-#: ../src/Editors/CropEditor.cs:98
-msgid "No Constraint"
-msgstr "Brez omejitev"
-
-#: ../src/Editors/CropEditor.cs:99
-msgid "Same as photo"
-msgstr "Enako kot fotografija"
-
-#: ../src/Editors/CropEditor.cs:104
-msgid "Custom Ratios..."
-msgstr "Razmerja velikosti po meri"
-
-#: ../src/Editors/DesaturateEditor.cs:17
-msgid "Desaturate"
-msgstr "Zmanjšanje nasičenja"
-
-#: ../src/Editors/RedEyeEditor.cs:19
-msgid "Red-eye Reduction"
-msgstr "Popravek rdečih oči"
-
-#: ../src/Editors/RedEyeEditor.cs:21
-msgid "Fix!"
-msgstr "Popravi"
-
-#: ../src/Editors/RedEyeEditor.cs:25
-msgid "Select the eyes you wish to fix."
-msgstr "Izberite oči za popravilo."
-
-#: ../src/Editors/SepiaEditor.cs:17
-msgid "Sepia Tone"
-msgstr "Sepia učinek staranja"
-
-#: ../src/Editors/SoftFocusEditor.cs:28
-msgid "Soft Focus"
-msgstr "Mehka izostritev"
-
-#: ../src/Editors/TiltEditor.cs:28
-msgid "Straighten"
-msgstr "Poravnava"
-
-#: ../src/FileImportBackend.cs:288
-msgid "Import error"
-msgstr "Napaka uvažanja"
-
-#: ../src/FileImportBackend.cs:289
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr "Napaka med uvažanjem {0}{2}{2}{1}"
-
-#: ../src/Filters/ResizeFilter.cs:70
-#: ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "Ni načina za shranjevanje datotek vrste \"{0}\""
-
-#: ../src/FormClient.cs:295
-msgid "Unhandled exception"
-msgstr "Neupravljana izjema"
-
-#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Kopiranje mesta fotografi_je"
-
-#: ../src/FSpot.addin.xml.h:2
-msgid "Export to"
-msgstr "Izvoz v"
-
-#: ../src/FSpot.addin.xml.h:3
-msgid "Open _With"
-msgstr "Odpri _z"
-
-#: ../src/FSpot.addin.xml.h:4
-#: ../src/ui/main_window.ui.h:15
-msgid "Rem_ove Tag"
-msgstr "Ods_trani značko"
-
-#: ../src/FSpot.addin.xml.h:5
-#: ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:453
-#: ../src/ui/main_window.ui.h:16
-msgid "Rotate _Left"
-msgstr "Zavrti _levo"
-
-#: ../src/FSpot.addin.xml.h:6
-#: ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:454
-#: ../src/ui/main_window.ui.h:17
-msgid "Rotate _Right"
-msgstr "Zavrti _desno"
-
-#: ../src/FSpot.addin.xml.h:7
-msgid "Tools"
-msgstr "Orodja"
-
-#: ../src/FSpot.addin.xml.h:8
-#: ../src/ui/main_window.ui.h:32
-msgid "_Attach Tag"
-msgstr "_Pripni značke"
-
-#: ../src/FSpot.addin.xml.h:9
-#: ../src/ui/main_window.ui.h:41
-msgid "_Delete From Drive"
-msgstr "Iz_briši z diska"
-
-#: ../src/FSpot.addin.xml.h:10
-#: ../src/ui/main_window.ui.h:59
-msgid "_Remove From Catalog"
-msgstr "_Odstrani iz kataloga"
-
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/f-spot.glade.h:2
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/f-spot.glade.h:3
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/f-spot.glade.h:4
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/f-spot.glade.h:5
-msgid "640 px"
-msgstr "640 px"
-
-#: ../src/f-spot.glade.h:6
-msgid "800 px"
-msgstr "800 px"
-
-#: ../src/f-spot.glade.h:7
-msgid "<b></b>"
-msgstr "<b></b>"
-
-#: ../src/f-spot.glade.h:10
-msgid "<b>Co_rrections</b>"
-msgstr "<b>Pop_ravki</b>"
-
-#: ../src/f-spot.glade.h:13
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>Interpolacija slike</b>"
-
-#: ../src/f-spot.glade.h:15
-msgid "<b>Size</b>"
-msgstr "<b>Velikost</b>"
-
-#: ../src/f-spot.glade.h:17
-msgid "<b>Summary</b>"
-msgstr "<b>Povzetek</b>"
-
-#: ../src/f-spot.glade.h:18
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>Prozorni Deli</b>"
-
-#: ../src/f-spot.glade.h:19
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>Ogled vseh uvoženih fotografij</b>"
-
-#: ../src/f-spot.glade.h:20
-msgid "<b>_White Balance</b>"
-msgstr "<b> _Ravnotežje bele barve </b>"
-
-#: ../src/f-spot.glade.h:21
-msgid "<small><i>Enable this to allow interpolation on zoomed images. You shouldn't disable this for viewing photos, but disabling the interpolation could be usefull in icon design.</i></small>"
-msgstr "<small><i>Možnost omogoča interpolacijo povečanih slik. Onemogočanje ni priporočeno za ogled fotografij, toda onemogočanje interpolacije bi lahko bilo uporabno pri oblikovanju ikon.</i></small>"
-
-#: ../src/f-spot.glade.h:22
-msgid "<small><i>You can choose how to display transparent parts in images. This option has no effect on photos, but setting this as check pattern or custom color could be usefull when viewing icons or other artworks with transparent parts.</i></small>"
-msgstr "<small><i>Mogoče je izbrati način prikaza prozornih delov slik. Ta možnost ne vpliva na fotografije, vendar je lahko koristna pri ogledu ikon in ostalih umetniških del s prozornimi deli.</i></small>"
-
-#: ../src/f-spot.glade.h:23
-msgid "As _background"
-msgstr "Kot _ozadje namizja"
-
-#: ../src/f-spot.glade.h:24
-msgid "As _custom color: "
-msgstr "Kot barvo _po meri"
-
-#: ../src/f-spot.glade.h:25
-msgid "As check _pattern"
-msgstr "_Kot preverjanje vzorca"
-
-#: ../src/f-spot.glade.h:26
-msgid "Attach Tags:"
-msgstr "Pripenjanje značk:"
-
-#: ../src/f-spot.glade.h:27
-msgid "Attach tag:"
-msgstr "Pripenjanje značke:"
-
-#: ../src/f-spot.glade.h:29
-msgid "CD"
-msgstr "CD"
-
-#: ../src/f-spot.glade.h:30
-msgid "C_ontrast:"
-msgstr "K_ontrast:"
-
-#: ../src/f-spot.glade.h:31
-msgid "Camera Selection"
-msgstr "Izbira fotoaparata"
-
-#: ../src/f-spot.glade.h:32
-msgid "Copy files to the Photos folder"
-msgstr "Kopiranje datotek v mapo fotografij"
-
-#: ../src/f-spot.glade.h:33
-msgid "Create Mail"
-msgstr "Ustvari sporočilo"
-
-#: ../src/f-spot.glade.h:34
-msgid "Create _icon for this tag when first used"
-msgstr "Ustvari _ikono za to značko ob prvi uporabi"
-
-#: ../src/f-spot.glade.h:35
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr "Ustvari sporočilo s pripetimi fotografijami (po možnosti spremenjenih velikosti)"
-
-#: ../src/f-spot.glade.h:36
-msgid "Detect duplicates"
-msgstr "Zaznavanje dvojnikov"
-
-#: ../src/f-spot.glade.h:37
-msgid "Display File _Names"
-msgstr "Prikaz imen _datotek"
-
-#: ../src/f-spot.glade.h:38
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "Prikaz samo tistih fotografij, ki so bile uvožene v določenih zvitkih."
-
-#: ../src/f-spot.glade.h:39
-msgid "Do not send a mail"
-msgstr "Ne pošlji pošte"
-
-#: ../src/f-spot.glade.h:40
-msgid "E-_Mail:"
-msgstr "_E-pošta:"
-
-#: ../src/f-spot.glade.h:41
-msgid "E_xport titles and comments"
-msgstr "Iz_voz naslovov in komentarjev"
-
-#: ../src/f-spot.glade.h:42
-msgid "Estimated new size"
-msgstr "Ocenjena nova velikost"
-
-#: ../src/f-spot.glade.h:44
-msgid "Extra large"
-msgstr "Zelo velika"
-
-#: ../src/f-spot.glade.h:45
-msgid "F-Spot View"
-msgstr "F-Spot pogled"
-
-#: ../src/f-spot.glade.h:47
-msgid "Filter on selected rolls"
-msgstr "Filter na izbranih zvitkih"
-
-#: ../src/f-spot.glade.h:48
-msgid "G_allery:"
-msgstr "G_alerija:"
-
-#: ../src/f-spot.glade.h:49
-msgid "Gallery"
-msgstr "Galerija"
-
-#: ../src/f-spot.glade.h:50
-#: ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
-msgid "Import"
-msgstr "Uvoz"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
-msgid "Import Source:"
-msgstr "Uvozni vir:"
-
-#: ../src/f-spot.glade.h:53
-msgid "Include subfolders"
-msgstr "Vključitev podmap"
-
-#: ../src/f-spot.glade.h:54
-msgid "Large"
-msgstr "Velika"
-
-#: ../src/f-spot.glade.h:55
-msgid "Manage your custom selection ratios"
-msgstr "Upravljanje razmerij za izbiranje po meri"
-
-#: ../src/f-spot.glade.h:56
-msgid "Medium"
-msgstr "Srednja"
-
-#: ../src/f-spot.glade.h:58
-msgid "Number of photos in selected rolls:"
-msgstr "Število fotografij v izbranih zvitkih:"
-
-#: ../src/f-spot.glade.h:59
-msgid "Number of pictures"
-msgstr "Število fotografij"
-
-#: ../src/f-spot.glade.h:60
-msgid "Open _Folder..."
-msgstr "Odpri _Mapo ..."
-
-#: ../src/f-spot.glade.h:62
-msgid "Original size (possible very large file size)"
-msgstr "Originalna velikost (mogoče zelo velika velikost datotek)"
-
-#: ../src/f-spot.glade.h:63
-#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
-msgid "P_arent Tag:"
-msgstr "S_tarševska značka:"
-
-#: ../src/f-spot.glade.h:64
-msgid "Pause"
-msgstr "Premor"
-
-#: ../src/f-spot.glade.h:65
-msgid "Preferences"
-msgstr "Nastavitve"
-
-#: ../src/f-spot.glade.h:66
-#: ../src/ItemAction.cs:123
-msgid "Previous"
-msgstr "Prejšnji"
-
-#: ../src/f-spot.glade.h:67
-msgid "Repair"
-msgstr "Popravi"
-
-#: ../src/f-spot.glade.h:70
-msgid "Select Photos to Copy From Camera..."
-msgstr "Izbor fotografij za kopiranje s fotoaparata"
-
-#: ../src/f-spot.glade.h:71
-msgid "Select a Tag..."
-msgstr "Izbor značke ..."
-
-#: ../src/f-spot.glade.h:72
-msgid "Select the camera from which you want to transfer files"
-msgstr "Izbor fotoaparata za prenos datotek"
-
-#: ../src/f-spot.glade.h:73
-msgid "Selected Camera: "
-msgstr "Izbran fotoaparat:"
-
-#: ../src/f-spot.glade.h:74
-msgid "Selection Constraints"
-msgstr "Izbira omejitev"
-
-#: ../src/f-spot.glade.h:75
-#: ../src/ui/main_window.ui.h:21
-msgid "Set as _Background"
-msgstr "Uporabi kot ozadje namizja"
-
-#: ../src/f-spot.glade.h:76
-msgid "Show all photos."
-msgstr "Prikaži vseh fotografije."
-
-#: ../src/f-spot.glade.h:77
-msgid "Show or hide the side pane"
-msgstr "Prikaži ali skrij stranski pult"
-
-#: ../src/f-spot.glade.h:78
-msgid "Show or hide the toolbar"
-msgstr "Skrij ali prikaži orodno vrstico"
-
-#: ../src/f-spot.glade.h:79
-msgid "Side _pane"
-msgstr "Stranski _pult"
-
-#: ../src/f-spot.glade.h:80
-msgid "Small"
-msgstr "Majhna"
-
-#: ../src/f-spot.glade.h:81
-msgid "Specify if an original size picture should be rotated or not. Smaller sizes are automatically rotated."
-msgstr "Določa ali naj bo originalna slika zavrtena ali ne. Manjše velikosti so samodejno zavrtene."
-
-#: ../src/f-spot.glade.h:82
-msgid "Strip image _metadata"
-msgstr "Odstrani _metapodatke slike"
-
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
-msgid "Te_mp:"
-msgstr "Zač_asno:"
-
-#: ../src/f-spot.glade.h:85
-msgid "Tiny"
-msgstr "Drobcena"
-
-#: ../src/f-spot.glade.h:86
-msgid "Total original size"
-msgstr "Skupna osnovna velikost"
-
-#: ../src/f-spot.glade.h:87
-#: ../src/ui/main_window.ui.h:28
-msgid "Zoom _in"
-msgstr "Po_večaj"
-
-#: ../src/f-spot.glade.h:88
-#: ../src/ui/main_window.ui.h:29
-msgid "Zoom _out"
-msgstr "Po_manjšaj"
-
-#: ../src/f-spot.glade.h:89
-#: ../src/ui/main_window.ui.h:30
-msgid "Zoom in"
-msgstr "Povečaj"
-
-#: ../src/f-spot.glade.h:90
-#: ../src/ui/main_window.ui.h:31
-msgid "Zoom out"
-msgstr "Pomanjšaj"
-
-#: ../src/f-spot.glade.h:91
-msgid "_Brightness:"
-msgstr "Svet_lost:"
-
-#: ../src/f-spot.glade.h:93
-msgid "_Create Mail"
-msgstr "Ustva_rjanje Pošte"
-
-#: ../src/f-spot.glade.h:94
-#: ../src/ui/main_window.ui.h:44
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../src/f-spot.glade.h:98
-msgid "_Exposure:"
-msgstr "Izpos_tavljenost:"
-
-#: ../src/f-spot.glade.h:99
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:100
-#: ../src/ui/main_window.ui.h:48
-msgid "_Fullscreen"
-msgstr "_Celozaslonski način"
-
-#: ../src/f-spot.glade.h:101
-msgid "_Gallery"
-msgstr "_Galerija"
-
-#: ../src/f-spot.glade.h:102
-#: ../src/ui/main_window.ui.h:49
-msgid "_Help"
-msgstr "Po_moč"
-
-#: ../src/f-spot.glade.h:103
-msgid "_Hue:"
-msgstr "_Odtenek:"
-
-#: ../src/f-spot.glade.h:104
-msgid "_Interpolate image on zoom"
-msgstr "_Interpolacija slike pri povečavi"
-
-#: ../src/f-spot.glade.h:105
-msgid "_New Window"
-msgstr "_Novo Okno"
-
-#: ../src/f-spot.glade.h:106
-msgid "_Open album in browser when done uploading"
-msgstr "_Odpri album v brskalniku po končanem nalaganju"
-
-#: ../src/f-spot.glade.h:107
-msgid "_Open destination when done exporting"
-msgstr "_Odpiri cilja po končanem izvozu"
-
-#: ../src/f-spot.glade.h:108
-#: ../src/ui/main_window.ui.h:56
-msgid "_Photo"
-msgstr "_Fotografija"
-
-#: ../src/f-spot.glade.h:110
-msgid "_Saturation:"
-msgstr "N_asičenost:"
-
-#: ../src/f-spot.glade.h:111
-msgid "_Scale photos to no larger than: "
-msgstr "_Spreminjanje velikosti fotografij na ne več kot: "
-
-#: ../src/f-spot.glade.h:112
-#: ../src/ui/main_window.ui.h:67
-msgid "_Slideshow"
-msgstr "_Diaprojekcija"
-
-#: ../src/f-spot.glade.h:113
-msgid "_Strip metadata"
-msgstr "O_dstrani metapodatke"
-
-#: ../src/f-spot.glade.h:114
-#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
-msgid "_Tag Name:"
-msgstr "Ime z_načke:"
-
-#: ../src/f-spot.glade.h:115
-msgid "_Tint:"
-msgstr "_Črnilo"
-
-#: ../src/f-spot.glade.h:116
-msgid "_Toolbar"
-msgstr "_Orodna vrstica"
-
-#: ../src/f-spot.glade.h:117
-msgid "_URI:"
-msgstr "_URI:"
-
-#: ../src/f-spot.glade.h:118
-#: ../src/ui/main_window.ui.h:75
-msgid "_View"
-msgstr "_Pogled"
-
-#: ../src/f-spot.glade.h:119
-msgid "_Virtual Filesystem"
-msgstr "_Navidezni datotečni sistem"
-
-#: ../src/f-spot.glade.h:120
-#: ../src/Widgets/FindBar.cs:177
-msgid "and"
-msgstr "in"
-
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:122
-msgid ""
-"at\n"
-"after\n"
-"between"
-msgstr ""
-"na\n"
-"za\n"
-"med"
-
-#: ../src/f-spot.glade.h:126
-msgid "x"
-msgstr "x"
-
-#: ../src/FullScreenView.cs:58
-msgid "Hide"
-msgstr "Skritje"
-
-#: ../src/FullScreenView.cs:60
-msgid "Hide Toolbar"
-msgstr "Skritje orodne vrstice"
-
-#: ../src/FullScreenView.cs:66
-msgid "Info"
-msgstr "Podrobnosti"
-
-#: ../src/FullScreenView.cs:68
-#: ../src/Widgets/InfoBox.cs:200
-msgid "Image Information"
-msgstr "Podrobnosti o sliki"
-
-#: ../src/FullScreenView.cs:73
-msgid "Exit fullscreen"
-msgstr "Izhod iz celozaslonskega načina"
-
-#: ../src/FullScreenView.cs:81
-#: ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:103
-msgid "Slideshow"
-msgstr "Diaprojekcija"
-
-#: ../src/FullScreenView.cs:82
-msgid "Start slideshow"
-msgstr "Zagon diaprojekcije"
-
-#: ../src/FullScreenView.cs:128
-msgid "Slide transition:"
-msgstr "Prehodi med diapozitivi:"
-
-#: ../src/GroupSelector.cs:57
-#: ../src/GroupSelector.cs:58
-msgid "More dates"
-msgstr "Več datumov"
-
-#: ../src/GroupSelector.cs:60
-#: ../src/GroupSelector.cs:61
-msgid "More"
-msgstr "Več"
-
-#: ../src/GroupSelector.cs:517
-#: ../src/ui/main_window.ui.h:34
-msgid "_Clear Date Range"
-msgstr "_Čiščenje datumskega območja"
-
-#: ../src/Imaging/Exif.cs:228
-msgid "Image Directory"
-msgstr "Mapa slik"
-
-#: ../src/Imaging/Exif.cs:230
-msgid "Thumbnail Directory"
-msgstr "Mapa sličic"
-
-#: ../src/Imaging/Exif.cs:232
-msgid "Exif Directory"
-msgstr "Exif mapa"
-
-#: ../src/Imaging/Exif.cs:234
-msgid "GPS Directory"
-msgstr "GPS mapa"
-
-#: ../src/Imaging/Exif.cs:236
-msgid "InterOperability Directory"
-msgstr "Mapa vzajemnega delovanja"
-
-#: ../src/Imaging/Exif.cs:238
-msgid "Unknown Directory"
-msgstr "Neznana mapa"
-
-#: ../src/Imaging/ImageFile.cs:116
-msgid "Writing to this file format is not supported"
-msgstr "Pisanje v to vrsto datoteke ni podprto"
-
-#: ../src/Imaging/IptcFile.cs:145
-msgid "IPTC Information Interchange Model (IIM) Version number"
-msgstr "Številka različice IPTC Informacijsko Izmenjalnega Modela (IIM) "
-
-#: ../src/Imaging/IptcFile.cs:147
-msgid "OSI Destination routing information"
-msgstr "OSI podrobnosti o potovanju do cilja"
-
-#: ../src/Imaging/IptcFile.cs:149
-msgid "IPTC file format"
-msgstr "IPTC vrsta datoteke"
-
-#: ../src/Imaging/IptcFile.cs:151
-msgid "Identifies the provider and product"
-msgstr "Določa dobavitelja in izdelek"
-
-#: ../src/Imaging/IptcFile.cs:153
-msgid "A unique number identifying the envelope"
-msgstr "Edinstveno število za določevanje ovojnice"
-
-#: ../src/Imaging/IptcFile.cs:155
-msgid "A unique number"
-msgstr "Edinstveno število"
-
-#: ../src/Imaging/IptcFile.cs:157
-msgid "The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
-msgstr "Prednost upravljanja ovojnice med 1 (najbolj nujno) in 9 (najmanj nujno)"
-
-#: ../src/Imaging/IptcFile.cs:159
-msgid "The year, month and day (CCYYMMDD) the service sent the material"
-msgstr "Leto, mesec in dan (LLLLMMDD), ko je storitev poslala material"
-
-#: ../src/Imaging/IptcFile.cs:161
-msgid "The hour, minute and second (HHMMSS) the service sent the material"
-msgstr "Ura, minuta in sekunda (UUMMSS), ko je storitev poslala material."
-
-#: ../src/Imaging/IptcFile.cs:163
-msgid "The character set designation"
-msgstr "Imenovanje niza znakov"
-
-#: ../src/Imaging/IptcFile.cs:165
-msgid "External globally unique object identifier"
-msgstr "Zunanje edinstveno določilo predmeta"
-
-#: ../src/Imaging/IptcFile.cs:170
-msgid "Abstract Relationship Method (ARM) identifier"
-msgstr "Določilo metode abstraktnega razmerja (ARM)"
-
-#: ../src/Imaging/IptcFile.cs:172
-msgid "Abstract Relationship Method (ARM) version number."
-msgstr "Številka različice metode abstraktnega razmerja (ARM)"
-
-#: ../src/Imaging/IptcFile.cs:175
-msgid "Number identifying the IIM version this application record uses"
-msgstr "Številka različice IIM, ki jo uporablja programski zapis"
-
-#: ../src/Imaging/IptcFile.cs:177
-msgid "Object type reference"
-msgstr "Določilo vrste predmeta"
-
-#: ../src/Imaging/IptcFile.cs:182
-msgid "Object attribute reference"
-msgstr "Določilo atributa predmeta"
-
-#: ../src/Imaging/IptcFile.cs:188
-#: ../src/Imaging/IptcFile.cs:192
-msgid "Object name"
-msgstr "Ime predmeta"
-
-#: ../src/Imaging/IptcFile.cs:190
-msgid "Status of the objectdata according to the provider"
-msgstr "Stanje podatkov predmeta glede na ponudnika"
-
-#: ../src/Imaging/IptcFile.cs:194
-msgid "Location within a city or area where the object originates"
-msgstr "Kraj znotraj mesta ali območja od koder izvira vsebina"
-
-#: ../src/Imaging/IptcFile.cs:197
-msgid "Name of the city the content is focussing on"
-msgstr "Ime mesta na katerega se osredotoča vsebina"
-
-#: ../src/Imaging/IptcFile.cs:200
-msgid "Copyright information for"
-msgstr "Podrobnosti avtorskih pravic za "
-
-#: ../src/Imaging/IptcFile.cs:203
-msgid "Full name of the country of the focus of the content"
-msgstr "Polno ime države in osredotočenost vsebine"
-
-#: ../src/Imaging/IptcFile.cs:206
-msgid "Two or three letter ISO3166 code of the country of the focus of the content"
-msgstr "Dvo ali tri črkovna ISO3166 koda države in osredotočenost vsebine"
-
-#: ../src/Imaging/IptcFile.cs:209
-msgid "Creator of the content"
-msgstr "Ustvarjalec vsebine"
-
-#: ../src/Imaging/IptcFile.cs:212
-msgid "Provider of the object"
-msgstr "Ponudnik predmeta"
-
-#: ../src/Imaging/IptcFile.cs:215
-msgid "The title of the author or creator"
-msgstr "Naslov avtorja ali ustvarjalca"
-
-#: ../src/Imaging/IptcFile.cs:218
-msgid "The person involved in writing, editing or correcting the object data or caption/abstract"
-msgstr "Oseba vključena v pisanje, urejanje ali popravljanje podatkov o predmetu ali obnove"
-
-#: ../src/Imaging/IptcFile.cs:222
-msgid "Headline of the content"
-msgstr "Naslovnica vsebine"
-
-#: ../src/Imaging/IptcFile.cs:225
-msgid "Instructions from the creator to the receiver not covered by other fields"
-msgstr "Navodila od ustvarjalca za uporabnika, ki niso opredeljena z drugimi polji"
-
-#: ../src/Imaging/IptcFile.cs:228
-msgid "Intellectual genre of the object"
-msgstr "Intelektualni žanr predmeta"
-
-#: ../src/Imaging/IptcFile.cs:241
-msgid "Unknown IIM DataSet"
-msgstr "Neznan IIM niz podatkov"
-
-#: ../src/ImportCommand.cs:48
-#: ../src/SingleView.cs:359
-msgid "Select Folder"
-msgstr "Izbira mape"
-
-#: ../src/ImportCommand.cs:259
-msgid "(No Cameras Detected)"
-msgstr "(Ni zaznanih fotoaparatov)"
-
-#: ../src/ImportCommand.cs:404
-#, csharp-format
-msgid "Loading {0} of {1}"
-msgstr "Nalaganje {0} od {1}"
-
-#: ../src/ImportCommand.cs:470
-msgid "Done Loading"
-msgstr "Nalaganje končano"
-
-#: ../src/ImportCommand.cs:684
-msgid "Directory does not exist."
-msgstr "Mapa ne obstaja"
-
-#: ../src/ImportCommand.cs:685
-#, csharp-format
-msgid "The directory you selected \"{0}\" does not exist. Please choose a different directory"
-msgstr "Mapa \"{0}\", ki ste jo izbrali, ne obstaja. Izberite drugo mapo."
-
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739
-#: ../src/ImportCommand.cs:741
-#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Značke uvažanja"
-
-#: ../src/ItemAction.cs:79
-#: ../src/MainWindow.cs:274
-#: ../src/SingleView.cs:86
-msgid "Rotate Left"
-msgstr "Zavrti levo"
-
-#: ../src/ItemAction.cs:80
-msgid "Rotate picture left"
-msgstr "Vrtenje fotografije levo"
-
-#: ../src/ItemAction.cs:91
-#: ../src/MainWindow.cs:278
-#: ../src/SingleView.cs:91
-msgid "Rotate Right"
-msgstr "Zavrti desno"
-
-#: ../src/ItemAction.cs:92
-msgid "Rotate picture right"
-msgstr "Vrtenje fotografij desno"
-
-#: ../src/ItemAction.cs:103
-msgid "Next picture"
-msgstr "Naslednja slika"
-
-#: ../src/ItemAction.cs:124
-msgid "Previous picture"
-msgstr "Prejšnja slika"
-
-#: ../src/MainWindow.cs:269
-msgid "Import new images"
-msgstr "Uvoz novih slik"
-
-#: ../src/MainWindow.cs:285
-#: ../src/ui/main_window.ui.h:3
-msgid "Browse"
-msgstr "Brskanje"
-
-#: ../src/MainWindow.cs:289
-msgid "Browse many photos simultaneously"
-msgstr "Brskanje po več fotografijah hkrati"
-
-#: ../src/MainWindow.cs:293
-msgid "Edit Image"
-msgstr "Urejanje slik"
-
-#: ../src/MainWindow.cs:297
-msgid "View and edit a photo"
-msgstr "Prikaz in urejanje fotografije"
-
-#: ../src/MainWindow.cs:302
-#: ../src/SingleView.cs:98
-msgid "Fullscreen"
-msgstr "Celozaslonski način"
-
-#: ../src/MainWindow.cs:304
-#: ../src/SingleView.cs:100
-msgid "View photos fullscreen"
-msgstr "Celozaslonski ogled fotografij"
-
-#: ../src/MainWindow.cs:309
-#: ../src/SingleView.cs:105
-msgid "View photos in a slideshow"
-msgstr "Ogled fotografij v diaprojekciji"
-
-#: ../src/MainWindow.cs:324
-msgid "Previous photo"
-msgstr "Predhodna fotografija"
-
-#: ../src/MainWindow.cs:329
-msgid "Next photo"
-msgstr "Naslednja fotografija"
-
-#: ../src/MainWindow.cs:1488
-msgid "No cameras detected."
-msgstr "Noben fotoaparat ni bil zaznan."
-
-#: ../src/MainWindow.cs:1489
-msgid "F-Spot was unable to find any cameras attached to this system. Double check that the camera is connected and has power"
-msgstr "Program F-spot ni zaznal v sistem povezanih fotoaparatov. Dvakrat preverite, ali je fotoaparat povezan in prižgan."
-
-#: ../src/MainWindow.cs:1528
-msgid "Error connecting to camera"
-msgstr "Napaka med povezovanjem s fotoaparatom"
-
-#: ../src/MainWindow.cs:1529
-#, csharp-format
-msgid "Received error \"{0}\" while connecting to camera"
-msgstr "Med povezovanjem s fotoaparatom je bila prejeta napaka \"{0}\""
-
-#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
-#, csharp-format
-msgid "Merge the selected tag"
-msgid_plural "Merge the {0} selected tags?"
-msgstr[0] "Združitev {0} izbranih značk?"
-msgstr[1] "Združitev {0} izbrane značke?"
-msgstr[2] "Združitev {0} izbranih značk?"
-msgstr[3] "Združitev {0} izbranih značk?"
-
-#: ../src/MainWindow.cs:1842
-msgid "This operation will merge the selected tags and any sub-tags into a single tag."
-msgstr "Z dejanjem bodo združene izbrane značke in morebitne pod-značke v eno samo značko."
-
-#: ../src/MainWindow.cs:1844
-msgid "_Merge Tags"
-msgstr "Z_družitev značk"
-
-#: ../src/MainWindow.cs:2049
-#, csharp-format
-msgid "{0} Photo out of {1}"
-msgid_plural "{0} Photos out of {1}"
-msgstr[0] "{0} fotografij od {1}"
-msgstr[1] "{0} fotografija od {1}"
-msgstr[2] "{0} fotografiji od {1}"
-msgstr[3] "{0} fotografije od {1}"
-
-#: ../src/MainWindow.cs:2051
-#: ../src/SingleView.cs:495
-#, csharp-format
-msgid "{0} Photo"
-msgid_plural "{0} Photos"
-msgstr[0] "{0} Fotografij"
-msgstr[1] "{0} Fotografija"
-msgstr[2] "{0} Fotografiji"
-msgstr[3] "{0} Fotografije"
-
-#: ../src/MainWindow.cs:2054
-#, csharp-format
-msgid " ({0} selected)"
-msgid_plural " ({0} selected)"
-msgstr[0] " ({0} izbranih)"
-msgstr[1] " ({0} izbrana)"
-msgstr[2] " ({0} izbrani)"
-msgstr[3] " ({0} izbrane)"
-
-#: ../src/MainWindow.cs:2135
-msgid "_Ok"
-msgstr "_V redu"
-
-#: ../src/MainWindow.cs:2136
-msgid "Error Deleting Picture"
-msgstr "Napaka med brisanjem fotografije"
-
-#: ../src/MainWindow.cs:2141
-#, csharp-format
-msgid "No permission to delete the file:{1}{0}"
-msgstr "Ni dovoljenj za izbris datoteke:{1}{0}"
-
-#: ../src/MainWindow.cs:2145
-#, csharp-format
-msgid "An error of type {0} occurred while deleting the file:{2}{1}"
-msgstr "Med brisanjem datoteke {2} {1} je prišlo do napake vrste {0}"
-
-#: ../src/MainWindow.cs:2177
-#, csharp-format
-msgid "Delete the selected photo permanently?"
-msgid_plural "Delete the {0} selected photos permanently?"
-msgstr[0] "Ali naj bo trajno izbrisanih {0} izbranih fotografij?"
-msgstr[1] "Ali naj bo trajno izbrisana {0} izbrana fotografija?"
-msgstr[2] "Ali naj bosta trajno izbrisani {0} izbrani fotografiji?"
-msgstr[3] "Ali naj bodo trajno izbrisane {0} izbrane fotografije?"
-
-#: ../src/MainWindow.cs:2181
-msgid "This deletes all versions of the selected photo from your drive."
-msgid_plural "This deletes all versions of the selected photos from your drive."
-msgstr[0] "Izbris vseh različic izbranih fotografij z diska."
-msgstr[1] "Izbris vseh različic izbrane fotografije z diska."
-msgstr[2] "Izbris vseh različic izbranih fotografij z diska."
-msgstr[3] "Izbris vseh različic izbranih fotografij z diska."
-
-#: ../src/MainWindow.cs:2184
-msgid "_Delete photo"
-msgid_plural "_Delete photos"
-msgstr[0] "Izbri_ši fotografije"
-msgstr[1] "Izbri_ši fotografijo"
-msgstr[2] "Izbri_ši fotografiji"
-msgstr[3] "Izbri_ši fotografije"
-
-#: ../src/MainWindow.cs:2220
-#, csharp-format
-msgid "Remove the selected photo from F-Spot?"
-msgid_plural "Remove the {0} selected photos from F-Spot?"
-msgstr[0] "Ali naj se odstrani {0} izbranih fotografij iz F-Spot ?"
-msgstr[1] "Ali naj se odstrani {0} izbrano fotografijo iz F-Spot ?"
-msgstr[2] "Ali naj se odstranita {0} izbrani fotografij iz F-Spot ?"
-msgstr[3] "Ali naj se odstranijo {0} izbrane fotografije iz F-Spot ?"
-
-#: ../src/MainWindow.cs:2225
-msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
-msgstr "Ob odstranjevanju fotografij iz F-Spot kataloga bodo vsi podatki o značkah izgubljeni. Fotografije bodo ostale na računalniku in jih lahko ponovno uvozite v F-Spot."
-
-#: ../src/MainWindow.cs:2226
-msgid "_Remove from Catalog"
-msgstr "_Odstrani iz kataloga"
-
-#: ../src/MainWindow.cs:2289
-#, csharp-format
-msgid "Delete tag \"{0}\"?"
-msgstr "Izbris značke \"{0}\"?"
-
-#: ../src/MainWindow.cs:2291
-#, csharp-format
-msgid "Delete the {0} selected tags?"
-msgstr "Izbris {0} izbrane značke ?"
-
-#: ../src/MainWindow.cs:2296
-msgid "photo"
-msgid_plural "photos"
-msgstr[0] "fotografije"
-msgstr[1] "fotografija"
-msgstr[2] "fotografiji"
-msgstr[3] "fotografije"
-
-#: ../src/MainWindow.cs:2298
-#, csharp-format
-msgid "If you delete this tag, the association with {0} {1} will be lost."
-msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
-msgstr[0] "Ob izbrisu značk, bo povezljivost z {0} {1} izgubljena."
-msgstr[1] "Ob izbrisu značke, bo povezljivost z {0} {1} izgubljena."
-msgstr[2] "Ob izbrisu značk, bo povezljivost z {0} {1} izgubljena."
-msgstr[3] "Ob izbrisu značk, bo povezljivost z {0} {1} izgubljena."
-
-#: ../src/MainWindow.cs:2303
-msgid "_Delete tag"
-msgid_plural "_Delete tags"
-msgstr[0] "Iz_bris značk"
-msgstr[1] "Iz_bris značke"
-msgstr[2] "Iz_bris značk"
-msgstr[3] "Iz_bris značk"
-
-#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
-msgid "Tag is not empty"
-msgstr "Značka ni prazna"
-
-#: ../src/MainWindow.cs:2318
-#, csharp-format
-msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
-msgstr "Ni mogoče izbrisati značk, ki imajo značke znotraj njih. Najprej izbrišite značke pod \"{0}\""
-
-#: ../src/MainWindow.cs:2750
-msgid "Rotate selected photo left"
-msgid_plural "Rotate selected photos left"
-msgstr[0] "Vrtenje izbranih fotografij levo"
-msgstr[1] "Vrtenje izbrane fotografije levo"
-msgstr[2] "Vrtenje izbranih fotografij levo"
-msgstr[3] "Vrtenje izbranih fotografij levo"
-
-#: ../src/MainWindow.cs:2763
-msgid "Rotate selected photo right"
-msgid_plural "Rotate selected photos right"
-msgstr[0] "Vrtenje izbranih fotografij desno"
-msgstr[1] "Vrtenje izbrane fotografije desno"
-msgstr[2] "Vrtenje izbranih fotografij desno"
-msgstr[3] "Vrtenje izbranih fotografij desno"
-
-#: ../src/MainWindow.cs:2774
-#, csharp-format
-msgid "Find _Selected Tag"
-msgid_plural "Find _Selected Tags"
-msgstr[0] "Iskanje _izbranih značk"
-msgstr[1] "Iskanje _izbrane značke "
-msgstr[2] "Iskanje _izbranih značk _z"
-msgstr[3] "Iskanje _izbranih značk"
-
-#: ../src/MainWindow.cs:2778
-#, csharp-format
-msgid "Find Selected Tag _With"
-msgid_plural "Find Selected Tags _With"
-msgstr[0] "Iskanje izbranih značk _z"
-msgstr[1] "Iskanje izbrane značke _z"
-msgstr[2] "Iskanje izbranih značk _z"
-msgstr[3] "Iskanje izbranih značk _z"
-
-#: ../src/MainWindow.cs:2819
-msgid "Create New Version?"
-msgid_plural "Create New Versions?"
-msgstr[0] "Ustvari nove različice?"
-msgstr[1] "Ustvari novo različico?"
-msgstr[2] "Ustvari novi različici?"
-msgstr[3] "Ustvari nove različice?"
-
-#: ../src/MainWindow.cs:2821
-#, csharp-format
-msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
-msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
-msgstr[0] "Ali naj pred zagonom {1} F-spot ustvari nove različice izbranih fotografij, da ohrani originale?"
-msgstr[1] "Ali naj pred zagonom {1} F-spot ustvari nove različice izbrane fotografije, da ohrani original?"
-msgstr[2] "Ali naj pred zagonom {1} F-spot ustvari nove različice izbranih fotografij, da ohrani originala?"
-msgstr[3] "Ali naj pred zagonom {1} F-spot ustvari nove različice izbranih fotografij, da ohrani originale?"
-
-#: ../src/MainWindow.cs:2843
-msgid "XCF version"
-msgstr "Različica XCF"
-
-#: ../src/MetadataStore.cs:19
-msgid "Creator"
-msgstr "Ustvarjalec"
-
-#: ../src/MetadataStore.cs:20
-msgid "Title"
-msgstr "Naslov"
-
-#: ../src/MetadataStore.cs:21
-msgid "Copyright"
-msgstr "Avtorske pravice"
-
-#: ../src/MetadataStore.cs:22
-msgid "Subject and Keywords"
-msgstr "Predmet in ključne besede"
-
-#: ../src/MetadataStore.cs:23
-msgid "Compression"
-msgstr "Stiskanje"
-
-#: ../src/MetadataStore.cs:25
-msgid "Planar Configuration"
-msgstr "Nastavitev ravnine"
-
-#: ../src/MetadataStore.cs:27
-msgid "Orientation"
-msgstr "Orientacija"
-
-#: ../src/MetadataStore.cs:29
-msgid "Photometric Interpretation"
-msgstr "Fotometrična interpretacija"
-
-#: ../src/MetadataStore.cs:31
-msgid "Resolution Unit"
-msgstr "Enota ločljivosti"
-
-#: ../src/MetadataStore.cs:33
-msgid "Exposure Program"
-msgstr "Program izpostavljenosti"
-
-#: ../src/MetadataStore.cs:35
-msgid "Metering Mode"
-msgstr "Način merjenja"
-
-#: ../src/MetadataStore.cs:37
-msgid "Exposure Mode"
-msgstr "Način izpostavljenosti"
-
-#: ../src/MetadataStore.cs:39
-msgid "Custom Rendered"
-msgstr "Izris po meri"
-
-#: ../src/MetadataStore.cs:41
-msgid "Components Configuration"
-msgstr "Nastavitve komponent"
-
-#: ../src/MetadataStore.cs:43
-msgid "Light Source"
-msgstr "Izvor svetlobe"
-
-#: ../src/MetadataStore.cs:45
-msgid "Sensing Method"
-msgstr "Metoda zaznavanja"
-
-#: ../src/MetadataStore.cs:47
-msgid "Color Space"
-msgstr "Barvni prostor"
-
-#: ../src/MetadataStore.cs:49
-msgid "White Balance"
-msgstr "Uravnoteženje bele barve"
-
-#: ../src/MetadataStore.cs:51
-msgid "Focal Plane Resolution Unit"
-msgstr "Enota ločljivosti ravnine gorišča"
-
-#: ../src/MetadataStore.cs:53
-msgid "File Source Type"
-msgstr "Vrsta izvorne datoteke"
-
-#: ../src/MetadataStore.cs:55
-msgid "Scene Capture Type"
-msgstr "Vrsta zajemanja scene"
-
-#: ../src/MetadataStore.cs:57
-msgid "Gain Control"
-msgstr "Nadzor Gaina"
-
-#: ../src/MetadataStore.cs:59
-msgid "Contrast"
-msgstr "Kontrast"
-
-#: ../src/MetadataStore.cs:61
-msgid "Saturation"
-msgstr "Nasičenost"
-
-#: ../src/MetadataStore.cs:63
-msgid "Sharpness"
-msgstr "Ostrost"
-
-#: ../src/MetadataStore.cs:65
-msgid "Scene Type"
-msgstr "Vrsta scene"
-
-#. Fixme this should really set parent menu
-#. items insensitve
-#: ../src/PhotoTagMenu.cs:74
-msgid "(No Tags)"
-msgstr "(Ni značk)"
-
-#: ../src/PhotoVersionCommands.cs:58
-msgid "Create New Version"
-msgstr "Ustvari novo različico"
-
-#: ../src/PhotoVersionCommands.cs:59
-msgid "Name:"
-msgstr "Ime:"
-
-#: ../src/PhotoVersionCommands.cs:63
-msgid "Rename Version"
-msgstr "Preimenuj različico"
-
-#: ../src/PhotoVersionCommands.cs:64
-msgid "New name:"
-msgstr "Novo ime:"
-
-#: ../src/PhotoVersionCommands.cs:110
-msgid "Could not create a new version"
-msgstr "Ni mogoče ustvariti nove različice"
-
-#: ../src/PhotoVersionCommands.cs:111
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to create version \"{1}\""
-msgstr "Prejeta je bila napaka \"{0}\". Ni mogoče ustvariti različice \"{1}\""
-
-#: ../src/PhotoVersionCommands.cs:138
-msgid "Really Delete?"
-msgstr "Resničen izbris?"
-
-#: ../src/PhotoVersionCommands.cs:139
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ../src/PhotoVersionCommands.cs:140
-msgid "Delete"
-msgstr "Izbriši"
-
-#: ../src/PhotoVersionCommands.cs:144
-#, csharp-format
-msgid "Really delete version \"{0}\"?"
-msgstr "Ali želite resnično izbrisati različico \"{0}\"?"
-
-#: ../src/PhotoVersionCommands.cs:154
-msgid "Could not delete a version"
-msgstr "Ni mogoče izbrisati različice"
-
-#: ../src/PhotoVersionCommands.cs:155
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
-msgstr "Prejeta je bila napaka \"{0}\". Ni mogoče izbrisati različice \"{1}\""
-
-#: ../src/PhotoVersionCommands.cs:196
-msgid "Could not rename a version"
-msgstr "Ni mogoče preimenovati različice"
-
-#: ../src/PhotoVersionCommands.cs:197
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
-msgstr "Prejeta je bila napaka \"{0}\". Ni mogoče preimenovati različice v \"{1}\""
-
-#: ../src/PhotoVersionMenu.cs:66
-#: ../src/Widgets/InfoBox.cs:554
-#: ../src/Widgets/InfoBox.cs:556
-msgid "(No Edits)"
-msgstr "(Ni urejanj)"
-
-#: ../src/PhotoView.cs:169
-#: ../src/UI.Dialog/EditExceptionDialog.cs:38
-msgid "Error editing photo"
-msgstr "Napaka med urejanjem fotografije"
-
-#: ../src/PhotoView.cs:170
-#: ../src/Sharpener.cs:73
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "Prejeta je bila izjema \"{0}\". Ni mogoče shraniti fotografije {1}"
-
-#: ../src/PhotoView.cs:359
-msgid "Comment:"
-msgstr "Komentar:"
-
-#: ../src/Preferences.cs:149
-msgid "Photos"
-msgstr "Fotografije"
-
-#: ../src/PrintOperation.cs:32
-msgid "Image Settings"
-msgstr "Nastavitve slik"
-
-#: ../src/QueryWidget.cs:58
-msgid "Find: "
-msgstr "Iskanje:"
-
-#: ../src/QueryWidget.cs:63
-msgid "Untagged photos"
-msgstr "Fotografije brez značk"
-
-#: ../src/QueryWidget.cs:71
-msgid "Rated photos"
-msgstr "Ocenjene fotografije"
-
-#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:80
-msgid "Import roll"
-msgstr "Uvozni zvitek"
-
-#: ../src/QueryWidget.cs:104
-msgid "Clear search"
-msgstr "Čiščenje iskanja"
-
-#: ../src/QueryWidget.cs:111
-msgid "Refresh search"
-msgstr "Osvežitev iskanja"
-
-#: ../src/QueryWidget.cs:113
-msgid "No matching photos found"
-msgstr "Ni mogoče najti ujemajočih se fotografij"
-
-#: ../src/QueryWidget.cs:155
-msgid "Hide _Find Bar"
-msgstr "Skrij _iskalno vrstico"
-
-#: ../src/QueryWidget.cs:161
-msgid "Show _Find Bar"
-msgstr "Prikaži is_kalno vrstico"
-
-#: ../src/RotateCommand.cs:96
-#: ../src/RotateCommand.cs:111
-msgid "Unable to rotate this type of photo"
-msgstr "Ni mogoče zavrteti te zvrsti fotografij"
-
-#: ../src/RotateCommand.cs:131
-msgid "Unable to rotate readonly file"
-msgstr "Ni mogoče vrteti datoteke označene samo za branje"
-
-#: ../src/RotateCommand.cs:198
-msgid "Rotating photos"
-msgstr "Vrtenje fotografij"
-
-#: ../src/RotateCommand.cs:209
-#, csharp-format
-msgid "Rotating photo \"{0}\""
-msgstr "Vrtenje fotografije \"{0}\""
-
-#: ../src/RotateCommand.cs:222
-msgid "Directory not found"
-msgstr "Mape ni mogoče najti"
-
-#: ../src/RotateCommand.cs:242
-#, csharp-format
-msgid "Unable to rotate photo"
-msgid_plural "Unable to rotate {0} photos"
-msgstr[0] "Ni mogoče zavrteti {0} fotografij"
-msgstr[1] "Ni mogoče zavrteti {0} fotografije"
-msgstr[2] "Ni mogoče zavrteti {0} fotografij"
-msgstr[3] "Ni mogoče zavrteti {0} fotografij"
-
-#: ../src/RotateCommand.cs:244
-#, csharp-format
-msgid "The photo could not be rotated because it is on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgid_plural "{0} photos could not be rotated because they are on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgstr[0] "{0} fotografij ni bilo mogoče zavrteti, ker se nahajajo na datotečnem sistemu samo za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite ponovno. "
-msgstr[1] "{0} fotografije ni bilo mogoče zavrteti, ker se nahajajo na datotečnem sistemu samo za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite ponovno. "
-msgstr[2] "{0} fotografij ni bilo mogoče zavrteti, ker se nahajajo na datotečnem sistemu samo za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite ponovno. "
-msgstr[3] "{0} fotografij ni bilo mogoče zavrteti, ker se nahajajo na datotečnem sistemu samo za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite ponovno. "
-
-#: ../src/RotateCommand.cs:271
-#, csharp-format
-msgid "Received error \"{0}\" while attempting to rotate {1}"
-msgstr "Med poskusom vrtenja {1} je prišlo do napake \"{0}\""
-
-#: ../src/RotateCommand.cs:276
-msgid "Error while rotating photo."
-msgstr "Napaka med vrtenjem fotografije"
-
-#: ../src/SendEmail.cs:240
-msgid "Preparing email"
-msgstr "Pripravljanje e-pošte"
-
-#: ../src/SendEmail.cs:292
-#, csharp-format
-msgid "Exporting picture \"{0}\""
-msgstr "Izvažanje slike \"{0}\""
-
-#: ../src/SendEmail.cs:314
-msgid "Error processing image"
-msgstr "Napaka med obdelavo slike"
-
-#: ../src/SendEmail.cs:315
-#, csharp-format
-msgid "An error occured while processing \"{0}\": {1}"
-msgstr "Med obdelavo \"{0}\": {1} je prišlo do napake"
-
-#. Send the mail :)
-#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "moje fotografije"
-
-#: ../src/Sharpener.cs:72
-msgid "Error saving sharpened photo"
-msgstr "Napaka med shranjevanjem izostrene datoteke"
-
-#: ../src/Sharpener.cs:102
-msgid "Sharpen"
-msgstr "Izostritev"
-
-#: ../src/Sharpener.cs:112
-msgid "Amount:"
-msgstr "Količina:"
-
-#: ../src/Sharpener.cs:113
-msgid "Radius:"
-msgstr "Polmer:"
-
-#: ../src/Sharpener.cs:114
-msgid "Threshold:"
-msgstr "Prag:"
-
-#: ../src/SingleView.cs:88
-msgid "Rotate photo left"
-msgstr "Vrtenje fotografije v levo"
-
-#: ../src/SingleView.cs:93
-msgid "Rotate photo right"
-msgstr "Vrtenje fotografije v desno"
-
-#: ../src/SingleView.cs:130
-msgid "Folder"
-msgstr "Mapa"
-
-#: ../src/SingleView.cs:356
-msgid "Open"
-msgstr "Odpri"
-
-#: ../src/SingleView.cs:456
-msgid "Set as Background"
-msgstr "Uporabi kot ozadje namizja"
-
-#: ../src/TagCommands.cs:96
-#: ../src/TagSelectionWidget.cs:498
-#: ../src/UI.Dialog/EditTagDialog.cs:78
-msgid "This name is already in use"
-msgstr "Ime je že v uporabi"
-
-#: ../src/TagCommands.cs:144
-msgid "Create New Tag"
-msgstr "Ustvari novo značko"
-
-#: ../src/TagCommands.cs:145
-msgid "Name of New Tag:"
-msgstr "Ime nove značke:"
-
-#: ../src/TagPopup.cs:26
-#, csharp-format
-msgid "Find"
-msgid_plural "Find"
-msgstr[0] "Iskanje"
-msgstr[1] "Iskanje"
-msgstr[2] "Iskanje"
-msgstr[3] "Iskanje"
-
-#: ../src/TagPopup.cs:36
-#: ../src/Widgets/TagMenu.cs:91
-msgid "Create New Tag..."
-msgstr "Ustvari novo značko ..."
-
-#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Uredi izbrane značke ..."
-
-#: ../src/TagPopup.cs:46
-msgid "Delete Tag"
-msgid_plural "Delete Tags"
-msgstr[0] "Izbriši značke"
-msgstr[1] "Izbriši značko"
-msgstr[2] "Izbriši znački"
-msgstr[3] "Izbriši značke"
-
-#: ../src/TagPopup.cs:52
-msgid "Attach Tag to Selection"
-msgid_plural "Attach Tags to Selection"
-msgstr[0] "Dodajanje značk izboru"
-msgstr[1] "Dodajanje značke izboru"
-msgstr[2] "Dodajanje značk izboru"
-msgstr[3] "Dodajanje značk izboru"
-
-#: ../src/TagPopup.cs:56
-msgid "Remove Tag From Selection"
-msgid_plural "Remove Tags From Selection"
-msgstr[0] "Odstranitev značk iz izbora"
-msgstr[1] "Odstranitev značke iz izbora"
-msgstr[2] "Odstranitev značk iz izbora"
-msgstr[3] "Odstranitev značk iz izbora"
-
-#: ../src/TagPopup.cs:62
-msgid "Merge Tags"
-msgstr "Združitev značk"
-
-#: ../src/TagQueryWidget.cs:34
-#, csharp-format
-msgid "Include Photos Tagged \"{0}\""
-msgstr "Vključitev fotografij označenih z \"{0}\""
-
-#: ../src/TagQueryWidget.cs:39
-#, csharp-format
-msgid "Exclude Photos Tagged \"{0}\""
-msgstr "Izključitev fotografij označenih z \"{0}\""
-
-#: ../src/TagQueryWidget.cs:44
-msgid "Remove From Search"
-msgstr "Odstrani iz iskanja"
-
-#: ../src/TagQueryWidget.cs:88
-#, csharp-format
-msgid "Find _With"
-msgid_plural "Find _With"
-msgstr[0] "Išči _z"
-msgstr[1] "Išči _z"
-msgstr[2] "Išči _z"
-msgstr[3] "Išči _z"
-
-#: ../src/TagQueryWidget.cs:114
-msgid "All"
-msgstr "Vse"
-
-#: ../src/TagQueryWidget.cs:149
-#: ../src/Term.cs:592
-#, csharp-format
-msgid "Not {0}"
-msgstr "Ne {0}"
-
-#: ../src/TagQueryWidget.cs:278
-msgid "Drag tags here to search for them"
-msgstr "Za iskanje po značkah je značke potrebno povleči sem"
-
-#: ../src/TagSelectionWidget.cs:497
-msgid "Error renaming tag"
-msgstr "Napaka preimenovanja značke"
-
-#: ../src/TagStore.cs:203
-msgid "Favorites"
-msgstr "Priljubljene"
-
-#: ../src/TagStore.cs:208
-msgid "Hidden"
-msgstr "Skrite"
-
-#: ../src/TagStore.cs:216
-msgid "People"
-msgstr "Ljudje"
-
-#: ../src/TagStore.cs:221
-msgid "Places"
-msgstr "Mesta"
-
-#: ../src/TagStore.cs:226
-msgid "Events"
-msgstr "Dogodki"
-
-#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239
-#: ../src/Widgets/InfoBox.cs:400
-msgid "(None)"
-msgstr "(Brez)"
-
-#: ../src/Term.cs:298
-msgid " and "
-msgstr "in"
-
-#. operators.Add (Catalog.GetString (" && "));
-#: ../src/Term.cs:300
-msgid ", "
-msgstr ","
-
-#: ../src/Term.cs:356
-msgid " or "
-msgstr " ali"
-
-#. OPS The operators we support, case insensitive
-#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:380
-#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
-#: ../src/Widgets/FindBar.cs:177
-msgid "or"
-msgstr "ali"
-
-#: ../src/ThumbnailCommand.cs:20
-msgid "Updating Thumbnails"
-msgstr "Posodabljanje sličic"
-
-#: ../src/ThumbnailCommand.cs:28
-#, csharp-format
-msgid "Updating picture \"{0}\""
-msgstr "Posodabljanje fotografije \"{0}\""
-
-#: ../src/UI.Dialog/AboutDialog.cs:71
-msgid "Photo management for GNOME"
-msgstr "Upravljanje fotografij za GNOME"
-
-#: ../src/UI.Dialog/AboutDialog.cs:72
-msgid "Copyright © 2003-2009 Novell Inc."
-msgstr "Avtorske pravice © 2003-2009 Novell Inc."
-
-#: ../src/UI.Dialog/AboutDialog.cs:95
-msgid "translator-credits"
-msgstr "Prevedel: Andrej Žnidaršič <andrej.znidarsic at gmail.com>"
-
-#: ../src/UI.Dialog/AboutDialog.cs:100
-msgid "F-Spot Website"
-msgstr "F-Spot spletišče"
-
-#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
-#, csharp-format
-msgid "Shift all photos by {0}"
-msgstr "Zamik vseh fotografij za {0}"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:99
-msgid "Today"
-msgstr "Danes"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:101
-msgid "Yesterday"
-msgstr "Včeraj"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:103
-msgid "Last 7 days"
-msgstr "Zadnjih 7 dni"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:105
-msgid "Last 30 days"
-msgstr "Zadnjih 30 dni"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:107
-msgid "Last 90 days"
-msgstr "Zadnjih 90 dni"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:109
-msgid "Last 360 days"
-msgstr "Zadnjih 360 dni"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:111
-msgid "Current Week (Mon-Sun)"
-msgstr "Trenutni Teden (Pon-Ned)"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:113
-msgid "Previous Week (Mon-Sun)"
-msgstr "Prejšnji Teden (Pon-Ned)"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:131
-msgid "Customized Range"
-msgstr "Razmerje po meri"
-
-#: ../src/UI.Dialog/EditTagIconDialog.cs:46
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "Urejanje ikone kot značke {0}"
-
-#: ../src/UI.Dialog/EditTagIconDialog.cs:68
-msgid "Select Photo from file"
-msgstr "Izberi fotografijo iz datoteke"
-
-#: ../src/UI.Dialog/EditTagIconDialog.cs:90
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-"\n"
-"<b>S Fotografije</b>\n"
-" Kot ikono za to značko lahko uporabite eno od fotografij iz vaše\n"
-" knjižnice. Najprej morate imeti vsaj eno fotografijo označeno\n"
-" s to značko. Prosimo označite fotografijo kot '{0}' in se vrnite sem,\n"
-"da jo lahko uporabite kot ikono."
-
-#: ../src/UI.Dialog/EditTagIconDialog.cs:168
-msgid "Unable to load image"
-msgstr "Ni mogoče naložiti slike."
-
-#: ../src/UI.Dialog/EditTagIconDialog.cs:169
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "Ni mogoče naložiti \"{0}\" kot ikono za značko"
-
-#: ../src/UI.Dialog/EditTagIconDialog.cs:207
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "Fotografija {0} od {1}"
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:24
-msgid "F-Spot Encountered a Fatal Error"
-msgstr "Prišlo je do usodne napake"
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:60
-msgid "Error Details"
-msgstr "Podrobnosti napake"
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:104
-msgid "An unhandled exception was thrown: "
-msgstr "Prišlo je do ne upravljane izjeme:"
-
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
-msgid "None"
-msgstr "Noben"
-
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
-msgid "System profile"
-msgstr "Sistemski profil"
-
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
-msgid "Standard theme"
-msgstr "Običajna tema"
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:20
-msgid "Error loading database."
-msgstr "Napaka med nalaganjem podatkovne zbirke"
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:21
-#, csharp-format
-msgid "F-Spot encountered an error while loading the photo database. The old database has be moved to {0} and a new database has been created."
-msgstr "Prišlo je do napake med nalaganjem podatkovne zbirke fotografij. Stara zbirka je bila premaknjena v {0}, zato je bila ustvarjena nova."
-
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
-msgid "Label"
-msgstr "Oznaka"
-
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
-msgid "Ratio"
-msgstr "Razmerje"
-
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
-msgid "Retry"
-msgstr "Poskusi ponovno"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
-msgid "0000:00:00 00:00:00"
-msgstr "0000:00:00 00:00:00"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
-msgid "00:00:00"
-msgstr "00:00:00"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
-msgid "5"
-msgstr "5"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
-msgid "<b>Action</b>"
-msgstr "<b>Dejanje</b>"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
-msgid "<b>Reference Photo</b>"
-msgstr "<b>Referenčna fotografija</b>"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
-msgid "Adjust Time"
-msgstr "Prilagodi čas"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
-msgid "Adjusted date: "
-msgstr "Prilagojen datum:"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
-msgid "Current date:"
-msgstr "Trenutni datum:"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
-msgid "Space all photos by"
-msgstr "Razmakne vse fotografije za"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
-msgid "difference:"
-msgstr "razlika:"
-
-#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
-msgid "min. Starting at {0}"
-msgstr "min. začetek pri {0}"
-
-#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
-msgid "<b>End Date</b>"
-msgstr "<b>Končni datum</b>"
-
-#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
-msgid "<b>Select period</b>"
-msgstr "<b>Izberi obdobje</b>"
-
-#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
-msgid "<b>Start Date</b>"
-msgstr "<b>Začetni datum</b>"
-
-#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
-msgid "Cancel, do not change the current timeline. "
-msgstr "Prekliči, ne spremeni trenutne časovnice."
-
-#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
-msgid "Only photos taken within these dates will be displayed."
-msgstr "Prikazane bodo samo fotografije znotraj teh datumov."
-
-#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
-msgid "Set date range"
-msgstr "Nastavi razpon datumov"
-
-#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
-msgid "<small></small>"
-msgstr "<small></small>"
-
-#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
-msgid "Edit Tag"
-msgstr "Urejanje značke"
-
-#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
-msgid "Edit icon"
-msgstr "Urejanje ikone"
-
-#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
-msgid "_Icon:"
-msgstr "_Ikona:"
-
-#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
-msgid "<b>From External Photo</b>"
-msgstr "<b>Iz zunanje fotografije</b>"
-
-#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
-msgid "<b>From Photo</b>"
-msgstr "<b>Iz fotografije</b>"
-
-#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
-msgid "<b>Predefined icons</b>"
-msgstr "<b>Pred določene ikone</b>"
-
-#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Predogled</b>"
-
-#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
-msgid "Design icon from"
-msgstr "Design ikone od "
-
-#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
-msgid "Edit Tag Icon"
-msgstr "Urejanje ikone značke"
-
-#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
-msgid "No _image"
-msgstr "Ni _slike"
-
-#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
-msgid "Photo 0 of 0"
-msgstr "Fotografija 0 od 0"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
-msgid "Color profile for display:"
-msgstr "Barvni profil za zaslon:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
-msgid "Color profile for printing:"
-msgstr "Barvni profil za tiskanje:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
-msgid "F-Spot Preferences"
-msgstr "F-Spot nastavitve"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
-msgid "F-Spot appearance:"
-msgstr "F-spot izgled:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
-msgid ""
-"Inside the image files when possible\n"
-"<small>Makes them accessible to other image-editing programs.</small>"
-msgstr ""
-"Znotraj slikovnih datotek, če je mogoče\n"
-"<small>To naredi slike dostopne ostalim programom za urejanje slik.</small>"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
-msgid "Select A Folder"
-msgstr "Izberi mapo"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
-msgid "Separately from the image files"
-msgstr "Ločeno od slikovnih datotek"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
-msgid "Store tags and descriptions for photos:"
-msgstr "Shranjevanje značke in opise fotografij:"
-
-#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
-msgid "When importing photos, copy them to:"
-msgstr "Pri uvažanju fotografij jih kopiraj v:"
-
-#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
-msgid "<b>Max Rating</b>"
-msgstr "<b>Najvišja Ocena</b>"
-
-#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
-msgid "<b>Min Rating</b>"
-msgstr "<b>Najnižja Ocena</b>"
-
-#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
-msgid "Set Rating Filter"
-msgstr "Nastavitev filtrov ocen"
-
-#: ../src/ui/main_window.ui.h:1
-msgid "Adjust _Time..."
-msgstr "Prilagodi _čas ..."
-
-#: ../src/ui/main_window.ui.h:2
-msgid "Arrange _by"
-msgstr "Uredi _po"
-
-#: ../src/ui/main_window.ui.h:4
-msgid "By _Date"
-msgstr "Po _datumu"
-
-#: ../src/ui/main_window.ui.h:5
-msgid "By _Import Roll"
-msgstr "Po _uvoznem zvitku"
-
-#: ../src/ui/main_window.ui.h:6
-msgid "By _Rating"
-msgstr "Po _oceni"
-
-#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Kopiraj _mesto"
-
-#: ../src/ui/main_window.ui.h:8
-msgid "Create New _Tag..."
-msgstr "Ustvari novo _značko ..."
-
-#: ../src/ui/main_window.ui.h:9
-msgid "Create _New Version..."
-msgstr "Ustvari _novo različico ..."
-
-#: ../src/ui/main_window.ui.h:10
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/ui/main_window.ui.h:11
-msgid "Fin_d"
-msgstr "Naj_di"
-
-#: ../src/ui/main_window.ui.h:12
-msgid "Manage _Extensions"
-msgstr "Upravljanje _razširitev"
-
-#: ../src/ui/main_window.ui.h:13
-msgid "Page Set_up..."
-msgstr "Nas_tavitve strani ..."
-
-#: ../src/ui/main_window.ui.h:14
-msgid "Re_fresh Thumbnail"
-msgstr "O_sveži sličico"
-
-#: ../src/ui/main_window.ui.h:19
-msgid "Select _None"
-msgstr "Izberi n_ič"
-
-#: ../src/ui/main_window.ui.h:20
-msgid "Send by _Mail..."
-msgstr "Pošlji po _pošti ..."
-
-#: ../src/ui/main_window.ui.h:22
-msgid "Side_bar"
-msgstr "Stranska v_rstica"
-
-#: ../src/ui/main_window.ui.h:23
-msgid "T_ags"
-msgstr "Zn_ačke"
-
-#: ../src/ui/main_window.ui.h:25
-msgid "Thumbnail _elements"
-msgstr "_Elementi sličic"
-
-#: ../src/ui/main_window.ui.h:26
-msgid "Too_lbar"
-msgstr "O_rodna vrstica"
-
-#: ../src/ui/main_window.ui.h:27
-msgid "View"
-msgstr "Pogled"
-
-#: ../src/ui/main_window.ui.h:33
-msgid "_Attach Tag to Selection"
-msgstr "_Pripni značko izboru"
-
-#: ../src/ui/main_window.ui.h:35
-msgid "_Clear Rating Filter"
-msgstr "_Počisti filter ocen"
-
-#: ../src/ui/main_window.ui.h:36
-msgid "_Clear Roll Filter"
-msgstr "_Počisti filter zvitkov"
-
-#: ../src/ui/main_window.ui.h:38
-msgid "_Components"
-msgstr "_Komponente"
-
-#: ../src/ui/main_window.ui.h:39
-msgid "_Contents"
-msgstr "_Vsebina"
-
-#: ../src/ui/main_window.ui.h:40
-msgid "_Dates"
-msgstr "_Datumi"
-
-#: ../src/ui/main_window.ui.h:42
-msgid "_Delete Selected Tag"
-msgstr "_Izbriši izbrano značko"
-
-#: ../src/ui/main_window.ui.h:43
-msgid "_Delete Version"
-msgstr "_Izbriši različico"
-
-#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Uredi izbrano značko ..."
-
-#: ../src/ui/main_window.ui.h:46
-msgid "_Export to"
-msgstr "_Izvozi v"
-
-#: ../src/ui/main_window.ui.h:47
-msgid "_Filmstrip"
-msgstr "_Filmski trak"
-
-#: ../src/ui/main_window.ui.h:50
-msgid "_Hidden"
-msgstr "_Skrite"
-
-#: ../src/ui/main_window.ui.h:51
-msgid "_Import..."
-msgstr "_Uvozi ..."
-
-#: ../src/ui/main_window.ui.h:52
-msgid "_Large"
-msgstr "_Velike"
-
-#: ../src/ui/main_window.ui.h:53
-msgid "_Last Import Roll"
-msgstr "_Zadnji uvozni zvitek"
-
-#: ../src/ui/main_window.ui.h:54
-msgid "_Loupe"
-msgstr "_Leča"
-
-#: ../src/ui/main_window.ui.h:55
-msgid "_Medium"
-msgstr "_Srednje"
-
-#: ../src/ui/main_window.ui.h:57
-msgid "_Quit"
-msgstr "_Izhod"
-
-#: ../src/ui/main_window.ui.h:58
-msgid "_Ratings"
-msgstr "_Ocene"
-
-#: ../src/ui/main_window.ui.h:60
-msgid "_Remove Tag From Selection"
-msgstr "_Odstrani značko iz izbora"
-
-#: ../src/ui/main_window.ui.h:61
-msgid "_Rename Version"
-msgstr "_Preimenuj različico"
-
-#: ../src/ui/main_window.ui.h:62
-msgid "_Reverse Order"
-msgstr "_Obratni vrstni red"
-
-#: ../src/ui/main_window.ui.h:63
-msgid "_Select Import Rolls..."
-msgstr "Izberi _uvozne zvitke"
-
-#: ../src/ui/main_window.ui.h:64
-msgid "_Set Date Range..."
-msgstr "Nastavi _razpon datumov ..."
-
-#: ../src/ui/main_window.ui.h:65
-msgid "_Set Rating filter..."
-msgstr "_Nastavi filter ocen ..."
-
-#: ../src/ui/main_window.ui.h:66
-msgid "_Sharpen..."
-msgstr "_Izostri ..."
-
-#: ../src/ui/main_window.ui.h:68
-msgid "_Small"
-msgstr "_Majhne"
-
-#: ../src/ui/main_window.ui.h:69
-msgid "_Tag Icons"
-msgstr "_Ikone značk"
-
-#: ../src/ui/main_window.ui.h:70
-msgid "_Tags"
-msgstr "_Značke"
-
-#: ../src/ui/main_window.ui.h:71
-msgid "_Timeline"
-msgstr "_Časovnica"
-
-#: ../src/ui/main_window.ui.h:72
-msgid "_Tools"
-msgstr "_Orodja"
-
-#: ../src/ui/main_window.ui.h:73
-msgid "_Untagged Photos"
-msgstr "_Neoznačene fotografije"
-
-#: ../src/ui/main_window.ui.h:74
-msgid "_Version"
-msgstr "_Različica"
-
-#: ../src/Updater.cs:616
-msgid "Updating F-Spot Database"
-msgstr "Posodabljanje F-Spot podatkovne zbirke"
-
-#: ../src/Updater.cs:617
-msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
-msgstr "Potrebno je počakati, da se podatkovna zbirka F-Spotove galerije do konca posodobi. Postopek je lahko dolgotrajen."
-
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:35
-msgid "Unable to create temporary file"
-msgstr "Ni mogoče ustvariti začasne datoteke "
-
-#: ../src/Widgets/CustomPrintWidget.cs:119
-msgid "Page Setup"
-msgstr "Nastavitve strani"
-
-#: ../src/Widgets/CustomPrintWidget.cs:123
-#: ../src/Widgets/CustomPrintWidget.cs:127
-#: ../src/Widgets/CustomPrintWidget.cs:133
-#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr "Velikost papirja: {0} x {1} mm"
-
-#: ../src/Widgets/CustomPrintWidget.cs:130
-msgid "Set Page Size and Orientation"
-msgstr "Nastavi velikost strani in usmerjenost"
-
-#: ../src/Widgets/CustomPrintWidget.cs:141
-msgid "Photos per page"
-msgstr "Fotografije na stran"
-
-#: ../src/Widgets/CustomPrintWidget.cs:151
-msgid "Repeat"
-msgstr "Ponovi"
-
-#: ../src/Widgets/CustomPrintWidget.cs:152
-msgid "Print cut marks"
-msgstr "Natisni oznake za izrez"
-
-#: ../src/Widgets/CustomPrintWidget.cs:158
-msgid "Photos layout"
-msgstr "Razporeditev fotografij"
-
-#: ../src/Widgets/CustomPrintWidget.cs:160
-msgid "Full Page (no margin)"
-msgstr "Polna stran (brez robov)"
-
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Widgets/CustomPrintWidget.cs:163
-msgid "Zoom"
-msgstr "Povečava"
-
-#: ../src/Widgets/CustomPrintWidget.cs:164
-msgid "Fill"
-msgstr "Zapolni"
-
-#: ../src/Widgets/CustomPrintWidget.cs:165
-msgid "Scaled"
-msgstr "Prilagojena velikost"
-
-#: ../src/Widgets/CustomPrintWidget.cs:170
-msgid "White borders"
-msgstr "Bela obroba"
-
-#: ../src/Widgets/CustomPrintWidget.cs:176
-msgid "Custom Text"
-msgstr "Besedilo po meri"
-
-#: ../src/Widgets/CustomPrintWidget.cs:180
-msgid "Photos infos"
-msgstr "Podrobnosti o fotografijah"
-
-#: ../src/Widgets/CustomPrintWidget.cs:182
-msgid "Print file name"
-msgstr "Natisni ime datoteke"
-
-#: ../src/Widgets/CustomPrintWidget.cs:183
-msgid "Print photo date"
-msgstr "Natisni datum posnetka fotografije"
-
-#: ../src/Widgets/CustomPrintWidget.cs:184
-msgid "Print photo time"
-msgstr "Natisni čas posnetka fotografije"
-
-#: ../src/Widgets/CustomPrintWidget.cs:185
-msgid "Print photo tags"
-msgstr "Natisni oznake fotografij"
-
-#: ../src/Widgets/CustomPrintWidget.cs:186
-msgid "Print photo comment"
-msgstr "Natisni opombe k fotografijam"
-
-#: ../src/Widgets/EditorPage.cs:29
-#: ../src/Widgets/Sidebar.cs:62
-msgid "Edit"
-msgstr "Urejanje"
-
-#: ../src/Widgets/EditorPage.cs:197
-msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
-msgstr "Orodje zahteva dejavno izbiro. Izberite ustrezno območje na fotografiji in poskusite ponovno."
-
-#: ../src/Widgets/EditorPage.cs:215
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] "Napaka med shranjevanjem prilagojenih fotografij"
-msgstr[1] "Napaka med shranjevanjem prilagojene fotografije"
-msgstr[2] "Napaka med shranjevanjem prilagojenih fotografij"
-msgstr[3] "Napaka med shranjevanjem prilagojenih fotografij"
-
-#: ../src/Widgets/EditorPage.cs:217
-#, csharp-format
-msgid "Received exception \"{0}\". Note that you have to develop RAW files into JPEG before you can edit them."
-msgstr "Prejeta izjema \"{0}\". RAW datoteke je potrebno pred urejanjem razviti v JPEG."
-
-#: ../src/Widgets/Filmstrip.cs:572
-msgid "_Horizontal"
-msgstr "_Vodoravno"
-
-#: ../src/Widgets/Filmstrip.cs:576
-msgid "_Vertical"
-msgstr "_Navpično"
-
-#: ../src/Widgets/FindBar.cs:58
-msgid "Find:"
-msgstr "Iskanje:"
-
-#: ../src/Widgets/FolderTreePage.cs:21
-msgid "Folders"
-msgstr "Mape"
-
-#: ../src/Widgets/FolderTreeView.cs:123
-msgid "Filesystem"
-msgstr "Datotečni sistem"
-
-#: ../src/Widgets/InfoBox.cs:182
-msgid "Histogram"
-msgstr "Histogram"
-
-#: ../src/Widgets/InfoBox.cs:217
-msgid "Date"
-msgstr "Datum"
-
-#: ../src/Widgets/InfoBox.cs:223
-msgid "Exposure"
-msgstr "Osvetljenost"
-
-#: ../src/Widgets/InfoBox.cs:227
-msgid "Focal Length"
-msgstr "Goriščna razdalja"
-
-#: ../src/Widgets/InfoBox.cs:233
-msgid "File Size"
-msgstr "Velikost datoteke"
-
-#: ../src/Widgets/InfoBox.cs:236
-msgid "Rating"
-msgstr "Ocena"
-
-#: ../src/Widgets/InfoBox.cs:409
-#: ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442
-#: ../src/Widgets/InfoBox.cs:451
-msgid "(Unknown)"
-msgstr "(Neznano)"
-
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr "(napačen zapis)"
-
-#: ../src/Widgets/InfoBox.cs:552
-#, csharp-format
-msgid "(One Edit)"
-msgid_plural "({0} Edits)"
-msgstr[0] "({0} urejanj)"
-msgstr[1] "({0} urejanje)"
-msgstr[2] "({0} urejanji)"
-msgstr[3] "({0} urejanja)"
-
-#: ../src/Widgets/InfoBox.cs:566
-msgid "(File read error)"
-msgstr "(Napaka pri branju datoteke)"
-
-#: ../src/Widgets/InfoBox.cs:611
-#, csharp-format
-msgid "{0} Photos"
-msgstr "{0} Fotografij"
-
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:631
-#, csharp-format
-msgid ""
-"On {0} between \n"
-"{1} and {2}"
-msgstr ""
-"Na {0} med \n"
-"{1} in {2}"
-
-#: ../src/Widgets/InfoBox.cs:636
-#, csharp-format
-msgid ""
-"Between {0} \n"
-"and {1}"
-msgstr ""
-"Med {0} \n"
-"in {1}"
-
-#: ../src/Widgets/InfoBox.cs:663
-msgid "(At least one File not found)"
-msgstr "(ni najdene niti ene datoteke)"
-
-#: ../src/Widgets/InfoBox.cs:780
-msgid "Show Photo Name"
-msgstr "Prikaži ime fotografije"
-
-#: ../src/Widgets/InfoBox.cs:789
-msgid "Show Date"
-msgstr "Prikaži datum"
-
-#: ../src/Widgets/InfoBox.cs:798
-msgid "Show Size"
-msgstr "Prikaži velikost"
-
-#: ../src/Widgets/InfoBox.cs:807
-msgid "Show Exposure"
-msgstr "Prikaži osvetlitev"
-
-#: ../src/Widgets/InfoBox.cs:816
-msgid "Show Focal Length"
-msgstr "Prikaži goriščno razdaljo"
-
-#: ../src/Widgets/InfoBox.cs:825
-msgid "Show Camera"
-msgstr "Prikaži fotoaparat"
-
-#: ../src/Widgets/InfoBox.cs:834
-msgid "Show File Size"
-msgstr "Prikaži velikost datotek"
-
-#: ../src/Widgets/MetadataDisplay.cs:23
-msgid "Metadata"
-msgstr "Metapodatki"
-
-#: ../src/Widgets/MetadataDisplay.cs:104
-msgid "Extended Metadata"
-msgstr "Razširjeni metapodatki"
-
-#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
-msgid "No Extended Metadata Available"
-msgstr "Razširjeni metapodatki niso na voljo"
-
-#: ../src/Widgets/MetadataDisplay.cs:410
-msgid "No active photo"
-msgstr "Ni dejavnih fotografij"
-
-#: ../src/Widgets/MetadataDisplay.cs:412
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "Fotografija \"{0}\" ne obstaja"
-
-#: ../src/Widgets/MetadataDisplay.cs:415
-msgid "No metadata available"
-msgstr "Metapodatki niso na voljo"
-
-#: ../src/Widgets/OpenWithMenu.cs:71
-msgid "No applications available"
-msgstr "Na voljo ni ustreznega programa"
-
-#: ../src/Widgets/RatingMenuItem.cs:56
-msgid "Rating:"
-msgstr "Ocena:"
-
-#: ../src/XmpTagsImporter.cs:91
-msgid "Country"
-msgstr "Država"
-
-#: ../src/XmpTagsImporter.cs:92
-msgid "City"
-msgstr "Mesto"
-
-#: ../src/XmpTagsImporter.cs:93
-msgid "State"
-msgstr "Stanje"
-
-#. namespace
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "Prikaže F-Spotovo diaprojekcijo"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "F-Spot fotografije"
-
-#~ msgid "<b>F-Spot tags</b>"
-#~ msgstr "<b>F-Spot značke</b>"
-#~ msgid "<b>Tabblo account</b>"
-#~ msgstr "<b>Tabblo račun</b>"
-#~ msgid ""
-#~ "<small><i>F-Spot tags can help you track the export status of photos. "
-#~ "Example: Use one tag for the photos that you plan to export, and another "
-#~ "one for those already exported. Here, you can tell F-Spot to "
-#~ "automatically replace these tags as appropriate.</i></small>"
-#~ msgstr ""
-#~ "<small><i>F-Spot značke lahko olajšajo sledenje izvoznemu statusu "
-#~ "fotografij. Primer: uporaba ene značke za fotografije, pripravljene na "
-#~ "izvoz in druge za fotografije, ki so bile že izvožene. Tukaj se nastavi "
-#~ "želena samodejna zamenjava značk.</i></small>"
-#~ msgid "Rem_ove from exported photos:"
-#~ msgstr "_Odstranitev iz izvoženih fotografij:"
-#~ msgid "Select..."
-#~ msgstr "Izberi ..."
-#~ msgid "_Attach to exported photos:"
-#~ msgstr "Pripni izvoženim fotogr_afijam:"
-#~ msgid "<b>{0}</b>."
-#~ msgstr "<b>{0}</b>."
-#~ msgid "A trust error occured while attempting to access"
-#~ msgstr "Med poskusom dostopa je prišlo do napake zaupanja"
-#~ msgid "Abort this session"
-#~ msgstr "Prekini to sejo"
-#~ msgid "Always trust this site's certificate"
-#~ msgstr "Vedno zaupaj certifikatu te strani"
-#~ msgid "Do you wish to:"
-#~ msgstr "Ali želite: "
-#~ msgid "Trust Error"
-#~ msgstr "Napaka zaupanja"
-#~ msgid "Trust the site's certificate this once"
-#~ msgstr "Zaupaj potrdilu te strani tokrat"
-#~ msgid "Dissolve"
-#~ msgstr "Raztapljanje"
-#~ msgid "Flip"
-#~ msgstr "Zrcaljenje"
-#~ msgid "Cover"
-#~ msgstr "Naslovnica"
-#~ msgid "Reveal"
-#~ msgstr "Razodeni"
-#~ msgid "Wipe"
-#~ msgstr "Dokončno počisti"
-#~ msgid "Split"
-#~ msgstr "Razdelitev"
-#~ msgid "Push"
-#~ msgstr "Potisk"
-
+# Andrej Žnidaršič <andrej.znidarsic at gmail.com>, 2009"
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: f-spot\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&component=General\n"
+"POT-Creation-Date: 2010-05-14 15:55+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Andrej Žnidaršič <andrej.znidarsic at gmail.com>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD ..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Prenos slik"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Prenašanje slike \"{0}\" na CD"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} od {1}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "Pošiljanje fotografij je končano"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Prenos končan"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "Napaka med prenosom"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "Napaka prenosa"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "kopiranje ..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>Obstaja nekaj razvrščenih datotek za zapis</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Fotografije za peko</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Samodejno vrtenje"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Ustvari CD"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Velikost"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Velikost "
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Brskaj po datotekah, ki so bile v razporedu"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Izvozi"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "_Zapiši le te fotografije na CD"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook ..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "Čakanje na overitev"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok\" below."
+msgstr ""
+"Program bo zagnal vaš brskalnik, zato da lahko preko spleta omogočite dovoljenja, ki ste jih izbrali.\n"
+"\n"
+"Ko bo Facebook zahteval vrnitev k programu, kliknite \"v redu\"."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "Določenih je preveč slik za izvoz"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid "Facebook only permits {0} photographs per album. Please refine your selection and try again."
+msgstr "Facebook omogoča le {0} fotografij na album. Treba je izpopolniti izbiro in poskusiti ponovno. "
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Nalaganje slik"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "Album mora imeti ime"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "Treba je poimenovati album ali izbrati obstoječi album."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "Ustvarjanje novega albuma je spodletelo"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"Med ustvarjanjem novega albuma je prišlo do napake.\n"
+"\n"
+"{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Nalaganje slike \"{0}\" ({1} od {2})"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Napaka med nalaganjem na Facebook: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Napaka"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Pošiljanje je končano"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Obisk skupine F-Spot na Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Čakanje na overitev"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok\" below. F-Spot will cache your session in gnome-keyring, if possible, and re-use it on future Facebook exports."
+msgstr ""
+"Program F-Spot bo zagnal brskalnik za prijavo v Facebook.\n"
+"\n"
+"Ko vas Facebook usmeri v vrnitev v ta program, kliknite \"Ok\" spodaj. F-Spot bo, če bo mogoče, vašo sejo shranil v gnome-keyring in jo ponovno uporabil pri prihodnjih izvozih v Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Overjanje ..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Napaka med prijavljanjem v Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid "There was a problem logging into Facebook. Check your credentials and try again."
+msgstr "Prišlo je do težav med prijavljanjem v Facebook. Preverite vaše geslo in poskusite ponovno. "
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Pooblaščanje seje"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "Seja zagnana, pridobivanje podrobnosti o uporabniku ..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "Seja zagnana, pridobivanje seznama prijateljev ..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "Seja zagnana, pridobivanje podrobnosti o prijateljih ..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "Seja zagnana, pridobivanje albumov fotografij ..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} je prijavljen v Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Napaka povezovanja s Facebook-om"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"Prišlo je do napake med nalaganjem vaših podrobnosti s Facebook-a.\n"
+"\n"
+"Javljena napaka: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Niste prijavljeni."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Samodejno potrjevanje fotografij"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Naslov"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Ustvari nov album"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Opis"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Izvozi v Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "Na tej fotografiji"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Mesto"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Prijava"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Odjava"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
+msgid "Name"
+msgstr "Ime"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Ni prijavljen"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Dovoljenja:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Ostani povezan"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Uporabi obstoječi album"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Kdo je to?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq ..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr ..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr ..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Pooblasti"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
+#, csharp-format
+msgid "Return to this window after you have finished the authorization process on {0} and click the \"Complete Authorization\" button below"
+msgstr "Po končanem postopku pooblastitve na {0} se je treba vrniti v to okno in klikniti gumb \"Končanje pooblastitve\" spodaj"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Končanje pooblastitve"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Prijavljanje v {0}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Preverjanje gesla ..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Dobrodošli {0}, povezani ste na {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Vpis kot drug uporabnik"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "Uporabljene {0} dovoljene {1} mesečne kvote."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Ni se mogoče prijaviti"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Čakanje na odziv {0} od {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "Nalaganje slike \"{0}\""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Napaka med nalaganjem k {0}: {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "Ni se mogoče prijaviti."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid "F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."
+msgstr "Ni se mogoče prijaviti na {0}. Prepričajte se, da ste dali pooblastitev z uporabno {0} vmesnika spletnega brskalnika."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Račun</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Fotografije</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Slog</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Dovoljenja za ogled</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "Izvoz"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "Izvoz _hierarhije oznak"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid "F-Spot needs your authorization in order to upload photos to your {0} account. Press the \"Authorize\" button to open a web browser and give F-Spot the authorization. "
+msgstr "F-Spot potrebuje pooblastitev za nalaganje fotografij na vaš {0} račun. Pritisnite gumb \"Pooblastitev\" za odprtje spletnega brskalnika in pooblastitev F-Spot-a"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "Prezri oznake _zgornjih ravni"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Zasebno"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Javno"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "Odstrani _metapodatke"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Vidno družini"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Vidno prijateljem"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "Izvoz znač_k"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "Sp_rememba velikosti v:"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "Ogled fotografij _v brskalniku po končanem nalaganju"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "točke"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "_Mapa ..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Izbor mape za izvoz"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "Gradnja Galerije"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "Napaka med nalaganjem slike \"{0}\" v galerijo: {2}{1}"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "Napaka: napaka med prenosom; preklicano"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Napaka: datoteka že obstaja; preklicano"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "Svetlo"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "Temno"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "Predhodni"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Kazalo"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376
+#: ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "Oznake"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58
+#: ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Naslednja"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "Galerija ustvarjena od"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "Pokaži sloge"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "Skrij sloge"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Oznake:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "Stran:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Cilj</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Metoda Izvoza</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "Ustvarjanje galerije z uporabo \"Originala\""
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "Ustvarjanje samostojne spletne _galerije"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "Op_is:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "Izvoz z_načk"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "Izvoz _ikon oznak"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Izvoz Mape"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "Ime G_alerije:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "_Odpiri cilj po končanem izvozu"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Mapa:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "_Shrani le datoteke"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "Spletno _Galerijo ..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Ni se mogoče povezati z galerijo neznane različice.\n"
+"Naložiti je treba vstavek Remote različice 1.0.8. ali kasnejše"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "Neveljaven URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "URL galerije ni veljaven URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "Med povezovanjem z Galerijo je prišlo do napake"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "Med poskusom prijave je prišlo do sledeče napake: {0}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "Galerija s tem imenom že obstaja"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid "There is already a Gallery with the same name in your registered Galleries. Please choose a unique name."
+msgstr "Galerija s tem imenom že obstaja v vpisanih galerijah. Izbrati je treba edinstveno ime."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "Vrhnja raven"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "Neveljavno ime Galerije"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Ime galerije vsebuje neveljavne znake.\n"
+"Dovoljene so le črke, številke ter - in _"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Napaka med nalaganjem slike \"{0}\" v galerijo: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(Ni Galerije)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(Ni Povezave)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(Ni Albumov)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Noben račun ni bil izbran"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Album</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Galerija</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr "<span weight='bold' size='larger'>Napaka med povezovanjem z Galerijo</span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "Izvozi _naslove in opombe"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "_Odpri album v brskalniku po končanem nalaganju"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Treba je potrditi, da so nastavitve za to galerijo pravilne."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "Ime _albuma:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "O_pis:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "Iz_voz v album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "Ime _Galerije:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Galerija:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "_Starševski album:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "_Geslo:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Naslov:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "_Uporabniško ime:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "Napaka med branjem odziva strežnika"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Strežnik je vrnil odgovor brez vsebine Galerije"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "Napaka med ustvarjanjem novega albuma"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"Med poskusom izvajanja zahtevanega opravila je prišlo do napake:\n"
+"{0} ({1})"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb ..."
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "Napaka med ustvarjanjem albuma"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid "The following error was encountered while attempting to create an album: {0}"
+msgstr "Med poskusom ustvarjanja albuma je prišlo do sledeče napake: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} Poslanih"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} od približno {1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Napaka med nalaganjem v Galerijo: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Prostor na voljo: {0}, uporabljenih {1}% od {2}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"Izbrani album ima mejo {0} slik,\n"
+"čemur bi zadostovala trenutna izbira {1} slik"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>PicasaWeb Izvoz</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>Vaš Google račun je zaklenjen</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Potrdite, da so nastavitve za to galerijo ustrezne.\n"
+"Vnesite črke, kot so prikazane na sliki v polju 'Captcha'\n"
+"<i>Velikost črk ni pomembna</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Javni Album"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "Naslov _Albuma:"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "S_amodejno vrtenje"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug ..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>SmugMug izvoz</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Račun:"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Nalaganje fotografije \"{0}\""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Prijavljanje v Tabblo"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Pridobivanje URL-ja za nalaganje"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo ..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "Pošiljanje fotografij je končano"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Pošiljanje je končano"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Napaka med nalaganjem v Tabblo:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot oznake</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo račun</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid "<small><i>F-Spot tags can help you track the export status of photos. Example: Use one tag for the photos that you plan to export, and another one for those already exported. Here, you can tell F-Spot to automatically replace these tags as appropriate.</i></small>"
+msgstr "<small><i>F-Spot oznake lahko olajšajo sledenje izvoznemu stanju fotografij. Primer: uporaba ene oznake za fotografije, pripravljene na izvoz in druge za fotografije, ki so bile že izvožene. Tukaj je mogoče nastaviti želeno samodejno zamenjava oznak.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Odstranitev iz izvoženih fotografij:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Izberi ..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "Pripni izvoženim fotogr_afijam:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Med poskusom dostopa je prišlo do napake zaupanja"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Prekini to sejo"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Vedno zaupaj potrdilu te strani"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Ali želite: "
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Napaka zaupanja"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Zaupaj potrdilu te strani tokrat"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "Stisnjena datot_eka ..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "Na voljo ni nobene izbire"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid "This tool requires an active selection. Please select one or more pictures and try again"
+msgstr "To orodje zahteva dejavno izbiro. Treba je izbrati eno ali več slik in poskusiti ponovno."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Izbor mape za izvoz"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Izvoz datotek"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Pripravljanje fotografije \"{0}\""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "_Ustvari"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "_Ime datoteke:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Mesto:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Merilo:"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid "In order to detect duplicates on pictures you imported before 0.5.0, F-Spot needs to analyze your image collection. This is not done by default as it's time consuming. You can Start or Pause this update process using this dialog."
+msgstr "Za zaznavanje dvojnikov slik, ki so bile uvožene pred 0.5.0, mora F-spot preučiti zbirko slik. To ni storjeno samodejno, ker vzame veliko časa. S tem pogovornim oknom se lahko postopek posodabljanja zažene ali začasno zaustavi."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid "You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr "Trenutno imate {0} fotografij, ki potrebujejo md5 izračun in {1} čakajočih služb"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75
+#: ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Zapri"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "Obdelava slik ..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "Zaustavljeno"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "Zaznaj dvojnike ..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Galerija F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Videti je, da je spletna galerija trenutno nepovezana"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Pokaži vse"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} fotografij"
+msgstr[1] "{0} fotografija"
+msgstr[2] "{0} fotografiji"
+msgstr[3] "{0} fotografije"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Trenutni pogled"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Izbrano"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Živa spletna galerija"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Galerija ostane dejavna dokler je ne izključite ali zaprete F-spot.\n"
+"Obidite posredniški strežnik HTTP in se prepričajte se, da lahko do nje dostopajo krajevni obiskovalci.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Ko je galerija dejavna, je mogoče do fotografij v souporabi\n"
+"dostopati preko zgornjega URL-ja"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Vklop in izklop spletne galerije"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Obiskovalcem dovoli dodajanje oznak"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Kopiraj URL na odložišče"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spot živa spletna galerija"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL galerije:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Omejitev fotografij v souporabi na"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Možnosti:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Fotografije z oznako"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Izbrane fotografije"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Souporaba:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Ogledov:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "brez"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galerija: {0}, fotografij: {1}, zadnji odjemalec: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Galerija je nedejavna"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Združi baze podatkov"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Napaka med odpiranjem izbrane datoteke"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"Izbrana datoteka ni veljavna ali podprta podatkovna zbirka.\n"
+"\n"
+"Prejeta je bila izjema \"{0}\"."
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid "<small><i>Choose the location of the database you want to import from</i></small>"
+msgstr "<small><i>Izbira mesta baze podatkov za uvažanje</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already imported from that database.</i></small>"
+msgstr ""
+"<small><i>Izbira uvoza iz izbrane baze podatkov.\n"
+"\"Samo novi zvitki\" je pametna možnost, ki se bo izognila ponovnemu uvažanju že uvoženih fotografij.\n"
+"\"Posamezni uvozni zvitek\" omogoča izbiro zvitka za združevanje.\n"
+"\"Vse\" uvozi vse in ustvari dvojnike, če so bile fotografije iz te baze podatkov že uvožene.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid "<small><i>Copy the images locally or keep them where they are. If you chose the later, be sure that this location will stay accessible from f-spot.</i></small>"
+msgstr "<small><i>Krajevno kopiranje slik ali izbira njihovega trenutnega mesta. V slednjem primeru se je treba prepričati, da bo to mesto ostalo dostopna iz f-spot-a.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "Posamezen uvozni zvitek"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Kopiranje slik v mapo fotografij"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Mesto podatkovne zbirke:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Vse"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Uvozi:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "Obdrži slike na njihovem originalnem mestu"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "Združitev druge F-Spot zbirke"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "Samo novi zvitki"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Preskoči"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>Podatkovna zbirka se navezuje na datoteke v mapi <b>{0}</b>.\n"
+"Izbrati je treba mapo za mapiranje.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "Nastavi ohranjevalnik zaslona"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Vse slike"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Zamik:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Zaslon:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Slike označene z:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "Naredi F-spot moj ohranjevalnik zaslona"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Nastavitve ohranjevalnika zaslona"
+
+#: ../f-spot.desktop.in.in.h:1
+#: ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1
+#: ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-spot upravljalnik fotografij"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Urejajte, uživajte in delite vaše fotografije."
+
+#: ../f-spot.desktop.in.in.h:4
+#: ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Upravljalnik fotografij"
+
+#: ../f-spot.schemas.in.h:1
+msgid "Display of transparent parts."
+msgstr "Prikaži prozorne dele."
+
+#: ../f-spot.schemas.in.h:2
+msgid "Enable this to allow interpolation on zoomed images."
+msgstr "Omogočite to za interpolacijo povečanih slik."
+
+#: ../f-spot.schemas.in.h:3
+msgid "Height of the import dialog."
+msgstr "Višina pogovornega okna uvoza."
+
+#: ../f-spot.schemas.in.h:4
+msgid "Height of the main window."
+msgstr "Višina glavnega okna."
+
+#: ../f-spot.schemas.in.h:5
+msgid "Height of the photo viewer window."
+msgstr "Višina okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:6
+msgid "If the 'transparency' option is set, the color specified in this option will be used as the transparent color when viewing images."
+msgstr "V primeru da je možnost 'prozornost' nastavljena, bo barva navedena v tej možnosti pri ogledu slik uporabljena kot prozorna barva."
+
+#: ../f-spot.schemas.in.h:7
+msgid "Interpolate image on zoom."
+msgstr "Interpolacija slike pri povečavi."
+
+#: ../f-spot.schemas.in.h:8
+msgid "Maximize the main window."
+msgstr "Razpne glavno okno."
+
+#: ../f-spot.schemas.in.h:9
+msgid "Maximize the photo viewer window."
+msgstr "Razpne okno pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:10
+msgid "Path to custom gtkrc for theming F-Spot."
+msgstr "Pot do gtkrc po meri za temo F-Spot."
+
+#: ../f-spot.schemas.in.h:11
+msgid "Show dates in the thumbnail view."
+msgstr "Pokaži datume v pogledu sličic."
+
+#: ../f-spot.schemas.in.h:12
+msgid "Show ratings in the thumbnail view."
+msgstr "Pokaži ocene v pogledu sličic."
+
+#: ../f-spot.schemas.in.h:13
+msgid "Show tags in the thumbnail view."
+msgstr "Pokaži oznake v pogledu sličic."
+
+#: ../f-spot.schemas.in.h:14
+msgid "Show the filename in the viewer window."
+msgstr "Pokaži ime datoteke v oknu pregledovalnika."
+
+#: ../f-spot.schemas.in.h:15
+msgid "Show the filmstrip in the main window."
+msgstr "Pokaži filmski trak v glavnem oknu."
+
+#: ../f-spot.schemas.in.h:16
+msgid "Show the sidebar in the main window."
+msgstr "Pokaži drsnik v glavnem oknu."
+
+#: ../f-spot.schemas.in.h:17
+msgid "Show the timeline in the main window."
+msgstr "Pokaži časovnico v glavnem oknu."
+
+#: ../f-spot.schemas.in.h:18
+msgid "Show the toolbar in the main window."
+msgstr "Pokaži orodno vrstico v glavnem oknu."
+
+#: ../f-spot.schemas.in.h:19
+msgid "Show the toolbar in the photo viewer window."
+msgstr "Pokaži ali skrij orodno vrstico v oknu pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:20
+msgid "Size of the tag icons shown in the sidebar."
+msgstr "Velikost ikon oznak pokazanih v stranski vrstici."
+
+#: ../f-spot.schemas.in.h:21
+msgid "The X position to use for the main window."
+msgstr "X položaj glavnega okna."
+
+#: ../f-spot.schemas.in.h:22
+msgid "The X position to use for the photo viewer window."
+msgstr "X položaj okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:23
+msgid "The Y position to use for the main window."
+msgstr "Y položaj glavnega okna."
+
+#: ../f-spot.schemas.in.h:24
+msgid "The Y position to use for the photo viewer window."
+msgstr "Y položaj okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:25
+msgid "The color to use for transparent parts."
+msgstr "Barva za prozorne dele."
+
+#: ../f-spot.schemas.in.h:26
+msgid "The height dimension to use for the import dialog."
+msgstr "Višina pogovornega okna."
+
+#: ../f-spot.schemas.in.h:27
+msgid "The height dimension to use for the main window."
+msgstr "Višina glavnega okna."
+
+#: ../f-spot.schemas.in.h:28
+msgid "The height dimension to use for the photo viewer window."
+msgstr "Višina okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:29
+msgid "The orientation of the filmstrip, if shown."
+msgstr "Usmeritev filmskega traku, če je prikazan."
+
+#: ../f-spot.schemas.in.h:30
+msgid "The orientation of the filmstrip."
+msgstr "Usmeritev filmskega traku."
+
+#: ../f-spot.schemas.in.h:31
+msgid "The size (width) of the sidebar in the main window."
+msgstr "Velikost (širina) drsnika v glavnemu oknu."
+
+#: ../f-spot.schemas.in.h:32
+msgid "The size of the sidebar in the main window."
+msgstr "Velikost drsnika v glavnemu oknu."
+
+#: ../f-spot.schemas.in.h:33
+msgid "The width dimension to use for the import dialog."
+msgstr "Širina pogovornega okna uvoza."
+
+#: ../f-spot.schemas.in.h:34
+msgid "The width dimension to use for the main window."
+msgstr "Širina glavnega okna."
+
+#: ../f-spot.schemas.in.h:35
+msgid "The width dimension to use for the photo viewer window."
+msgstr "Širina okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:36
+msgid "Use the current photo's filename as the viewer window's title."
+msgstr "Uporabi ime datoteke trenutne slike kot naslov okna pregledovalnika."
+
+#: ../f-spot.schemas.in.h:37
+msgid "Width of the import dialog."
+msgstr "Širina pogovornega okna uvoza."
+
+#: ../f-spot.schemas.in.h:38
+msgid "Width of the main window."
+msgstr "Širina glavnega okna."
+
+#: ../f-spot.schemas.in.h:39
+msgid "Width of the photo viewer window."
+msgstr "Širina okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:40
+msgid "Width of the preview image pane in the import dialog."
+msgstr "Širina pladnja predogleda slike v pogovornemu oknu."
+
+#: ../f-spot.schemas.in.h:41
+msgid "X position of the main window."
+msgstr "X položaj glavnega okna"
+
+#: ../f-spot.schemas.in.h:42
+msgid "X position of the photo viewer window."
+msgstr "X položaj okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:43
+msgid "Y position of the main window."
+msgstr "Y položaj glavnega okna"
+
+#: ../f-spot.schemas.in.h:44
+msgid "Y position of the photo viewer window."
+msgstr "Y položaj okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:45
+msgid "You can choose how to display transparent parts in images. This option has no effect on photos but setting this value to CHECK_PATTERN or CUSTOM_COLOR could be useful when viewing icons or other artwork with transparent parts."
+msgstr "Mogoče je izbrati način prikaza prozornih delov slik. Ta možnost ne vpliva na fotografije, vendar je lahko nastavitev te vrednosti na črtast vzroec ali barva po izbira koristna pri ogledu ikon in ostalih delov grafične podobe s prozornimi deli."
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Uvoz v F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-_Spot preledovalnik fotografij"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Pregledovalnik fotografij"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441
+#: ../src/RotateCommand.cs:224
+msgid "File not found"
+msgstr "Datoteke ni mogoče najti"
+
+#: ../lib/libfspot/f-jpeg-utils.c:464
+#, c-format
+msgid "Unknown transform type %d"
+msgstr "Neznana vrsta pretvorbe %d"
+
+#: ../lib/libfspot/f-jpeg-utils.c:472
+msgid "Operation failed"
+msgstr "Dejanje ni uspelo"
+
+#: ../src/CameraFileSelectionDialog.cs:76
+msgid "Preview"
+msgstr "Predogled"
+
+#: ../src/CameraFileSelectionDialog.cs:78
+msgid "Path"
+msgstr "Pot"
+
+#: ../src/CameraFileSelectionDialog.cs:80
+#: ../src/f-spot.glade.h:47
+msgid "File"
+msgstr "Datoteka"
+
+#: ../src/CameraFileSelectionDialog.cs:102
+msgid "Select Tag"
+msgstr "Izbor oznake"
+
+#: ../src/CameraFileSelectionDialog.cs:138
+msgid "Downloading Previews"
+msgstr "Nalaganje predogledov"
+
+#: ../src/CameraFileSelectionDialog.cs:148
+#, csharp-format
+msgid "Downloading Preview of {0}"
+msgstr "Nalaganje predogleda {0}"
+
+#: ../src/CameraFileSelectionDialog.cs:220
+#, csharp-format
+msgid "Copying file {0} of {1}"
+msgstr "Kopiranje datoteke {0} od {1}"
+
+#: ../src/CameraFileSelectionDialog.cs:235
+msgid "Error transferring file"
+msgstr "Napaka med prenosom datoteke"
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Download Complete"
+msgstr "Prenos končan"
+
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Kopiranje datotek končano"
+
+#: ../src/CameraFileSelectionDialog.cs:268
+#, csharp-format
+msgid "Transferring \"{0}\" from camera"
+msgstr "Prenašanje \"{0}\" s fotoaparata"
+
+#: ../src/CameraSelectionDialog.cs:29
+#: ../src/Widgets/InfoBox.cs:231
+msgid "Camera"
+msgstr "Fotoaparat"
+
+#: ../src/CameraSelectionDialog.cs:30
+msgid "Port"
+msgstr "Vrata"
+
+#: ../src/Core/App.cs:278
+#, csharp-format
+msgid "No photos matching {0} found"
+msgstr "Fotografije, ki se sklada z {0}, ni bilo mogoče najti"
+
+#: ../src/Core/App.cs:279
+#, csharp-format
+msgid ""
+"The tag \"{0}\" is not applied to any photos. Try adding\n"
+"the tag to some photos or selecting a different tag in the\n"
+"F-Spot preference dialog."
+msgstr ""
+"Oznaka \"{0}\" ni uporabljena. Poskusite z dodajanjem\n"
+"oznake fotografijam ali izberite drugo značko v\n"
+"pogovornem oknu F-Spot možnosti."
+
+#: ../src/Core/App.cs:283
+msgid "Search returned no results"
+msgstr "Iskanje ni vrnilo rezultatov"
+
+#: ../src/Core/App.cs:284
+msgid ""
+"The tag F-Spot is looking for does not exist. Try\n"
+"selecting a different tag in the F-Spot preference\n"
+"dialog."
+msgstr ""
+"Oznaka, ki jo išče F-Spot, ne obstaja. Poskusite\n"
+"z izborom druge oznake v pogovornem oknu \n"
+"F-Spot možnosti."
+
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Core/Photo.cs:473
+msgid "Reparented"
+msgstr "Različica slike "
+
+#: ../src/Core/Photo.cs:473
+#, csharp-format
+msgid "Reparented ({0})"
+msgstr "Različica slike ({0})"
+
+#: ../src/Core/Photo.cs:492
+#, csharp-format
+msgid "Modified"
+msgid_plural "Modified ({0})"
+msgstr[0] "Spremenjenih ({0})"
+msgstr[1] "Spremenjena ({0})"
+msgstr[2] "Spremenjeni ({0})"
+msgstr[3] "Spremenjene ({0})"
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1}"
+msgstr "Spremenjena v {1}"
+
+#: ../src/Core/Photo.cs:513
+#, csharp-format
+msgid "Modified in {1} ({0})"
+msgstr "Spremenjena v {1} ({0})"
+
+#. Note that the original version is never stored in the photo_versions table in the
+#. database.
+#: ../src/Core/Photo.cs:671
+#: ../src/f-spot.glade.h:62
+msgid "Original"
+msgstr "Izvorno"
+
+#: ../src/Editors/AutoStretchEditor.cs:17
+msgid "Auto Color"
+msgstr "Samodejna barva"
+
+#: ../src/Editors/ColorEditor.cs:38
+msgid "Adjust Colors"
+msgstr "Prilagajanje barv"
+
+#: ../src/Editors/ColorEditor.cs:41
+msgid "Adjust"
+msgstr "Prilagodi"
+
+#: ../src/Editors/CropEditor.cs:35
+msgid "4 x 3 (Book)"
+msgstr "4 x 3 (knjiga)"
+
+#: ../src/Editors/CropEditor.cs:36
+msgid "4 x 6 (Postcard)"
+msgstr "4 x 6 (razglednica)"
+
+#: ../src/Editors/CropEditor.cs:37
+msgid "5 x 7 (L, 2L)"
+msgstr "5 x 7 (L, 2L)"
+
+#: ../src/Editors/CropEditor.cs:38
+msgid "8 x 10"
+msgstr "8 x 10"
+
+#: ../src/Editors/CropEditor.cs:39
+msgid "Square"
+msgstr "Kvadrat"
+
+#: ../src/Editors/CropEditor.cs:42
+msgid "Crop"
+msgstr "Obreži"
+
+#: ../src/Editors/CropEditor.cs:73
+msgid "Select the area that needs cropping."
+msgstr "Izbor območja za obrez"
+
+#: ../src/Editors/CropEditor.cs:98
+msgid "No Constraint"
+msgstr "Brez omejitev"
+
+#: ../src/Editors/CropEditor.cs:99
+msgid "Same as photo"
+msgstr "Enako kot fotografija"
+
+#: ../src/Editors/CropEditor.cs:104
+msgid "Custom Ratios..."
+msgstr "Razmerja velikosti po meri"
+
+#: ../src/Editors/DesaturateEditor.cs:17
+msgid "Desaturate"
+msgstr "Zmanjšaj nasičenje"
+
+#: ../src/Editors/RedEyeEditor.cs:19
+msgid "Red-eye Reduction"
+msgstr "Popravek rdečih oči"
+
+#: ../src/Editors/RedEyeEditor.cs:21
+msgid "Fix!"
+msgstr "Popravi"
+
+#: ../src/Editors/RedEyeEditor.cs:25
+msgid "Select the eyes you wish to fix."
+msgstr "Izberite oči za popravilo."
+
+#: ../src/Editors/SepiaEditor.cs:17
+msgid "Sepia Tone"
+msgstr "Sepia učinek staranja"
+
+#: ../src/Editors/SoftFocusEditor.cs:32
+msgid "Soft Focus"
+msgstr "Mehka izostritev"
+
+#: ../src/Editors/TiltEditor.cs:30
+msgid "Straighten"
+msgstr "Poravnava"
+
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "Napaka uvažanja"
+
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Napaka med uvažanjem {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70
+#: ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Ni načina za shranjevanje datotek vrste \"{0}\""
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Nesprejeta napaka"
+
+#: ../src/FSpot.addin.xml.h:1
+msgid "Copy Photo"
+msgstr "Kopiranj fotografijo"
+
+#: ../src/FSpot.addin.xml.h:2
+msgid "Export to"
+msgstr "Izvoz v"
+
+#: ../src/FSpot.addin.xml.h:3
+msgid "Open _With"
+msgstr "Odpri _z"
+
+#: ../src/FSpot.addin.xml.h:4
+#: ../src/ui/main_window.ui.h:15
+msgid "Rem_ove Tag"
+msgstr "Ods_trani oznako"
+
+#: ../src/FSpot.addin.xml.h:5
+#: ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425
+#: ../src/ui/main_window.ui.h:16
+msgid "Rotate _Left"
+msgstr "Zavrti _levo"
+
+#: ../src/FSpot.addin.xml.h:6
+#: ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426
+#: ../src/ui/main_window.ui.h:17
+msgid "Rotate _Right"
+msgstr "Zavrti _desno"
+
+#: ../src/FSpot.addin.xml.h:7
+msgid "Tools"
+msgstr "Orodja"
+
+#: ../src/FSpot.addin.xml.h:8
+#: ../src/ui/main_window.ui.h:32
+msgid "_Attach Tag"
+msgstr "_Pripni oznake"
+
+#: ../src/FSpot.addin.xml.h:9
+#: ../src/ui/main_window.ui.h:41
+msgid "_Delete From Drive"
+msgstr "Iz_briši z diska"
+
+#: ../src/FSpot.addin.xml.h:10
+#: ../src/ui/main_window.ui.h:59
+msgid "_Remove From Catalog"
+msgstr "_Odstrani iz kataloga"
+
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
+
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
+
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
+
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>Pop_ravki</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Interpolacija slike</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Velikost</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Povzetek</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Prozorni deli</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Ogled vseh uvoženih slik</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b> _Ravnotežje bele barve </b>"
+
+#: ../src/f-spot.glade.h:21
+msgid "<small><i>Enable this to allow interpolation on zoomed images. You shouldn't disable this for viewing photos, but disabling the interpolation could be usefull in icon design.</i></small>"
+msgstr "<small><i>Možnost omogoča interpolacijo približanih slik. Onemogočanje ni priporočeno za ogled fotografij, toda onemogočanje interpolacije bi lahko bilo uporabno pri oblikovanju ikon.</i></small>"
+
+#: ../src/f-spot.glade.h:22
+msgid "<small><i>You can choose how to display transparent parts in images. This option has no effect on photos, but setting this as check pattern or custom color could be usefull when viewing icons or other artworks with transparent parts.</i></small>"
+msgstr "<small><i>Mogoče je izbrati način prikaza prozornih delov slik. Ta možnost ne vpliva na fotografije, vendar je lahko koristna pri ogledu ikon in ostalih delov grafične podobe s prozornimi deli.</i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "Kot _ozadje"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "Kot barvo _po meri"
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "Kot preizkusni _vzorec"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Pripenjanje oznak:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Pripenjanje oznake:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "K_ontrast:"
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_CD ..."
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "Izbira fotoaparata"
+
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "Kopiranje datotek v mapo fotografij"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "Ustvari sporočilo"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr "Ustvari _ikono za to oznako ob prvi uporabi"
+
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "Ustvari sporočilo s pripetimi fotografijami (po možnosti spremenjenih velikosti)"
+
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr "Zaznavanje dvojnikov"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "Prikaz imen _datotek"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "Prikaz le tistih fotografij, ki so bile uvožene v določenih zvitkih."
+
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "Ne pošlji pošte"
+
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "_E-pošta:"
+
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "Izvozi _naslove in opombe"
+
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "Ocenjena nova velikost"
+
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "Zelo velika"
+
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "F-Spot pogled"
+
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr "Filter na izbranih zvitkih"
+
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "G_alerija:"
+
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "Galerija"
+
+#: ../src/f-spot.glade.h:51
+#: ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Uvozi"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "Uvozni vir:"
+
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "_Upoštevaj podmape"
+
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "Velika"
+
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr "Upravljanje razmerij za izbiranje po meri"
+
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "Srednja"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "Število slik v izbranih zvitkih:"
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "Število slik"
+
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "Odpri _Mapo ..."
+
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "Originalna velikost (mogoče zelo velika velikost datotek)"
+
+#: ../src/f-spot.glade.h:64
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "N_adrejena oznaka:"
+
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "Premor"
+
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "Možnosti"
+
+#: ../src/f-spot.glade.h:67
+#: ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Predhodni"
+
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "Popravi"
+
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr "Izbor fotografij za kopiranje s fotoaparata"
+
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "Izbor oznake ..."
+
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "Izbor fotoaparata za prenos datotek"
+
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "Izbran fotoaparat:"
+
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "Izbira omejitev"
+
+#: ../src/f-spot.glade.h:76
+#: ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "Nastavi kot _ozadje"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "Pokaži vseh fotografije."
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "Pokaži ali skrij stranski pladenj"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "Pokaži ali skrij orodno vrstico"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "_Stranski pladenj"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "Majhna"
+
+#: ../src/f-spot.glade.h:82
+msgid "Specify if an original size picture should be rotated or not. Smaller sizes are automatically rotated."
+msgstr "Določa ali naj bo originalna slika zavrtena ali ne. Manjše velikosti so samodejno zavrtene."
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "Odstrani _metapodatke slike"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr "Zač_asno:"
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "Drobcena"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr "Skupna osnovna velikost"
+
+#: ../src/f-spot.glade.h:88
+#: ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "_Približaj"
+
+#: ../src/f-spot.glade.h:89
+#: ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "_Oddalji"
+
+#: ../src/f-spot.glade.h:90
+#: ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Približaj"
+
+#: ../src/f-spot.glade.h:91
+#: ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Oddalji"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "Svet_lost:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "Ustvari sporočilo"
+
+#: ../src/f-spot.glade.h:94
+#: ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "Izpos_tavljenost:"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100
+#: ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "_Celozaslonski način"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Galerija"
+
+#: ../src/f-spot.glade.h:102
+#: ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "Po_moč"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "_Odtenek:"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "_Interpolacija slike pri približanju"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Novo Okno"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "_Odpri album v brskalniku po končanem nalaganju"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "_Odpiri cilj po končanem izvozu"
+
+#: ../src/f-spot.glade.h:108
+#: ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Fotografija"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "N_asičenost:"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "_Spreminjanje velikosti fotografij na ne več kot: "
+
+#: ../src/f-spot.glade.h:112
+#: ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "_Predstavitev"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "O_dstrani metapodatke"
+
+#: ../src/f-spot.glade.h:114
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "Ime _oznake:"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "_Črnilo"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "_Orodna vrstica"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118
+#: ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "_Pogled"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "_Navidezni datotečni sistem"
+
+#: ../src/f-spot.glade.h:120
+#: ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "in"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"na\n"
+"za\n"
+"med"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
+
+#: ../src/FullScreenView.cs:58
+msgid "Hide"
+msgstr "Skrij"
+
+#: ../src/FullScreenView.cs:60
+msgid "Hide Toolbar"
+msgstr "Skrij orodno vrstico"
+
+#: ../src/FullScreenView.cs:66
+msgid "Info"
+msgstr "Podrobnosti"
+
+#: ../src/FullScreenView.cs:68
+#: ../src/Widgets/InfoBox.cs:201
+msgid "Image Information"
+msgstr "Podrobnosti o sliki"
+
+#: ../src/FullScreenView.cs:73
+msgid "Exit fullscreen"
+msgstr "Izhod iz celozaslonskega načina"
+
+#: ../src/FullScreenView.cs:81
+#: ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
+msgid "Slideshow"
+msgstr "Predstavitev"
+
+#: ../src/FullScreenView.cs:82
+msgid "Start slideshow"
+msgstr "Zagon diapredstavitve"
+
+#: ../src/FullScreenView.cs:128
+msgid "Slide transition:"
+msgstr "Prehodi med diapozitivi:"
+
+#: ../src/GroupSelector.cs:57
+#: ../src/GroupSelector.cs:58
+msgid "More dates"
+msgstr "Več datumov"
+
+#: ../src/GroupSelector.cs:60
+#: ../src/GroupSelector.cs:61
+msgid "More"
+msgstr "Več"
+
+#: ../src/GroupSelector.cs:517
+#: ../src/ui/main_window.ui.h:34
+msgid "_Clear Date Range"
+msgstr "_Čiščenje datumskega območja"
+
+#: ../src/Imaging/Exif.cs:228
+msgid "Image Directory"
+msgstr "Mapa slik"
+
+#: ../src/Imaging/Exif.cs:230
+msgid "Thumbnail Directory"
+msgstr "Mapa sličic"
+
+#: ../src/Imaging/Exif.cs:232
+msgid "Exif Directory"
+msgstr "Exif mapa"
+
+#: ../src/Imaging/Exif.cs:234
+msgid "GPS Directory"
+msgstr "GPS mapa"
+
+#: ../src/Imaging/Exif.cs:236
+msgid "InterOperability Directory"
+msgstr "Mapa vzajemnega delovanja"
+
+#: ../src/Imaging/Exif.cs:238
+msgid "Unknown Directory"
+msgstr "Neznana mapa"
+
+#: ../src/Imaging/ImageFile.cs:117
+msgid "Writing to this file format is not supported"
+msgstr "Pisanje v to vrsto datoteke ni podprto"
+
+#: ../src/Imaging/IptcFile.cs:145
+msgid "IPTC Information Interchange Model (IIM) Version number"
+msgstr "Številka različice IPTC Informacijsko Izmenjalnega Modela (IIM) "
+
+#: ../src/Imaging/IptcFile.cs:147
+msgid "OSI Destination routing information"
+msgstr "OSI podrobnosti o potovanju do cilja"
+
+#: ../src/Imaging/IptcFile.cs:149
+msgid "IPTC file format"
+msgstr "IPTC vrsta datoteke"
+
+#: ../src/Imaging/IptcFile.cs:151
+msgid "Identifies the provider and product"
+msgstr "Določa ponudnika in izdelek"
+
+#: ../src/Imaging/IptcFile.cs:153
+msgid "A unique number identifying the envelope"
+msgstr "Edinstveno število za določevanje ovojnice"
+
+#: ../src/Imaging/IptcFile.cs:155
+msgid "A unique number"
+msgstr "Edinstveno število"
+
+#: ../src/Imaging/IptcFile.cs:157
+msgid "The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
+msgstr "Prednost upravljanja ovojnice med 1 (najbolj nujno) in 9 (najmanj nujno)"
+
+#: ../src/Imaging/IptcFile.cs:159
+msgid "The year, month and day (CCYYMMDD) the service sent the material"
+msgstr "Leto, mesec in dan (LLLLMMDD), ko je storitev poslala material"
+
+#: ../src/Imaging/IptcFile.cs:161
+msgid "The hour, minute and second (HHMMSS) the service sent the material"
+msgstr "Ura, minuta in sekunda (UUMMSS), ko je storitev poslala material."
+
+#: ../src/Imaging/IptcFile.cs:163
+msgid "The character set designation"
+msgstr "Imenovanje niza znakov"
+
+#: ../src/Imaging/IptcFile.cs:165
+msgid "External globally unique object identifier"
+msgstr "Zunanje edinstveno določilo predmeta"
+
+#: ../src/Imaging/IptcFile.cs:170
+msgid "Abstract Relationship Method (ARM) identifier"
+msgstr "Določilo metode abstraktnega razmerja (ARM)"
+
+#: ../src/Imaging/IptcFile.cs:172
+msgid "Abstract Relationship Method (ARM) version number."
+msgstr "Številka različice metode abstraktnega razmerja (ARM)"
+
+#: ../src/Imaging/IptcFile.cs:175
+msgid "Number identifying the IIM version this application record uses"
+msgstr "Številka različice IIM, ki jo uporablja programski zapis"
+
+#: ../src/Imaging/IptcFile.cs:177
+msgid "Object type reference"
+msgstr "Sklic vrste predmeta"
+
+#: ../src/Imaging/IptcFile.cs:182
+msgid "Object attribute reference"
+msgstr "Sklic atributov predmeta"
+
+#: ../src/Imaging/IptcFile.cs:188
+#: ../src/Imaging/IptcFile.cs:192
+msgid "Object name"
+msgstr "Ime predmeta"
+
+#: ../src/Imaging/IptcFile.cs:190
+msgid "Status of the objectdata according to the provider"
+msgstr "Stanje podatkov predmeta glede na ponudnika"
+
+#: ../src/Imaging/IptcFile.cs:194
+msgid "Location within a city or area where the object originates"
+msgstr "Kraj znotraj mesta ali območja od koder izvira vsebina"
+
+#: ../src/Imaging/IptcFile.cs:197
+msgid "Name of the city the content is focussing on"
+msgstr "Ime mesta na katerega se osredotoča vsebina"
+
+#: ../src/Imaging/IptcFile.cs:200
+msgid "Copyright information for"
+msgstr "Podrobnosti avtorskih pravic za "
+
+#: ../src/Imaging/IptcFile.cs:203
+msgid "Full name of the country of the focus of the content"
+msgstr "Polno ime države in osredotočenost vsebine"
+
+#: ../src/Imaging/IptcFile.cs:206
+msgid "Two or three letter ISO3166 code of the country of the focus of the content"
+msgstr "Dvo ali tri črkovna ISO3166 koda države in osredotočenost vsebine"
+
+#: ../src/Imaging/IptcFile.cs:209
+msgid "Creator of the content"
+msgstr "Ustvarjalec vsebine"
+
+#: ../src/Imaging/IptcFile.cs:212
+msgid "Provider of the object"
+msgstr "Ponudnik predmeta"
+
+#: ../src/Imaging/IptcFile.cs:215
+msgid "The title of the author or creator"
+msgstr "Naslov avtorja ali ustvarjalca"
+
+#: ../src/Imaging/IptcFile.cs:218
+msgid "The person involved in writing, editing or correcting the object data or caption/abstract"
+msgstr "Oseba vključena v pisanje, urejanje ali popravljanje podatkov o predmetu ali obnove"
+
+#: ../src/Imaging/IptcFile.cs:222
+msgid "Headline of the content"
+msgstr "Naslovnica vsebine"
+
+#: ../src/Imaging/IptcFile.cs:225
+msgid "Instructions from the creator to the receiver not covered by other fields"
+msgstr "Navodila od ustvarjalca za uporabnika, ki niso opredeljena z drugimi polji"
+
+#: ../src/Imaging/IptcFile.cs:228
+msgid "Intellectual genre of the object"
+msgstr "Intelektualna zvrst predmeta"
+
+#: ../src/Imaging/IptcFile.cs:241
+msgid "Unknown IIM DataSet"
+msgstr "Neznan IIM niz podatkov"
+
+#: ../src/ImportCommand.cs:48
+#: ../src/SingleView.cs:344
+msgid "Select Folder"
+msgstr "Izbor mape"
+
+#: ../src/ImportCommand.cs:259
+msgid "(No Cameras Detected)"
+msgstr "(Ni zaznanih fotoaparatov)"
+
+#: ../src/ImportCommand.cs:404
+#, csharp-format
+msgid "Loading {0} of {1}"
+msgstr "Nalaganje {0} od {1}"
+
+#: ../src/ImportCommand.cs:470
+msgid "Done Loading"
+msgstr "Nalaganje končano"
+
+#: ../src/ImportCommand.cs:684
+msgid "Directory does not exist."
+msgstr "Mapa ne obstaja"
+
+#: ../src/ImportCommand.cs:685
+#, csharp-format
+msgid "The directory you selected \"{0}\" does not exist. Please choose a different directory"
+msgstr "Mapa \"{0}\", ki ste jo izbrali, ne obstaja. Izberite drugo mapo."
+
+#: ../src/ImportCommand.cs:738
+#: ../src/ImportCommand.cs:740
+#: ../src/XmpTagsImporter.cs:89
+msgid "Imported Tags"
+msgstr "Uvožene oznake"
+
+#: ../src/ItemAction.cs:79
+#: ../src/MainWindow.cs:308
+#: ../src/SingleView.cs:71
+msgid "Rotate Left"
+msgstr "Zavrti levo"
+
+#: ../src/ItemAction.cs:80
+msgid "Rotate picture left"
+msgstr "Vrtenje slike levo"
+
+#: ../src/ItemAction.cs:91
+#: ../src/MainWindow.cs:312
+#: ../src/SingleView.cs:76
+msgid "Rotate Right"
+msgstr "Zavrti desno"
+
+#: ../src/ItemAction.cs:92
+msgid "Rotate picture right"
+msgstr "Vrtenje slike desno"
+
+#: ../src/ItemAction.cs:103
+msgid "Next picture"
+msgstr "Naslednja slika"
+
+#: ../src/ItemAction.cs:124
+msgid "Previous picture"
+msgstr "Predhodna slika"
+
+#: ../src/MainWindow.cs:303
+msgid "Import new images"
+msgstr "Uvoz novih slik"
+
+#: ../src/MainWindow.cs:319
+#: ../src/ui/main_window.ui.h:3
+msgid "Browse"
+msgstr "Prebrskaj"
+
+#: ../src/MainWindow.cs:323
+msgid "Browse many photos simultaneously"
+msgstr "Brskanje po več fotografijah hkrati"
+
+#: ../src/MainWindow.cs:327
+msgid "Edit Image"
+msgstr "Uredi sliko"
+
+#: ../src/MainWindow.cs:331
+msgid "View and edit a photo"
+msgstr "Prikaz in urejanje fotografije"
+
+#: ../src/MainWindow.cs:336
+#: ../src/SingleView.cs:83
+msgid "Fullscreen"
+msgstr "Celozaslonski način"
+
+#: ../src/MainWindow.cs:338
+#: ../src/SingleView.cs:85
+msgid "View photos fullscreen"
+msgstr "Celozaslonski ogled fotografij"
+
+#: ../src/MainWindow.cs:343
+#: ../src/SingleView.cs:90
+msgid "View photos in a slideshow"
+msgstr "Ogled fotografij v diapredstavitvi"
+
+#: ../src/MainWindow.cs:358
+msgid "Previous photo"
+msgstr "Predhodna fotografija"
+
+#: ../src/MainWindow.cs:363
+msgid "Next photo"
+msgstr "Naslednja fotografija"
+
+#: ../src/MainWindow.cs:1518
+msgid "No cameras detected."
+msgstr "Noben fotoaparat ni bil zaznan."
+
+#: ../src/MainWindow.cs:1519
+msgid "F-Spot was unable to find any cameras attached to this system. Double check that the camera is connected and has power"
+msgstr "Program F-spot ni zaznal v sistem povezanih fotoaparatov. Dvakrat preverite, ali je fotoaparat povezan in prižgan."
+
+#: ../src/MainWindow.cs:1558
+msgid "Error connecting to camera"
+msgstr "Napaka med povezovanjem s fotoaparatom"
+
+#: ../src/MainWindow.cs:1559
+#, csharp-format
+msgid "Received error \"{0}\" while connecting to camera"
+msgstr "Med povezovanjem s fotoaparatom je bila prejeta napaka \"{0}\""
+
+#. Translators, The singular case will never happen here.
+#: ../src/MainWindow.cs:1846
+#, csharp-format
+msgid "Merge the selected tag"
+msgid_plural "Merge the {0} selected tags?"
+msgstr[0] "Združitev {0} izbranih oznak?"
+msgstr[1] "Združitev {0} izbrane oznake?"
+msgstr[2] "Združitev {0} izbranih oznak?"
+msgstr[3] "Združitev {0} izbranih oznak?"
+
+#: ../src/MainWindow.cs:1873
+msgid "This operation will merge the selected tags and any sub-tags into a single tag."
+msgstr "Z dejanjem bodo združene izbrane oznake in morebitne pod-oznake v eno samo oznako."
+
+#: ../src/MainWindow.cs:1875
+msgid "_Merge Tags"
+msgstr "Z_druži oznake"
+
+#: ../src/MainWindow.cs:2080
+#, csharp-format
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] "{0} fotografij od {1}"
+msgstr[1] "{0} fotografija od {1}"
+msgstr[2] "{0} fotografiji od {1}"
+msgstr[3] "{0} fotografije od {1}"
+
+#: ../src/MainWindow.cs:2082
+#: ../src/SingleView.cs:467
+#, csharp-format
+msgid "{0} Photo"
+msgid_plural "{0} Photos"
+msgstr[0] "{0} Fotografij"
+msgstr[1] "{0} Fotografija"
+msgstr[2] "{0} Fotografiji"
+msgstr[3] "{0} Fotografije"
+
+#: ../src/MainWindow.cs:2085
+#, csharp-format
+msgid " ({0} selected)"
+msgid_plural " ({0} selected)"
+msgstr[0] " ({0} izbranih)"
+msgstr[1] " ({0} izbrana)"
+msgstr[2] " ({0} izbrani)"
+msgstr[3] " ({0} izbrane)"
+
+#: ../src/MainWindow.cs:2166
+msgid "_Ok"
+msgstr "_V redu"
+
+#: ../src/MainWindow.cs:2167
+msgid "Error Deleting Picture"
+msgstr "Napaka med brisanjem slike"
+
+#: ../src/MainWindow.cs:2172
+#, csharp-format
+msgid "No permission to delete the file:{1}{0}"
+msgstr "Ni dovoljenj za izbris datoteke:{1}{0}"
+
+#: ../src/MainWindow.cs:2176
+#, csharp-format
+msgid "An error of type {0} occurred while deleting the file:{2}{1}"
+msgstr "Med brisanjem datoteke {2} {1} je prišlo do napake vrste {0}"
+
+#: ../src/MainWindow.cs:2208
+#, csharp-format
+msgid "Delete the selected photo permanently?"
+msgid_plural "Delete the {0} selected photos permanently?"
+msgstr[0] "Ali naj bo trajno izbrisanih {0} izbranih fotografij?"
+msgstr[1] "Ali naj bo trajno izbrisana {0} izbrana fotografija?"
+msgstr[2] "Ali naj bosta trajno izbrisani {0} izbrani fotografiji?"
+msgstr[3] "Ali naj bodo trajno izbrisane {0} izbrane fotografije?"
+
+#: ../src/MainWindow.cs:2212
+msgid "This deletes all versions of the selected photo from your drive."
+msgid_plural "This deletes all versions of the selected photos from your drive."
+msgstr[0] "Izbris vseh različic izbranih fotografij z diska."
+msgstr[1] "Izbris vseh različic izbrane fotografije z diska."
+msgstr[2] "Izbris vseh različic izbranih fotografij z diska."
+msgstr[3] "Izbris vseh različic izbranih fotografij z diska."
+
+#: ../src/MainWindow.cs:2215
+msgid "_Delete photo"
+msgid_plural "_Delete photos"
+msgstr[0] "Izbri_ši fotografije"
+msgstr[1] "Izbri_ši fotografijo"
+msgstr[2] "Izbri_ši fotografiji"
+msgstr[3] "Izbri_ši fotografije"
+
+#: ../src/MainWindow.cs:2251
+#, csharp-format
+msgid "Remove the selected photo from F-Spot?"
+msgid_plural "Remove the {0} selected photos from F-Spot?"
+msgstr[0] "Ali naj se odstrani {0} izbranih fotografij iz F-Spot ?"
+msgstr[1] "Ali naj se odstrani {0} izbrano fotografijo iz F-Spot ?"
+msgstr[2] "Ali naj se odstranita {0} izbrani fotografij iz F-Spot ?"
+msgstr[3] "Ali naj se odstranijo {0} izbrane fotografije iz F-Spot ?"
+
+#: ../src/MainWindow.cs:2256
+msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
+msgstr "Ob odstranjevanju fotografij iz F-Spot kataloga bodo vsi podatki o oznakah izgubljeni. Fotografije bodo ostale na računalniku in jih lahko ponovno uvozite v F-Spot."
+
+#: ../src/MainWindow.cs:2257
+msgid "_Remove from Catalog"
+msgstr "_Odstrani iz kataloga"
+
+#: ../src/MainWindow.cs:2320
+#, csharp-format
+msgid "Delete tag \"{0}\"?"
+msgstr "Izbris oznake \"{0}\"?"
+
+#: ../src/MainWindow.cs:2322
+#, csharp-format
+msgid "Delete the {0} selected tags?"
+msgstr "Izbris {0} izbrane oznake ?"
+
+#: ../src/MainWindow.cs:2327
+msgid "photo"
+msgid_plural "photos"
+msgstr[0] "fotografije"
+msgstr[1] "fotografija"
+msgstr[2] "fotografiji"
+msgstr[3] "fotografije"
+
+#: ../src/MainWindow.cs:2329
+#, csharp-format
+msgid "If you delete this tag, the association with {0} {1} will be lost."
+msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
+msgstr[1] "Ob izbrisu oznake, bo povezljivost z {0} {1} izgubljena."
+msgstr[2] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
+msgstr[3] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
+
+#: ../src/MainWindow.cs:2334
+msgid "_Delete tag"
+msgid_plural "_Delete tags"
+msgstr[0] "Iz_briši oznake"
+msgstr[1] "Iz_briši oznako"
+msgstr[2] "Iz_briši oznaki"
+msgstr[3] "Iz_briši oznake"
+
+#. A Category is not empty. Can not delete it.
+#: ../src/MainWindow.cs:2348
+msgid "Tag is not empty"
+msgstr "Oznaka ni prazna"
+
+#: ../src/MainWindow.cs:2349
+#, csharp-format
+msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
+msgstr "Ni mogoče izbrisati oznak, ki imajo oznake znotraj njih. Najprej izbrišite oznake pod \"{0}\""
+
+#: ../src/MainWindow.cs:2789
+msgid "Rotate selected photo left"
+msgid_plural "Rotate selected photos left"
+msgstr[0] "Vrtenje izbranih fotografij levo"
+msgstr[1] "Vrtenje izbrane fotografije levo"
+msgstr[2] "Vrtenje izbranih fotografij levo"
+msgstr[3] "Vrtenje izbranih fotografij levo"
+
+#: ../src/MainWindow.cs:2802
+msgid "Rotate selected photo right"
+msgid_plural "Rotate selected photos right"
+msgstr[0] "Vrtenje izbranih fotografij desno"
+msgstr[1] "Vrtenje izbrane fotografije desno"
+msgstr[2] "Vrtenje izbranih fotografij desno"
+msgstr[3] "Vrtenje izbranih fotografij desno"
+
+#: ../src/MainWindow.cs:2813
+#, csharp-format
+msgid "Find _Selected Tag"
+msgid_plural "Find _Selected Tags"
+msgstr[0] "Išči _izbranih oznak"
+msgstr[1] "Išči _izbrano oznako "
+msgstr[2] "Išči _izbrani oznaki"
+msgstr[3] "Išči _izbrane oznake"
+
+#: ../src/MainWindow.cs:2817
+#, csharp-format
+msgid "Find Selected Tag _With"
+msgid_plural "Find Selected Tags _With"
+msgstr[0] "Išči izbranih oznakih _z"
+msgstr[1] "Išči izbrano oznako _z"
+msgstr[2] "Išči izbrani oznaki _z"
+msgstr[3] "Išči izbrane oznake _z"
+
+#: ../src/MainWindow.cs:2858
+msgid "Create New Version?"
+msgid_plural "Create New Versions?"
+msgstr[0] "Ustvari nove različice?"
+msgstr[1] "Ustvari novo različico?"
+msgstr[2] "Ustvari novi različici?"
+msgstr[3] "Ustvari nove različice?"
+
+#: ../src/MainWindow.cs:2860
+#, csharp-format
+msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
+msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
+msgstr[0] "Ali naj pred zagonom {1} F-spot ustvari nove različice izbranih fotografij, da ohrani originale?"
+msgstr[1] "Ali naj pred zagonom {1} F-spot ustvari nove različice izbrane fotografije, da ohrani original?"
+msgstr[2] "Ali naj pred zagonom {1} F-spot ustvari nove različice izbranih fotografij, da ohrani originala?"
+msgstr[3] "Ali naj pred zagonom {1} F-spot ustvari nove različice izbranih fotografij, da ohrani originale?"
+
+#: ../src/MainWindow.cs:2882
+msgid "XCF version"
+msgstr "Različica XCF"
+
+#: ../src/MetadataStore.cs:19
+msgid "Creator"
+msgstr "Ustvarjalec"
+
+#: ../src/MetadataStore.cs:20
+msgid "Title"
+msgstr "Naslov"
+
+#: ../src/MetadataStore.cs:21
+msgid "Copyright"
+msgstr "Avtorske pravice"
+
+#: ../src/MetadataStore.cs:22
+msgid "Subject and Keywords"
+msgstr "Predmet in ključne besede"
+
+#: ../src/MetadataStore.cs:23
+msgid "Compression"
+msgstr "Stiskanje"
+
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
+msgid "Planar Configuration"
+msgstr "Nastavitev ravnine"
+
+#: ../src/MetadataStore.cs:31
+msgid "Orientation"
+msgstr "Usmerjenost"
+
+#: ../src/MetadataStore.cs:33
+msgid "Photometric Interpretation"
+msgstr "Fotometrično tolmačenje"
+
+#: ../src/MetadataStore.cs:35
+msgid "Resolution Unit"
+msgstr "Enota ločljivosti"
+
+#: ../src/MetadataStore.cs:37
+msgid "Exposure Program"
+msgstr "Program osvetlitve"
+
+#: ../src/MetadataStore.cs:39
+msgid "Metering Mode"
+msgstr "Način umerjanja"
+
+#: ../src/MetadataStore.cs:41
+msgid "Exposure Mode"
+msgstr "Način osvetlitve"
+
+#: ../src/MetadataStore.cs:43
+msgid "Custom Rendered"
+msgstr "Izris po meri"
+
+#: ../src/MetadataStore.cs:45
+msgid "Components Configuration"
+msgstr "Nastavitve enot"
+
+#: ../src/MetadataStore.cs:47
+msgid "Light Source"
+msgstr "Vir svetlobe"
+
+#: ../src/MetadataStore.cs:49
+msgid "Sensing Method"
+msgstr "Metoda zaznavanja"
+
+#: ../src/MetadataStore.cs:51
+msgid "Color Space"
+msgstr "Barvni prostor"
+
+#: ../src/MetadataStore.cs:53
+msgid "White Balance"
+msgstr "Uravnoteženje beline"
+
+#: ../src/MetadataStore.cs:55
+msgid "Focal Plane Resolution Unit"
+msgstr "Enota ploskovne ločljivosti žarišča."
+
+#: ../src/MetadataStore.cs:57
+msgid "File Source Type"
+msgstr "Vrsta izvorne datoteke"
+
+#: ../src/MetadataStore.cs:59
+msgid "Scene Capture Type"
+msgstr "Vrsta zajema scene"
+
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
+msgid "Gain Control"
+msgstr "Nadzor ojačitve"
+
+#: ../src/MetadataStore.cs:65
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: ../src/MetadataStore.cs:67
+msgid "Saturation"
+msgstr "Nasičenost"
+
+#: ../src/MetadataStore.cs:69
+msgid "Sharpness"
+msgstr "Ostrina"
+
+#: ../src/MetadataStore.cs:71
+msgid "Scene Type"
+msgstr "Vrsta scene"
+
+#. Fixme this should really set parent menu
+#. items insensitve
+#: ../src/PhotoTagMenu.cs:74
+msgid "(No Tags)"
+msgstr "(Ni oznak)"
+
+#: ../src/PhotoVersionCommands.cs:58
+msgid "Create New Version"
+msgstr "Ustvari novo različico"
+
+#: ../src/PhotoVersionCommands.cs:59
+msgid "Name:"
+msgstr "Ime:"
+
+#: ../src/PhotoVersionCommands.cs:63
+msgid "Rename Version"
+msgstr "Preimenuj različico"
+
+#: ../src/PhotoVersionCommands.cs:64
+msgid "New name:"
+msgstr "Novo ime:"
+
+#: ../src/PhotoVersionCommands.cs:110
+msgid "Could not create a new version"
+msgstr "Ni mogoče ustvariti nove različice"
+
+#: ../src/PhotoVersionCommands.cs:111
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to create version \"{1}\""
+msgstr "Prejeta je bila napaka \"{0}\". Ni mogoče ustvariti različice \"{1}\""
+
+#: ../src/PhotoVersionCommands.cs:138
+msgid "Really Delete?"
+msgstr "Resničen izbris?"
+
+#: ../src/PhotoVersionCommands.cs:139
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: ../src/PhotoVersionCommands.cs:140
+msgid "Delete"
+msgstr "Izbriši"
+
+#: ../src/PhotoVersionCommands.cs:144
+#, csharp-format
+msgid "Really delete version \"{0}\"?"
+msgstr "Ali zares želite izbrisati različico \"{0}\"?"
+
+#: ../src/PhotoVersionCommands.cs:154
+msgid "Could not delete a version"
+msgstr "Ni mogoče izbrisati različice"
+
+#: ../src/PhotoVersionCommands.cs:155
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
+msgstr "Prejeta je bila napaka \"{0}\". Ni mogoče izbrisati različice \"{1}\""
+
+#: ../src/PhotoVersionCommands.cs:196
+msgid "Could not rename a version"
+msgstr "Ni mogoče preimenovati različice"
+
+#: ../src/PhotoVersionCommands.cs:197
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
+msgstr "Prejeta je bila napaka \"{0}\". Ni mogoče preimenovati različice v \"{1}\""
+
+#: ../src/PhotoVersionMenu.cs:66
+#: ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
+msgid "(No Edits)"
+msgstr "(Ni urejanj)"
+
+#: ../src/PhotoView.cs:167
+#: ../src/UI.Dialog/EditExceptionDialog.cs:38
+msgid "Error editing photo"
+msgstr "Napaka med urejanjem fotografije"
+
+#: ../src/PhotoView.cs:168
+#: ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "Prejeta je bila izjema \"{0}\". Ni mogoče shraniti fotografije {1}"
+
+#: ../src/PhotoView.cs:357
+msgid "Comment:"
+msgstr "Opomba:"
+
+#: ../src/Preferences.cs:152
+msgid "Photos"
+msgstr "Fotografije"
+
+#: ../src/PrintOperation.cs:32
+msgid "Image Settings"
+msgstr "Nastavitve slik"
+
+#: ../src/QueryWidget.cs:58
+msgid "Find: "
+msgstr "Najdi: "
+
+#: ../src/QueryWidget.cs:63
+msgid "Untagged photos"
+msgstr "Neoznačene fotografije"
+
+#: ../src/QueryWidget.cs:71
+msgid "Rated photos"
+msgstr "Ocenjene fotografije"
+
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/QueryWidget.cs:80
+msgid "Import roll"
+msgstr "Uvozni zvitek"
+
+#: ../src/QueryWidget.cs:104
+msgid "Clear search"
+msgstr "Čiščenje iskanja"
+
+#: ../src/QueryWidget.cs:111
+msgid "Refresh search"
+msgstr "Osvežitev iskanja"
+
+#: ../src/QueryWidget.cs:113
+msgid "No matching photos found"
+msgstr "Ni mogoče najti skladnih fotografij"
+
+#: ../src/QueryWidget.cs:155
+msgid "Hide _Find Bar"
+msgstr "Skrij _iskalno vrstico"
+
+#: ../src/QueryWidget.cs:161
+msgid "Show _Find Bar"
+msgstr "Pokaži is_kalno vrstico"
+
+#: ../src/RotateCommand.cs:96
+#: ../src/RotateCommand.cs:111
+msgid "Unable to rotate this type of photo"
+msgstr "Ni mogoče zavrteti te zvrsti fotografij"
+
+#: ../src/RotateCommand.cs:131
+msgid "Unable to rotate readonly file"
+msgstr "Ni mogoče vrteti datoteke označene le za branje"
+
+#: ../src/RotateCommand.cs:198
+msgid "Rotating photos"
+msgstr "Vrtenje fotografij"
+
+#: ../src/RotateCommand.cs:209
+#, csharp-format
+msgid "Rotating photo \"{0}\""
+msgstr "Vrtenje fotografije \"{0}\""
+
+#: ../src/RotateCommand.cs:222
+msgid "Directory not found"
+msgstr "Mape ni mogoče najti"
+
+#: ../src/RotateCommand.cs:242
+#, csharp-format
+msgid "Unable to rotate photo"
+msgid_plural "Unable to rotate {0} photos"
+msgstr[0] "Ni mogoče zavrteti {0} fotografij"
+msgstr[1] "Ni mogoče zavrteti {0} fotografije"
+msgstr[2] "Ni mogoče zavrteti {0} fotografij"
+msgstr[3] "Ni mogoče zavrteti {0} fotografij"
+
+#: ../src/RotateCommand.cs:244
+#, csharp-format
+msgid "The photo could not be rotated because it is on a read only file system or media such as a CDROM. Please check the permissions and try again."
+msgid_plural "{0} photos could not be rotated because they are on a read only file system or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] "{0} fotografij ni bilo mogoče zavrteti, ker se nahajajo na datotečnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite ponovno. "
+msgstr[1] "{0} fotografije ni bilo mogoče zavrteti, ker se nahajajo na datotečnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite ponovno. "
+msgstr[2] "{0} fotografij ni bilo mogoče zavrteti, ker se nahajajo na datotečnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite ponovno. "
+msgstr[3] "{0} fotografij ni bilo mogoče zavrteti, ker se nahajajo na datotečnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite ponovno. "
+
+#: ../src/RotateCommand.cs:271
+#, csharp-format
+msgid "Received error \"{0}\" while attempting to rotate {1}"
+msgstr "Med poskusom vrtenja {1} je prišlo do napake \"{0}\""
+
+#: ../src/RotateCommand.cs:276
+msgid "Error while rotating photo."
+msgstr "Napaka med vrtenjem fotografije"
+
+#: ../src/SendEmail.cs:240
+msgid "Preparing email"
+msgstr "Pripravljanje e-pošte"
+
+#: ../src/SendEmail.cs:292
+#, csharp-format
+msgid "Exporting picture \"{0}\""
+msgstr "Izvažanje slike \"{0}\""
+
+#: ../src/SendEmail.cs:314
+msgid "Error processing image"
+msgstr "Napaka med obdelavo slike"
+
+#: ../src/SendEmail.cs:315
+#, csharp-format
+msgid "An error occured while processing \"{0}\": {1}"
+msgstr "Med obdelavo \"{0}\": {1} je prišlo do napake"
+
+#. Send the mail :)
+#: ../src/SendEmail.cs:330
+msgid "My Photos"
+msgstr "Moje fotografije"
+
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Napaka med shranjevanjem izostrene datoteke"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Izostritev"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Količina:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Polmer:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Prag:"
+
+#: ../src/SingleView.cs:73
+msgid "Rotate photo left"
+msgstr "Vrtenje fotografije v levo"
+
+#: ../src/SingleView.cs:78
+msgid "Rotate photo right"
+msgstr "Vrtenje fotografije v desno"
+
+#: ../src/SingleView.cs:115
+msgid "Folder"
+msgstr "Mapa"
+
+#: ../src/SingleView.cs:341
+msgid "Open"
+msgstr "Odpri"
+
+#: ../src/SingleView.cs:428
+msgid "Set as Background"
+msgstr "Nastavi kot ozadje"
+
+#: ../src/TagCommands.cs:96
+#: ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
+msgid "This name is already in use"
+msgstr "Ime je že v uporabi"
+
+#: ../src/TagCommands.cs:144
+msgid "Create New Tag"
+msgstr "Ustvari novo oznako"
+
+#: ../src/TagCommands.cs:145
+msgid "Name of New Tag:"
+msgstr "Ime nove oznake:"
+
+#: ../src/TagPopup.cs:26
+#, csharp-format
+msgid "Find"
+msgid_plural "Find"
+msgstr[0] "Iskanje"
+msgstr[1] "Iskanje"
+msgstr[2] "Iskanje"
+msgstr[3] "Iskanje"
+
+#: ../src/TagPopup.cs:36
+#: ../src/Widgets/TagMenu.cs:91
+msgid "Create New Tag..."
+msgstr "Ustvari novo oznako ..."
+
+#: ../src/TagPopup.cs:42
+msgid "Edit Tag..."
+msgstr "Urejanje oznake ..."
+
+#: ../src/TagPopup.cs:46
+msgid "Delete Tag"
+msgid_plural "Delete Tags"
+msgstr[0] "Izbriši oznake"
+msgstr[1] "Izbriši oznako"
+msgstr[2] "Izbriši oznaki"
+msgstr[3] "Izbriši oznake"
+
+#: ../src/TagPopup.cs:52
+msgid "Attach Tag to Selection"
+msgid_plural "Attach Tags to Selection"
+msgstr[0] "Dodajanje oznak izboru"
+msgstr[1] "Dodajanje oznake izboru"
+msgstr[2] "Dodajanje oznak izboru"
+msgstr[3] "Dodajanje oznak izboru"
+
+#: ../src/TagPopup.cs:56
+msgid "Remove Tag From Selection"
+msgid_plural "Remove Tags From Selection"
+msgstr[0] "Odstranitev oznak iz izbora"
+msgstr[1] "Odstranitev oznake iz izbora"
+msgstr[2] "Odstranitev oznak iz izbora"
+msgstr[3] "Odstranitev oznak iz izbora"
+
+#: ../src/TagPopup.cs:62
+msgid "Merge Tags"
+msgstr "Združitev oznak"
+
+#: ../src/TagQueryWidget.cs:34
+#, csharp-format
+msgid "Include Photos Tagged \"{0}\""
+msgstr "Vključitev fotografij označenih z \"{0}\""
+
+#: ../src/TagQueryWidget.cs:39
+#, csharp-format
+msgid "Exclude Photos Tagged \"{0}\""
+msgstr "Izključitev fotografij označenih z \"{0}\""
+
+#: ../src/TagQueryWidget.cs:44
+msgid "Remove From Search"
+msgstr "Odstrani iz iskanja"
+
+#: ../src/TagQueryWidget.cs:88
+#, csharp-format
+msgid "Find _With"
+msgid_plural "Find _With"
+msgstr[0] "Išči _z"
+msgstr[1] "Išči _z"
+msgstr[2] "Išči _z"
+msgstr[3] "Išči _z"
+
+#: ../src/TagQueryWidget.cs:114
+msgid "All"
+msgstr "Vse"
+
+#: ../src/TagQueryWidget.cs:149
+#: ../src/Term.cs:592
+#, csharp-format
+msgid "Not {0}"
+msgstr "Ne {0}"
+
+#: ../src/TagQueryWidget.cs:278
+msgid "Drag tags here to search for them"
+msgstr "Za iskanje po oznakah jih povlecite sem"
+
+#: ../src/TagSelectionWidget.cs:497
+msgid "Error renaming tag"
+msgstr "Napaka med preimenovanjem oznake"
+
+#: ../src/TagStore.cs:203
+msgid "Favorites"
+msgstr "Priljubljeno"
+
+#: ../src/TagStore.cs:208
+msgid "Hidden"
+msgstr "Skrito"
+
+#: ../src/TagStore.cs:216
+msgid "People"
+msgstr "Ljudje"
+
+#: ../src/TagStore.cs:221
+msgid "Places"
+msgstr "Mesta"
+
+#: ../src/TagStore.cs:226
+msgid "Events"
+msgstr "Dogodki"
+
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/TagStore.cs:239
+#: ../src/Widgets/InfoBox.cs:409
+msgid "(None)"
+msgstr "(Brez)"
+
+#: ../src/Term.cs:298
+msgid " and "
+msgstr " in "
+
+#. operators.Add (Catalog.GetString (" && "));
+#: ../src/Term.cs:300
+msgid ", "
+msgstr ","
+
+#: ../src/Term.cs:356
+msgid " or "
+msgstr " ali "
+
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Term.cs:380
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
+msgid "or"
+msgstr "ali"
+
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Posodabljanje sličic"
+
+#: ../src/ThumbnailCommand.cs:28
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "Posodabljanje slike \"{0}\""
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
+msgid "Photo management for GNOME"
+msgstr "Upravljanje fotografij za GNOME"
+
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Avtorske pravice © 2003-2009 Novell Inc."
+
+#: ../src/UI.Dialog/AboutDialog.cs:100
+msgid "translator-credits"
+msgstr "Andrej Žnidaršič <andrej.znidarsic at gmail.com>"
+
+#: ../src/UI.Dialog/AboutDialog.cs:105
+msgid "F-Spot Website"
+msgstr "F-Spot spletišče"
+
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
+#, csharp-format
+msgid "Shift all photos by {0}"
+msgstr "Zamik vseh fotografij za {0}"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "Danes"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "Včeraj"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "Zadnjih 7 dni"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "Zadnjih 30 dni"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "Zadnjih 90 dni"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "Zadnjih 360 dni"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "Trenutni Teden (Pon-Ned)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "Prejšnji Teden (Pon-Ned)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "Razmerje po meri"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Urejanje ikone za oznako {0}"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "Izberi fotografijo iz datoteke"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>S Fotografije</b>\n"
+" Kot ikono za to oznako lahko uporabite eno od fotografij iz vaše\n"
+" knjižnice. Najprej morate imeti vsaj eno fotografijo označeno\n"
+" s to oznako. Označite fotografijo kot '{0}' in se vrnite sem,\n"
+"da jo lahko uporabite kot ikono."
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Ni mogoče naložiti slike."
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "Ni mogoče naložiti \"{0}\" kot ikono za oznako"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "Fotografija {0} od {1}"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
+msgstr "Prišlo je do usodne napake"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "Podrobnosti napake"
+
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr "Nesprejeto izjemno dejanje:"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "Noben"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "Sistemski profil"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "Običajna tema"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "Napaka med nalaganjem podatkovne zbirke"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#, csharp-format
+msgid "F-Spot encountered an error while loading the photo database. The old database has be moved to {0} and a new database has been created."
+msgstr "Prišlo je do napake med nalaganjem podatkovne zbirke fotografij. Stara zbirka je bila premaknjena v {0}, zato je bila ustvarjena nova."
+
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "Oznaka"
+
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "Razmerje"
+
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "Poskusi ponovno"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Dejanje</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Referenčna fotografija</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Prilagodi čas"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Prilagojen datum:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Trenutni datum:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Razmakni vse fotografije za"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "razlika:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "najmanjši začetek pri {0}"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>Končni datum</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Izberi obdobje</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Začetni datum</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Prekliči, ne spremeni trenutne časovnice."
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Prikazane bodo le fotografije znotraj teh datumov."
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Nastavi razpon datumov"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Urejanje oznake"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Urejanje ikone"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Ikona:"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Iz zunanje fotografije</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Iz fotografije</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Pred določene ikone</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Predogled</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Oblika ikone od "
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Urejanje ikone oznake"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "_Brez slike"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "Fotografija 0 od 0"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Barvni profil za zaslon:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Barvni profil za tiskanje:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "Možnosti F-Spot"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "Videz F-spot:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+"Znotraj slikovnih datotek, če je mogoče\n"
+"<small>To naredi slike dostopne ostalim programom za urejanje slik.</small>"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Izbira mape"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "Ločeno od slikovnih datotek"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Shranjevanje oznak in opisov fotografij:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "Pri uvažanju fotografij jih kopiraj v:"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>Najvišja Ocena</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>Najnižja Ocena</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Nastavitev filtrov ocen"
+
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "Prilagodi _čas ..."
+
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "Uredi _po"
+
+#: ../src/ui/main_window.ui.h:4
+msgid "By _Date"
+msgstr "Po _datumu"
+
+#: ../src/ui/main_window.ui.h:5
+msgid "By _Import Roll"
+msgstr "Po _uvoznem zvitku"
+
+#: ../src/ui/main_window.ui.h:6
+msgid "By _Rating"
+msgstr "Po _oceni"
+
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: ../src/ui/main_window.ui.h:8
+msgid "Create New _Tag..."
+msgstr "Ustvari novo _oznako ..."
+
+#: ../src/ui/main_window.ui.h:9
+msgid "Create _New Version..."
+msgstr "Ustvari _novo različico ..."
+
+#: ../src/ui/main_window.ui.h:11
+msgid "Fin_d"
+msgstr "Naj_di"
+
+#: ../src/ui/main_window.ui.h:12
+msgid "Manage _Extensions"
+msgstr "Upravljanje _razširitev"
+
+#: ../src/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "Nas_tavitve strani ..."
+
+#: ../src/ui/main_window.ui.h:14
+msgid "Re_fresh Thumbnail"
+msgstr "O_sveži sličico"
+
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Izberi _vse"
+
+#: ../src/ui/main_window.ui.h:19
+msgid "Select _None"
+msgstr "Ne izberi _ničesar"
+
+#: ../src/ui/main_window.ui.h:20
+msgid "Send by _Mail..."
+msgstr "Pošlji po _pošti ..."
+
+#: ../src/ui/main_window.ui.h:22
+msgid "Side_bar"
+msgstr "Stranska v_rstica"
+
+#: ../src/ui/main_window.ui.h:23
+msgid "T_ags"
+msgstr "Ozn_ake"
+
+#: ../src/ui/main_window.ui.h:25
+msgid "Thumbnail _elements"
+msgstr "_Elementi sličic"
+
+#: ../src/ui/main_window.ui.h:26
+msgid "Too_lbar"
+msgstr "O_rodna vrstica"
+
+#: ../src/ui/main_window.ui.h:27
+msgid "View"
+msgstr "Pogled"
+
+#: ../src/ui/main_window.ui.h:33
+msgid "_Attach Tag to Selection"
+msgstr "_Pripni oznako izboru"
+
+#: ../src/ui/main_window.ui.h:35
+msgid "_Clear Rating Filter"
+msgstr "_Počisti filter ocen"
+
+#: ../src/ui/main_window.ui.h:36
+msgid "_Clear Roll Filter"
+msgstr "_Počisti filter zvitkov"
+
+#: ../src/ui/main_window.ui.h:38
+msgid "_Components"
+msgstr "_Sestavni deli"
+
+#: ../src/ui/main_window.ui.h:39
+msgid "_Contents"
+msgstr "_Vsebina"
+
+#: ../src/ui/main_window.ui.h:40
+msgid "_Dates"
+msgstr "_Datumi"
+
+#: ../src/ui/main_window.ui.h:42
+msgid "_Delete Selected Tag"
+msgstr "_Izbriši izbrano oznako"
+
+#: ../src/ui/main_window.ui.h:43
+msgid "_Delete Version"
+msgstr "_Izbriši različico"
+
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "_Uredi oznako ..."
+
+#: ../src/ui/main_window.ui.h:46
+msgid "_Export to"
+msgstr "_Izvozi v"
+
+#: ../src/ui/main_window.ui.h:47
+msgid "_Filmstrip"
+msgstr "_Filmski trak"
+
+#: ../src/ui/main_window.ui.h:50
+msgid "_Hidden"
+msgstr "_Skrito"
+
+#: ../src/ui/main_window.ui.h:51
+msgid "_Import..."
+msgstr "_Uvozi ..."
+
+#: ../src/ui/main_window.ui.h:52
+msgid "_Large"
+msgstr "_Velike"
+
+#: ../src/ui/main_window.ui.h:53
+msgid "_Last Import Roll"
+msgstr "_Zadnji uvozni zvitek"
+
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr "_Leča"
+
+#: ../src/ui/main_window.ui.h:55
+msgid "_Medium"
+msgstr "_Srednje"
+
+#: ../src/ui/main_window.ui.h:57
+msgid "_Quit"
+msgstr "_Končaj"
+
+#: ../src/ui/main_window.ui.h:58
+msgid "_Ratings"
+msgstr "_Ocene"
+
+#: ../src/ui/main_window.ui.h:60
+msgid "_Remove Tag From Selection"
+msgstr "_Odstrani oznako iz izbora"
+
+#: ../src/ui/main_window.ui.h:61
+msgid "_Rename Version"
+msgstr "_Preimenuj različico"
+
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "_Obrnjen vrstni red"
+
+#: ../src/ui/main_window.ui.h:63
+msgid "_Select Import Rolls..."
+msgstr "Izberi _uvozne zvitke ..."
+
+#: ../src/ui/main_window.ui.h:64
+msgid "_Set Date Range..."
+msgstr "Nastavi _razpon datumov ..."
+
+#: ../src/ui/main_window.ui.h:65
+msgid "_Set Rating filter..."
+msgstr "_Nastavi filter ocen ..."
+
+#: ../src/ui/main_window.ui.h:66
+msgid "_Sharpen..."
+msgstr "_Izostri ..."
+
+#: ../src/ui/main_window.ui.h:68
+msgid "_Small"
+msgstr "_Majhne"
+
+#: ../src/ui/main_window.ui.h:69
+msgid "_Tag Icons"
+msgstr "_Ikone oznak"
+
+#: ../src/ui/main_window.ui.h:70
+msgid "_Tags"
+msgstr "O_znake"
+
+#: ../src/ui/main_window.ui.h:71
+msgid "_Timeline"
+msgstr "_Časovnica"
+
+#: ../src/ui/main_window.ui.h:72
+msgid "_Tools"
+msgstr "_Orodja"
+
+#: ../src/ui/main_window.ui.h:73
+msgid "_Untagged Photos"
+msgstr "_Neoznačene fotografije"
+
+#: ../src/ui/main_window.ui.h:74
+msgid "_Version"
+msgstr "_Različica"
+
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "Posodabljanje F-Spot podatkovne zbirke"
+
+#: ../src/Updater.cs:623
+msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
+msgstr "Počakati je treba, da se podatkovna zbirka F-Spotove galerije do konca posodobi. Postopek je lahko dolgotrajen."
+
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "Ni mogoče ustvariti začasne datoteke "
+
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Nastavitve strani"
+
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Velikost papirja: {0} x {1} mm"
+
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "Nastavi velikost strani in usmerjenost"
+
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Fotografije na stran"
+
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Ponavljanje"
+
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Natisni oznake za izrez"
+
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "Razporeditev fotografij"
+
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "Polna stran (brez robov)"
+
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Približevanje"
+
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Zapolni"
+
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Prilagojena velikost"
+
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "Bele obrobe"
+
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Besedilo po meri"
+
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Podrobnosti o fotografijah"
+
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "Natisni ime datoteke"
+
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "Natisni datum posnetka fotografije"
+
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "Natisni čas posnetka fotografije"
+
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "Natisni oznake fotografij"
+
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "Natisni opombe fotografij"
+
+#: ../src/Widgets/EditorPage.cs:30
+#: ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "Urejanje"
+
+#: ../src/Widgets/EditorPage.cs:198
+msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
+msgstr "Orodje zahteva dejavno izbiro. Izberite ustrezno območje na fotografiji in poskusite ponovno"
+
+#: ../src/Widgets/EditorPage.cs:216
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Napaka med shranjevanjem prilagojenih fotografij"
+msgstr[1] "Napaka med shranjevanjem prilagojene fotografije"
+msgstr[2] "Napaka med shranjevanjem prilagojenih fotografij"
+msgstr[3] "Napaka med shranjevanjem prilagojenih fotografij"
+
+#: ../src/Widgets/EditorPage.cs:218
+#, csharp-format
+msgid "Received exception \"{0}\". Note that you have to develop RAW files into JPEG before you can edit them."
+msgstr "Prejeta izjema \"{0}\". RAW datoteke je treba pred urejanjem razviti v JPEG."
+
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Vodoravno"
+
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "_Navpično"
+
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Najdi:"
+
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "Mape"
+
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Datotečni sistem"
+
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Histogram"
+
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Različica"
+
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Datum"
+
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Osvetljenost"
+
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "Goriščna razdalja"
+
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Velikost datoteke"
+
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Ocena"
+
+#: ../src/Widgets/InfoBox.cs:390
+#: ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(napačen zapis)"
+
+#: ../src/Widgets/InfoBox.cs:418
+#: ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451
+#: ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Neznano)"
+
+#: ../src/Widgets/InfoBox.cs:561
+#, csharp-format
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "({0} urejanj)"
+msgstr[1] "({0} urejanje)"
+msgstr[2] "({0} urejanji)"
+msgstr[3] "({0} urejanja)"
+
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(Napaka med branjem datoteke)"
+
+#: ../src/Widgets/InfoBox.cs:620
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0} Fotografij"
+
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"Na {0} med \n"
+"{1} in {2}"
+
+#: ../src/Widgets/InfoBox.cs:645
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"Med {0} \n"
+"in {1}"
+
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(ni najdene vsaj ene datoteke)"
+
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Pokaži ime fotografije"
+
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Pokaži datum"
+
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Pokaži velikost"
+
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Pokaži osvetlitev"
+
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "Pokaži goriščno razdaljo"
+
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Pokaži fotoaparat"
+
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Pokaži velikost datotek"
+
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "Metapodatki"
+
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "Razširjeni metapodatki"
+
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "Razširjeni metapodatki niso na voljo"
+
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "Ni dejavnih fotografij"
+
+#: ../src/Widgets/MetadataDisplay.cs:414
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "Fotografija \"{0}\" ne obstaja"
+
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "Metapodatki niso na voljo"
+
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Ni razpoložljivih programov"
+
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "Ocena:"
+
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Država"
+
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "Mesto"
+
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Regija"
+
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Prikaže F-Spotovo diapredstavitev"
+
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot fotografije"
+
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Uredi izbrane oznake ..."
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Uredi izbrane oznake ..."
+#~ msgid "Package"
+#~ msgstr "Paket"
+#~ msgid "Extension Installation"
+#~ msgstr "Namestitev razširitev"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Izberite razširitve za namestitev in kliknite Naprej</b> "
+#~ msgid "Install from:"
+#~ msgstr "Nameščanje iz: "
+#~ msgid "_Repositories..."
+#~ msgstr "Sk_ladišča ..."
+#~ msgid "Show all packages"
+#~ msgstr "Pokaži vse pakete"
+#~ msgid "Show new versions only"
+#~ msgstr "Pokaži le nove različice"
+#~ msgid "Show updates only"
+#~ msgstr "Pokaži le posodobitve"
+#~ msgid "_Unselect All"
+#~ msgstr "_Počisti ves izbor"
+#~ msgid "label124"
+#~ msgstr "oznaka123"
+#~ msgid "Overall Progress:"
+#~ msgstr "Skupni napredek:"
+#~ msgid "Downloading extensions..."
+#~ msgstr "Prenašanje razširitev ..."
+#~ msgid "Extension Manager"
+#~ msgstr "Upravljalnik razširitev"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "Za izvajanje dejanja so obvezne dodatne razširitve."
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Nameščene bodo sledeče razširitve:"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Upravljalnik razširitev</b></big> "
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Trenutno so nameščene sledeče razširitve:"
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Namesti razširitve ..."
+#~ msgid "_Uninstall..."
+#~ msgstr "_Odstrani ..."
+#~ msgid "Enable"
+#~ msgstr "Omogoči"
+#~ msgid "Disable"
+#~ msgstr "Onemogoči"
+#~ msgid "Details"
+#~ msgstr "Podrobnosti"
+#~ msgid "Extension Repository Management"
+#~ msgstr "Upravljanje skladišča razširitev"
+#~ msgid "Add New Repository"
+#~ msgstr "Dodajanje novega skladišča"
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Izbor mesta skladišča za registracijo:"
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registracija spletnega skladišča"
+#~ msgid "Url:"
+#~ msgstr "URL:"
+#~ msgid "Register a local repository"
+#~ msgstr "Registracija krajevnega skladišča."
+#~ msgid "Path:"
+#~ msgstr "Pot:"
+#~ msgid "Browse..."
+#~ msgstr "Prebrskaj ..."
+#~ msgid "Version:"
+#~ msgstr "Različica:"
+#~ msgid "Author:"
+#~ msgstr "Avtor:"
+#~ msgid "Copyright:"
+#~ msgstr "Avtorske pravice:"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Odvisnosti razširitve:"
+#~ msgid "All registered repositories"
+#~ msgstr "Vsa registrirana skladišča"
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Ali ste prepričani, da želite preklicati namestitev?"
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Sledeči paketi bodo odstranjeni:"
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr "Druge razširitve so odvisne od prejšnjih in bodo tudi odstranjene:"
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Izbrane razširitve ne morejo biti nameščene zaradi spora odvisnosti."
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Nameščeni bodo sledeči paketi:"
+#~ msgid " (in user directory)"
+#~ msgstr "(v uporabnikovi mapi)"
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Odstranjeni bodo sledeči paketi:"
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Ni bilo zadoščeno sledečim odvisnostim:"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Namestitev je uspešno končana."
+#~ msgid "The installation failed!"
+#~ msgstr "Namestitev je spodletela!"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Namestitev je zaključena z opozorili."
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Odstranjevanje namestitve je bilo uspešno zaključeno."
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Odstranjevanje namestitve je spodletelo!"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Odstranjevanje namestitve je bilo zaključeno z opozorili."
+#~ msgid "Repository"
+#~ msgstr "Skladišče"
+#~ msgid "Installation cancelled"
+#~ msgstr "Namestitev je bila preklicana"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Nekaj zahtevanih razširitev ni bilo najdenih"
+#~ msgid "Installation failed"
+#~ msgstr "Namestitev ni uspela"
+#~ msgid "Extension"
+#~ msgstr "Razširitev"
+#~ msgid "Other"
+#~ msgstr "Ostalo"
+#~ msgid "Url"
+#~ msgstr "Url"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Prišlo je do izjemne napake: {0}"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Onemogočene razširitve ne morejo biti naložene."
+#~ msgid "Loading {0} extension"
+#~ msgstr "Nalaganje razširitve {0}"
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Zahtevana razširitev '{0}' je onemogočena."
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Zahtevana razširitev '{0}' ni nameščena."
+#~ msgid "(provided by {0})"
+#~ msgstr "(ponudnik {0})"
+#~ msgid "my photos"
+#~ msgstr "moje fotografije"
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Kopiraj _mesto"
+#~ msgid "Dissolve"
+#~ msgstr "Raztapljanje"
+#~ msgid "Flip"
+#~ msgstr "Zrcaljenje"
+#~ msgid "Cover"
+#~ msgstr "Naslovnica"
+#~ msgid "Reveal"
+#~ msgstr "Razodeni"
+#~ msgid "Wipe"
+#~ msgstr "Dokončno počisti"
+#~ msgid "Split"
+#~ msgstr "Razdelitev"
+#~ msgid "Push"
+#~ msgstr "Potisk"
+
diff --git a/po/sv.po b/po/sv.po
index 2937ef3..d5e68b5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,15 +1,15 @@
# Swedish messages for f-spot.
-# Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2010 Free Software Foundation, Inc.
# Christian Rose <menthos at menthos.com>, 2004.
# Sergej Kotliar <sigge at hystrix.se>, 2006.
-# Daniel Nylander <po at danielnylander.se>, 2006, 2007, 2008, 2009.
+# Daniel Nylander <po at danielnylander.se>, 2006, 2007, 2008, 2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: f-spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-18 13:03+0200\n"
-"PO-Revision-Date: 2009-09-18 13:10+0100\n"
+"POT-Creation-Date: 2010-03-02 19:01+0100\n"
+"PO-Revision-Date: 2010-03-02 19:01+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr "Överför bilden \"{0}\" till cd"
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
-#: ../src/MainWindow.cs:638
+#: ../src/MainWindow.cs:673
#: ../src/UI.Dialog/AdjustTimeDialog.cs:129
#: ../src/UI.Dialog/ProgressDialog.cs:92
#, csharp-format
@@ -45,7 +45,7 @@ msgid "{0} of {1}"
msgstr "{0} av {1}"
#: ../extensions/Exporters/CDExport/CDExport.cs:233
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:379
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
@@ -94,7 +94,7 @@ msgid "Create CD"
msgstr "Skapa cd"
#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
-#: ../src/Widgets/InfoBox.cs:220
+#: ../src/Widgets/InfoBox.cs:221
msgid "Size"
msgstr "Storlek"
@@ -112,6 +112,7 @@ msgstr "_Bläddra i tidigare schemalagda filer"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
#: ../src/f-spot.glade.h:95
msgid "_Export"
msgstr "_Exportera"
@@ -138,15 +139,16 @@ msgstr ""
"\n"
"När du blir dirigerad av Facebook till att återgå till detta program så klicka på \"Ok\" nedan."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
msgid "Too many images to export"
msgstr "För många bilder att exportera"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
-msgid "Facebook only permits 60 photographs per album. Please refine your selection and try again."
-msgstr "Facebook tillåter 60 fotografi per album. Definiera om ditt val och försök igen."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid "Facebook only permits {0} photographs per album. Please refine your selection and try again."
+msgstr "Facebook tillåter endast {0} fotografier per album. Definiera om ditt val och försök igen."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
@@ -154,19 +156,19 @@ msgstr "Facebook tillåter 60 fotografi per album. Definiera om ditt val och f
msgid "Uploading Pictures"
msgstr "Skickar upp bilder"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
msgid "Album must have a name"
msgstr "Albumet måste ha ett namn"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
msgid "Please name your album or choose an existing album."
msgstr "Namnge ditt album eller välj ett befintligt album."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
msgid "Creating a new album failed"
msgstr "Skapandet av nytt album misslyckades"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
#, csharp-format
msgid ""
"An error occurred creating a new album.\n"
@@ -177,30 +179,29 @@ msgstr ""
"\n"
"{0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:356
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
#, csharp-format
msgid "Uploading picture \"{0}\" ({1} of {2})"
msgstr "Skickar upp bilden \"{0}\" ({1} av {2})"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
#, csharp-format
msgid "Error Uploading To Facebook: {0}"
msgstr "Fel vid sändning till Facebook: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
msgid "Error"
msgstr "Fel"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:381
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
@@ -208,6 +209,10 @@ msgstr "Fel"
msgid "Upload Complete"
msgstr "Sändning färdig"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Besök F-Spot-gruppen på Facebook"
+
#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
msgid "Waiting for authentication"
msgstr "Väntar på autentisering"
@@ -317,8 +322,7 @@ msgid "Logout"
msgstr "Logga ut"
#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:211
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Namn"
@@ -432,6 +436,7 @@ msgstr "<b>Konto</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
#: ../src/f-spot.glade.h:14
#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
msgid "<b>Photos</b>"
@@ -454,7 +459,8 @@ msgstr "<b>Visningsrättigheter</b>"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../src/f-spot.glade.h:43
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
msgid "Export"
msgstr "Exportera"
@@ -544,61 +550,61 @@ msgid "Error: File Already Exists; Aborting"
msgstr "Fel: Filen finns redan; Avbryter"
#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
msgid "Light"
msgstr "Ljus"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
msgid "Dark"
msgstr "Mörk"
#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
msgid "Prev"
msgstr "Föregående"
# hoppas att detta är substantivet
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
#: ../src/CameraFileSelectionDialog.cs:82
msgid "Index"
msgstr "Index"
#. Don't care otherwise, Tags sounds reasonable
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
-#: ../src/MainWindow.cs:342
-#: ../src/Widgets/Sidebar.cs:64
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376
+#: ../src/Widgets/Sidebar.cs:56
msgid "Tags"
msgstr "Taggar"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../src/f-spot.glade.h:57
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58
#: ../src/ItemAction.cs:102
msgid "Next"
msgstr "Nästa"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
msgid "Gallery generated by"
msgstr "Galleri genererat av"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
msgid "Show Styles"
msgstr "Visa stilar"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
msgid "Hide Styles"
msgstr "Dölj stilar"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
#: ../src/ui/main_window.ui.h:24
msgid "Tags: "
msgstr "Taggar: "
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
msgid "Page:"
msgstr "Sida:"
@@ -811,6 +817,7 @@ msgstr "_Föräldraalbum:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
msgid "_Password:"
msgstr "_Lösenord:"
@@ -821,6 +828,7 @@ msgstr "_Titel:"
#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
msgid "_Username:"
msgstr "_Användarnamn:"
@@ -966,12 +974,64 @@ msgstr "Sändning färdig"
msgid "Error uploading to Tabblo: "
msgstr "Fel vid sändning till Tabblo: "
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot-taggar</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo-konto</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid "<small><i>F-Spot tags can help you track the export status of photos. Example: Use one tag for the photos that you plan to export, and another one for those already exported. Here, you can tell F-Spot to automatically replace these tags as appropriate.</i></small>"
+msgstr "<small><i>F-Spot-taggar kan hjälpa dig att hålla ordning på exportstatusen för foton. Exempel: Använd en tagg för foton som du planerar att exportera och en annan för de som redan är exporterade. Här kan du säga till F-Spot att automatiskt ersätta dessa taggar där det lämpar sig.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "Ta b_ort från exporterade foton:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Välj..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "F_äst till exporterade foton:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Ett fel inträffade vid försök att komma åt"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Avbryt denna session"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Lita alltid på certifikatet för denna webbplats "
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Vill du:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Tillitsfel"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Lita tillfälligt på certifikatet för denna webbplats"
+
#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
msgid "Compressed fil_e..."
msgstr "Komprimerad fi_l..."
#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../src/Widgets/EditorPage.cs:196
+#: ../src/Widgets/EditorPage.cs:197
msgid "No selection available"
msgstr "Ingen markering tillgänglig"
@@ -993,7 +1053,6 @@ msgid "Preparing photo \"{0}\""
msgstr "Förbereder fotot \"{0}\""
#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-#: ../src/f-spot.glade.h:92
msgid "_Create"
msgstr "S_kapa"
@@ -1032,8 +1091,8 @@ msgid "Stopped"
msgstr "Stoppad"
#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
-msgid "Hash for Duplicates"
-msgstr "Kontrollsumma för dubletter"
+msgid "Check for Duplicates..."
+msgstr "Leta efter dubletter..."
#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
msgid "F-Spot Gallery"
@@ -1212,8 +1271,8 @@ msgid "New Rolls Only"
msgstr "Endast nya rullar"
#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-#: ../src/FileImportBackend.cs:290
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:55
+#: ../src/FileImportBackend.cs:291
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:58
msgid "Skip"
msgstr "Hoppa över"
@@ -1257,27 +1316,34 @@ msgstr "Konfiguration för skärmsläckare"
#: ../f-spot.desktop.in.in.h:1
#: ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1
+#: ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:2
msgid "F-Spot Photo Manager"
msgstr "Fotohanteraren F-Spot"
-#: ../f-spot.desktop.in.in.h:2
+#: ../f-spot.desktop.in.in.h:3
msgid "Organize, enjoy, and share your photos"
msgstr "Organisera, njut av, och dela med dig av dina foton"
-#: ../f-spot.desktop.in.in.h:3
-#: ../f-spot-import.desktop.in.in.h:3
+#: ../f-spot.desktop.in.in.h:4
+#: ../f-spot-import.desktop.in.in.h:4
msgid "Photo Manager"
msgstr "Fotohanterare"
-#: ../f-spot-import.desktop.in.in.h:2
+#: ../f-spot-import.desktop.in.in.h:3
msgid "Import into F-Spot"
msgstr "Importera till F-Spot"
-#: ../f-spot-view.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:2
msgid "F-Spot Photo Viewer"
msgstr "Fotovisaren F-Spot"
-#: ../f-spot-view.desktop.in.in.h:2
+#: ../f-spot-view.desktop.in.in.h:3
msgid "Photo Viewer"
msgstr "Fotovisare"
@@ -1295,274 +1361,6 @@ msgstr "Okänd transformeringstyp %d"
msgid "Operation failed"
msgstr "Åtgärden misslyckades"
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Paket"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Installation av tillägg"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Välj tilläggen att installera och klicka på Nästa</b>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Installera från:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Förråd..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Visa alla paket"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Visa endast nya versioner"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Visa endast uppdateringar"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "_Avmarkera allt"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Markera _allt"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "etikett124"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Övergripande förlopp:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Hämtar tillägg..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Tilläggshanterare"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Ytterligare utökningar är nödvändiga för att genomföra den här åtgärden."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Följande tillägg kommer att installeras:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Tilläggshanterare</b></big>"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Följande tillägg är för närvarande installerade:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Installera tillägg..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "_Avinstallera..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "Aktivera"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Inaktivera"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Detaljer"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Förrådshantering för tillägg"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Lägg till nytt förråd"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Välj platsen för förrådet som du vill registrera:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Registrera ett förråd på nätet"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url:"
-
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Registrera ett lokalt förråd"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Sökväg:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Bläddra..."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Version:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Upphovsman:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Beroenden för tillägg:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Alla registrerade förråd"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Är du säker på att du vill avbryta installationen?"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Följande paket kommer att avinstalleras:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid "There are other extensions that depend on the previous ones which will also be uninstalled:"
-msgstr "Det finns andra tillägg som är beroende av tidigare tillägg som också kommer att avinstalleras:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid "The selected extensions can't be installed because there are dependency conflicts."
-msgstr "De markerade tilläggen kan inte installeras därför att det finns konflikter i tilläggens beroenden."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Följande paket kommer att installeras:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr "(i användarkatalog)"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Följande paket behöver avinstalleras:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Följande beroenden kunde inte lösas:"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Installationen lyckades."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Installationen misslyckades!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Installationen färdigställdes med varningar."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Avinstallationen lyckades."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Avinstallationen misslyckades!"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Avinstallationen färdigställdes med varningar."
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Förråd"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Installationen avbröts"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Några av de nödvändiga tilläggen hittades inte"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Tillägg"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "Version"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Annan"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
-
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
-#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Undantag inträffade: {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Inaktiverade tillägg kan inte läsas in."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
-#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Läser in tillägget {0}"
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
-#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Det nödvändiga tillägget \"{0}\" är inaktiverat."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
-#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Det nödvändiga tillägget \"{0}\" är inte installerat."
-
-#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
-#, csharp-format
-msgid "(provided by {0})"
-msgstr "(tillhandahålls av {0})"
-
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "Förhandsvisning"
@@ -1572,7 +1370,7 @@ msgid "Path"
msgstr "Sökväg"
#: ../src/CameraFileSelectionDialog.cs:80
-#: ../src/f-spot.glade.h:46
+#: ../src/f-spot.glade.h:47
msgid "File"
msgstr "Fil"
@@ -1612,7 +1410,7 @@ msgid "Transferring \"{0}\" from camera"
msgstr "Överför \"{0}\" från kamera"
#: ../src/CameraSelectionDialog.cs:29
-#: ../src/Widgets/InfoBox.cs:230
+#: ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Kamera"
@@ -1620,12 +1418,12 @@ msgstr "Kamera"
msgid "Port"
msgstr "Port"
-#: ../src/Core.cs:203
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Inga foton som matchar {0} hittades"
-#: ../src/Core.cs:204
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -1636,11 +1434,11 @@ msgstr ""
"Prova att sätta taggen på några foton, eller välja en\n"
"annan tagg i F-Spots inställningsdialog."
-#: ../src/Core.cs:208
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Sökningen gav inga resultat"
-#: ../src/Core.cs:209
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -1667,20 +1465,20 @@ msgid_plural "Modified ({0})"
msgstr[0] "Ändrad"
msgstr[1] "Ändrad ({0})"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Ändrad i {1}"
-#: ../src/Core/Photo.cs:511
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Ändrad i {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:666
-#: ../src/f-spot.glade.h:61
+#: ../src/Core/Photo.cs:671
+#: ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Original"
@@ -1756,19 +1554,19 @@ msgstr "Markera ögonen som du vill rätta till."
msgid "Sepia Tone"
msgstr "Sepiaton"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "Mjuk fokus"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Räta ut"
-#: ../src/FileImportBackend.cs:288
+#: ../src/FileImportBackend.cs:289
msgid "Import error"
msgstr "Importeringsfel"
-#: ../src/FileImportBackend.cs:289
+#: ../src/FileImportBackend.cs:290
#, csharp-format
msgid "Error importing {0}{2}{2}{1}"
msgstr "Fel vid import av {0}{2}{2}{1}"
@@ -1784,8 +1582,8 @@ msgid "Unhandled exception"
msgstr "Ohanterat undantag"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Kopiera fotots p_lats"
+msgid "Copy Photo"
+msgstr "Kopiera foto"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -1801,15 +1599,15 @@ msgid "Rem_ove Tag"
msgstr "Ta b_ort tagg"
#: ../src/FSpot.addin.xml.h:5
-#: ../src/f-spot.glade.h:68
-#: ../src/SingleView.cs:453
+#: ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425
#: ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Rotera åt _vänster"
#: ../src/FSpot.addin.xml.h:6
-#: ../src/f-spot.glade.h:69
-#: ../src/SingleView.cs:454
+#: ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426
#: ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Rotera åt _höger"
@@ -1927,225 +1725,229 @@ msgid "C_ontrast:"
msgstr "_Kontrast:"
#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "S_kapa"
+
+#: ../src/f-spot.glade.h:32
msgid "Camera Selection"
msgstr "Val av kamera"
-#: ../src/f-spot.glade.h:32
+#: ../src/f-spot.glade.h:33
msgid "Copy files to the Photos folder"
msgstr "Kopiera filer till fotomappen"
-#: ../src/f-spot.glade.h:33
+#: ../src/f-spot.glade.h:34
msgid "Create Mail"
msgstr "Skapa e-post"
-#: ../src/f-spot.glade.h:34
+#: ../src/f-spot.glade.h:35
msgid "Create _icon for this tag when first used"
msgstr "Skapa _ikon för denna tagg när den först används"
-#: ../src/f-spot.glade.h:35
+#: ../src/f-spot.glade.h:36
msgid "Create a mail with the selected photos (possibly resized) attached"
msgstr "Skapa ett e-postmeddelande med de markerade fotona (möjligen storleksändrade) som bilagor"
-#: ../src/f-spot.glade.h:36
+#: ../src/f-spot.glade.h:37
msgid "Detect duplicates"
msgstr "Detektera dubletter"
-#: ../src/f-spot.glade.h:37
+#: ../src/f-spot.glade.h:38
msgid "Display File _Names"
msgstr "Visa fil_namn"
-#: ../src/f-spot.glade.h:38
+#: ../src/f-spot.glade.h:39
msgid "Display only those photos that were imported in specified Rolls."
msgstr "Visa endast de foton som blev importerade i angivna rullar."
-#: ../src/f-spot.glade.h:39
+#: ../src/f-spot.glade.h:40
msgid "Do not send a mail"
msgstr "Skicka inte e-post"
-#: ../src/f-spot.glade.h:40
+#: ../src/f-spot.glade.h:41
msgid "E-_Mail:"
msgstr "E-_post:"
-#: ../src/f-spot.glade.h:41
+#: ../src/f-spot.glade.h:42
msgid "E_xport titles and comments"
msgstr "E_xportera titlar och kommentarer"
-#: ../src/f-spot.glade.h:42
+#: ../src/f-spot.glade.h:43
msgid "Estimated new size"
msgstr "Uppskattad ny storlek"
-#: ../src/f-spot.glade.h:44
+#: ../src/f-spot.glade.h:45
msgid "Extra large"
msgstr "Extra stor"
-#: ../src/f-spot.glade.h:45
+#: ../src/f-spot.glade.h:46
msgid "F-Spot View"
msgstr "F-Spot Bildvisning"
-#: ../src/f-spot.glade.h:47
+#: ../src/f-spot.glade.h:48
msgid "Filter on selected rolls"
msgstr "Filtrera på markerade rullar"
-#: ../src/f-spot.glade.h:48
+#: ../src/f-spot.glade.h:49
msgid "G_allery:"
msgstr "G_alleri:"
-#: ../src/f-spot.glade.h:49
+#: ../src/f-spot.glade.h:50
msgid "Gallery"
msgstr "Galleri"
-#: ../src/f-spot.glade.h:50
+#: ../src/f-spot.glade.h:51
#: ../src/ImportCommand.cs:547
-#: ../src/MainWindow.cs:267
+#: ../src/MainWindow.cs:301
msgid "Import"
msgstr "Importera"
#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:52
+#: ../src/f-spot.glade.h:53
msgid "Import Source:"
msgstr "Importera från:"
-#: ../src/f-spot.glade.h:53
+#: ../src/f-spot.glade.h:54
msgid "Include subfolders"
msgstr "Inkludera underkataloger"
-#: ../src/f-spot.glade.h:54
+#: ../src/f-spot.glade.h:55
msgid "Large"
msgstr "Stor"
-#: ../src/f-spot.glade.h:55
+#: ../src/f-spot.glade.h:56
msgid "Manage your custom selection ratios"
msgstr "Hantera dina anpassade markeringsförhållanden"
-#: ../src/f-spot.glade.h:56
+#: ../src/f-spot.glade.h:57
msgid "Medium"
msgstr "Mellan"
-#: ../src/f-spot.glade.h:58
+#: ../src/f-spot.glade.h:59
msgid "Number of photos in selected rolls:"
msgstr "Antal foton i markerade rullar:"
-#: ../src/f-spot.glade.h:59
+#: ../src/f-spot.glade.h:60
msgid "Number of pictures"
msgstr "Antal bilder"
-#: ../src/f-spot.glade.h:60
+#: ../src/f-spot.glade.h:61
msgid "Open _Folder..."
msgstr "Öppna _mapp..."
-#: ../src/f-spot.glade.h:62
+#: ../src/f-spot.glade.h:63
msgid "Original size (possible very large file size)"
msgstr "Ursprunglig storlek (möjligen mycket stor filstorlek)"
-#: ../src/f-spot.glade.h:63
+#: ../src/f-spot.glade.h:64
#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
msgid "P_arent Tag:"
msgstr "_Föräldertagg:"
-#: ../src/f-spot.glade.h:64
+#: ../src/f-spot.glade.h:65
msgid "Pause"
msgstr "Paus"
-#: ../src/f-spot.glade.h:65
+#: ../src/f-spot.glade.h:66
msgid "Preferences"
msgstr "Inställningar"
-#: ../src/f-spot.glade.h:66
+#: ../src/f-spot.glade.h:67
#: ../src/ItemAction.cs:123
msgid "Previous"
msgstr "Föregående"
-#: ../src/f-spot.glade.h:67
+#: ../src/f-spot.glade.h:68
msgid "Repair"
msgstr "Reparera"
-#: ../src/f-spot.glade.h:70
+#: ../src/f-spot.glade.h:71
msgid "Select Photos to Copy From Camera..."
msgstr "Välj foton att kopiera från kameran"
-#: ../src/f-spot.glade.h:71
+#: ../src/f-spot.glade.h:72
msgid "Select a Tag..."
msgstr "Markera en tagg..."
-#: ../src/f-spot.glade.h:72
+#: ../src/f-spot.glade.h:73
msgid "Select the camera from which you want to transfer files"
msgstr "Välj kameran som du vill överföra bilder från"
-#: ../src/f-spot.glade.h:73
+#: ../src/f-spot.glade.h:74
msgid "Selected Camera: "
msgstr "Vald kamera: "
-#: ../src/f-spot.glade.h:74
+#: ../src/f-spot.glade.h:75
msgid "Selection Constraints"
msgstr "Markeringskriterier"
-#: ../src/f-spot.glade.h:75
+#: ../src/f-spot.glade.h:76
#: ../src/ui/main_window.ui.h:21
msgid "Set as _Background"
msgstr "Ställ in som _bakgrund"
-#: ../src/f-spot.glade.h:76
+#: ../src/f-spot.glade.h:77
msgid "Show all photos."
msgstr "Visa alla foton."
-#: ../src/f-spot.glade.h:77
+#: ../src/f-spot.glade.h:78
msgid "Show or hide the side pane"
msgstr "Visa eller dölj sidopanelen"
-#: ../src/f-spot.glade.h:78
+#: ../src/f-spot.glade.h:79
msgid "Show or hide the toolbar"
msgstr "Visa eller dölj verktygsraden"
-#: ../src/f-spot.glade.h:79
+#: ../src/f-spot.glade.h:80
msgid "Side _pane"
msgstr "Sido_panel"
-#: ../src/f-spot.glade.h:80
+#: ../src/f-spot.glade.h:81
msgid "Small"
msgstr "Liten"
-#: ../src/f-spot.glade.h:81
+#: ../src/f-spot.glade.h:82
msgid "Specify if an original size picture should be rotated or not. Smaller sizes are automatically rotated."
msgstr "Ange om en bild av ursprunglig storlek ska roteras eller inte. Mindre storlekar roteras automatiskt."
-#: ../src/f-spot.glade.h:82
+#: ../src/f-spot.glade.h:83
msgid "Strip image _metadata"
msgstr "Rensa bildens _metadata"
#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:84
+#: ../src/f-spot.glade.h:85
msgid "Te_mp:"
msgstr "Te_mp:"
-#: ../src/f-spot.glade.h:85
+#: ../src/f-spot.glade.h:86
msgid "Tiny"
msgstr "Mycket liten"
-#: ../src/f-spot.glade.h:86
+#: ../src/f-spot.glade.h:87
msgid "Total original size"
msgstr "Total ursprunglig storlek"
-#: ../src/f-spot.glade.h:87
+#: ../src/f-spot.glade.h:88
#: ../src/ui/main_window.ui.h:28
msgid "Zoom _in"
msgstr "Zooma _in"
-#: ../src/f-spot.glade.h:88
+#: ../src/f-spot.glade.h:89
#: ../src/ui/main_window.ui.h:29
msgid "Zoom _out"
msgstr "Zooma _ut"
-#: ../src/f-spot.glade.h:89
+#: ../src/f-spot.glade.h:90
#: ../src/ui/main_window.ui.h:30
msgid "Zoom in"
msgstr "Zooma in"
-#: ../src/f-spot.glade.h:90
+#: ../src/f-spot.glade.h:91
#: ../src/ui/main_window.ui.h:31
msgid "Zoom out"
msgstr "Zooma ut"
-#: ../src/f-spot.glade.h:91
+#: ../src/f-spot.glade.h:92
msgid "_Brightness:"
msgstr "_Ljusstyrka:"
@@ -2281,7 +2083,7 @@ msgid "Info"
msgstr "Info"
#: ../src/FullScreenView.cs:68
-#: ../src/Widgets/InfoBox.cs:200
+#: ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "Bildinformation"
@@ -2290,8 +2092,8 @@ msgid "Exit fullscreen"
msgstr "Lämna helskärmsläge"
#: ../src/FullScreenView.cs:81
-#: ../src/MainWindow.cs:307
-#: ../src/SingleView.cs:103
+#: ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Bildspel"
@@ -2342,7 +2144,7 @@ msgstr "InterOperability-katalog"
msgid "Unknown Directory"
msgstr "Okänd katalog"
-#: ../src/Imaging/ImageFile.cs:116
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Skrivning till detta filformat stöds inte"
@@ -2472,7 +2274,7 @@ msgid "Unknown IIM DataSet"
msgstr "Okänt IIM DataSet"
#: ../src/ImportCommand.cs:48
-#: ../src/SingleView.cs:359
+#: ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Välj mapp"
@@ -2498,16 +2300,15 @@ msgstr "Katalogen finns inte."
msgid "The directory you selected \"{0}\" does not exist. Please choose a different directory"
msgstr "Katalogen du valde \"{0}\" finns inte. Välj en annan katalog"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:739
-#: ../src/ImportCommand.cs:741
+#: ../src/ImportCommand.cs:738
+#: ../src/ImportCommand.cs:740
#: ../src/XmpTagsImporter.cs:89
-msgid "Import Tags"
-msgstr "Importera taggar"
+msgid "Imported Tags"
+msgstr "Importerade taggar"
#: ../src/ItemAction.cs:79
-#: ../src/MainWindow.cs:274
-#: ../src/SingleView.cs:86
+#: ../src/MainWindow.cs:308
+#: ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Rotera åt vänster"
@@ -2516,8 +2317,8 @@ msgid "Rotate picture left"
msgstr "Rotera bild åt vänster"
#: ../src/ItemAction.cs:91
-#: ../src/MainWindow.cs:278
-#: ../src/SingleView.cs:91
+#: ../src/MainWindow.cs:312
+#: ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Rotera åt höger"
@@ -2533,237 +2334,237 @@ msgstr "Nästa bild"
msgid "Previous picture"
msgstr "Föregående bild"
-#: ../src/MainWindow.cs:269
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Importera nya bilder"
-#: ../src/MainWindow.cs:285
+#: ../src/MainWindow.cs:319
#: ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "Bläddra"
-#: ../src/MainWindow.cs:289
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "Bläddra bland många foton samtidigt"
-#: ../src/MainWindow.cs:293
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Redigera bild"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Visa och redigera ett foto"
-#: ../src/MainWindow.cs:302
-#: ../src/SingleView.cs:98
+#: ../src/MainWindow.cs:336
+#: ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "Helskärm"
-#: ../src/MainWindow.cs:304
-#: ../src/SingleView.cs:100
+#: ../src/MainWindow.cs:338
+#: ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Visa foton i helskärmsläge"
-#: ../src/MainWindow.cs:309
-#: ../src/SingleView.cs:105
+#: ../src/MainWindow.cs:343
+#: ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "Visa foton i ett bildspel"
-#: ../src/MainWindow.cs:324
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Föregående foto"
-#: ../src/MainWindow.cs:329
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Nästa foto"
-#: ../src/MainWindow.cs:1488
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Inga kameror hittades"
-#: ../src/MainWindow.cs:1489
+#: ../src/MainWindow.cs:1519
msgid "F-Spot was unable to find any cameras attached to this system. Double check that the camera is connected and has power"
msgstr "F-Spot kunde inte hitta några kameror anslutna till detta system. Kontrollera att kameran är ansluten och att den har ström"
-#: ../src/MainWindow.cs:1528
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Fel vid anslutning till kamera"
-#: ../src/MainWindow.cs:1529
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Tog emot fel \"{0}\" vid anslutning till kamera"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1815
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "Sammanfoga den markerade taggen"
msgstr[1] "Sammanfoga de {0} markerade taggarna"
-#: ../src/MainWindow.cs:1842
+#: ../src/MainWindow.cs:1873
msgid "This operation will merge the selected tags and any sub-tags into a single tag."
msgstr "Denna operation kommer att slå ihop de markerade taggarna och deras undertaggar till en enda tagg."
-#: ../src/MainWindow.cs:1844
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "_Slå ihop taggar"
-#: ../src/MainWindow.cs:2049
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{0} foto utav {1}"
msgstr[1] "{0} foton utav {1}"
-#: ../src/MainWindow.cs:2051
-#: ../src/SingleView.cs:495
+#: ../src/MainWindow.cs:2082
+#: ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} foto"
msgstr[1] "{0} foton"
-#: ../src/MainWindow.cs:2054
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} markerad)"
msgstr[1] " ({0} markerade)"
-#: ../src/MainWindow.cs:2135
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_OK"
-#: ../src/MainWindow.cs:2136
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "Fel vid borttagning av foto"
-#: ../src/MainWindow.cs:2141
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "Ingen behörighet att ta bort filen:{1}{0}"
-#: ../src/MainWindow.cs:2145
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "Ett fel av typen {0} inträffade vid borttagning av filen:{2}{1}"
-#: ../src/MainWindow.cs:2177
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "Ta bort det markerade fotot permanent?"
msgstr[1] "Ta bort de {0} markerade fotona permanent?"
-#: ../src/MainWindow.cs:2181
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural "This deletes all versions of the selected photos from your drive."
msgstr[0] "Detta tar bort alla versioner av det markerade fotot från din disk."
msgstr[1] "Detta tar bort alla versioner av markerade foton från din disk."
-#: ../src/MainWindow.cs:2184
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "_Ta bort foto"
msgstr[1] "_Ta bort foton"
-#: ../src/MainWindow.cs:2220
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "Ta bort det markerade fotot från F-Spot?"
msgstr[1] "Ta bort de {0} markerade fotona från F-Spot?"
-#: ../src/MainWindow.cs:2225
+#: ../src/MainWindow.cs:2256
msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
msgstr "Om du tar bort foton från F-Spot-katalogen kommer all tagginformation för dem att gå förlorad. Fotona finns dock kvar på din dator och kan importeras in till F-Spot på nytt."
# SUN CHANGED MESSAGE
-#: ../src/MainWindow.cs:2226
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
msgstr "Ta bort från _katalog"
-#: ../src/MainWindow.cs:2289
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "Ta bort taggen \"{0}\"?"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "Ta bort de {0} markerade taggarna?"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "foto"
msgstr[1] "foton"
-#: ../src/MainWindow.cs:2298
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
msgstr[0] "Om du tar bort denna tagg så försvinner associationen med {0} {1}."
msgstr[1] "Om du tar bort dessa taggar så försvinner associationen med {0} {1}."
-#: ../src/MainWindow.cs:2303
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "_Ta bort tagg"
msgstr[1] "_Ta bort taggar"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2317
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Taggen är inte tom"
-#: ../src/MainWindow.cs:2318
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
msgstr "Kan inte ta bort taggar som har andra taggar under sig. Ta bort alla taggar under \"{0}\" först"
-#: ../src/MainWindow.cs:2750
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Rotera det markerade fotot åt vänster"
msgstr[1] "Rotera de markerade fotona åt vänster"
-#: ../src/MainWindow.cs:2763
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Rotera det markerade fotot åt höger"
msgstr[1] "Rotera de markerade fotona åt höger"
-#: ../src/MainWindow.cs:2774
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "Sök efter _vald tagg"
msgstr[1] "Sök efter _valda taggar"
-#: ../src/MainWindow.cs:2778
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "Sök efter vald tagg _med"
msgstr[1] "Sök efter valda taggar _med"
-#: ../src/MainWindow.cs:2819
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Skapa en ny version?"
msgstr[1] "Skapa nya versioner?"
-#: ../src/MainWindow.cs:2821
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
msgstr[0] "Innan start av {1}, ska F-Spot skapa en ny version av det markerade fotot för att bibehålla originalet?"
msgstr[1] "Innan start av {1}, ska F-Spot skapa nya versioner av de markerade fotona för att bibehålla originalen?"
-#: ../src/MainWindow.cs:2843
+#: ../src/MainWindow.cs:2882
msgid "XCF version"
msgstr "XCF-version"
@@ -2787,89 +2588,95 @@ msgstr "Ämne och nyckelord"
msgid "Compression"
msgstr "Komprimering"
-#: ../src/MetadataStore.cs:25
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Planär inställning"
-#: ../src/MetadataStore.cs:27
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Orientering"
-#: ../src/MetadataStore.cs:29
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
msgstr "Fotometrisk tolkning"
-#: ../src/MetadataStore.cs:31
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Upplösningsenhet"
-#: ../src/MetadataStore.cs:33
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Exponeringsprogram"
-#: ../src/MetadataStore.cs:35
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Exponeringsmätningsläge"
-#: ../src/MetadataStore.cs:37
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Exponeringsläge"
-#: ../src/MetadataStore.cs:39
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Renderat på anpassat sätt"
-#: ../src/MetadataStore.cs:41
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Komponentinställningar"
-#: ../src/MetadataStore.cs:43
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Ljuskälla"
# detta kan vara "Exponeringsmätning. "
# hittade inte var strängen förkommer.
-#: ../src/MetadataStore.cs:45
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Avkänningsmetod"
-#: ../src/MetadataStore.cs:47
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Färgrymd"
-#: ../src/MetadataStore.cs:49
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Vitbalans"
-#: ../src/MetadataStore.cs:51
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Fokalplanets upplösningsenhet"
-#: ../src/MetadataStore.cs:53
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Filens källtyp"
-#: ../src/MetadataStore.cs:55
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Typ av scenfångst"
-#: ../src/MetadataStore.cs:57
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Förstärkningskontroll"
-#: ../src/MetadataStore.cs:59
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/MetadataStore.cs:61
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Mättnad"
-#: ../src/MetadataStore.cs:63
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Skärpa"
-#: ../src/MetadataStore.cs:65
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Scentyp"
@@ -2940,28 +2747,28 @@ msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Tog emot undantag \"{0}\". Kunde inte byta namn på version \"{1}\""
#: ../src/PhotoVersionMenu.cs:66
-#: ../src/Widgets/InfoBox.cs:554
-#: ../src/Widgets/InfoBox.cs:556
+#: ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(Inga ändringar)"
-#: ../src/PhotoView.cs:169
+#: ../src/PhotoView.cs:167
#: ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "Fel vid redigering av foto"
-#: ../src/PhotoView.cs:170
+#: ../src/PhotoView.cs:168
#: ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "Mottog undantaget \"{0}\". Kunde inte spara fotot {1}"
-#: ../src/PhotoView.cs:359
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Kommentar:"
-#: ../src/Preferences.cs:149
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Foton"
@@ -3071,8 +2878,8 @@ msgstr "Ett fel inträffade vid behandling av \"{0}\": {1}"
#. Send the mail :)
#: ../src/SendEmail.cs:330
-msgid "my photos"
-msgstr "mina foton"
+msgid "My Photos"
+msgstr "Mina foton"
#: ../src/Sharpener.cs:72
msgid "Error saving sharpened photo"
@@ -3094,23 +2901,23 @@ msgstr "Radie:"
msgid "Threshold:"
msgstr "Tröskelvärde:"
-#: ../src/SingleView.cs:88
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Rotera fotot åt vänster"
-#: ../src/SingleView.cs:93
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Rotera fotot åt höger"
-#: ../src/SingleView.cs:130
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Mapp"
-#: ../src/SingleView.cs:356
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "Öppna"
-#: ../src/SingleView.cs:456
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "Ställ in som bakgrund"
@@ -3141,8 +2948,8 @@ msgid "Create New Tag..."
msgstr "Skapa ny tagg..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Redigera markerad tagg..."
+msgid "Edit Tag..."
+msgstr "Redigera tagg..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
@@ -3227,7 +3034,7 @@ msgstr "Händelser"
#. The label for the root category is used in new and edit tag dialogs
#: ../src/TagStore.cs:239
-#: ../src/Widgets/InfoBox.cs:400
+#: ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Inget)"
@@ -3261,15 +3068,15 @@ msgstr "Uppdaterar miniatyrbilder"
msgid "Updating picture \"{0}\""
msgstr "Uppdaterar bilden \"{0}\""
-#: ../src/UI.Dialog/AboutDialog.cs:71
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "Fotohantering för GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:72
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:95
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"Daniel Nylander\n"
@@ -3279,7 +3086,7 @@ msgstr ""
"Skicka synpunkter på översättningen till\n"
"tp-sv at listor.tp-sv.se"
-#: ../src/UI.Dialog/AboutDialog.cs:100
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "F-Spots webbplats"
@@ -3377,16 +3184,16 @@ msgstr "Felinformation"
msgid "An unhandled exception was thrown: "
msgstr "Ett ohanterat undantag kastades: "
-#: ../src/UI.Dialog/PreferenceDialog.cs:53
-#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
msgid "None"
msgstr "Inget"
-#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
msgid "System profile"
msgstr "Systemprofil"
-#: ../src/UI.Dialog/PreferenceDialog.cs:84
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
msgid "Standard theme"
msgstr "Standardtema"
@@ -3407,7 +3214,7 @@ msgstr "Etikett"
msgid "Ratio"
msgstr "Förhållande"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
msgid "Retry"
msgstr "Försök igen"
@@ -3601,8 +3408,8 @@ msgid "By _Rating"
msgstr "Efter bet_yg"
#: ../src/ui/main_window.ui.h:7
-msgid "Copy Locat_ion"
-msgstr "Kopiera _plats"
+msgid "Copy"
+msgstr "Kopiera"
#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
@@ -3612,10 +3419,6 @@ msgstr "Skapa ny _tagg..."
msgid "Create _New Version..."
msgstr "Skapa _ny version..."
-#: ../src/ui/main_window.ui.h:10
-msgid "F-Spot"
-msgstr "F-Spot"
-
#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "_Sök"
@@ -3632,6 +3435,10 @@ msgstr "Sidkonfi_guration..."
msgid "Re_fresh Thumbnail"
msgstr "_Uppdatera miniatyrbild"
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Markera _allt"
+
#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "A_vmarkera allt"
@@ -3693,8 +3500,8 @@ msgid "_Delete Version"
msgstr "_Ta bort version"
#: ../src/ui/main_window.ui.h:45
-msgid "_Edit Selected Tag..."
-msgstr "_Redigera markerad tagg..."
+msgid "_Edit Tag..."
+msgstr "R_edigera tagg..."
#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
@@ -3782,7 +3589,7 @@ msgstr "_Tidslinje"
#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
-msgstr "_Verktyg"
+msgstr "Ver_ktyg"
#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
@@ -3792,11 +3599,11 @@ msgstr "_Otaggade foton"
msgid "_Version"
msgstr "_Version"
-#: ../src/Updater.cs:616
+#: ../src/Updater.cs:622
msgid "Updating F-Spot Database"
msgstr "Uppdaterar F-Spot-databasen"
-#: ../src/Updater.cs:617
+#: ../src/Updater.cs:623
msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
msgstr "Var god vänta medan databasen för ditt F-Spot-galleri uppdateras. Detta kan ta lite tid."
@@ -3885,22 +3692,22 @@ msgstr "Skriv ut fototaggar"
msgid "Print photo comment"
msgstr "Skriv ut fotokommentar"
-#: ../src/Widgets/EditorPage.cs:29
-#: ../src/Widgets/Sidebar.cs:62
+#: ../src/Widgets/EditorPage.cs:30
+#: ../src/Widgets/Sidebar.cs:54
msgid "Edit"
msgstr "Redigera"
-#: ../src/Widgets/EditorPage.cs:197
+#: ../src/Widgets/EditorPage.cs:198
msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
msgstr "Detta verktyg kräver en aktiv markering. Markera ett område i fotot och försök göra samma operation igen"
-#: ../src/Widgets/EditorPage.cs:215
+#: ../src/Widgets/EditorPage.cs:216
msgid "Error saving adjusted photo"
msgid_plural "Error saving adjusted photos"
msgstr[0] "Fel vid sparande av justerat foto"
msgstr[1] "Fel vid sparande av justerade foton"
-#: ../src/Widgets/EditorPage.cs:217
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid "Received exception \"{0}\". Note that you have to develop RAW files into JPEG before you can edit them."
msgstr "Mottog undantaget \"{0}\". Observera att du måste framkalla RAW-filer i JPEG innan du kan redigera dem."
@@ -3917,7 +3724,7 @@ msgstr "_Vertikalt"
msgid "Find:"
msgstr "Sök:"
-#: ../src/Widgets/FolderTreePage.cs:21
+#: ../src/Widgets/FolderTreePage.cs:22
msgid "Folders"
msgstr "Mappar"
@@ -3929,55 +3736,61 @@ msgstr "Filsystem"
msgid "Histogram"
msgstr "Histogram"
-#: ../src/Widgets/InfoBox.cs:217
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Version"
+
+#: ../src/Widgets/InfoBox.cs:218
msgid "Date"
msgstr "Datum"
-#: ../src/Widgets/InfoBox.cs:223
+#: ../src/Widgets/InfoBox.cs:224
msgid "Exposure"
msgstr "Exponering"
-#: ../src/Widgets/InfoBox.cs:227
+#: ../src/Widgets/InfoBox.cs:228
msgid "Focal Length"
msgstr "Brännvidd"
-#: ../src/Widgets/InfoBox.cs:233
+#: ../src/Widgets/InfoBox.cs:234
msgid "File Size"
msgstr "Filstorlek"
-#: ../src/Widgets/InfoBox.cs:236
+#: ../src/Widgets/InfoBox.cs:237
msgid "Rating"
msgstr "Betyg"
-#: ../src/Widgets/InfoBox.cs:409
-#: ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442
+#: ../src/Widgets/InfoBox.cs:390
+#: ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(felaktigt format)"
+
+#: ../src/Widgets/InfoBox.cs:418
+#: ../src/Widgets/InfoBox.cs:441
#: ../src/Widgets/InfoBox.cs:451
+#: ../src/Widgets/InfoBox.cs:460
msgid "(Unknown)"
msgstr "(Okänt)"
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr "(felaktigt format)"
-
-#: ../src/Widgets/InfoBox.cs:552
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
msgid "(One Edit)"
msgid_plural "({0} Edits)"
msgstr[0] "(En redigering)"
msgstr[1] "({0} redigeringar)"
-#: ../src/Widgets/InfoBox.cs:566
+#: ../src/Widgets/InfoBox.cs:575
msgid "(File read error)"
msgstr "(Filläsningsfel)"
-#: ../src/Widgets/InfoBox.cs:611
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
msgid "{0} Photos"
msgstr "{0} foton"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:631
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
msgid ""
"On {0} between \n"
@@ -3986,7 +3799,7 @@ msgstr ""
"Den {0} mellan \n"
"{1} och {2}"
-#: ../src/Widgets/InfoBox.cs:636
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
msgid ""
"Between {0} \n"
@@ -3995,61 +3808,61 @@ msgstr ""
"Mellan {0} \n"
"och {1}"
-#: ../src/Widgets/InfoBox.cs:663
+#: ../src/Widgets/InfoBox.cs:672
msgid "(At least one File not found)"
msgstr "(Minst en fil hittades inte)"
-#: ../src/Widgets/InfoBox.cs:780
+#: ../src/Widgets/InfoBox.cs:789
msgid "Show Photo Name"
msgstr "Visa Fotonamn"
-#: ../src/Widgets/InfoBox.cs:789
+#: ../src/Widgets/InfoBox.cs:798
msgid "Show Date"
msgstr "Visa Datum"
-#: ../src/Widgets/InfoBox.cs:798
+#: ../src/Widgets/InfoBox.cs:807
msgid "Show Size"
msgstr "Visa Storlek"
-#: ../src/Widgets/InfoBox.cs:807
+#: ../src/Widgets/InfoBox.cs:816
msgid "Show Exposure"
msgstr "Visa Exponering"
-#: ../src/Widgets/InfoBox.cs:816
+#: ../src/Widgets/InfoBox.cs:825
msgid "Show Focal Length"
msgstr "Visa Brännvidd"
-#: ../src/Widgets/InfoBox.cs:825
+#: ../src/Widgets/InfoBox.cs:834
msgid "Show Camera"
msgstr "Visa Kamera"
-#: ../src/Widgets/InfoBox.cs:834
+#: ../src/Widgets/InfoBox.cs:843
msgid "Show File Size"
msgstr "Visa Filstorlek"
-#: ../src/Widgets/MetadataDisplay.cs:23
+#: ../src/Widgets/MetadataDisplay.cs:25
msgid "Metadata"
msgstr "Metadata"
-#: ../src/Widgets/MetadataDisplay.cs:104
+#: ../src/Widgets/MetadataDisplay.cs:106
msgid "Extended Metadata"
msgstr "Utökad metadata"
#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:392
+#: ../src/Widgets/MetadataDisplay.cs:394
msgid "No Extended Metadata Available"
msgstr "Ingen utökad metadata tillgänglig"
-#: ../src/Widgets/MetadataDisplay.cs:410
+#: ../src/Widgets/MetadataDisplay.cs:412
msgid "No active photo"
msgstr "Inget aktivt foto"
-#: ../src/Widgets/MetadataDisplay.cs:412
+#: ../src/Widgets/MetadataDisplay.cs:414
#, csharp-format
msgid "The photo \"{0}\" does not exist"
msgstr "Fotot \"{0}\" finns inte"
-#: ../src/Widgets/MetadataDisplay.cs:415
+#: ../src/Widgets/MetadataDisplay.cs:417
msgid "No metadata available"
msgstr "Ingen metadata tillgänglig"
@@ -4082,41 +3895,147 @@ msgstr "Visa ett bildspel från F-Spot"
msgid "F-Spot photos"
msgstr "Foton från F-Spot"
-#~ msgid "<b>F-Spot tags</b>"
-#~ msgstr "<b>F-Spot-taggar</b>"
-#~ msgid "<b>Tabblo account</b>"
-#~ msgstr "<b>Tabblo-konto</b>"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Redigera markerad tagg..."
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Redigera markerad tagg..."
+#~ msgid "Package"
+#~ msgstr "Paket"
+#~ msgid "Extension Installation"
+#~ msgstr "Installation av tillägg"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Välj tilläggen att installera och klicka på Nästa</b>"
+#~ msgid "Install from:"
+#~ msgstr "Installera från:"
+#~ msgid "_Repositories..."
+#~ msgstr "_Förråd..."
+#~ msgid "Show all packages"
+#~ msgstr "Visa alla paket"
+#~ msgid "Show new versions only"
+#~ msgstr "Visa endast nya versioner"
+#~ msgid "Show updates only"
+#~ msgstr "Visa endast uppdateringar"
+#~ msgid "_Unselect All"
+#~ msgstr "_Avmarkera allt"
+#~ msgid "label124"
+#~ msgstr "etikett124"
+#~ msgid "Overall Progress:"
+#~ msgstr "Övergripande förlopp:"
+#~ msgid "Downloading extensions..."
+#~ msgstr "Hämtar tillägg..."
+#~ msgid "Extension Manager"
+#~ msgstr "Tilläggshanterare"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr ""
+#~ "Ytterligare utökningar är nödvändiga för att genomföra den här åtgärden."
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Följande tillägg kommer att installeras:"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Tilläggshanterare</b></big>"
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Följande tillägg är för närvarande installerade:"
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Installera tillägg..."
+#~ msgid "_Uninstall..."
+#~ msgstr "_Avinstallera..."
+#~ msgid "Enable"
+#~ msgstr "Aktivera"
+#~ msgid "Disable"
+#~ msgstr "Inaktivera"
+#~ msgid "Details"
+#~ msgstr "Detaljer"
+#~ msgid "Extension Repository Management"
+#~ msgstr "Förrådshantering för tillägg"
+#~ msgid "Add New Repository"
+#~ msgstr "Lägg till nytt förråd"
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Välj platsen för förrådet som du vill registrera:"
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registrera ett förråd på nätet"
+#~ msgid "Url:"
+#~ msgstr "Url:"
+#~ msgid "Register a local repository"
+#~ msgstr "Registrera ett lokalt förråd"
+#~ msgid "Path:"
+#~ msgstr "Sökväg:"
+#~ msgid "Browse..."
+#~ msgstr "Bläddra..."
+#~ msgid "Version:"
+#~ msgstr "Version:"
+#~ msgid "Author:"
+#~ msgstr "Upphovsman:"
+#~ msgid "Copyright:"
+#~ msgstr "Copyright:"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Beroenden för tillägg:"
+#~ msgid "All registered repositories"
+#~ msgstr "Alla registrerade förråd"
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Är du säker på att du vill avbryta installationen?"
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Följande paket kommer att avinstalleras:"
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Det finns andra tillägg som är beroende av tidigare tillägg som också "
+#~ "kommer att avinstalleras:"
#~ msgid ""
-#~ "<small><i>F-Spot tags can help you track the export status of photos. "
-#~ "Example: Use one tag for the photos that you plan to export, and another "
-#~ "one for those already exported. Here, you can tell F-Spot to "
-#~ "automatically replace these tags as appropriate.</i></small>"
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
#~ msgstr ""
-#~ "<small><i>F-Spot-taggar kan hjälpa dig att hålla ordning på "
-#~ "exportstatusen för foton. Exempel: Använd en tagg för foton som du "
-#~ "planerar att exportera och en annan för de som redan är exporterade. Här "
-#~ "kan du säga till F-Spot att automatiskt ersätta dessa taggar där det "
-#~ "lämpar sig.</i></small>"
-#~ msgid "Rem_ove from exported photos:"
-#~ msgstr "Ta b_ort från exporterade foton:"
-#~ msgid "Select..."
-#~ msgstr "Välj..."
-#~ msgid "_Attach to exported photos:"
-#~ msgstr "F_äst till exporterade foton:"
-#~ msgid "<b>{0}</b>."
-#~ msgstr "<b>{0}</b>."
-#~ msgid "A trust error occured while attempting to access"
-#~ msgstr "Ett fel inträffade vid försök att komma åt"
-#~ msgid "Abort this session"
-#~ msgstr "Avbryt denna session"
-#~ msgid "Always trust this site's certificate"
-#~ msgstr "Lita alltid på certifikatet för denna webbplats "
-#~ msgid "Do you wish to:"
-#~ msgstr "Vill du:"
-#~ msgid "Trust Error"
-#~ msgstr "Tillitsfel"
-#~ msgid "Trust the site's certificate this once"
-#~ msgstr "Lita tillfälligt på certifikatet för denna webbplats"
+#~ "De markerade tilläggen kan inte installeras därför att det finns "
+#~ "konflikter i tilläggens beroenden."
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Följande paket kommer att installeras:"
+#~ msgid " (in user directory)"
+#~ msgstr "(i användarkatalog)"
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Följande paket behöver avinstalleras:"
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Följande beroenden kunde inte lösas:"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Installationen lyckades."
+#~ msgid "The installation failed!"
+#~ msgstr "Installationen misslyckades!"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Installationen färdigställdes med varningar."
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Avinstallationen lyckades."
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Avinstallationen misslyckades!"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Avinstallationen färdigställdes med varningar."
+#~ msgid "Repository"
+#~ msgstr "Förråd"
+#~ msgid "Installation cancelled"
+#~ msgstr "Installationen avbröts"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Några av de nödvändiga tilläggen hittades inte"
+#~ msgid "Installation failed"
+#~ msgstr "Installationen misslyckades"
+#~ msgid "Extension"
+#~ msgstr "Tillägg"
+#~ msgid "Other"
+#~ msgstr "Annan"
+#~ msgid "Url"
+#~ msgstr "Url"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Undantag inträffade: {0}"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Inaktiverade tillägg kan inte läsas in."
+#~ msgid "Loading {0} extension"
+#~ msgstr "Läser in tillägget {0}"
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Det nödvändiga tillägget \"{0}\" är inaktiverat."
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Det nödvändiga tillägget \"{0}\" är inte installerat."
+#~ msgid "(provided by {0})"
+#~ msgstr "(tillhandahålls av {0})"
+#~ msgid "my photos"
+#~ msgstr "mina foton"
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Kopiera _plats"
#~ msgid "Dissolve"
#~ msgstr "Lös upp"
#~ msgid "Flip"
diff --git a/po/ta.po b/po/ta.po
index d9fa3e6..c087a2b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,3 +1,4 @@
+# translation of f-spot.master.ta.po to Tamil
# translation of f-spot.master.ta.po to
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
@@ -7,14 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: f-spot.master.ta\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&component=General\n"
-"POT-Creation-Date: 2009-07-02 05:49+0000\n"
-"PO-Revision-Date: 2009-07-02 12:27+0530\n"
-"Last-Translator: \n"
-"Language-Team: <en at li.org>\n"
+"POT-Creation-Date: 2009-10-13 20:41+0000\n"
+"PO-Revision-Date: 2009-10-30 15:49+0530\n"
+"Last-Translator: I. Felix <ifelix at redhat.com>\n"
+"Language-Team: Tamil <fedora-trans-ta at redhat.com>\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"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n"
+"\n"
"\n"
"\n"
"\n"
@@ -26,331 +28,1636 @@ msgstr ""
"\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "பதிப்பு:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "குறுவட்டு (_C)..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "ஆசிரியர்:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "இடமாற்றப்படும் படங்கள்"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "பதிப்புரிமை:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "படங்களை \"{0}\" குறுவட்டிற்கு இடமாற்றுகிறது"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "விரிவாக்க சார்புகள்:"
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:638 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{1} இல் {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "அனைத்து பதிவு செய்யப்பட்ட தொகுபதிவகங்கள்"
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "நிழற்படங்கள் அனுப்பியது முடிவு பெற்றது"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "நீங்கள் நிறுவலை ரத்து செய்ய வேண்டுமா?"
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "மொத்தமாக இடமாற்றம்"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "பின்வரும் தொகுப்புகள் நிறுவல் நீக்கப்படும்:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "இடமாற்றப்படும் போது பிழை"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "இடமாற்றும் போது பிழை"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "நகலாகிறது..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>இங்கு முன்பு திட்டமிட்ட உருப்படிகளை எழுத இருக்கிறது</i></b>"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>எழுதுவதற்கான நிழற்படங்கள்</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "தானியக்க சுழற்சி"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "CDஐ உருவாக்கு"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:220
+msgid "Size"
+msgstr "அளவு"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "ஏற்றப்பட்ட தேர்வின் அளவு:"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "முன்பு திட்டமிடப்பட்ட கோப்புகளில் உலாவு (_B)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "ஏற்றுமதி (_E)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "இந்த நிழற்படங்களை மட்டும் குறுவட்டில் எழுது (_W)"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "அங்கீகாரத்திற்காக காத்திருக்கிறது"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr "முன்பு உள்ளது போல வேறு விரிவாக்கங்களும் உள்ளன அவை நிறுவல் நீக்கப்படும்:"
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
+msgstr ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "ஏற்றுவதற்கு நிறைய படங்கள் உள்ளன"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+#| msgid ""
+#| "Facebook only permits 60 photographs per album. Please refine your "
+#| "selection and try again."
msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
-msgstr "தேர்ந்தெடுக்கப்பட்ட விரிவாக்கங்கள் நிறுவப்படாது ஏனெனில் அவை சார்பு முரண்களை கொண்டுள்ளது."
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+"ஆல்பம் ஒன்றுக்கு {0} நிழற்படங்கள் மட்டுமே ஃபேஸ் புத்தகத்தில் அனுமதிக்கிறது. உங்களுடைய "
+"தேர்ந்தெடுத்தலை மெருகூட்டி மீண்டும் தேர்ந்தெடுக்கவும்."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "பின்வரும் தொகுப்புகள் நிறுவப்படும்:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "படங்களை பதிவேற்றுகிறது"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (பயனர் அடைவில்)"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "ஆல்பம் ஒரு பெயரை பெற்றிருக்க வேண்டும்"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "பின்வரும் தொகுப்புகள் நிறுவல் நீக்கப்பட வேண்டும்:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "உங்களுடைய ஆல்பத்திற்கு பெயரிடவும் அல்லது இருக்கிற ஒரு ஆல்பத்தை தேர்ந்தெடு."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "பின்வரும் சார்புகள் தீர்க்க முடியவில்லை:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "புதிய ஆல்பத்தை உருவாக்குவதில் தோல்வி"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "நிறுவல் வெற்றிகரமாக முடிந்தது."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"ஒரு புதிய ஆல்பத்தை உருவாக்குவதில் பிழை ஏற்பட்டுவிட்டது.\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "நிறுவல் தோல்வியடைந்தது!"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "\"{0}\" படத்தை பதிவேற்றுகிறது ({2} இல் {1})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "நிறுவல் எச்சரிக்கைகளுடன் முடிவடைந்தது."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "ஃபேஸ்புத்தக்கத்துடன் மேம்படுத்துவதில் பிழை: {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "நிறுவல் நீக்கல் வெற்றிகரமாக முடிந்தது."
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
+msgid "Error"
+msgstr "பிழை"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "நிறுவல் நீக்கல் தோல்வியடைந்தது!"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "முழுவதும் பதிவேற்று"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "நிறுவல் நீக்கல் எச்சரிக்கைகளுடன் முடிவடைந்தது."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "அங்கீகாரத்திற்காக காத்திருக்கிறது"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "தொகுபதிவகம்"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+" F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "நிறுவல் ரத்து செய்யப்பட்டது"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "அங்கீகரிக்கிறது..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "சில தேவையான விரிவாக்கங்கள் காணப்படவில்லை"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "ஃபேஸ் புத்தகத்தினுள் உட்புகுவதில் பிழை"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "நிறுவல் தோல்வியடைந்தது"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr "Facebookஇல் புகுபதிவு செய்யப்படும் போது சிக்கல். அதனை சரிபார்த்து மீண்டும் முயற்சிக்கவும்."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "விரிவாக்கம்"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "அங்கீகார அமர்வு"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Version"
-msgstr "பதிப்பு"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "அமர்வு துவக்கப்பட்டது, பயனர் தகவலை எடுக்கிறது..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "வேறு"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "அமர்வு துவக்கப்பட்டது, நண்பர் பட்டியலை எடுக்கிறது..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "அமர்வு துவக்கப்பட்டது, நண்பர் விவரங்களை எடுக்கிறது..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "அமர்வு துவக்கப்பட்டது, நிழற்பட ஆல்பங்களை எடுக்கிறது..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} ஃபேஸ்புத்தகத்தினுள் உட்புகுதல்"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Facebook இணைப்பு பிழை"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "நீங்கள் உட்புகவில்லை."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "நிழற்படங்களை தானாக உறுதிப்படுத்து"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+#| msgid "Ratio"
+msgid "Caption"
+msgstr "தலைப்பு"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+#| msgid "Creating a new album failed"
+msgid "Create a new album"
+msgstr "புதிய ஆல்பத்தை உருவாக்கு"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+#| msgid "D_escription:"
+msgid "Description"
+msgstr "விளக்கம்:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+#| msgid "Export to"
+msgid "Export to Facebook"
+msgstr "Facebookக்கு ஏற்று"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+#| msgid "No active photo"
+msgid "In this photo"
+msgstr "இந்த நிழற்படத்தில்"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "இடம்"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+#| msgid "Location"
+msgid "Login"
+msgstr "புகுபதிவு"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "வெளியேறு"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
#: ../src/Widgets/InfoBox.cs:211
msgid "Name"
msgstr "பெயர்"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "Url"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+#| msgid "You are not logged in."
+msgid "Not logged in"
+msgstr "உட்புகவில்லை."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+#| msgid "Version:"
+msgid "Permissions:"
+msgstr "அனுமதிகள்:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+#| msgid "(Not Connected)"
+msgid "Stay Connected"
+msgstr "இணைப்பில் இருக்கிறது"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "இருக்கும் ஆல்பத்தை பயன்படுத்து"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "இது யார்?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "அங்கீகாரம்"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "பிழை ஏற்பட்டுள்ளது: {0}"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"{0}இல் உங்கள் அனுமதியளிக்கும் செயலை முடித்தவுடன் இந்த சாளரத்திற்கு வந்து \"அனுமதியை "
+"முடிக்கவும்\" பொத்தான் கீழே சொடுக்கவும்"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "முழு அங்கீகாரம்"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "{0}இல் புகுபதிவு செய்"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "நற்சான்றுகளை சோதிக்கிறது..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "{0} நல்வரவு நீங்கள் {1}இல் இணைக்கப்பட்டுள்ளீர்கள்"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "வேறு பயனராக புகுபதிவு செய்யவும்"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "உங்களுக்கு அனுமதிக்கப்பட்ட {1} மாதத்தில் {1} ஒதுக்கீடு"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "புகுபதிவு செய்ய முடியவில்லை"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "{1} இல் {1} பதிலுக்குக் காத்திருக்கிறது"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "படம் \"{0}\" பதிவேற்றப்படுகிறது"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "{0}இல் பதிவேற்றுவதில் பிழை: {1}"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "புகுபதிவு செய்ய முடியவில்லை."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"F-Spot {0}இல் புகுபதிவு செய்ய முடியவில்லை. நீங்கள் {0} இணைய உலாவி முகப்பை "
+"பயன்படுத்தி அங்கீகாரம் கொடுத்தீர்கள் என உறுதிப்படுத்தவும்."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>கணக்கு</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>நிழற்படங்கள்</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>பாணி</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>பார்வை அனுமதிகள்</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../src/f-spot.glade.h:43
+msgid "Export"
+msgstr "ஏற்றுமதி"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "டேக் வரிசைய ஏற்று (_h)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"F-Spotக்கு உங்கள் {0} கணக்கில் நிழற்படங்களை பதிவேற்ற உங்கள் அனுமதி தேவைப்படுகிறது."
+"\"அனுமதி\" பொத்தானை அழுத்தி ஒரு இணைய உலாவியைத் திறந்து F-Spot க்கு அனுமதி "
+"கொடுக்கவும்."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "மேல் அளவு ஒட்டுகளை நிராகரி (_t)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "தனிப்பட்டது"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "பொதுவானது"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "மெட்டா தரவை கழற்று (_m)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "குடும்பத்திற்கு தெரியும்படி"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "நண்பர்களுக்கு தெரியும்படி"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "ஒட்டுகளை ஏற்று (_E)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "மறுஅளவிடல் (_R):"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "பதிவேற்றம் முடிந்ததும் உலாவியில் நிழற்படங்களை காட்டு (_V)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "பிக்செல்கள்"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "கோப்புறை (_o)..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "ஏற்றுமதி கோப்புறையை தேர்ந்தெடு"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "படத்தொகுப்பை உருவாக்கு"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "படம் \"{0}\"ஐ கேலரி:{2}{1}க்கு ஏற்றுவதில் பிழை"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "பிழை: இடம் மாற்றப்படும் போது பிழை; கைவிடப்படுகிறது"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "பிழை: கோப்பு ஏற்கனவே உள்ளது; கைவிடப்படுகிறது"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:803
+msgid "Light"
+msgstr "ஒளி"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:804
+msgid "Dark"
+msgstr "கருமை"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:984
+msgid "Prev"
+msgstr "முந்தைய"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:986
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1227
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "அட்டவணை"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:989
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1161
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1201
+#: ../src/MainWindow.cs:342 ../src/Widgets/Sidebar.cs:64
+msgid "Tags"
+msgstr "ஒட்டுகள்"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
+#: ../src/f-spot.glade.h:57 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "அடுத்து"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1096
+msgid "Gallery generated by"
+msgstr "படத்தொகுப்பை உருவாக்கியவர்"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1136
+msgid "Show Styles"
+msgstr "பாணிகளைக் காட்டு"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1137
+msgid "Hide Styles"
+msgstr "பாணிகளை மறை"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1172
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1173
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "ஒட்டுகள்: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1304
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1437
+msgid "Page:"
+msgstr "பக்கம்:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>இலக்கு</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>ஏற்றுமதி முறை</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "\"அசல்\"ஐ பயன்படுத்தி படத்தொகுப்பை உருவாக்கு (_g)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "தனித்த இணைய படத்தொகுப்பை உருவாக்கு (_w)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "விளக்கம் (_e):"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "ஒட்டுகளை ஏற்றவும் (_t)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "ஒட்டு சின்னங்களை ஏற்றவும் (_i)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "கோப்புறை ஏற்றுமதி"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "படத்தொகுப்பு பெயர் (_a):"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "ஏற்றுதல் முடிந்ததும் இலக்கைத் திற (_d)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "கோப்புறை (_F):"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "இந்த கோப்புகளை மட்டும் சேமி (_S)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "இணையத்தள கேலரி (_G)..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"எந்த பதிப்பு என்று தெரியாமல் கேலரியில் இணைக்க முடியாது.\n"
+"தொலை கூடுதலை நீங்கள் சரிசெய்ய வேண்டுமா 1.0.8 அல்லது பின்னர்"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "தவறான URL"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "படத்தொகுப்பு URL ஒரு சரியான URLஆக தோன்றவில்லை"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "படத்தொகுப்புடன் இணைக்கும் போது பிழை"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "பின்வரும் பிழை புகுபதிவு செய்யும் போது பிழை ஏற்பட்டது: {0}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "இந்த பெயருடைய ஒரு கேலரி ஏற்கனவே இருக்கிறது"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+"இதே பெயருடைய ஒரு கேலரி உங்களுடைய பதிவு செய்யப்பட்ட கேலரிகளில் உள்ளது. தனித்தனைமை "
+"வாய்ந்த பெயரை தேர்ந்தெடு."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(மேல்நிலை)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "தவறான கேலரி பெயர்"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"கேலரி தவறான எழுத்துக்களை பெற்றுள்ளது.\n"
+"எழுத்துக்கள் மட்டும், எண்கள், - மற்றும் _ அனுமதிக்கப்படுகிறது"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "படம் \"{0}\"ஐ படத்தொகுப்பில் பதிவேற்றும் போது பிழை: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(படத்தொகுப்பு இல்லை)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(இணைக்கப்படவில்லை)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(ஆல்பங்கள் இல்லை)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "கணக்கு எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>ஆல்பம்</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>படத்தொகுப்பு</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr "<span weight='bold' size='larger'>படத்தொகுப்புடன் இணைக்கும் போது பிழை</span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "தலைப்புகள் மற்றும் குறிப்புரைகளை ஏற்று (_t)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "பதிவேற்றம் முடிந்ததும் உலாவியில் ஆல்பத்தை திற (_a)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "இந்தப் படத்தொகுப்பின் அமைவுகள் சரியா என சரிபார்க்கவும்."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "ஆல்பம் பெயர் (_A):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "விளக்கம் (_D):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "ஆல்பத்திற்கு ஏற்று (_E):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "படத்தொகுப்பு பெயர் (_G):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "படத்தொகுப்பு (_G):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "தாய் ஆல்பம் (_P):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+msgid "_Password:"
+msgstr "கடவுச்சொல் (_P):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "தலைப்பு (_T):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+msgid "_Username:"
+msgstr "பயனர் பெயர் (_U):"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "சேவையக பதிவை வாசிப்பதில் பிழை"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "படத்தொகுப்பு உள்ளடக்கம் இல்லாமல் சேவையகம் பதில் அளித்தது"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "புதிய ஆல்பத்தை உருவாக்கும் போது பிழை"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"கோரப்பட்ட செயலை செய்யும் கோது பின்வரும் பிழை ஏற்பட்டது:\n"
+"{0} ({1})"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "ஆல்பத்தை உருவாக்கும் போது பிழை"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid "The following error was encountered while attempting to create an album: {0}"
+msgstr "ஒரு ஆல்பத்தை உருவாக்கும் போது பின்வரும் பிழை ஏற்பட்டது: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} அனுப்பு"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} தோராயமாக. {1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "படத்தொகுப்பில் பதிவேற்றும் போது பிழை: {0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "இருக்கும் இடம்: {0}, {1}% {2}இல் பயன்படுத்தப்பட்டது"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"தேர்ந்தெடுக்கப்பட்ட ஆல்பம் {0} படங்களை கொண்டுள்ளது,\n"
+"இது நடப்பு தேர்ந்தெடுக்கப்பட்ட {1} படங்களுடன் கொடுக்கப்பட்டுள்ளது"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>PicasaWeb ஏற்றுமதி</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>உங்கள் கூகுள் கணக்கு பூட்டப்பட்டுள்ளது</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"இந்தப் படத்தொகுப்பின் அமைவுகள் சரியா என சரிபார்க்கவும்.\n"
+"படத்தில் காட்டிய எழுத்துக்களை போல 'Captcha' புலத்தில் \n"
+"உள்ளிடவும். <i>எழுத்துக்கள் உணர்வறிதல் இல்லை</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "பொதுவான ஆல்பம்"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "ஆல்பம் தலைப்பு (_A):"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "தானாகசுழலுதல் (_A)"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>SmugMug ஏற்றுமதி</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "கணக்கு (_A):"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "நிழற்படம் மேம்படுத்தப்படுகிறது \"{0}\""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Tabbloஇல் புகுபதிவு செய்கிறது"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "URLஐ பதிவேற்ற எடுக்கிறது"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "நிழற்படங்களை அனுப்புவது முடிவடைந்தது"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "மேம்படுத்துதல் முடிவடைந்தது"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Tabbloக்கு பதிவேற்றுவதில் பிழை: "
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "அழுத்தப்பட்ட கோப்பு (_e)..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:196
+msgid "No selection available"
+msgstr "தேர்வு எதுவும் இல்லை"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"இந்த கருவிக்கு செயல் தேர்வு தேவைப்படுகிறது. ஒன்று அல்லது அதற்கு மேற்பட்ட படங்களை "
+"தேர்ந்தெடுத்து மீண்டும் முயற்சிக்கவும்"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "ஏற்றப்பட்ட கோப்புறையை தேர்ந்தெடு"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "கோப்புகளை ஏற்றுகிறது"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "நிழற்படத்தை தயாராக்குகிறது \"{0}\""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+#: ../src/f-spot.glade.h:92
+msgid "_Create"
+msgstr "உருவாக்கு (_C)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "கோப்பு பெயர் (_F):"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "இடம் (_L):"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "அளவு (_S):"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid "You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr "You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "மூடு (_C)"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "பணங்களை செயல்பாட்டில் உள்ளது..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "நிறுத்தப்பட்டது"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Hash for Duplicates"
+msgstr "Hash for Duplicates"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+#| msgid "(No Gallery)"
+msgid "F-Spot Gallery"
+msgstr "F-Spot கேலரி"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "The web gallery seems to be offline now"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+#| msgid "Show Styles"
+msgid "Show All"
+msgstr "அனைத்தையும் காட்டு"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+#| msgid "{0} Photo"
+#| msgid_plural "{0} Photos"
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} நிழற்படம்"
+msgstr[1] "{0} நிழற்படங்கள்"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "நடப்பு பார்வை"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+#| msgid "Delete"
+msgid "Selected"
+msgstr "தேர்ந்தெடுக்கப்பட்டது"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+#| msgid "Web _Gallery..."
+msgid "Live Web Gallery"
+msgstr "லைவ் இணைய கேலரி"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "இணைய கேலரியை செயல்படுத்து அல்லது செயல்நீக்கு"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "ஒட்டுகளை சேர்க்க பார்வையாளர்களை அனுமதி"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "URLஐ கிளிப்போர்டுக்கு நகலெடு"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spot லைவ் இணைய கேலரி"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+#| msgid "G_allery:"
+msgid "Gallery URL:"
+msgstr "கேலரி URL:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Limit number of shared photos to"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "விருப்பங்கள்:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+#| msgid "Photos per page"
+msgid "Photos with a Tag"
+msgstr "ஒரு ஒட்டுடன் நிழற்படங்கள்"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+#| msgid "_Delete photo"
+#| msgid_plural "_Delete photos"
+msgid "Selected Photos"
+msgstr "தேர்ந்தெடுக்கப்பட்ட நிழற்படங்கள்"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+#| msgid "Sharpen"
+msgid "Share:"
+msgstr "பகிர்வு:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+#| msgid "View"
+msgid "Views:"
+msgstr "பார்வைகள்:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+#| msgid "(None)"
+msgid "none"
+msgstr "ஒன்றுமில்லை"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " கேலரி: {0}, நிழற்படங்கள்: {1}, கடைசி கிளையன்: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+#| msgid "Gallery generated by"
+msgid "Gallery is inactive"
+msgstr "கேலரி செயல்நீக்கப்பட்டது"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "அமிழ்த்துதல் Db"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "தேர்ந்தெடுக்கப்பட்ட கோப்பினை திறப்பதில் பிழை"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"நீ தேர்ந்தெடுத்த கோப்பு சரியானது இல்லை அல்லது தரவுதளத்திற்கு துணைபுரிகிறது.\n"
+"\n"
+"விடுப்பட்டவை பெறப்படுகிறது \"{0}\"."
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr "<small><i>நீ இறக்க விரும்புவதிலிருந்து தரவுதளத்தின் இடத்தை தேர்ந்தெடு</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "ஒரு ஒற்றை இறக்கு ரோல்"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "நிழற்படங்கள் கோப்புறையில் உருவங்களை நகலெடு"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "தரவுதறத்தின் இடம்:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "எல்லாமும்"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "இறக்கவும்:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "உருவங்களை அவற்றின் உண்மையான இடத்தில் வைக்கவும்"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "மற்ற F-Spot தொகுப்பை அமிழ்த்துகிறது"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "புதிய ரோல்கள் மட்டும்"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:290 ../src/UI.Dialog/ThreadProgressDialog.cs:55
+msgid "Skip"
+msgstr "தவிர்"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big><b>{0}</b> அடைவை கொண்ட ஒரு தரவுத்தளத்தை இந்த கோப்புகள் குறிக்கிறது.\n"
+" இந்த அடைவை தேர்ந்தெடுக்கவும் அதனால் நான் ஒப்பிடலாம்.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "திரைசேமிப்பை கட்டமை"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "அனைத்து படங்கள்"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+#| msgid "_Display:"
+msgid "Delay:"
+msgstr "தாமதம்:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+#| msgid "_Display:"
+msgid "Display:"
+msgstr "காட்சி:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "உருவங்கள் இதனுடன் ஒட்டப்படுகின்றன:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+#| msgid "Make F-Spot your screensaver"
+msgid "Make F-Spot my screensaver"
+msgstr "F-Spotஐ என் திரைச்சேமிப்பாக்கு"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+#| msgid "Planar Configuration"
+msgid "Screensaver Configuration"
+msgstr "திரைசேமிப்பு கட்டமைப்பு"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-Spot நிழற்பட மேலாளர்"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "உங்கள் நிழற்படங்களை ஒழுங்குபடுத்தி, பகிர்ந்து, மகிழவும்"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "நிழற்பட மேலாளர்"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "F-Spotல் இறக்கவும்"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-Spot நிழற்படக் காட்டி"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "நிழற்பட காட்டி"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
+msgid "File not found"
+msgstr "கோப்பு காணப்படவில்லை "
+
+#: ../lib/libfspot/f-jpeg-utils.c:464
+#, c-format
+msgid "Unknown transform type %d"
+msgstr "தெரியாத மாற்றும் வகை %d"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
+#: ../lib/libfspot/f-jpeg-utils.c:472
+msgid "Operation failed"
+msgstr "செயல்பாடு தோல்வியுற்றது"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
msgid "Package"
msgstr "தொகுப்பு"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
msgid "Extension Installation"
msgstr "விரிவாக்க நிறுவல்"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
msgid "<b>Select the extensions to install and click on Next</b>"
msgstr "<b>நிறுவ விரிவாக்கங்களை தேர்ந்தெடுத்து பின் அடுத்து என்பதை சொடுக்கவும்</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
msgid "Install from:"
msgstr "இதிலிருந்து நிறுவல்:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
msgid "_Repositories..."
msgstr "தொகுபதிவகங்கள் (_R)..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
msgid "Show all packages"
msgstr "அனைத்து தொகுப்புகளையும் காட்டு"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
msgid "Show new versions only"
msgstr "புதிய பதிப்புகளை மட்டும் காட்டு"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
msgid "Show updates only"
msgstr "மேம்படுத்தல்களை மட்டும் காட்டு"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
msgid "_Unselect All"
msgstr "அனைத்தையும் தேர்வு நீக்கு (_U)"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:97
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
+#: ../src/ui/main_window.ui.h:18
msgid "Select _All"
msgstr "அனைத்தையும் தேர்ந்தெடு (_A)"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
msgid "label124"
msgstr "label124"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
msgid "Overall Progress:"
msgstr "மொத்த செயல்:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
msgid "Downloading extensions..."
msgstr "விரிவாக்கங்களை பதிவிறக்குகிறது..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
msgid "Extension Manager"
msgstr "விரிவாக்க மேலாளர்"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
msgid "Additional extensions are required to perform this operation."
msgstr "கூடுதல் விரிவாக்கங்கள் இந்த செயலை செய்ய தேவைப்படுகிறது."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
msgid "The following extensions will be installed:"
msgstr "பின்வரும் விரிவாக்கங்கள் நிறுவப்படும்:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
msgid "<big><b>Extension Manager</b></big>"
msgstr "<big><b>விரிவாக்க மேலாளர்</b></big>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
msgid "The following extensions are currently installed:"
msgstr "தற்போது பின்வரும் விரிவாக்கங்கள் நிறுவப்பட்டுள்ளது:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
msgid "_Install Extensions..."
msgstr "விரிவாக்கங்களை நிறுவு (_I)..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
msgid "_Uninstall..."
msgstr "நிறுவல் நீக்கு (_U)..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:13
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
msgid "Enable"
msgstr "செய்யக்கூடிய"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
msgid "Disable"
msgstr "செய்யமுடியாத"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:799
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:370
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
-msgid "Error"
-msgstr "பிழை"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
msgid "Details"
msgstr "விவரங்கள்"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
msgid "Extension Repository Management"
msgstr "விரிவாக்க தொகுபதிவக மேலாண்மை"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
msgid "Add New Repository"
msgstr "புதிய தொகுபதிவகத்தை சேர்"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
msgid "Select the location of the repository you want to register:"
msgstr "தொகுபதிவுக்கேற்ற இடத்தை தேர்ந்தெடுத்து நீ பதிவு செய்யவும்."
#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
msgid "Register an on-line repository"
msgstr "ஆன்- லைனில் தொகுபதிவை பதிவு செய்யவும்"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
msgid "Url:"
msgstr "Url:"
#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
msgid "Register a local repository"
msgstr "உள்ளமை தொகுபதிவை பதிவு செய்வும்"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
msgid "Path:"
msgstr "பாதை:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
+#: ../lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
msgid "Browse..."
msgstr "உலாவு..."
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
+msgid "Version:"
+msgstr "பதிப்பு:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
+msgid "Author:"
+msgstr "ஆசிரியர்:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
+msgid "Copyright:"
+msgstr "பதிப்புரிமை:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
+msgid "Extension Dependencies:"
+msgstr "விரிவாக்க சார்புகள்:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
+msgid "All registered repositories"
+msgstr "அனைத்து பதிவு செய்யப்பட்ட தொகுபதிவகங்கள்"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
+msgid "Are you sure you want to cancel the installation?"
+msgstr "நீங்கள் நிறுவலை ரத்து செய்ய வேண்டுமா?"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
+msgid "The following packages will be uninstalled:"
+msgstr "பின்வரும் தொகுப்புகள் நிறுவல் நீக்கப்படும்:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+msgid ""
+"There are other extensions that depend on the previous ones which will also "
+"be uninstalled:"
+msgstr "முன்பு உள்ளது போல வேறு விரிவாக்கங்களும் உள்ளன அவை நிறுவல் நீக்கப்படும்:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+msgid ""
+"The selected extensions can't be installed because there are dependency "
+"conflicts."
+msgstr "தேர்ந்தெடுக்கப்பட்ட விரிவாக்கங்கள் நிறுவப்படாது ஏனெனில் அவை சார்பு முரண்களை கொண்டுள்ளது."
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
+msgid "The following packages will be installed:"
+msgstr "பின்வரும் தொகுப்புகள் நிறுவப்படும்:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
+msgid " (in user directory)"
+msgstr " (பயனர் அடைவில்)"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
+msgid "The following packages need to be uninstalled:"
+msgstr "பின்வரும் தொகுப்புகள் நிறுவல் நீக்கப்பட வேண்டும்:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
+msgid "The following dependencies could not be resolved:"
+msgstr "பின்வரும் சார்புகள் தீர்க்க முடியவில்லை:"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
+msgid "The installation has been successfully completed."
+msgstr "நிறுவல் வெற்றிகரமாக முடிந்தது."
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
+msgid "The installation failed!"
+msgstr "நிறுவல் தோல்வியடைந்தது!"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
+msgid "The installation has completed with warnings."
+msgstr "நிறுவல் எச்சரிக்கைகளுடன் முடிவடைந்தது."
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
+msgid "The uninstallation has been successfully completed."
+msgstr "நிறுவல் நீக்கல் வெற்றிகரமாக முடிந்தது."
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
+msgid "The uninstallation failed!"
+msgstr "நிறுவல் நீக்கல் தோல்வியடைந்தது!"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
+msgid "The uninstallation has completed with warnings."
+msgstr "நிறுவல் நீக்கல் எச்சரிக்கைகளுடன் முடிவடைந்தது."
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
+msgid "Repository"
+msgstr "தொகுபதிவகம்"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
+msgid "Installation cancelled"
+msgstr "நிறுவல் ரத்து செய்யப்பட்டது"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
+msgid "Some of the required extensions were not found"
+msgstr "சில தேவையான விரிவாக்கங்கள் காணப்படவில்லை"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
+msgid "Installation failed"
+msgstr "நிறுவல் தோல்வியடைந்தது"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
+msgid "Extension"
+msgstr "விரிவாக்கம்"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
+#: ../src/Widgets/InfoBox.cs:214
+msgid "Version"
+msgstr "பதிப்பு"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
+msgid "Other"
+msgstr "வேறு"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
+msgid "Url"
+msgstr "Url"
+
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
+#: ../lib/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
#, csharp-format
-msgid "(provided by {0})"
-msgstr "({0}வால் கொடுக்கப்படுகிறது)"
+msgid "Exception occurred: {0}"
+msgstr "பிழை ஏற்பட்டுள்ளது: {0}"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
msgid "Disabled extensions can't be loaded."
msgstr "செயல்நீக்கப்பட்ட விரிவாக்கங்களை ஏற்ற முடியவில்லை."
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
#, csharp-format
msgid "Loading {0} extension"
msgstr "விரிவாக்கமு {0} ஏற்றப்படுகிறது"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
#, csharp-format
msgid "The required extension '{0}' is disabled."
msgstr "கோரப்பட்ட விரிவாக்கம் '{0}' செயல்படவில்லை."
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
#, csharp-format
msgid "The required extension '{0}' is not installed."
msgstr "கோரப்பட்ட விரிவாக்கம் '{0}' நிறுவப்படவில்லை."
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "F-Spot நிழற்படக் காட்டி"
-
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "நிழற்பட காட்டி"
-
-#: ../f-spot-import.desktop.in.in.h:1 ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "F-Spot நிழற்பட மேலாளர்"
-
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "F-Spotல் இறக்கவும்"
-
-#: ../f-spot-import.desktop.in.in.h:3 ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "நிழற்பட மேலாளர்"
-
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "உங்கள் நிழற்படங்களை ஒழுங்குபடுத்தி, பகிர்ந்து, மகிழவும்"
-
-#: ../libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
-msgid "File not found"
-msgstr "கோப்பு காணப்படவில்லை "
-
-#: ../libfspot/f-jpeg-utils.c:464
-#, c-format
-msgid "Unknown transform type %d"
-msgstr "தெரியாத மாற்றும் வகை %d"
-
-#: ../libfspot/f-jpeg-utils.c:472
-msgid "Operation failed"
-msgstr "செயல்பாடு தோல்வியுற்றது"
+#: ../lib/mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#, csharp-format
+msgid "(provided by {0})"
+msgstr "({0}வால் கொடுக்கப்படுகிறது)"
#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
@@ -360,16 +1667,10 @@ msgstr "முன்பார்வை"
msgid "Path"
msgstr "பாதை"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:65
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:46
msgid "File"
msgstr "கோப்பு"
-#: ../src/CameraFileSelectionDialog.cs:82
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1234
-msgid "Index"
-msgstr "அட்டவணை"
-
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
msgstr "ஒட்டினை தேர்ந்தெடு"
@@ -383,12 +1684,6 @@ msgstr "முன்பார்வைகளின் பதிவிறக்
msgid "Downloading Preview of {0}"
msgstr "{0}இன் முன்பார்வையை பதிவிறக்குகிறது"
-#: ../src/CameraFileSelectionDialog.cs:199
-#: ../extensions/Exporters/CDExport/CDExport.cs:246
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
-msgid "Transferring Pictures"
-msgstr "இடமாற்றப்படும் படங்கள்"
-
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
@@ -399,14 +1694,14 @@ msgid "Error transferring file"
msgstr "இடமாற்றப்பட்ட கோப்பில் பிழை"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "கோப்புகளை நகலெடுப்பது முடிந்தது"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "பதிவிறக்கம் முடிந்தது"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "கோப்புகளை நகலெடுப்பது முடிந்தது"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "கேமராவிலிருந்து \"{0}\" இடமாற்றப்படுகிறது"
@@ -419,12 +1714,12 @@ msgstr "கேமரா"
msgid "Port"
msgstr "துறை"
-#: ../src/Core.cs:200
+#: ../src/Core.cs:203
#, csharp-format
msgid "No photos matching {0} found"
msgstr "நிழற்படங்கள் {0} பொருத்தம் காண முடியவில்லை"
-#: ../src/Core.cs:201
+#: ../src/Core.cs:204
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -435,11 +1730,11 @@ msgstr ""
"நிழற்படங்களுக்கு ஒட்டினை சேர்க்க முயற்சிக்கவும் அல்லது வேறு ஒட்டினை\n"
"F-Spot முன்னுரிமை உரையாடலில் தேர்ந்தெடுக்கவும்."
-#: ../src/Core.cs:205
+#: ../src/Core.cs:208
msgid "Search returned no results"
msgstr "தேடுதல் எந்த முடிவையும் கொடுக்கவில்லை"
-#: ../src/Core.cs:206
+#: ../src/Core.cs:209
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -466,19 +1761,19 @@ msgid_plural "Modified ({0})"
msgstr[0] "மாற்றப்பட்டது"
msgstr[1] "மாற்றப்பட்டது ({0})"
-#: ../src/Core/Photo.cs:516
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "{1}இல் மாற்றப்பட்டது"
-#: ../src/Core/Photo.cs:516
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "{1} ({0}) இதில் மாற்றியமைக்கப்பட்டது"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:83
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:61
msgid "Original"
msgstr "அசல்"
@@ -562,6 +1857,24 @@ msgstr "மென்மையான ஃபோகஸ்"
msgid "Straighten"
msgstr "நேராக்கு"
+#: ../src/FileImportBackend.cs:288
+msgid "Import error"
+msgstr "இறக்குமதி பிழை"
+
+#: ../src/FileImportBackend.cs:289
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "பிழை இறக்கப்படுகிறது {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "கோப்பின் வகை \"{0}\"ஐ சேமிக்க வழியில்லை"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "கையாள முடியாத விதிவிலக்கு"
+
#: ../src/FSpot.addin.xml.h:1
msgid "Copy Photo Locat_ion"
msgstr "Copy Photo Locat_ion"
@@ -574,17 +1887,17 @@ msgstr "ஏற்று"
msgid "Open _With"
msgstr "இதனுடன் திற (_W)"
-#: ../src/FSpot.addin.xml.h:4 ../src/f-spot.glade.h:92
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
msgstr "ஒட்டு நீக்கு (_o)"
-#: ../src/FSpot.addin.xml.h:5 ../src/SingleView.cs:454
-#: ../src/f-spot.glade.h:94
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:68
+#: ../src/SingleView.cs:451 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "இடதுபுறமாக சுழற்று (_L)"
-#: ../src/FSpot.addin.xml.h:6 ../src/SingleView.cs:455
-#: ../src/f-spot.glade.h:95
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:452 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "வலதுபுறமாக சுழற்று (_R)"
@@ -592,40 +1905,453 @@ msgstr "வலதுபுறமாக சுழற்று (_R)"
msgid "Tools"
msgstr "கருவிகள்"
-#: ../src/FSpot.addin.xml.h:8 ../src/f-spot.glade.h:127
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "ஒட்டு இணை (_A)"
-#: ../src/FSpot.addin.xml.h:9 ../src/f-spot.glade.h:138
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
msgstr "இயக்கியிலிருந்து அழி (_D)"
-#: ../src/FSpot.addin.xml.h:10 ../src/f-spot.glade.h:170
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
msgstr "கேட்லாக்கிலிருந்து நீக்கு (_R)"
-#: ../src/FileImportBackend.cs:285
-msgid "Import error"
-msgstr "இறக்குமதி பிழை"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:286
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr "பிழை இறக்கப்படுகிறது {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
-#: ../src/FileImportBackend.cs:287 ../src/UI.Dialog/ThreadProgressDialog.cs:51
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-msgid "Skip"
-msgstr "தவிர்"
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
-#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "கோப்பின் வகை \"{0}\"ஐ சேமிக்க வழியில்லை"
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
-#: ../src/FormClient.cs:295
-msgid "Unhandled exception"
-msgstr "கையாள முடியாத விதிவிலக்கு"
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>திருத்தங்கள் (_r)</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>பட இடைசெருகல்</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>அளவு</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>சுருக்கம்</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>ஒளிஊடுருவும் பாகங்கள்</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>இறக்கப்பட்ட அனைத்து படங்களையும் காட்டு</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>வெள்ளை சமன் (_W)</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr ""
+"<small><i>இதனை செயல்படுத்துவது அளவிடப்பட்ட படங்களை அனுமதிக்கும். நீங்கள் இந்த நிழற்படஙளை "
+"பார்க்க செயல்நீக்கக்கூடாது ஆனால் செயல்நீக்கினால் சின்ன வடிவங்களில் பயனுள்ளதாக இருக்கும்.</i></"
+"small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>நீங்கள் படங்களில் ஒளி ஊடுருவும் பகுதிகளை எவ்வாறு காட்ட வேண்டும் என "
+"தேர்ந்தெடுக்கலாம். இந்த விருப்பம் நிழற்படங்களில் எந்த விளைவையும் ஏற்படுத்தாது, ஆனால் இதனை "
+"தோற்றம் அல்லது தனிபயன் நிறங்களுக்கு அமைத்தால் சின்னங்கள் அல்லது வேறு கலைவேலைகளை "
+"ஒளிஊடுருவும் பகுதிகளுடன் பார்க்கும் போது பயனுள்ளதாக இருக்கும்.</i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "பின்னணியாக (_b)"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "தனிபயன் நிறமாக (_c): "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "சோதிக்கும் தோற்றத்தால் (_p)"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "ஒட்டுகளை சேர்:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "ஒட்டு இணை:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "குறுவட்டு"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "வேறுபாடு (_o):"
+
+#: ../src/f-spot.glade.h:31
+msgid "Camera Selection"
+msgstr "கேமரா தேர்வு"
+
+#: ../src/f-spot.glade.h:32
+msgid "Copy files to the Photos folder"
+msgstr "நிழற்பட அடைவுக்கு கோப்புகளை நகலெடு"
+
+#: ../src/f-spot.glade.h:33
+msgid "Create Mail"
+msgstr "மின்னஞ்சலை உருவாக்கு"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create _icon for this tag when first used"
+msgstr "முதலில் பயன்படுத்தும் போது இந்த டேக்கிற்கு ஒரு சின்னத்தை உருவாக்கவும் (_i)"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "தேர்ந்தெடுக்கப்பட்ட நிழற்படங்களுடன் ஒரு மின்னஞ்சலை உருவாக்கி (மறுஅளவிடப்பட்ட) சேர்க்கப்பட்டது"
+
+#: ../src/f-spot.glade.h:36
+msgid "Detect duplicates"
+msgstr "போலிகளை கண்டுபிடி"
+
+#: ../src/f-spot.glade.h:37
+msgid "Display File _Names"
+msgstr "கோப்பு பெயர்களை காட்டு (_N)"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "குறிப்பட்ட ரோல்களில் இறக்கப்பட்ட அந்த நிழற்படங்களை மட்டும் காட்டு."
+
+#: ../src/f-spot.glade.h:39
+msgid "Do not send a mail"
+msgstr "மின்னஞ்சலை அனுப்ப வேண்டாம்"
+
+#: ../src/f-spot.glade.h:40
+msgid "E-_Mail:"
+msgstr "மின்னஞ்சல் (_M):"
+
+#: ../src/f-spot.glade.h:41
+msgid "E_xport titles and comments"
+msgstr "தலைப்புகள் மற்றும் குறிப்புரைகளை ஏற்று (_x)"
+
+#: ../src/f-spot.glade.h:42
+msgid "Estimated new size"
+msgstr "புதிய அளவின் மதிப்பிடப்பட்டது"
+
+#: ../src/f-spot.glade.h:44
+msgid "Extra large"
+msgstr "மேலும் பெரிய"
+
+#: ../src/f-spot.glade.h:45
+msgid "F-Spot View"
+msgstr "F-Spot காட்டி"
+
+#: ../src/f-spot.glade.h:47
+msgid "Filter on selected rolls"
+msgstr "தேர்ந்தெடுக்கப்பட்ட ரோல்களில் மேல் வடிக்கவும்"
+
+#: ../src/f-spot.glade.h:48
+msgid "G_allery:"
+msgstr "படத்தொகுப்பு (_a):"
+
+#: ../src/f-spot.glade.h:49
+msgid "Gallery"
+msgstr "படத்தொகுப்பு"
+
+#: ../src/f-spot.glade.h:50 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:267
+msgid "Import"
+msgstr "இறக்குமதி"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:52
+msgid "Import Source:"
+msgstr "மூலங்களை இறக்கு:"
+
+#: ../src/f-spot.glade.h:53
+msgid "Include subfolders"
+msgstr "துணைகோப்புகளையும் சேர்க்கவும்"
+
+#: ../src/f-spot.glade.h:54
+msgid "Large"
+msgstr "பெரிய"
+
+#: ../src/f-spot.glade.h:55
+msgid "Manage your custom selection ratios"
+msgstr "உங்களுடைய தேர்ந்தெடுக்கப்பட்ட தனிபயன் வரம்புகளை மேலாண்மை செய்யவும்"
+
+#: ../src/f-spot.glade.h:56
+msgid "Medium"
+msgstr "நடுத்தரம்"
+
+#: ../src/f-spot.glade.h:58
+msgid "Number of photos in selected rolls:"
+msgstr "பல தேர்ந்தெடுக்கப்பட்ட நிழற்படங்கள் ரோலில் உள்ளன:"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of pictures"
+msgstr "படங்களின் எண்ணிக்கை"
+
+#: ../src/f-spot.glade.h:60
+msgid "Open _Folder..."
+msgstr "கோப்புறையை திற (_F)..."
+
+#: ../src/f-spot.glade.h:62
+msgid "Original size (possible very large file size)"
+msgstr "அசல் அளவு (மிகப் பெரிய கோப்பு அளவு வரலாம்)"
+
+#: ../src/f-spot.glade.h:63 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "தாய் ஒட்டு (_a):"
+
+#: ../src/f-spot.glade.h:64
+msgid "Pause"
+msgstr "இடைநிறுத்தம்"
+
+#: ../src/f-spot.glade.h:65
+msgid "Preferences"
+msgstr "முன்னுரிமைகள்"
+
+#: ../src/f-spot.glade.h:66 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "முந்தைய"
+
+#: ../src/f-spot.glade.h:67
+msgid "Repair"
+msgstr "பழுதுபார்"
+
+#: ../src/f-spot.glade.h:70
+msgid "Select Photos to Copy From Camera..."
+msgstr "கேமிராவிலிருந்து நிழற்படங்களை தேர்ந்தெடுக்கவும்..."
+
+#: ../src/f-spot.glade.h:71
+msgid "Select a Tag..."
+msgstr "ஒரு ஒட்டினை தேர்ந்தெடு..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select the camera from which you want to transfer files"
+msgstr "இடமாற்றம் செய்ய வேண்டிய கோப்புகள் உள்ள கேமிராவை தேர்ந்தெடுக்கவும்"
+
+#: ../src/f-spot.glade.h:73
+msgid "Selected Camera: "
+msgstr "தேர்ந்தெடுக்கப்பட்ட கேமரா: "
+
+#: ../src/f-spot.glade.h:74
+msgid "Selection Constraints"
+msgstr "தேர்ந்தெடுத்தல் வகைகள்"
+
+#: ../src/f-spot.glade.h:75 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "பின்னணியாக அமை (_B)"
+
+#: ../src/f-spot.glade.h:76
+msgid "Show all photos."
+msgstr "அனைத்து நிழற்படங்களையும் காட்டு."
+
+#: ../src/f-spot.glade.h:77
+msgid "Show or hide the side pane"
+msgstr "பக்கப் பலகத்தை காட்டு அல்லது மறை"
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the toolbar"
+msgstr "கருவிப்பட்டையைக் காட்டு அல்லது மறை"
+
+#: ../src/f-spot.glade.h:79
+msgid "Side _pane"
+msgstr "பக்கப் பலகம் (_p)"
+
+#: ../src/f-spot.glade.h:80
+msgid "Small"
+msgstr "சிறிய"
+
+#: ../src/f-spot.glade.h:81
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"ஒரு அசல் அளவு படம் சுழற்ற வேண்டுமா அல்லது வேண்டாமா என குறிப்பிடு. சிறிய அளவுகள் "
+"தானாக சுழற்றப்படும்."
+
+#: ../src/f-spot.glade.h:82
+msgid "Strip image _metadata"
+msgstr "பட மெட்டா தரவை கழற்று (_m)"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:84
+msgid "Te_mp:"
+msgstr "தற்காலிக (_m):"
+
+#: ../src/f-spot.glade.h:85
+msgid "Tiny"
+msgstr "மெலிந்த"
+
+#: ../src/f-spot.glade.h:86
+msgid "Total original size"
+msgstr "மொத்த அசல் அளவு"
+
+#: ../src/f-spot.glade.h:87 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "சிறியதாக்கு (_i)"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "பெரியதாக்கு ( _o)"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "சிறியதாக்கு"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "பெரிதாக்கு"
+
+#: ../src/f-spot.glade.h:91
+msgid "_Brightness:"
+msgstr "வெளிச்சம் (_B):"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "மின்னஞ்சலை உருவாக்கு (_C)"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "திருத்து (_E)"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "வெளிகாட்டு (_E):"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "முழுத்திரை (_F)"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "படத்தொகுப்பு (_G)"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "உதவி (_H)"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "ஹ்யூ (_H):"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "படத்தை அளவிடுதலில் இண்டர்போலைட் (_I)"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "புதிய சாளரம் (_N)"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "பதிவேற்றுதல் முடிந்தவுடன் ஆல்பத்தைத் திற (_O)"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "ஏற்றுதல் முடிந்தவுடன் இலக்கைத் திற (_O)"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "நிழற்படம் (_P)"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "சேச்சுரேஷன் (_S):"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "நிழற்படங்களை பெரியது இல்லாமல் அளவிடு (_S):"
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "ஸ்லைடு காட்சி (_S)"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "மெட்டா தரவை கழற்று (_S)"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "ஒட்டு பெயர் (_T):"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "டின்ட் (_T):"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "கருவிபட்டி (_T)"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "பார்வை (_V)"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "மெய்நிகர் கோப்பு முறைமை (_V)"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "மற்றும்"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"அதில்\n"
+"பிறகு\n"
+"இதற்கிடையில்"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
#: ../src/FullScreenView.cs:58
msgid "Hide"
@@ -647,8 +2373,8 @@ msgstr "படத் தகவல்"
msgid "Exit fullscreen"
msgstr "முழுத்திரையிலிருந்து வெளியேறு"
-#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:315
-#: ../src/SingleView.cs:104
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:307
+#: ../src/SingleView.cs:101
msgid "Slideshow"
msgstr "ஸ்லைடு காட்சி"
@@ -660,59 +2386,15 @@ msgstr "ஸ்லைடு காட்சியை துவக்கு"
msgid "Slide transition:"
msgstr "ஸ்லைடு மாறுதல்:"
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "கரைதல்"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "திருப்பு"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "அட்டை"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "வெளிப்படுத்தல்"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "துடை"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "பிரி"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "தள்ளு"
-
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "மேலும் நாட்கள்"
#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "மேலும் அடைவுகள்"
-
-#: ../src/GroupSelector.cs:63 ../src/GroupSelector.cs:64
msgid "More"
msgstr "மேலும்"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "மாதத்தால் ஒழுங்குபடுத்து (_M)"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "கோப்புறையால் ஒழுங்குப்படுத்து (_F)"
-
-#: ../src/GroupSelector.cs:523 ../src/f-spot.glade.h:174
-msgid "_Reverse Order"
-msgstr "தலைகீழ் வரிசை (_R)"
-
-#: ../src/GroupSelector.cs:529 ../src/f-spot.glade.h:130
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "தேதி வரம்பை துடை (_C)"
@@ -740,7 +2422,7 @@ msgstr "InterOperability அடைவு"
msgid "Unknown Directory"
msgstr "தெரியாத அடைவு"
-#: ../src/Imaging/ImageFile.cs:93
+#: ../src/Imaging/ImageFile.cs:116
msgid "Writing to this file format is not supported"
msgstr "இந்த கோப்பு முறை எழுதுவதற்கு துணைபுரியவில்லை"
@@ -874,33 +2556,28 @@ msgstr "பொருளின் அறிவார்ந்த வகை"
msgid "Unknown IIM DataSet"
msgstr "தெரியாத IIM DataSet"
-#: ../src/ImportCommand.cs:47 ../src/SingleView.cs:360
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:357
msgid "Select Folder"
msgstr "கோப்புறையை தேர்வு செய்"
-#: ../src/ImportCommand.cs:258
+#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
msgstr "(கேமிராக்கள் எதுவும் கண்டறியப்படவில்லை)"
-#: ../src/ImportCommand.cs:403
+#: ../src/ImportCommand.cs:404
#, csharp-format
msgid "Loading {0} of {1}"
msgstr "{1} இல் {0}ஐ ஏற்றுகிறது"
-#: ../src/ImportCommand.cs:469
+#: ../src/ImportCommand.cs:470
msgid "Done Loading"
msgstr "ஏற்றுதல் முடிவுற்றது"
-#: ../src/ImportCommand.cs:539 ../src/MainWindow.cs:275
-#: ../src/f-spot.glade.h:70
-msgid "Import"
-msgstr "இறக்குமதி"
-
-#: ../src/ImportCommand.cs:669
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "அடைவு இல்லை."
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
@@ -908,12 +2585,12 @@ msgid ""
msgstr "நீங்கள் தேர்ந்தெடுத்த அடைவு \"{0}\" இல்லை. ஒரு வேறு அடைவைத் தேர்ந்தெடு"
#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:723 ../src/ImportCommand.cs:725
+#: ../src/ImportCommand.cs:739 ../src/ImportCommand.cs:741
#: ../src/XmpTagsImporter.cs:89
msgid "Import Tags"
msgstr "ஒட்டுகளை இறக்கு"
-#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:282 ../src/SingleView.cs:87
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:274 ../src/SingleView.cs:84
msgid "Rotate Left"
msgstr "இடமாக சுழற்று"
@@ -921,7 +2598,7 @@ msgstr "இடமாக சுழற்று"
msgid "Rotate picture left"
msgstr "படத்தை இடமாக சுழற்று"
-#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:286 ../src/SingleView.cs:92
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:278 ../src/SingleView.cs:89
msgid "Rotate Right"
msgstr "வலமாக சுழற்று"
@@ -929,87 +2606,59 @@ msgstr "வலமாக சுழற்று"
msgid "Rotate picture right"
msgstr "நிழற்படத்தை வலமாக சுழற்று"
-#: ../src/ItemAction.cs:102 ../src/f-spot.glade.h:78
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:999
-msgid "Next"
-msgstr "அடுத்து"
-
#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "அடுத்த படம்"
-#: ../src/ItemAction.cs:123 ../src/f-spot.glade.h:90
-msgid "Previous"
-msgstr "முந்தைய"
-
#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "முந்தைய படம்"
-#: ../src/MainWindow.cs:277
+#: ../src/MainWindow.cs:269
msgid "Import new images"
msgstr "புதிய படங்களை இறக்கவும்"
-#: ../src/MainWindow.cs:293 ../src/f-spot.glade.h:38
+#: ../src/MainWindow.cs:285 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "உலாவு"
-#: ../src/MainWindow.cs:297
+#: ../src/MainWindow.cs:289
msgid "Browse many photos simultaneously"
msgstr "ஒரே நேரத்தில் பல நிழற்படங்களில் உலாவு"
-#: ../src/MainWindow.cs:301
+#: ../src/MainWindow.cs:293
msgid "Edit Image"
msgstr "படத்தை திருத்தவும்"
-#: ../src/MainWindow.cs:305
+#: ../src/MainWindow.cs:297
msgid "View and edit a photo"
msgstr "ஒரு நிழற்படத்தை காட்டி திருத்து"
-#: ../src/MainWindow.cs:310 ../src/SingleView.cs:99
+#: ../src/MainWindow.cs:302 ../src/SingleView.cs:96
msgid "Fullscreen"
msgstr "முழுத்திரை"
-#: ../src/MainWindow.cs:312 ../src/SingleView.cs:101
+#: ../src/MainWindow.cs:304 ../src/SingleView.cs:98
msgid "View photos fullscreen"
msgstr "நிழற்படங்களின் முழுத்திரையாக காட்டு"
-#: ../src/MainWindow.cs:317 ../src/SingleView.cs:106
+#: ../src/MainWindow.cs:309 ../src/SingleView.cs:103
msgid "View photos in a slideshow"
msgstr "நிழற்படங்களை ஸ்லைடு காட்சியாக காட்டு"
-#: ../src/MainWindow.cs:332
+#: ../src/MainWindow.cs:324
msgid "Previous photo"
msgstr "முந்தைய நிழற்படம்"
-#: ../src/MainWindow.cs:337
+#: ../src/MainWindow.cs:329
msgid "Next photo"
msgstr "அடுத்த நிழற்படம்"
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/MainWindow.cs:350 ../src/Widgets/Sidebar.cs:64
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1168
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1208
-msgid "Tags"
-msgstr "ஒட்டுகள்"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/MainWindow.cs:641 ../src/UI.Dialog/AdjustTimeDialog.cs:129
-#: ../src/UI.Dialog/ProgressDialog.cs:92
-#: ../extensions/Exporters/CDExport/CDExport.cs:164
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:783
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{1} இல் {0}"
-
-#: ../src/MainWindow.cs:1501
+#: ../src/MainWindow.cs:1488
msgid "No cameras detected."
msgstr "கேமராக்கள் கண்டுபிடிக்கப்படவில்லை."
-#: ../src/MainWindow.cs:1502
+#: ../src/MainWindow.cs:1489
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
@@ -1017,80 +2666,80 @@ msgstr ""
"F-Spot உங்கள் கணினியில் எந்த கேமிராவையும் காண முடியவில்லை. கேமிரா இணைக்கப்பட்டு "
"மின்சாரம் உள்ளதா எனவும் சரி பார்க்கவும்"
-#: ../src/MainWindow.cs:1541
+#: ../src/MainWindow.cs:1528
msgid "Error connecting to camera"
msgstr "கேமராவுடன் இணைப்பதில் பிழை"
-#: ../src/MainWindow.cs:1542
+#: ../src/MainWindow.cs:1529
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "பிழை \"{0}\" கேமிராவுடன் இணைக்கும் போது பெறப்பட்டது"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1875
+#: ../src/MainWindow.cs:1815
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
msgstr[0] "தேர்ந்தெடுக்கப்பட்ட ஒட்டினை ஒருங்கிணை"
msgstr[1] "{0} தேர்ந்தெடுக்கப்பட்ட ஒட்டினை ஒருங்கிணைக்கவா?"
-#: ../src/MainWindow.cs:1902
+#: ../src/MainWindow.cs:1842
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
msgstr "செயல்பாடு தேர்ந்தெடுக்கப்பட்ட ஒட்டுடனும் துணை ஒட்டுகள் ஒரு ஒற்றை ஒட்டுடன் ஒருங்கிணைக்கப்படும்."
-#: ../src/MainWindow.cs:1904
+#: ../src/MainWindow.cs:1844
msgid "_Merge Tags"
msgstr "ஒட்டுகளை ஒருங்கிணை (_M)"
-#: ../src/MainWindow.cs:2109
+#: ../src/MainWindow.cs:2049
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
msgstr[0] "{1} இல் {0} நிழற்படம்"
msgstr[1] "{1} இல் {0} நிழற்படங்கள்"
-#: ../src/MainWindow.cs:2111 ../src/SingleView.cs:496
+#: ../src/MainWindow.cs:2051 ../src/SingleView.cs:493
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} நிழற்படம்"
msgstr[1] "{0} நிழற்படம்"
-#: ../src/MainWindow.cs:2114
+#: ../src/MainWindow.cs:2054
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " ({0} தேர்ந்தெடுக்கப்பட்டது)"
msgstr[1] " ({0} தேர்ந்தெடுக்கப்பட்டது)"
-#: ../src/MainWindow.cs:2195
+#: ../src/MainWindow.cs:2135
msgid "_Ok"
msgstr "சரி (_O)"
-#: ../src/MainWindow.cs:2196
+#: ../src/MainWindow.cs:2136
msgid "Error Deleting Picture"
msgstr "படத்தை அழிப்பதில் பிழை"
-#: ../src/MainWindow.cs:2201
+#: ../src/MainWindow.cs:2141
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "கோப்பினை அழிப்பதற்கு அடுமதி இல்லை:{1}{0}"
-#: ../src/MainWindow.cs:2205
+#: ../src/MainWindow.cs:2145
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
msgstr "கோப்பினை அழிக்கும் போது ஒரு வகையான பிழை {0} நிகழ்ந்துவிட்டது:{2}{1}"
-#: ../src/MainWindow.cs:2237
+#: ../src/MainWindow.cs:2177
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
msgstr[0] "தேர்ந்தெடுக்கப்பட்ட நிழற்படத்தை நிரந்தரமாக அழிக்க வேண்டுமா?"
msgstr[1] "{0} தேர்ந்தெடுக்கப்பட்ட நிழற்படத்தை நிரந்தரமாக அழிக்க வேண்டுமா?"
-#: ../src/MainWindow.cs:2241
+#: ../src/MainWindow.cs:2181
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural "This deletes all versions of the selected photos from your drive."
msgstr[0] ""
@@ -1100,20 +2749,20 @@ msgstr[1] ""
"இது உங்கள் இயக்கியிலிருந்து தேர்ந்தெடுக்கப்பட்ட நிழற்படத்தின் அனைத்து பதிப்புகளையும் "
"அழிக்கிறது."
-#: ../src/MainWindow.cs:2244
+#: ../src/MainWindow.cs:2184
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "நிழற்படத்தை அழி (_D)"
msgstr[1] "நிழற்படங்களை அழி (_D)"
-#: ../src/MainWindow.cs:2280
+#: ../src/MainWindow.cs:2220
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
msgstr[0] "F-Spotலிருந்து தேர்ந்தெடுக்கப்பட்ட நிழற்படத்தை நீக்க வேண்டுமா?"
msgstr[1] "F-Spotலிருந்து {0} தேர்ந்தெடுக்கப்பட்ட நிழற்படங்களை நீக்க வேண்டுமா?"
-#: ../src/MainWindow.cs:2285
+#: ../src/MainWindow.cs:2225
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
@@ -1122,45 +2771,45 @@ msgstr ""
"நீங்கள் F-Spot கேட்லாக்கை நீக்கினால் ஒட்டு தகவல்கள் அனைத்தும் இழக்கப்படும். நிழற்படங்கள் உங்கள் "
"கணினியில் இருக்கும் அவற்றை மீண்டும் F-Spotஇல் இறக்கி கொள்ளலாம்."
-#: ../src/MainWindow.cs:2286
+#: ../src/MainWindow.cs:2226
msgid "_Remove from Catalog"
msgstr "கேட்லாக்கிலிருந்து நீக்கு (_R)"
-#: ../src/MainWindow.cs:2349
+#: ../src/MainWindow.cs:2289
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "\"{0}\"ஒட்டினை அழிக்க வேண்டுமா?"
-#: ../src/MainWindow.cs:2351
+#: ../src/MainWindow.cs:2291
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "தேர்ந்தெடுக்கப்பட்ட {0} ஒட்டுக்களை அழிக்க வேண்டுமா?"
-#: ../src/MainWindow.cs:2356
+#: ../src/MainWindow.cs:2296
msgid "photo"
msgid_plural "photos"
msgstr[0] "நிழற்படம்"
msgstr[1] "நிழற்படங்கள்"
-#: ../src/MainWindow.cs:2358
+#: ../src/MainWindow.cs:2298
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
msgstr[0] "நீங்கள் இந்த டேக்கை அழித்தால். அது தொடர்புடைய {0} {1} இழக்கப்படும்."
msgstr[1] "நீங்கள் இந்த டேக்களை அழித்தால். அது தொடர்புடைய {0} {1} இழக்கப்படும்."
-#: ../src/MainWindow.cs:2363
+#: ../src/MainWindow.cs:2303
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "ஒட்டினை அழி (_D)"
msgstr[1] "ஒட்டினை அழி (_D)"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2377
+#: ../src/MainWindow.cs:2317
msgid "Tag is not empty"
msgstr "ஒட்டு வெற்றாக இல்லை"
-#: ../src/MainWindow.cs:2378
+#: ../src/MainWindow.cs:2318
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
@@ -1169,39 +2818,39 @@ msgstr ""
"ஒட்டுகள் அதனுள் ஒட்டுகளை கொண்டிருந்தால் அழிக்க முடியவில்லை. முதலில் \"{0}\" இன் கீழ் "
"ஒட்டுகளை அழிக்கவும்"
-#: ../src/MainWindow.cs:2816
+#: ../src/MainWindow.cs:2750
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "தேர்ந்தெடுக்கப்பட்ட நிழற்படத்தை இடப்பக்கம் சுழற்று"
msgstr[1] "தேர்ந்தெடுக்கப்பட்ட நிழற்படத்தை இடப்பக்கம் சுழற்று"
-#: ../src/MainWindow.cs:2829
+#: ../src/MainWindow.cs:2763
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "தேர்ந்தெடுக்கப்பட்ட நிழற்படத்தை வலப்பக்கம் சுழற்று"
msgstr[1] "தேர்ந்தெடுக்கப்பட்ட நிழற்படத்தை வலப்பக்கம் சுழற்று"
-#: ../src/MainWindow.cs:2837
+#: ../src/MainWindow.cs:2774
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "தேர்ந்தெடுக்கப்பட்ட ஒட்டுகளை கண்டுபிடி(_S)"
msgstr[1] ""
-#: ../src/MainWindow.cs:2841
+#: ../src/MainWindow.cs:2778
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
msgstr[0] "இதனுடன் தேர்ந்தெடுக்கப்பட்ட ஒட்டை கண்டுபிடி(_W)"
msgstr[1] ""
-#: ../src/MainWindow.cs:2880
+#: ../src/MainWindow.cs:2819
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "புதிய பதிப்பை உருவாக்க வேண்டுமா?"
msgstr[1] "புதிய பதிப்பை உருவாக்க வேண்டுமா?"
-#: ../src/MainWindow.cs:2882
+#: ../src/MainWindow.cs:2821
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -1216,7 +2865,7 @@ msgstr[1] ""
"{1}ஐ துவக்கும் முனை, F-Spot தேர்ந்தெடுக்கப்பட்ட நிழற்படத்திற்கு ஒரு புதிய பதிப்பை "
"உருவாக்கி அசலை வைத்திருக்குமா?"
-#: ../src/MainWindow.cs:2904
+#: ../src/MainWindow.cs:2843
msgid "XCF version"
msgstr "XCF பதிப்பு"
@@ -1390,25 +3039,26 @@ msgstr "ஒரு பதிப்பிற்கு மறுபெயரிட
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "விதிவிலக்கு \"{0}\" பெறப்பட்டது. \"{1}\" பதிப்பை மறுபெயரிட முடியவில்லை"
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:549
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:562
+#: ../src/Widgets/InfoBox.cs:564
msgid "(No Edits)"
msgstr "(திருத்தங்கள் இல்லை)"
-#: ../src/PhotoView.cs:163 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "நிழற்படத்தை திருத்தும் போது பிழை"
-#: ../src/PhotoView.cs:164 ../src/Sharpener.cs:73
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
#: ../src/UI.Dialog/EditExceptionDialog.cs:25
#, csharp-format
msgid "Received exception \"{0}\". Unable to save photo {1}"
msgstr "விதிவிலக்கு \"{0}\" பெறப்பட்டது. நிழற்படம் {1}ஐ சேமிக்க முடியவில்லை"
-#: ../src/PhotoView.cs:301
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "குறிப்பு:"
-#: ../src/Preferences.cs:152
+#: ../src/Preferences.cs:149
msgid "Photos"
msgstr "நிழற்படங்கள்"
@@ -1416,40 +3066,40 @@ msgstr "நிழற்படங்கள்"
msgid "Image Settings"
msgstr "பட அமைவுகள்"
-#: ../src/QueryWidget.cs:47
+#: ../src/QueryWidget.cs:58
msgid "Find: "
msgstr "கண்டுபிடி: "
-#: ../src/QueryWidget.cs:52
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "ஒட்டில்லாத நிழற்படங்கள்"
-#: ../src/QueryWidget.cs:60
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "மதிப்பிடப்பட்ட நிழற்படங்கள்"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:69
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
msgstr "ரோலை இறக்கு"
-#: ../src/QueryWidget.cs:89
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "தேடுதலை துடை"
-#: ../src/QueryWidget.cs:96
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "தேடுதலை புதுப்பி"
-#: ../src/QueryWidget.cs:98
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "பொருந்தும் நிழற்படங்கள் காணப்படவில்லை"
-#: ../src/QueryWidget.cs:136
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "பைன்டு பாரை மறை(_F)"
-#: ../src/QueryWidget.cs:142
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "பைன்டு பாரை காட்டு((_F)"
@@ -1548,87 +3198,39 @@ msgstr "ரேடியஸ்:"
msgid "Threshold:"
msgstr "வாயில்:"
-#: ../src/SingleView.cs:89
+#: ../src/SingleView.cs:86
msgid "Rotate photo left"
msgstr "நிழற்படத்தை இடப்பக்கம் சுழற்று"
-#: ../src/SingleView.cs:94
+#: ../src/SingleView.cs:91
msgid "Rotate photo right"
msgstr "நிழற்படத்தை வலப்பக்கம் சுழற்று"
-#: ../src/SingleView.cs:131 ../src/UI.Dialog/ui/PreferenceDialog.glade.h:14
+#: ../src/SingleView.cs:128
msgid "Folder"
msgstr "கோப்புறை"
-#: ../src/SingleView.cs:357
+#: ../src/SingleView.cs:354
msgid "Open"
msgstr "திற"
-#: ../src/SingleView.cs:457
+#: ../src/SingleView.cs:454
msgid "Set as Background"
msgstr "பின்னணியாக அமை"
-#: ../src/TagCommands.cs:93 ../src/TagCommands.cs:226
-#: ../src/TagSelectionWidget.cs:501
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "இந்த பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது"
-#: ../src/TagCommands.cs:141
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "புதிய ஒட்டினை உருவாக்கு"
-#: ../src/TagCommands.cs:142
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "புதிய ஒட்டின் பெயர்:"
-#: ../src/TagCommands.cs:292
-msgid "Edit Tag"
-msgstr "ஒட்டினை திருத்து"
-
-#: ../src/TagCommands.cs:293
-msgid "Tag Name:"
-msgstr "ஒட்டு பெயர்:"
-
-#: ../src/TagCommands.cs:409
-msgid "Unable to load image"
-msgstr "படத்தை ஏற்ற முடியவில்லை"
-
-#: ../src/TagCommands.cs:410
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "ஒட்டுக்கு சின்னமாக ஏற்ற \"{0}\" முடியவில்லை"
-
-#: ../src/TagCommands.cs:453
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "நிழற்படம் {1}ஆல் {0}"
-
-#: ../src/TagCommands.cs:483
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "ஒட்டு {0}க்கான சிறுபடத்தை திருத்து"
-
-#: ../src/TagCommands.cs:499
-msgid "Select Photo from file"
-msgstr "கோப்பிலிருந்து நிழற்படத்தை தேர்ந்தெடுக்கவும்"
-
-#: ../src/TagCommands.cs:522
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-"\n"
-"<b>யிழற்படத்திலிருந்து</b>\n"
-" இந்த ஒட்டின் சின்னத்திமாக உங்களுடைய நூலகத்திலிருக்கும் நிழற்படங்கள் ஒன்றை பயன்படுத்தவும் .\n"
-" எப்படிஇருப்பினும், முதலில் ஒரு நிழற்படமாவது சம்பந்தப்பட்டு இருக்க வேண்டும்\n"
-" இந்த ஒட்டுடன். ஒரு நிழற்படமாக இதனுடன் ஒட்டவும் '{0}' மற்றும் இங்கே திரும்பவும்\n"
-" இதை சின்னமாக பயன்படுத்தவும்."
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
@@ -1691,7 +3293,7 @@ msgstr[1] "அதனுடன் கண்டுபிடி (_W)"
msgid "All"
msgstr "அனைத்தும்"
-#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:596
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "இல்லை {0}"
@@ -1700,7 +3302,7 @@ msgstr "இல்லை {0}"
msgid "Drag tags here to search for them"
msgstr "அவற்றை தேட ஒட்டை இங்கிருந்து இழுக்கவும்"
-#: ../src/TagSelectionWidget.cs:500
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "ஒட்டு மறுபெயரிடுவதில் பிழை"
@@ -1725,26 +3327,27 @@ msgid "Events"
msgstr "நிகழ்வுகள்"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:400
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:408
msgid "(None)"
msgstr "(ஒன்றுமில்லை)"
-#: ../src/Term.cs:302
+#: ../src/Term.cs:298
msgid " and "
msgstr " மற்றும் "
#. operators.Add (Catalog.GetString (" && "));
-#: ../src/Term.cs:304
+#: ../src/Term.cs:300
msgid ", "
msgstr ", "
-#: ../src/Term.cs:360
+#: ../src/Term.cs:356
msgid " or "
msgstr " அல்லது "
#. OPS The operators we support, case insensitive
#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:384 ../src/Widgets/FindBar.cs:177
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "அல்லது"
@@ -1754,73 +3357,107 @@ msgstr "சிறுபடங்களை மேம்படுத்துக
#: ../src/ThumbnailCommand.cs:28
#, csharp-format
-#| msgid "Uploading picture \"{0}\""
msgid "Updating picture \"{0}\""
msgstr "படம் \"{0}\" பதிவேற்றப்படுகிறது"
-#: ../src/UI.Dialog/AboutDialog.cs:70
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
msgstr "GNOMEக்கிற்கான நிழற்பட மேலாண்மை"
-#: ../src/UI.Dialog/AboutDialog.cs:71
-#| msgid "Copyright © 2003-2008 Novell Inc."
+#: ../src/UI.Dialog/AboutDialog.cs:77
msgid "Copyright © 2003-2009 Novell Inc."
msgstr "பதிப்புரிமை © 2003-2008 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:94
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr "மொழிபெயர்பாளர்-சன்மானம்"
-#: ../src/UI.Dialog/AboutDialog.cs:99
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "F-Spot இணைய தளம்"
#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
msgid "Shift all photos by {0}"
msgstr "{0}ஆல் அனைத்து நிழற்படங்களையும் மாற்று"
-#: ../src/UI.Dialog/DateRangeDialog.cs:102
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
msgid "Today"
msgstr "இன்று"
-#: ../src/UI.Dialog/DateRangeDialog.cs:104
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
msgid "Yesterday"
msgstr "நேற்று"
-#: ../src/UI.Dialog/DateRangeDialog.cs:106
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
msgid "Last 7 days"
msgstr "கடைசி 7 நாட்கள்"
-#: ../src/UI.Dialog/DateRangeDialog.cs:108
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
msgid "Last 30 days"
msgstr "கடைசி 30 நாட்கள்"
-#: ../src/UI.Dialog/DateRangeDialog.cs:110
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
msgid "Last 90 days"
msgstr "கடைசி 90 நாட்கள்"
-#: ../src/UI.Dialog/DateRangeDialog.cs:112
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
msgid "Last 360 days"
msgstr "கடைசி 360 நாட்கள்"
-#: ../src/UI.Dialog/DateRangeDialog.cs:114
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
msgid "Current Week (Mon-Sun)"
msgstr "நடப்பு வாரம் (திங்-ஞா)"
-#: ../src/UI.Dialog/DateRangeDialog.cs:116
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
msgid "Previous Week (Mon-Sun)"
msgstr "முந்தைய வாரம் (திங்-ஞா)"
-#: ../src/UI.Dialog/DateRangeDialog.cs:132
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:11
-msgid "All Images"
-msgstr "அனைத்து படங்கள்"
-
-#: ../src/UI.Dialog/DateRangeDialog.cs:134
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
msgid "Customized Range"
msgstr "தனிபயனாக்கப்பட்ட வரம்பு"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "ஒட்டு {0}க்கான சிறுபடத்தை திருத்து"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "கோப்பிலிருந்து நிழற்படத்தை தேர்ந்தெடுக்கவும்"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>யிழற்படத்திலிருந்து</b>\n"
+" இந்த ஒட்டின் சின்னத்திமாக உங்களுடைய நூலகத்திலிருக்கும் நிழற்படங்கள் ஒன்றை பயன்படுத்தவும் .\n"
+" எப்படிஇருப்பினும், முதலில் ஒரு நிழற்படமாவது சம்பந்தப்பட்டு இருக்க வேண்டும்\n"
+" இந்த ஒட்டுடன். ஒரு நிழற்படமாக இதனுடன் ஒட்டவும் '{0}' மற்றும் இங்கே திரும்பவும்\n"
+" இதை சின்னமாக பயன்படுத்தவும்."
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "படத்தை ஏற்ற முடியவில்லை"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "ஒட்டுக்கு சின்னமாக ஏற்ற \"{0}\" முடியவில்லை"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "நிழற்படம் {1}ஆல் {0}"
+
#: ../src/UI.Dialog/ExceptionDialog.cs:24
msgid "F-Spot Encountered a Fatal Error"
msgstr "F-Spot ஒரு முக்கியமான பிழை கண்டுள்ளது"
@@ -1833,6 +3470,21 @@ msgstr "பிழை விவரங்கள்"
msgid "An unhandled exception was thrown: "
msgstr "ஒரு கையாள முடியாத விதிவிலக்கு ஏற்பட்டுள்ளது:"
+#: ../src/UI.Dialog/PreferenceDialog.cs:53
+#: ../src/UI.Dialog/PreferenceDialog.cs:71
+#| msgid "(None)"
+msgid "None"
+msgstr "ஒன்றுமில்லை"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:55
+#| msgid "System Theme"
+msgid "System profile"
+msgstr "கணினி விவரக்குறிப்பு"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:84
+msgid "Standard theme"
+msgstr "இயல்பான தீம்"
+
#: ../src/UI.Dialog/RepairDbDialog.cs:20
msgid "Error loading database."
msgstr "தரவுத்தளத்தை ஏற்றுவதில் பிழை."
@@ -1854,115 +3506,404 @@ msgstr "லேபிள்"
msgid "Ratio"
msgstr "விகதம்"
-#: ../src/UI.Dialog/ThreadProgressDialog.cs:49
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:53
msgid "Retry"
msgstr "மறுமுயற்சி"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:1
-msgid "<b>Color Management</b>"
-msgstr "<b>நிற நிர்வாகம்</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+#| msgid "<b>Account</b>"
+msgid "<b>Action</b>"
+msgstr "<b>செயல்</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+#| msgid "<b>From Photo</b>"
+msgid "<b>Reference Photo</b>"
+msgstr "<b>குறிப்பு நிழற்படம்</b>"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+#| msgid "Adjust _Time..."
+msgid "Adjust Time"
+msgstr "நேரத்தை சரிசெய்"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "சரிசெய்யப்பட்ட தேதி:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+#| msgid "More dates"
+msgid "Current date:"
+msgstr "நடப்பு தேதி:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+#| msgid "Shift all photos by {0}"
+msgid "Space all photos by"
+msgstr "அனைத்து நிழற்படங்களின் இடைவெளி"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+#| msgid "Preferences"
+msgid "difference:"
+msgstr "வித்தியாசம்:"
+
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+#| msgid "Rotating photo \"{0}\""
+msgid "min. Starting at {0}"
+msgstr "நிமிடம் {0}இல் துவக்குதல்"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+#| msgid "<b>Min Rating</b>"
+msgid "<b>End Date</b>"
+msgstr "<b>முடிவு தேதி</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+#| msgid "<b>Screensaver</b>"
+msgid "<b>Select period</b>"
+msgstr "<b>காலத்தை தேர்ந்தெடு</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+#| msgid "<b>Style</b>"
+msgid "<b>Start Date</b>"
+msgstr "<b>துவக்க தேதி</b>"
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Cancel, do not change the current timeline. "
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Only photos taken within these dates will be displayed."
+
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+#| msgid "_Set Date Range..."
+msgid "Set date range"
+msgstr "தேதி வரம்பை அமைக்கவும்"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "ஒட்டினை திருத்து"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:2
-msgid "<b>Import Settings</b>"
-msgstr "<b>இறக்குமதி அமைவுகள்</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "சின்னத்தைத் திருத்து"
+
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "சின்னம் (_I):"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:3
-msgid "<b>Metadata</b>"
-msgstr "<b>மெட்டா தரவு</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>வெளி நிழற்படத்திலிருந்து</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:4
-msgid "<b>Screensaver</b>"
-msgstr "<b>திரைச்சேமிப்பி</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>நிழற்படத்திலிருந்து</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:5
-msgid "<b>Theming</b>"
-msgstr "<b>Theming</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+#| msgid "<b>Predefined</b>"
+msgid "<b>Predefined icons</b>"
+msgstr "<b>முன்வரையறுக்கப்பட்டது சின்னங்கள்</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:6
-msgid ""
-"<small><i>Choose the folder where F-Spot should store newly imported photos</"
-"i></small>"
-msgstr ""
-"<small><i>F-Spot புதிதாக இறக்கப்பட்ட நிழற்படங்களை சேமிக்க வேண்டிய கோப்புறையை "
-"தேர்ந்தெடு</i></small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>முன்பார்வை</b>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:7
-msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr ""
-"<small><i>இந்த விருப்பத்தை ஒட்டுகள் மற்றும் விளக்கங்களை துணைபுரியும் பட வடிவங்களுக்குள் "
-"சேமிக்க செயல்படுத்தவும்.</i></small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "சின்னத்தை இதிலிருந்து வடிவமை"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:9
-msgid ""
-"<small><i>While acting as a screensaver, F-Spot can display all of your "
-"images, or a small subset based on tags.</i></small>"
-msgstr ""
-"<small><i>ஒரு திரை சேமிப்பாக செயல்படும் போது, F-Spot உங்கள் அனைத்து படங்கள் அல்லது "
-"ஒரு சிறிய டேக்கை காட்டும்.</i></small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "ஒட்டு சிறுபடத்தை திருத்து"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:10
-msgid "<small><i>You'll have to restart F-Spot to load the new theme.</i></small>"
-msgstr "<small><i>நீங்கள் F-Spotஐ புதிய தீம்மை ஏற்ற மறுதுவக்கலாம்.</i></small>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "படம் இல்லை (_i)"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:12
-msgid "Custom Theme"
-msgstr "தனிபயன் தீம்"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "நிழற்படம் 0 இல் 0"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:15
-msgid "From List:"
-msgstr "அனுப்புனர் பட்டியல்:"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "காட்சிக்கு நிற விவரக்குறிப்பு:"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:16
-msgid "From gtkrc File:"
-msgstr "gtkrc கோப்பிலிருந்து:"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "அச்சடிப்பிற்கு நிற விவரக்குறிப்பு:"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:17
-msgid "Images tagged with:"
-msgstr "உருவங்கள் இதனுடன் ஒட்டப்படுகின்றன:"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+#| msgid "Preferences"
+msgid "F-Spot Preferences"
+msgstr "F-Spot முன்னுரிமைகள்"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:18
-msgid "Make F-Spot your screensaver"
-msgstr "F-Spot உங்கள் திரைச்சேமிப்பாக்கு"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-Spot தோற்றம்:"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:19 ../src/f-spot.glade.h:89
-msgid "Preferences"
-msgstr "முன்னுரிமைகள்"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:20
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
msgid "Select A Folder"
msgstr "ஒரு கோப்புறையைத் தேர்ந்தெடு"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:21
-msgid "Select A gtkrc File"
-msgstr "ஒரு gtkrc கோப்பினை தேர்ந்தெடு"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "பட கோப்புகளிலிருந்து தனியாக"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Store tags and descriptions for photos:"
+
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "When importing photos, copy them to:"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>அதிக மதிப்பிடுதல்</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>குறைந்த மதிப்பிடுதல்</b>"
+
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "மதிப்பீடு வடிப்பியை அமைக்கவும்"
+
+#: ../src/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "நேரத்தை சரிசெய் (_T)..."
+
+#: ../src/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "ஒழுங்குபடுத்தல் (_b)"
+
+#: ../src/ui/main_window.ui.h:4
+msgid "By _Date"
+msgstr "தேதியால் (_D)"
+
+#: ../src/ui/main_window.ui.h:5
+msgid "By _Import Roll"
+msgstr "இறக்கு ரோலால் (_I)"
+
+#: ../src/ui/main_window.ui.h:6
+msgid "By _Rating"
+msgstr "விகிதப்படுத்துதலால்( _R)"
+
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy Locat_ion"
+msgstr "இடத்தை நகலெடு (_i)"
+
+#: ../src/ui/main_window.ui.h:8
+msgid "Create New _Tag..."
+msgstr "புதிய ஒட்டு உருவாக்கு (_T)..."
+
+#: ../src/ui/main_window.ui.h:9
+msgid "Create _New Version..."
+msgstr "புதிய பதிப்பை உருவாக்கு (_N)..."
+
+#: ../src/ui/main_window.ui.h:11
+msgid "Fin_d"
+msgstr "கண்டுபிடி (_d)"
+
+#: ../src/ui/main_window.ui.h:12
+msgid "Manage _Extensions"
+msgstr "விரிவாக்கங்களை மேலான்மை செய் (_E)"
+
+#: ../src/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "பக்க அமைப்பு (_u)..."
+
+#: ../src/ui/main_window.ui.h:14
+msgid "Re_fresh Thumbnail"
+msgstr "சிறுபடத்தைப் புதுப்பி (_f)"
+
+#: ../src/ui/main_window.ui.h:19
+msgid "Select _None"
+msgstr "ஒன்றையும் தேர்ந்தெடுக்க வேண்டாம் (_N)"
+
+#: ../src/ui/main_window.ui.h:20
+msgid "Send by _Mail..."
+msgstr "மின்னஞ்சல் வழியாக அனுப்பு (_M)..."
+
+#: ../src/ui/main_window.ui.h:22
+msgid "Side_bar"
+msgstr "பக்க பட்டி (_b)"
+
+#: ../src/ui/main_window.ui.h:23
+msgid "T_ags"
+msgstr "ஒட்டுகள் (_a)"
+
+#: ../src/ui/main_window.ui.h:25
+msgid "Thumbnail _elements"
+msgstr "சின்னப்படம் உருப்படிகள் (_e)"
+
+#: ../src/ui/main_window.ui.h:26
+msgid "Too_lbar"
+msgstr "கருவி பட்டி (_l)"
+
+#: ../src/ui/main_window.ui.h:27
+msgid "View"
+msgstr "பார்வை"
+
+#: ../src/ui/main_window.ui.h:33
+msgid "_Attach Tag to Selection"
+msgstr "தேர்வுக்கு ஒட்டினை இணை (_A)"
+
+#: ../src/ui/main_window.ui.h:35
+msgid "_Clear Rating Filter"
+msgstr "மதிப்பீடு வடிப்பியை சரிசெய் (_C)"
+
+#: ../src/ui/main_window.ui.h:36
+msgid "_Clear Roll Filter"
+msgstr "ரோல் வடிப்பியை சரிசெய் (_C)"
+
+#: ../src/ui/main_window.ui.h:38
+msgid "_Components"
+msgstr "கூறுகள் (_C)"
+
+#: ../src/ui/main_window.ui.h:39
+msgid "_Contents"
+msgstr "உள்ளடக்கம் (_C)"
+
+#: ../src/ui/main_window.ui.h:40
+msgid "_Dates"
+msgstr "தேதிகள் (_D)"
+
+#: ../src/ui/main_window.ui.h:42
+msgid "_Delete Selected Tag"
+msgstr "தேர்ந்தெடுக்கப்பட்ட ஒட்டினை அழி (_D)"
+
+#: ../src/ui/main_window.ui.h:43
+msgid "_Delete Version"
+msgstr "பதிப்பை அழி (_D)"
+
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Selected Tag..."
+msgstr "தேர்ந்தெடுக்கப்பட்ட ஒட்டினை திருத்து (_E)..."
+
+#: ../src/ui/main_window.ui.h:46
+msgid "_Export to"
+msgstr "இதற்கு ஏற்று (_E)"
+
+#: ../src/ui/main_window.ui.h:47
+msgid "_Filmstrip"
+msgstr "ஃபிலிம்ஸ்ட்ரீப் (_F)"
+
+#: ../src/ui/main_window.ui.h:50
+msgid "_Hidden"
+msgstr "மறைக்கப்பட்டது (_H)"
+
+#: ../src/ui/main_window.ui.h:51
+msgid "_Import..."
+msgstr "இறக்கு (_I)..."
+
+#: ../src/ui/main_window.ui.h:52
+msgid "_Large"
+msgstr "பெரியதுனது (_L)"
+
+#: ../src/ui/main_window.ui.h:53
+msgid "_Last Import Roll"
+msgstr "கடைசியாக இறக்கப்பட்ட ரோல் (_L)"
+
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr "_Loupe"
+
+#: ../src/ui/main_window.ui.h:55
+msgid "_Medium"
+msgstr "நடுத்தரமான (_M)"
+
+#: ../src/ui/main_window.ui.h:57
+msgid "_Quit"
+msgstr "வெளியேறு (_Q)"
+
+#: ../src/ui/main_window.ui.h:58
+msgid "_Ratings"
+msgstr "மதிப்பிடுதல் (_R)"
+
+#: ../src/ui/main_window.ui.h:60
+msgid "_Remove Tag From Selection"
+msgstr "தேர்விலிருந்து ஒட்டை நீக்கு (_R)"
+
+#: ../src/ui/main_window.ui.h:61
+msgid "_Rename Version"
+msgstr "பதிப்பை மறுபெயரிடு (_R)"
+
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "தலைகீழ் வரிசை (_R)"
+
+#: ../src/ui/main_window.ui.h:63
+msgid "_Select Import Rolls..."
+msgstr "இறக்கப்பட்ட ரோல்களை தேர்ந்தெடு (_S)..."
+
+#: ../src/ui/main_window.ui.h:64
+msgid "_Set Date Range..."
+msgstr "தேதி வரம்பை அமைக்கவும் (_S)..."
+
+#: ../src/ui/main_window.ui.h:65
+msgid "_Set Rating filter..."
+msgstr "மதிப்பீடு வடிப்பியை அமைக்கவும் (_S)..."
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:22
-msgid "System Theme"
-msgstr "கணினி தீம்"
+#: ../src/ui/main_window.ui.h:66
+msgid "_Sharpen..."
+msgstr "கூர்மையான (_S)..."
+
+#: ../src/ui/main_window.ui.h:68
+msgid "_Small"
+msgstr "சிறிய (_S)"
+
+#: ../src/ui/main_window.ui.h:69
+msgid "_Tag Icons"
+msgstr "சின்னங்களை ஒட்டு (_T)"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:23
-msgid "Try to use the system display profile"
-msgstr "கணினி காட்சி விளக்கங்களை பயன்படுத்த முயற்சிக்கவும்"
+#: ../src/ui/main_window.ui.h:70
+msgid "_Tags"
+msgstr "ஒட்டுக்கள் (_T)"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:24
-msgid "Write _metadata to file"
-msgstr "மெட்டாதரவை கோப்பில் எழுது (_m)"
+#: ../src/ui/main_window.ui.h:71
+msgid "_Timeline"
+msgstr "டைம்லான் (_T)"
+
+#: ../src/ui/main_window.ui.h:72
+msgid "_Tools"
+msgstr "கருவிகள் (_T)"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:25
-msgid "_Display:"
-msgstr "காட்சி (_D):"
+#: ../src/ui/main_window.ui.h:73
+msgid "_Untagged Photos"
+msgstr "ஒட்டுநீக்கப்பட்ட நிழற்படங்கள் (_U)"
-#: ../src/UI.Dialog/ui/PreferenceDialog.glade.h:26
-msgid "_Print output:"
-msgstr "வெளிப்பாட்டை அச்சிடு (_P):"
+#: ../src/ui/main_window.ui.h:74
+msgid "_Version"
+msgstr "பதிப்பு (_V)"
-#: ../src/Updater.cs:528
+#: ../src/Updater.cs:616
msgid "Updating F-Spot Database"
msgstr "F-Spot தரவுத்தளத்தை மேம்படுத்துகிறது"
-#: ../src/Updater.cs:529
+#: ../src/Updater.cs:617
msgid ""
"Please wait while your F-Spot gallery's database is updated. This may take "
"some time."
@@ -2003,7 +3944,6 @@ msgid "Print cut marks"
msgstr "அச்சிடும் வெட்டு குறிப்புகள்"
#: ../src/Widgets/CustomPrintWidget.cs:158
-#| msgid "Photos"
msgid "Photos layout"
msgstr "நிழற்படங்கள் அமைப்பு"
@@ -2029,31 +3969,27 @@ msgid "White borders"
msgstr "வெள்ளை எல்லைக்கோடுகள்"
#: ../src/Widgets/CustomPrintWidget.cs:176
-msgid "Custom Text: "
-msgstr "தனிபயன் உரை:"
+#| msgid "Custom Text: "
+msgid "Custom Text"
+msgstr "தனிபயன் உரை"
#: ../src/Widgets/CustomPrintWidget.cs:180
-#| msgid "Photos"
msgid "Photos infos"
msgstr "நிழற்படங்கள் தகவல்கள்"
#: ../src/Widgets/CustomPrintWidget.cs:182
-#| msgid "_File name:"
msgid "Print file name"
msgstr "கோப்பு பெயரை அச்சடி"
#: ../src/Widgets/CustomPrintWidget.cs:183
-#| msgid "Previous photo"
msgid "Print photo date"
msgstr "நிழற்படம் தேதியை அச்சிடு"
#: ../src/Widgets/CustomPrintWidget.cs:184
-#| msgid "Previous photo"
msgid "Print photo time"
msgstr "நிழற்படம் நேரத்தை அச்சிடு"
#: ../src/Widgets/CustomPrintWidget.cs:185
-#| msgid "Print cut marks"
msgid "Print photo tags"
msgstr "நிழற்பட டேக்குகளை அச்சிடு"
@@ -2065,13 +4001,6 @@ msgstr "நிழற்பட கருத்துக்களை அச்ச
msgid "Edit"
msgstr "திருத்து"
-#: ../src/Widgets/EditorPage.cs:196
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:46
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:45
-#: ../extensions/Tools/PictureTile/PictureTile.cs:51
-msgid "No selection available"
-msgstr "தேர்வு எதுவும் இல்லை"
-
#: ../src/Widgets/EditorPage.cs:197
msgid ""
"This tool requires an active selection. Please select a region of the photo "
@@ -2095,13 +4024,27 @@ msgstr ""
"பெறப்பட்ட விதிவிலக்கf \"{0}\". நீங்கள் RAW கோப்புகளை JPEGக்கு அவற்றை திருத்தும் முன் "
"உருவாக்குகிறீர்கள் "
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "கிடைமட்டம் (_H)"
+
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "செங்குத்து (_V)"
+
#: ../src/Widgets/FindBar.cs:58
msgid "Find:"
msgstr "தேடு:"
-#: ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:196
-msgid "and"
-msgstr "மற்றும்"
+#: ../src/Widgets/FolderTreePage.cs:21
+#| msgid "Folder"
+msgid "Folders"
+msgstr "கோப்புறைகள்"
+
+#: ../src/Widgets/FolderTreeView.cs:123
+#| msgid "_Virtual Filesystem"
+msgid "Filesystem"
+msgstr "கோப்பு முறைமை"
#: ../src/Widgets/InfoBox.cs:182
msgid "Histogram"
@@ -2111,11 +4054,6 @@ msgstr "ஹிஸ்டோகிராம்"
msgid "Date"
msgstr "தேதி"
-#: ../src/Widgets/InfoBox.cs:220
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:5
-msgid "Size"
-msgstr "அளவு"
-
#: ../src/Widgets/InfoBox.cs:223
msgid "Exposure"
msgstr "எக்ஸ்போஷர்"
@@ -2132,26 +4070,35 @@ msgstr "கோப்பு அளவு"
msgid "Rating"
msgstr "மதிப்பிடுதல்"
-#: ../src/Widgets/InfoBox.cs:409 ../src/Widgets/InfoBox.cs:432
-#: ../src/Widgets/InfoBox.cs:442 ../src/Widgets/InfoBox.cs:451
+#: ../src/Widgets/InfoBox.cs:389 ../src/Widgets/InfoBox.cs:397
+#: ../src/Widgets/InfoBox.cs:427
+msgid "(wrong format)"
+msgstr "(தவறான வடிவம்)"
+
+#: ../src/Widgets/InfoBox.cs:417 ../src/Widgets/InfoBox.cs:440
+#: ../src/Widgets/InfoBox.cs:450 ../src/Widgets/InfoBox.cs:459
msgid "(Unknown)"
msgstr "(தெரியாத)"
-#: ../src/Widgets/InfoBox.cs:419
-msgid "(wrong format)"
-msgstr "(தவறான வடிவம்)"
+#: ../src/Widgets/InfoBox.cs:560
+#, csharp-format
+#| msgid "(No Edits)"
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(ஒரு திருத்தம்)"
+msgstr[1] "({0} திருத்தங்கள்)"
-#: ../src/Widgets/InfoBox.cs:558
+#: ../src/Widgets/InfoBox.cs:574
msgid "(File read error)"
msgstr "(கோப்பு வாசித்தல் பிழை)"
-#: ../src/Widgets/InfoBox.cs:603
+#: ../src/Widgets/InfoBox.cs:619
#, csharp-format
msgid "{0} Photos"
msgstr "{0} நிழற்படங்கள்"
#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:623
+#: ../src/Widgets/InfoBox.cs:639
#, csharp-format
msgid ""
"On {0} between \n"
@@ -2160,7 +4107,7 @@ msgstr ""
"{0} விற்கு இடையில் \n"
"{1} மற்றும் {2}"
-#: ../src/Widgets/InfoBox.cs:628
+#: ../src/Widgets/InfoBox.cs:644
#, csharp-format
msgid ""
"Between {0} \n"
@@ -2169,35 +4116,35 @@ msgstr ""
"{0} \n"
"மற்றும் {1} நடுவில்"
-#: ../src/Widgets/InfoBox.cs:655
+#: ../src/Widgets/InfoBox.cs:671
msgid "(At least one File not found)"
msgstr "(ஒரு கோப்பு கூட காணப்படவில்லை)"
-#: ../src/Widgets/InfoBox.cs:772
+#: ../src/Widgets/InfoBox.cs:788
msgid "Show Photo Name"
msgstr "நிழற்பட பெயரை காட்டு"
-#: ../src/Widgets/InfoBox.cs:781
+#: ../src/Widgets/InfoBox.cs:797
msgid "Show Date"
msgstr "தேதியைக் காட்டு"
-#: ../src/Widgets/InfoBox.cs:790
+#: ../src/Widgets/InfoBox.cs:806
msgid "Show Size"
msgstr "அளவைக் காட்டு"
-#: ../src/Widgets/InfoBox.cs:799
+#: ../src/Widgets/InfoBox.cs:815
msgid "Show Exposure"
msgstr "எக்ஸ்போஷரைக் காட்டு"
-#: ../src/Widgets/InfoBox.cs:808
+#: ../src/Widgets/InfoBox.cs:824
msgid "Show Focal Length"
msgstr "ஃபோகல் நீளத்தை காட்டு"
-#: ../src/Widgets/InfoBox.cs:817
+#: ../src/Widgets/InfoBox.cs:833
msgid "Show Camera"
msgstr "கேமிராவை காட்டு"
-#: ../src/Widgets/InfoBox.cs:826
+#: ../src/Widgets/InfoBox.cs:842
msgid "Show File Size"
msgstr "கோப்பு அளவை காட்டு"
@@ -2235,10 +4182,6 @@ msgstr "பயன்பாடுகள் இல்லை"
msgid "Rating:"
msgstr "மதிப்பிடுதல்:"
-#: ../src/XmpTagsImporter.cs:90
-msgid "Location"
-msgstr "இடம்"
-
#: ../src/XmpTagsImporter.cs:91
msgid "Country"
msgstr "நாடு"
@@ -2252,799 +4195,6 @@ msgid "State"
msgstr "நிலை"
#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/f-spot.glade.h:2
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/f-spot.glade.h:3
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/f-spot.glade.h:4
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/f-spot.glade.h:5
-msgid "640 px"
-msgstr "640 px"
-
-#: ../src/f-spot.glade.h:6
-msgid "800 px"
-msgstr "800 px"
-
-#: ../src/f-spot.glade.h:7
-msgid "<b></b>"
-msgstr "<b></b>"
-
-#: ../src/f-spot.glade.h:8
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>கணக்கு</b>"
-
-#: ../src/f-spot.glade.h:9
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>ஆல்பம்</b>"
-
-#: ../src/f-spot.glade.h:10
-msgid "<b>Co_rrections</b>"
-msgstr "<b>திருத்தங்கள் (_r)</b>"
-
-#: ../src/f-spot.glade.h:11
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>இலக்கு</b>"
-
-#: ../src/f-spot.glade.h:12
-msgid "<b>From External Photo</b>"
-msgstr "<b>வெளி நிழற்படத்திலிருந்து</b>"
-
-#: ../src/f-spot.glade.h:13
-msgid "<b>From Photo</b>"
-msgstr "<b>நிழற்படத்திலிருந்து</b>"
-
-#: ../src/f-spot.glade.h:14
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>படத்தொகுப்பு</b>"
-
-#: ../src/f-spot.glade.h:15
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>பட இடைசெருகல்</b>"
-
-#: ../src/f-spot.glade.h:16
-msgid "<b>Max Rating</b>"
-msgstr "<b>அதிக மதிப்பிடுதல்</b>"
-
-#: ../src/f-spot.glade.h:17
-msgid "<b>Min Rating</b>"
-msgstr "<b>குறைந்த மதிப்பிடுதல்</b>"
-
-#: ../src/f-spot.glade.h:18
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
-msgid "<b>Photos</b>"
-msgstr "<b>நிழற்படங்கள்</b>"
-
-#: ../src/f-spot.glade.h:19
-msgid "<b>Predefined</b>"
-msgstr "<b>முன்வரையறுக்கப்பட்டது</b>"
-
-#: ../src/f-spot.glade.h:20
-msgid "<b>Preview</b>"
-msgstr "<b>முன்பார்வை</b>"
-
-#: ../src/f-spot.glade.h:21
-msgid "<b>Size</b>"
-msgstr "<b>அளவு</b>"
-
-#: ../src/f-spot.glade.h:22
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>பாணி</b>"
-
-#: ../src/f-spot.glade.h:23
-msgid "<b>Summary</b>"
-msgstr "<b>சுருக்கம்</b>"
-
-#: ../src/f-spot.glade.h:24
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>ஒளிஊடுருவும் பாகங்கள்</b>"
-
-#: ../src/f-spot.glade.h:25
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>இறக்கப்பட்ட அனைத்து படங்களையும் காட்டு</b>"
-
-#: ../src/f-spot.glade.h:26
-msgid "<b>_White Balance</b>"
-msgstr "<b>வெள்ளை சமன் (_W)</b>"
-
-#: ../src/f-spot.glade.h:27
-msgid "<small></small>"
-msgstr "<small></small>"
-
-#: ../src/f-spot.glade.h:28
-msgid ""
-"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
-"disable this for viewing photos, but disabling the interpolation could be "
-"usefull in icon design.</i></small>"
-msgstr ""
-"<small><i>இதனை செயல்படுத்துவது அளவிடப்பட்ட படங்களை அனுமதிக்கும். நீங்கள் இந்த நிழற்படஙளை "
-"பார்க்க செயல்நீக்கக்கூடாது ஆனால் செயல்நீக்கினால் சின்ன வடிவங்களில் பயனுள்ளதாக இருக்கும்.</i></"
-"small>"
-
-#: ../src/f-spot.glade.h:29
-msgid ""
-"<small><i>You can choose how to display transparent parts in images. This "
-"option has no effect on photos, but setting this as check pattern or custom "
-"color could be usefull when viewing icons or other artworks with transparent "
-"parts.</i></small>"
-msgstr ""
-"<small><i>நீங்கள் படங்களில் ஒளி ஊடுருவும் பகுதிகளை எவ்வாறு காட்ட வேண்டும் என "
-"தேர்ந்தெடுக்கலாம். இந்த விருப்பம் நிழற்படங்களில் எந்த விளைவையும் ஏற்படுத்தாது, ஆனால் இதனை "
-"தோற்றம் அல்லது தனிபயன் நிறங்களுக்கு அமைத்தால் சின்னங்கள் அல்லது வேறு கலைவேலைகளை "
-"ஒளிஊடுருவும் பகுதிகளுடன் பார்க்கும் போது பயனுள்ளதாக இருக்கும்.</i></small>"
-
-#: ../src/f-spot.glade.h:30
-msgid "Adjust _Time..."
-msgstr "நேரத்தை சரிசெய் (_T)..."
-
-#: ../src/f-spot.glade.h:31
-msgid "Arrange _by"
-msgstr "ஒழுங்குபடுத்தல் (_b)"
-
-#: ../src/f-spot.glade.h:32
-msgid "As _background"
-msgstr "பின்னணியாக (_b)"
-
-#: ../src/f-spot.glade.h:33
-msgid "As _custom color: "
-msgstr "தனிபயன் நிறமாக (_c): "
-
-#: ../src/f-spot.glade.h:34
-msgid "As check _pattern"
-msgstr "சோதிக்கும் தோற்றத்தால் (_p)"
-
-#: ../src/f-spot.glade.h:35
-msgid "Attach Tags:"
-msgstr "ஒட்டுகளை சேர்:"
-
-#: ../src/f-spot.glade.h:36
-msgid "Attach tag:"
-msgstr "ஒட்டு இணை:"
-
-#: ../src/f-spot.glade.h:37
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "தானியக்க சுழற்சி"
-
-#: ../src/f-spot.glade.h:39
-msgid "By _Date"
-msgstr "தேதியால் (_D)"
-
-#: ../src/f-spot.glade.h:40
-msgid "By _Import Roll"
-msgstr "இறக்கு ரோலால் (_I)"
-
-#: ../src/f-spot.glade.h:41
-msgid "By _Rating"
-msgstr "விகிதப்படுத்துதலால்( _R)"
-
-#: ../src/f-spot.glade.h:42
-msgid "CD"
-msgstr "குறுவட்டு"
-
-#: ../src/f-spot.glade.h:43
-msgid "C_ontrast:"
-msgstr "வேறுபாடு (_o):"
-
-#: ../src/f-spot.glade.h:44
-msgid "Camera Selection"
-msgstr "கேமரா தேர்வு"
-
-#: ../src/f-spot.glade.h:45
-msgid "Copy Locat_ion"
-msgstr "இடத்தை நகலெடு (_i)"
-
-#: ../src/f-spot.glade.h:46
-msgid "Copy files to the Photos folder"
-msgstr "நிழற்பட அடைவுக்கு கோப்புகளை நகலெடு"
-
-#: ../src/f-spot.glade.h:47
-msgid "Create Mail"
-msgstr "மின்னஞ்சலை உருவாக்கு"
-
-#: ../src/f-spot.glade.h:48
-msgid "Create New _Tag..."
-msgstr "புதிய ஒட்டு உருவாக்கு (_T)..."
-
-#: ../src/f-spot.glade.h:49
-msgid "Create _New Version..."
-msgstr "புதிய பதிப்பை உருவாக்கு (_N)..."
-
-#: ../src/f-spot.glade.h:50
-msgid "Create _icon for this tag when first used"
-msgstr "முதலில் பயன்படுத்தும் போது இந்த டேக்கிற்கு ஒரு சின்னத்தை உருவாக்கவும் (_i)"
-
-#: ../src/f-spot.glade.h:51
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr "தேர்ந்தெடுக்கப்பட்ட நிழற்படங்களுடன் ஒரு மின்னஞ்சலை உருவாக்கி (மறுஅளவிடப்பட்ட) சேர்க்கப்பட்டது"
-
-#: ../src/f-spot.glade.h:52
-msgid "Detect duplicates"
-msgstr "போலிகளை கண்டுபிடி"
-
-#: ../src/f-spot.glade.h:53
-msgid "Display File _Names"
-msgstr "கோப்பு பெயர்களை காட்டு (_N)"
-
-#: ../src/f-spot.glade.h:54
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "குறிப்பட்ட ரோல்களில் இறக்கப்பட்ட அந்த நிழற்படங்களை மட்டும் காட்டு."
-
-#: ../src/f-spot.glade.h:55
-msgid "Do not send a mail"
-msgstr "மின்னஞ்சலை அனுப்ப வேண்டாம்"
-
-#: ../src/f-spot.glade.h:56
-msgid "E-_Mail:"
-msgstr "மின்னஞ்சல் (_M):"
-
-#: ../src/f-spot.glade.h:57
-msgid "E_xport titles and comments"
-msgstr "தலைப்புகள் மற்றும் குறிப்புரைகளை ஏற்று (_x)"
-
-#: ../src/f-spot.glade.h:58
-msgid "Edit Tag Icon"
-msgstr "ஒட்டு சிறுபடத்தை திருத்து"
-
-#: ../src/f-spot.glade.h:59
-msgid "Edit icon"
-msgstr "சின்னத்தைத் திருத்து"
-
-#: ../src/f-spot.glade.h:60
-msgid "Estimated new size"
-msgstr "புதிய அளவின் மதிப்பிடப்பட்டது"
-
-#: ../src/f-spot.glade.h:61
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-msgid "Export"
-msgstr "ஏற்றுமதி"
-
-#: ../src/f-spot.glade.h:62
-msgid "Extra large"
-msgstr "மேலும் பெரிய"
-
-#: ../src/f-spot.glade.h:63
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:64
-msgid "F-Spot View"
-msgstr "F-Spot காட்டி"
-
-#: ../src/f-spot.glade.h:66
-msgid "Filter on selected rolls"
-msgstr "தேர்ந்தெடுக்கப்பட்ட ரோல்களில் மேல் வடிக்கவும்"
-
-#: ../src/f-spot.glade.h:67
-msgid "Fin_d"
-msgstr "கண்டுபிடி (_d)"
-
-#: ../src/f-spot.glade.h:68
-msgid "G_allery:"
-msgstr "படத்தொகுப்பு (_a):"
-
-#: ../src/f-spot.glade.h:69
-msgid "Gallery"
-msgstr "படத்தொகுப்பு"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:72
-msgid "Import Source:"
-msgstr "மூலங்களை இறக்கு:"
-
-#: ../src/f-spot.glade.h:73
-msgid "Include subfolders"
-msgstr "துணைகோப்புகளையும் சேர்க்கவும்"
-
-#: ../src/f-spot.glade.h:74
-msgid "Large"
-msgstr "பெரிய"
-
-#: ../src/f-spot.glade.h:75
-msgid "Manage _Extensions"
-msgstr "விரிவாக்கங்களை மேலான்மை செய் (_E)"
-
-#: ../src/f-spot.glade.h:76
-msgid "Manage your custom selection ratios"
-msgstr "உங்களுடைய தேர்ந்தெடுக்கப்பட்ட தனிபயன் வரம்புகளை மேலாண்மை செய்யவும்"
-
-#: ../src/f-spot.glade.h:77
-msgid "Medium"
-msgstr "நடுத்தரம்"
-
-#: ../src/f-spot.glade.h:79
-msgid "No _image"
-msgstr "படம் இல்லை (_i)"
-
-#: ../src/f-spot.glade.h:80
-msgid "Number of photos in selected rolls:"
-msgstr "பல தேர்ந்தெடுக்கப்பட்ட நிழற்படங்கள் ரோலில் உள்ளன:"
-
-#: ../src/f-spot.glade.h:81
-msgid "Number of pictures"
-msgstr "படங்களின் எண்ணிக்கை"
-
-#: ../src/f-spot.glade.h:82
-msgid "Open _Folder..."
-msgstr "கோப்புறையை திற (_F)..."
-
-#: ../src/f-spot.glade.h:84
-msgid "Original size (possible very large file size)"
-msgstr "அசல் அளவு (மிகப் பெரிய கோப்பு அளவு வரலாம்)"
-
-#: ../src/f-spot.glade.h:85
-msgid "P_arent Tag:"
-msgstr "தாய் ஒட்டு (_a):"
-
-#: ../src/f-spot.glade.h:86
-msgid "Page Set_up..."
-msgstr "பக்க அமைப்பு (_u)..."
-
-#: ../src/f-spot.glade.h:87
-msgid "Pause"
-msgstr "இடைநிறுத்தம்"
-
-#: ../src/f-spot.glade.h:88
-msgid "Photo 0 of 0"
-msgstr "நிழற்படம் 0 இல் 0"
-
-#: ../src/f-spot.glade.h:91
-msgid "Re_fresh Thumbnail"
-msgstr "சிறுபடத்தைப் புதுப்பி (_f)"
-
-#: ../src/f-spot.glade.h:93
-msgid "Repair"
-msgstr "பழுதுபார்"
-
-#: ../src/f-spot.glade.h:96
-msgid "Select Photos to Copy From Camera..."
-msgstr "கேமிராவிலிருந்து நிழற்படங்களை தேர்ந்தெடுக்கவும்..."
-
-#: ../src/f-spot.glade.h:98
-msgid "Select _None"
-msgstr "ஒன்றையும் தேர்ந்தெடுக்க வேண்டாம் (_N)"
-
-#: ../src/f-spot.glade.h:99
-msgid "Select a Tag..."
-msgstr "ஒரு ஒட்டினை தேர்ந்தெடு..."
-
-#: ../src/f-spot.glade.h:100
-msgid "Select the camera from which you want to transfer files"
-msgstr "இடமாற்றம் செய்ய வேண்டிய கோப்புகள் உள்ள கேமிராவை தேர்ந்தெடுக்கவும்"
-
-#: ../src/f-spot.glade.h:101
-msgid "Selected Camera: "
-msgstr "தேர்ந்தெடுக்கப்பட்ட கேமரா: "
-
-#: ../src/f-spot.glade.h:102
-msgid "Selection Constraints"
-msgstr "தேர்ந்தெடுத்தல் வகைகள்"
-
-#: ../src/f-spot.glade.h:103
-msgid "Send by _Mail..."
-msgstr "மின்னஞ்சல் வழியாக அனுப்பு (_M)..."
-
-#: ../src/f-spot.glade.h:104
-msgid "Set Rating Filter"
-msgstr "மதிப்பீடு வடிப்பியை அமைக்கவும்"
-
-#: ../src/f-spot.glade.h:105
-msgid "Set as _Background"
-msgstr "பின்னணியாக அமை (_B)"
-
-#: ../src/f-spot.glade.h:106
-msgid "Show all photos."
-msgstr "அனைத்து நிழற்படங்களையும் காட்டு."
-
-#: ../src/f-spot.glade.h:107
-msgid "Show or hide the side pane"
-msgstr "பக்கப் பலகத்தை காட்டு அல்லது மறை"
-
-#: ../src/f-spot.glade.h:108
-msgid "Show or hide the toolbar"
-msgstr "கருவிப்பட்டையைக் காட்டு அல்லது மறை"
-
-#: ../src/f-spot.glade.h:109
-msgid "Side _pane"
-msgstr "பக்கப் பலகம் (_p)"
-
-#: ../src/f-spot.glade.h:110
-msgid "Side_bar"
-msgstr "பக்க பட்டி (_b)"
-
-#: ../src/f-spot.glade.h:111
-msgid "Small"
-msgstr "சிறிய"
-
-#: ../src/f-spot.glade.h:112
-msgid ""
-"Specify if an original size picture should be rotated or not. Smaller sizes "
-"are automatically rotated."
-msgstr ""
-"ஒரு அசல் அளவு படம் சுழற்ற வேண்டுமா அல்லது வேண்டாமா என குறிப்பிடு. சிறிய அளவுகள் "
-"தானாக சுழற்றப்படும்."
-
-#: ../src/f-spot.glade.h:113
-msgid "Strip image _metadata"
-msgstr "பட மெட்டா தரவை கழற்று (_m)"
-
-#: ../src/f-spot.glade.h:114
-msgid "T_ags"
-msgstr "ஒட்டுகள் (_a)"
-
-#: ../src/f-spot.glade.h:115
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1180
-msgid "Tags: "
-msgstr "ஒட்டுகள்: "
-
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:117
-msgid "Te_mp:"
-msgstr "தற்காலிக (_m):"
-
-#: ../src/f-spot.glade.h:118
-msgid "Thumbnail _elements"
-msgstr "சின்னப்படம் உருப்படிகள் (_e)"
-
-#: ../src/f-spot.glade.h:119
-msgid "Tiny"
-msgstr "மெலிந்த"
-
-#: ../src/f-spot.glade.h:120
-msgid "Too_lbar"
-msgstr "கருவி பட்டி (_l)"
-
-#: ../src/f-spot.glade.h:121
-msgid "Total original size"
-msgstr "மொத்த அசல் அளவு"
-
-#: ../src/f-spot.glade.h:122
-msgid "View"
-msgstr "பார்வை"
-
-#: ../src/f-spot.glade.h:123
-msgid "Zoom _in"
-msgstr "சிறியதாக்கு (_i)"
-
-#: ../src/f-spot.glade.h:124
-msgid "Zoom _out"
-msgstr "பெரியதாக்கு ( _o)"
-
-#: ../src/f-spot.glade.h:125
-msgid "Zoom in"
-msgstr "சிறியதாக்கு"
-
-#: ../src/f-spot.glade.h:126
-msgid "Zoom out"
-msgstr "பெரிதாக்கு"
-
-#: ../src/f-spot.glade.h:128
-msgid "_Attach Tag to Selection"
-msgstr "தேர்வுக்கு ஒட்டினை இணை (_A)"
-
-#: ../src/f-spot.glade.h:129
-msgid "_Brightness:"
-msgstr "வெளிச்சம் (_B):"
-
-#: ../src/f-spot.glade.h:131
-msgid "_Clear Rating Filter"
-msgstr "மதிப்பீடு வடிப்பியை சரிசெய் (_C)"
-
-#: ../src/f-spot.glade.h:132
-msgid "_Clear Roll Filter"
-msgstr "ரோல் வடிப்பியை சரிசெய் (_C)"
-
-#: ../src/f-spot.glade.h:133
-msgid "_Components"
-msgstr "கூறுகள் (_C)"
-
-#: ../src/f-spot.glade.h:134
-msgid "_Contents"
-msgstr "உள்ளடக்கம் (_C)"
-
-#: ../src/f-spot.glade.h:135
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-msgid "_Create"
-msgstr "உருவாக்கு (_C)"
-
-#: ../src/f-spot.glade.h:136
-msgid "_Create Mail"
-msgstr "மின்னஞ்சலை உருவாக்கு (_C)"
-
-#: ../src/f-spot.glade.h:137
-msgid "_Dates"
-msgstr "தேதிகள் (_D)"
-
-#: ../src/f-spot.glade.h:139
-msgid "_Delete Selected Tag"
-msgstr "தேர்ந்தெடுக்கப்பட்ட ஒட்டினை அழி (_D)"
-
-#: ../src/f-spot.glade.h:140
-msgid "_Delete Version"
-msgstr "பதிப்பை அழி (_D)"
-
-#: ../src/f-spot.glade.h:141
-msgid "_Edit"
-msgstr "திருத்து (_E)"
-
-#: ../src/f-spot.glade.h:142
-msgid "_Edit Selected Tag..."
-msgstr "தேர்ந்தெடுக்கப்பட்ட ஒட்டினை திருத்து (_E)..."
-
-#: ../src/f-spot.glade.h:143
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export"
-msgstr "ஏற்றுமதி (_E)"
-
-#: ../src/f-spot.glade.h:144
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "ஒட்டுகளை ஏற்று (_E)"
-
-#: ../src/f-spot.glade.h:145
-msgid "_Export to"
-msgstr "இதற்கு ஏற்று (_E)"
-
-#: ../src/f-spot.glade.h:146
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-msgid "_Export to Album:"
-msgstr "ஆல்பத்திற்கு ஏற்று (_E):"
-
-#: ../src/f-spot.glade.h:147
-msgid "_Exposure:"
-msgstr "வெளிகாட்டு (_E):"
-
-#: ../src/f-spot.glade.h:148
-msgid "_Filmstrip"
-msgstr "ஃபிலிம்ஸ்ட்ரீப் (_F)"
-
-#: ../src/f-spot.glade.h:149
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:150
-msgid "_Folder"
-msgstr "கோப்புறை (_F)"
-
-#: ../src/f-spot.glade.h:151
-msgid "_Fullscreen"
-msgstr "முழுத்திரை (_F)"
-
-#: ../src/f-spot.glade.h:152
-msgid "_Gallery"
-msgstr "படத்தொகுப்பு (_G)"
-
-#: ../src/f-spot.glade.h:153
-msgid "_Help"
-msgstr "உதவி (_H)"
-
-#: ../src/f-spot.glade.h:154
-msgid "_Hidden"
-msgstr "மறைக்கப்பட்டது (_H)"
-
-#: ../src/f-spot.glade.h:155
-msgid "_Hue:"
-msgstr "ஹ்யூ (_H):"
-
-#: ../src/f-spot.glade.h:156
-msgid "_Icon:"
-msgstr "சின்னம் (_I):"
-
-#: ../src/f-spot.glade.h:157
-msgid "_Import..."
-msgstr "இறக்கு (_I)..."
-
-#: ../src/f-spot.glade.h:158
-msgid "_Interpolate image on zoom"
-msgstr "படத்தை அளவிடுதலில் இண்டர்போலைட் (_I)"
-
-#: ../src/f-spot.glade.h:159
-msgid "_Large"
-msgstr "பெரியதுனது (_L)"
-
-#: ../src/f-spot.glade.h:160
-msgid "_Last Import Roll"
-msgstr "கடைசியாக இறக்கப்பட்ட ரோல் (_L)"
-
-#: ../src/f-spot.glade.h:161
-msgid "_Loupe"
-msgstr "_Loupe"
-
-#: ../src/f-spot.glade.h:162
-msgid "_Medium"
-msgstr "நடுத்தரமான (_M)"
-
-#: ../src/f-spot.glade.h:163
-msgid "_Month"
-msgstr "மாதம் (_M)"
-
-#: ../src/f-spot.glade.h:164
-msgid "_New Window"
-msgstr "புதிய சாளரம் (_N)"
-
-#: ../src/f-spot.glade.h:165
-msgid "_Open album in browser when done uploading"
-msgstr "பதிவேற்றுதல் முடிந்தவுடன் ஆல்பத்தைத் திற (_O)"
-
-#: ../src/f-spot.glade.h:166
-msgid "_Open destination when done exporting"
-msgstr "ஏற்றுதல் முடிந்தவுடன் இலக்கைத் திற (_O)"
-
-#: ../src/f-spot.glade.h:167
-msgid "_Photo"
-msgstr "நிழற்படம் (_P)"
-
-#: ../src/f-spot.glade.h:168
-msgid "_Quit"
-msgstr "வெளியேறு (_Q)"
-
-#: ../src/f-spot.glade.h:169
-msgid "_Ratings"
-msgstr "மதிப்பிடுதல் (_R)"
-
-#: ../src/f-spot.glade.h:171
-msgid "_Remove Tag From Selection"
-msgstr "தேர்விலிருந்து ஒட்டை நீக்கு (_R)"
-
-#: ../src/f-spot.glade.h:172
-msgid "_Rename Version"
-msgstr "பதிப்பை மறுபெயரிடு (_R)"
-
-#: ../src/f-spot.glade.h:173
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-msgid "_Resize to: "
-msgstr "மறுஅளவிடல் (_R):"
-
-#: ../src/f-spot.glade.h:175
-msgid "_Saturation:"
-msgstr "சேச்சுரேஷன் (_S):"
-
-#: ../src/f-spot.glade.h:176
-msgid "_Scale photos to no larger than: "
-msgstr "நிழற்படங்களை பெரியது இல்லாமல் அளவிடு (_S):"
-
-#: ../src/f-spot.glade.h:177
-msgid "_Select Import Rolls..."
-msgstr "இறக்கப்பட்ட ரோல்களை தேர்ந்தெடு (_S)..."
-
-#: ../src/f-spot.glade.h:178
-msgid "_Set Date Range..."
-msgstr "தேதி வரம்பை அமைக்கவும் (_S)..."
-
-#: ../src/f-spot.glade.h:179
-msgid "_Set Rating filter..."
-msgstr "மதிப்பீடு வடிப்பியை அமைக்கவும் (_S)..."
-
-#: ../src/f-spot.glade.h:180
-msgid "_Sharpen..."
-msgstr "கூர்மையான (_S)..."
-
-#: ../src/f-spot.glade.h:181
-msgid "_Slideshow"
-msgstr "ஸ்லைடு காட்சி (_S)"
-
-#: ../src/f-spot.glade.h:182
-msgid "_Small"
-msgstr "சிறிய (_S)"
-
-#: ../src/f-spot.glade.h:183
-msgid "_Strip metadata"
-msgstr "மெட்டா தரவை கழற்று (_S)"
-
-#: ../src/f-spot.glade.h:184
-msgid "_Tag Icons"
-msgstr "சின்னங்களை ஒட்டு (_T)"
-
-#: ../src/f-spot.glade.h:185
-msgid "_Tag Name:"
-msgstr "ஒட்டு பெயர் (_T):"
-
-#: ../src/f-spot.glade.h:186
-msgid "_Tags"
-msgstr "ஒட்டுக்கள் (_T)"
-
-#: ../src/f-spot.glade.h:187
-msgid "_Timeline"
-msgstr "டைம்லான் (_T)"
-
-#: ../src/f-spot.glade.h:188
-msgid "_Tint:"
-msgstr "டின்ட் (_T):"
-
-#: ../src/f-spot.glade.h:189
-msgid "_Toolbar"
-msgstr "கருவிபட்டி (_T)"
-
-#: ../src/f-spot.glade.h:190
-msgid "_Tools"
-msgstr "கருவிகள் (_T)"
-
-#: ../src/f-spot.glade.h:191
-msgid "_URI:"
-msgstr "_URI:"
-
-#: ../src/f-spot.glade.h:192
-msgid "_Untagged Photos"
-msgstr "ஒட்டுநீக்கப்பட்ட நிழற்படங்கள் (_U)"
-
-#: ../src/f-spot.glade.h:193
-msgid "_Version"
-msgstr "பதிப்பு (_V)"
-
-#: ../src/f-spot.glade.h:194
-msgid "_View"
-msgstr "பார்வை (_V)"
-
-#: ../src/f-spot.glade.h:195
-msgid "_Virtual Filesystem"
-msgstr "மெய்நிகர் கோப்பு முறைமை (_V)"
-
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:198
-msgid ""
-"at\n"
-"after\n"
-"between"
-msgstr ""
-"அதில்\n"
-"பிறகு\n"
-"இதற்கிடையில்"
-
-#: ../src/f-spot.glade.h:201
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
-msgid "pixels"
-msgstr "பிக்செல்கள்"
-
-#: ../src/f-spot.glade.h:202
-msgid "x"
-msgstr "x"
-
#: ../tools/f-spot-screensaver.desktop.in.h:1
msgid "Display a slideshow from F-Spot"
msgstr "F-Spotஇலிருந்து ஒரு ஸ்லைடு காட்சியைக் காட்டு"
@@ -3053,1085 +4203,3 @@ msgstr "F-Spotஇலிருந்து ஒரு ஸ்லைடு காட
msgid "F-Spot photos"
msgstr "F-Spot நிழற்படங்கள்"
-#: ../extensions/Editors/BlackoutEditor/BlackoutEditor.cs:18
-msgid "Blackout"
-msgstr "கருமையாக்கப்பட்ட"
-
-#: ../extensions/Editors/BlackoutEditor/BlackoutEditor.cs:26
-#| msgid "Select the area that needs cropping."
-msgid "Select the area that you want blacked out."
-msgstr "நீங்கள் கருமையாக்க வேண்டிய தேர்ந்தெடுக்கப்பட்ட இடம்."
-
-#: ../extensions/Editors/PixelateEditor/PixelateEditor.cs:18
-#| msgid "Private"
-msgid "Pixelate"
-msgstr "பிக்ஸல் செய்யப்பட்ட"
-
-#: ../extensions/Editors/PixelateEditor/PixelateEditor.cs:26
-#| msgid "Select the area that needs cropping."
-msgid "Select the area that you want pixelated."
-msgstr "நீங்கள் பிக்ஸெலேட் செய்ய வேண்டிய தேர்ந்தெடுக்கப்பட்ட இடம்."
-
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "குறுவட்டு (_C)..."
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:162
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "படங்களை \"{0}\" குறுவட்டிற்கு இடமாற்றுகிறது"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:177
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:378
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
-msgid "Done Sending Photos"
-msgstr "நிழற்படங்கள் அனுப்பியது முடிவு பெற்றது"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:179
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
-msgid "Transfer Complete"
-msgstr "மொத்தமாக இடமாற்றம்"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:186
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
-msgid "Error While Transferring"
-msgstr "இடமாற்றப்படும் போது பிழை"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:193
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
-msgid "Error Transferring"
-msgstr "இடமாற்றும் போது பிழை"
-
-#: ../extensions/Exporters/CDExport/CDExport.cs:206
-msgid "copying..."
-msgstr "நகலாகிறது..."
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr "<b><i>இங்கு முன்பு திட்டமிட்ட உருப்படிகளை எழுத இருக்கிறது</i></b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>எழுதுவதற்கான நிழற்படங்கள்</b>"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:4
-msgid "Create CD"
-msgstr "CDஐ உருவாக்கு"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:6
-msgid "Size of the exported selection:"
-msgstr "ஏற்றப்பட்ட தேர்வின் அளவு:"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr "முன்பு திட்டமிடப்பட்ட கோப்புகளில் உலாவு (_B)"
-
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:8
-msgid "_Write only these photos to CD"
-msgstr "இந்த நிழற்படங்களை மட்டும் குறுவட்டில் எழுது (_W)"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-msgid "_Zooomr..."
-msgstr "_Zooomr..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "அங்கீகாரம்"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
-msgid ""
-"Return to this window after you have finished the authorization process on "
-"{0} and click the \"Complete Authorization\" button below"
-msgstr ""
-"{0}இல் உங்கள் அனுமதியளிக்கும் செயலை முடித்தவுடன் இந்த சாளரத்திற்கு வந்து \"அனுமதியை "
-"முடிக்கவும்\" பொத்தான் கீழே சொடுக்கவும்"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "முழு அங்கீகாரம்"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "{0}இல் புகுபதிவு செய்"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr "நற்சான்றுகளை சோதிக்கிறது..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "{0} நல்வரவு நீங்கள் {1}இல் இணைக்கப்பட்டுள்ளீர்கள்"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "வேறு பயனராக புகுபதிவு செய்யவும்"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "உங்களுக்கு அனுமதிக்கப்பட்ட {1} மாதத்தில் {1} ஒதுக்கீடு"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "புகுபதிவு செய்ய முடியவில்லை"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "{1} இல் {1} பதிலுக்குக் காத்திருக்கிறது"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:779
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "படம் \"{0}\" பதிவேற்றப்படுகிறது"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "{0}இல் பதிவேற்றுவதில் பிழை: {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:810
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
-msgid "Upload Complete"
-msgstr "முழுவதும் பதிவேற்று"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-msgid "Unable to log on."
-msgstr "புகுபதிவு செய்ய முடியவில்லை."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
-#, csharp-format
-msgid ""
-"F-Spot was unable to log on to {0}. Make sure you have given the "
-"authentication using {0} web browser interface."
-msgstr ""
-"F-Spot {0}இல் புகுபதிவு செய்ய முடியவில்லை. நீங்கள் {0} இணைய உலாவி முகப்பை "
-"பயன்படுத்தி அங்கீகாரம் கொடுத்தீர்கள் என உறுதிப்படுத்தவும்."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:732
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:297
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
-msgid "Uploading Pictures"
-msgstr "படங்களை பதிவேற்றுகிறது"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>பார்வை அனுமதிகள்</b>"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "டேக் வரிசைய ஏற்று (_h)"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
-msgid ""
-"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
-msgstr ""
-"F-Spotக்கு உங்கள் {0} கணக்கில் நிழற்படங்களை பதிவேற்ற உங்கள் அனுமதி தேவைப்படுகிறது."
-"\"அனுமதி\" பொத்தானை அழுத்தி ஒரு இணைய உலாவியைத் திறந்து F-Spot க்கு அனுமதி "
-"கொடுக்கவும்."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "மேல் அளவு ஒட்டுகளை நிராகரி (_t)"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "தனிப்பட்டது"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "பொதுவானது"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "மெட்டா தரவை கழற்று (_m)"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "குடும்பத்திற்கு தெரியும்படி"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "நண்பர்களுக்கு தெரியும்படி"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-msgid "_View photos in browser when done uploading"
-msgstr "பதிவேற்றம் முடிந்ததும் உலாவியில் நிழற்படங்களை காட்டு (_V)"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "கோப்புறை (_o)..."
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
-msgid "Select Export Folder"
-msgstr "ஏற்றுமதி கோப்புறையை தேர்ந்தெடு"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
-msgid "Building Gallery"
-msgstr "படத்தொகுப்பை உருவாக்கு"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "படம் \"{0}\"ஐ கேலரி:{2}{1}க்கு ஏற்றுவதில் பிழை"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
-msgid "Error: Error while transferring; Aborting"
-msgstr "பிழை: இடம் மாற்றப்படும் போது பிழை; கைவிடப்படுகிறது"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
-msgid "Error: File Already Exists; Aborting"
-msgstr "பிழை: கோப்பு ஏற்கனவே உள்ளது; கைவிடப்படுகிறது"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:810
-msgid "Light"
-msgstr "ஒளி"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:811
-msgid "Dark"
-msgstr "கருமை"
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:991
-msgid "Prev"
-msgstr "முந்தைய"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1103
-msgid "Gallery generated by"
-msgstr "படத்தொகுப்பை உருவாக்கியவர்"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1143
-msgid "Show Styles"
-msgstr "பாணிகளைக் காட்டு"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1144
-msgid "Hide Styles"
-msgstr "பாணிகளை மறை"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1311
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1444
-msgid "Page:"
-msgstr "பக்கம்:"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>ஏற்றுமதி முறை</b>"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr "\"அசல்\"ஐ பயன்படுத்தி படத்தொகுப்பை உருவாக்கு (_g)"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr "தனித்த இணைய படத்தொகுப்பை உருவாக்கு (_w)"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "விளக்கம் (_e):"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
-msgid "Export _tags"
-msgstr "ஒட்டுகளை ஏற்றவும் (_t)"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
-msgid "Export tag _icons"
-msgstr "ஒட்டு சின்னங்களை ஏற்றவும் (_i)"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-msgid "Folder Export"
-msgstr "கோப்புறை ஏற்றுமதி"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-msgid "G_allery Name:"
-msgstr "படத்தொகுப்பு பெயர் (_a):"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
-msgid "Open _destination when done exporting"
-msgstr "ஏற்றுதல் முடிந்ததும் இலக்கைத் திற (_d)"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-msgid "_Folder:"
-msgstr "கோப்புறை (_F):"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-msgid "_Save the files only"
-msgstr "இந்த கோப்புகளை மட்டும் சேமி (_S)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-msgid "Web _Gallery..."
-msgstr "இணையத்தள கேலரி (_G)..."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
-msgstr ""
-"எந்த பதிப்பு என்று தெரியாமல் கேலரியில் இணைக்க முடியாது.\n"
-"தொலை கூடுதலை நீங்கள் சரிசெய்ய வேண்டுமா 1.0.8 அல்லது பின்னர்"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:393
-msgid "Invalid URL"
-msgstr "தவறான URL"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:394
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "படத்தொகுப்பு URL ஒரு சரியான URLஆக தோன்றவில்லை"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:404
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:431
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:442
-msgid "Error while connecting to Gallery"
-msgstr "படத்தொகுப்புடன் இணைக்கும் போது பிழை"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:405
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:432
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:443
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "பின்வரும் பிழை புகுபதிவு செய்யும் போது பிழை ஏற்பட்டது: {0}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:419
-msgid "A Gallery with this name already exists"
-msgstr "இந்த பெயருடைய ஒரு கேலரி ஏற்கனவே இருக்கிறது"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:420
-#, csharp-format
-msgid ""
-"There is already a Gallery with the same name in your registered Galleries. "
-"Please choose a unique name."
-msgstr ""
-"இதே பெயருடைய ஒரு கேலரி உங்களுடைய பதிவு செய்யப்பட்ட கேலரிகளில் உள்ளது. தனித்தனைமை "
-"வாய்ந்த பெயரை தேர்ந்தெடு."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:530
-msgid "(TopLevel)"
-msgstr "(மேல்நிலை)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:592
-msgid "Invalid Gallery name"
-msgstr "தவறான கேலரி பெயர்"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:593
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
-"கேலரி தவறான எழுத்துக்களை பெற்றுள்ளது.\n"
-"எழுத்துக்கள் மட்டும், எண்கள், - மற்றும் _ அனுமதிக்கப்படுகிறது"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:798
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "படம் \"{0}\"ஐ படத்தொகுப்பில் பதிவேற்றும் போது பிழை: {1}"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:826
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
-msgid "(No Gallery)"
-msgstr "(படத்தொகுப்பு இல்லை)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:918
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(Not Connected)"
-msgstr "(இணைக்கப்படவில்லை)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:919
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
-msgid "(No Albums)"
-msgstr "(ஆல்பங்கள் இல்லை)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:971
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
-msgid "No account selected"
-msgstr "கணக்கு எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr "<span weight='bold' size='larger'>படத்தொகுப்புடன் இணைக்கும் போது பிழை</span>\n"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-msgid "Export _titles and comments"
-msgstr "தலைப்புகள் மற்றும் குறிப்புரைகளை ஏற்று (_t)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "பதிவேற்றம் முடிந்ததும் உலாவியில் ஆல்பத்தை திற (_a)"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "இந்தப் படத்தொகுப்பின் அமைவுகள் சரியா என சரிபார்க்கவும்."
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-msgid "U_RL:"
-msgstr "U_RL:"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-msgid "_Album Name:"
-msgstr "ஆல்பம் பெயர் (_A):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "விளக்கம் (_D):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-msgid "_Gallery Name:"
-msgstr "படத்தொகுப்பு பெயர் (_G):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "படத்தொகுப்பு (_G):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-msgid "_Parent Album:"
-msgstr "தாய் ஆல்பம் (_P):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:9
-msgid "_Password:"
-msgstr "கடவுச்சொல் (_P):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-msgid "_Title:"
-msgstr "தலைப்பு (_T):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:10
-msgid "_Username:"
-msgstr "பயனர் பெயர் (_U):"
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr "சேவையக பதிவை வாசிப்பதில் பிழை"
-
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
-msgstr "படத்தொகுப்பு உள்ளடக்கம் இல்லாமல் சேவையகம் பதில் அளித்தது"
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
-msgid "Error while creating new album"
-msgstr "புதிய ஆல்பத்தை உருவாக்கும் போது பிழை"
-
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to perform the "
-"requested operation:\n"
-"{0} ({1})"
-msgstr ""
-"கோரப்பட்ட செயலை செய்யும் கோது பின்வரும் பிழை ஏற்பட்டது:\n"
-"{0} ({1})"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
-msgstr "F_acebook..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
-#| msgid "Waiting for authentication"
-msgid "Waiting for authorization"
-msgstr "அங்கீகாரத்திற்காக காத்திருக்கிறது"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
-msgid ""
-"F-Spot will now launch your browser so that you can enable the permission "
-"you just selected.\n"
-"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok"
-"\" below."
-msgstr ""
-"F-Spot will now launch your browser so that you can enable the permission "
-"you just selected.\n"
-"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok"
-"\" below."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
-msgid "Too many images to export"
-msgstr "ஏற்றுவதற்கு நிறைய படங்கள் உள்ளன"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
-msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
-"selection and try again."
-msgstr ""
-"ஆல்பம் ஒன்றுக்கு 60 நிழற்படங்கள் மட்டுமே ஃபேஸ் புத்தகத்தில் அனுமதிக்கிறது. உங்களுடைய "
-"தேர்ந்தெடுத்தலை மெருகூட்டி மீண்டும் தேர்ந்தெடுக்கவும்."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:317
-msgid "Album must have a name"
-msgstr "ஆல்பம் ஒரு பெயரை பெற்றிருக்க வேண்டும்"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:318
-msgid "Please name your album or choose an existing album."
-msgstr "உங்களுடைய ஆல்பத்திற்கு பெயரிடவும் அல்லது இருக்கிற ஒரு ஆல்பத்தை தேர்ந்தெடு."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:332
-msgid "Creating a new album failed"
-msgstr "புதிய ஆல்பத்தை உருவாக்குவதில் தோல்வி"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:333
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
-"ஒரு புதிய ஆல்பத்தை உருவாக்குவதில் பிழை ஏற்பட்டுவிட்டது.\n"
-"\n"
-"{0}"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:355
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "\"{0}\" படத்தை பதிவேற்றுகிறது ({2} இல் {1})"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:369
-#, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr "ஃபேஸ்புத்தக்கத்துடன் மேம்படுத்துவதில் பிழை: {0}"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:186
-msgid "Waiting for authentication"
-msgstr "அங்கீகாரத்திற்காக காத்திருக்கிறது"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:187
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook.\n"
-"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok"
-"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
-"re-use it on future Facebook exports."
-msgstr ""
-" F-Spot will now launch your browser so that you can log into Facebook.\n"
-"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok"
-"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
-"re-use it on future Facebook exports."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:192
-msgid "Authenticating..."
-msgstr "அங்கீகரிக்கிறது..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:202
-msgid "Error logging into Facebook"
-msgstr "ஃபேஸ் புத்தகத்தினுள் உட்புகுவதில் பிழை"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:203
-msgid ""
-"There was a problem logging into Facebook. Check your credentials and try "
-"again."
-msgstr "Facebookஇல் புகுபதிவு செய்யப்படும் போது சிக்கல். அதனை சரிபார்த்து மீண்டும் முயற்சிக்கவும்."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
-#| msgid "Authorize"
-msgid "Authorizing Session"
-msgstr "அங்கீகார அமர்வு"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:221
-msgid "Session established, fetching user info..."
-msgstr "அமர்வு துவக்கப்பட்டது, பயனர் தகவலை எடுக்கிறது..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
-msgid "Session established, fetching friend list..."
-msgstr "அமர்வு துவக்கப்பட்டது, நண்பர் பட்டியலை எடுக்கிறது..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
-msgid "Session established, fetching friend details..."
-msgstr "அமர்வு துவக்கப்பட்டது, நண்பர் விவரங்களை எடுக்கிறது..."
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:247
-msgid "Session established, fetching photo albums..."
-msgstr "அமர்வு துவக்கப்பட்டது, நிழற்பட ஆல்பங்களை எடுக்கிறது..."
-
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:260
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr "{0} {1} ஃபேஸ்புத்தகத்தினுள் உட்புகுதல்"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:266
-msgid "Facebook Connection Error"
-msgstr "Facebook இணைப்பு பிழை"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:267
-#, csharp-format
-msgid ""
-"There was an error when downloading your information from Facebook.\n"
-"\n"
-"Facebook said: {0}"
-msgstr ""
-"There was an error when downloading your information from Facebook.\n"
-"\n"
-"Facebook said: {0}"
-
-#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:296
-msgid "You are not logged in."
-msgstr "நீங்கள் உட்புகவில்லை."
-
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-msgid "Compressed fil_e..."
-msgstr "அழுத்தப்பட்ட கோப்பு (_e)..."
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:46
-#: ../extensions/Tools/PictureTile/PictureTile.cs:52
-msgid ""
-"This tool requires an active selection. Please select one or more pictures "
-"and try again"
-msgstr ""
-"இந்த கருவிக்கு செயல் தேர்வு தேவைப்படுகிறது. ஒன்று அல்லது அதற்கு மேற்பட்ட படங்களை "
-"தேர்ந்தெடுத்து மீண்டும் முயற்சிக்கவும்"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:63
-msgid "Select export folder"
-msgstr "ஏற்றப்பட்ட கோப்புறையை தேர்ந்தெடு"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:101
-msgid "Exporting files"
-msgstr "கோப்புகளை ஏற்றுகிறது"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:107
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:140
-#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "நிழற்படத்தை தயாராக்குகிறது \"{0}\""
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-msgid "_File name:"
-msgstr "கோப்பு பெயர் (_F):"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-msgid "_Location:"
-msgstr "இடம் (_L):"
-
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
-msgid "_Scale:"
-msgstr "அளவு (_S):"
-
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-msgid "Merge Db"
-msgstr "அமிழ்த்துதல் Db"
-
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
-msgid "Error opening the selected file"
-msgstr "தேர்ந்தெடுக்கப்பட்ட கோப்பினை திறப்பதில் பிழை"
-
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
-#, csharp-format
-msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-"நீ தேர்ந்தெடுத்த கோப்பு சரியானது இல்லை அல்லது தரவுதளத்திற்கு துணைபுரிகிறது.\n"
-"\n"
-"விடுப்பட்டவை பெறப்படுகிறது \"{0}\"."
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-msgid ""
-"<small><i>Choose the location of the database you want to import from</i></"
-"small>"
-msgstr "<small><i>நீ இறக்க விரும்புவதிலிருந்து தரவுதளத்தின் இடத்தை தேர்ந்தெடு</i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
-"you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already "
-"imported from that database.</i></small>"
-msgstr ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
-"you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already "
-"imported from that database.</i></small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
-msgid ""
-"<small><i>Copy the images locally or keep them where they are. If you chose "
-"the later, be sure that this location will stay accessible from f-spot.</i></"
-"small>"
-msgstr ""
-"<small><i>Copy the images locally or keep them where they are. If you chose "
-"the later, be sure that this location will stay accessible from f-spot.</i></"
-"small>"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
-msgid "A Single Import Roll"
-msgstr "ஒரு ஒற்றை இறக்கு ரோல்"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
-msgid "Copy images to photos folder"
-msgstr "நிழற்படங்கள் கோப்புறையில் உருவங்களை நகலெடு"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-msgid "Database Location:"
-msgstr "தரவுதறத்தின் இடம்:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr "எல்லாமும்"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-msgid "Import:"
-msgstr "இறக்கவும்:"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr "உருவங்களை அவற்றின் உண்மையான இடத்தில் வைக்கவும்"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another F-Spot collection"
-msgstr "மற்ற F-Spot தொகுப்பை அமிழ்த்துகிறது"
-
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr "புதிய ரோல்கள் மட்டும்"
-
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-"<big><b>{0}</b> அடைவை கொண்ட ஒரு தரவுத்தளத்தை இந்த கோப்புகள் குறிக்கிறது.\n"
-" இந்த அடைவை தேர்ந்தெடுக்கவும் அதனால் நான் ஒப்பிடலாம்.</big>"
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.addin.xml.h:1
-msgid "Create p_hotomosaic"
-msgstr "p_hotomosaic உருவாக்கு"
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:65
-msgid "Metapixel not available"
-msgstr "மெட்டாபிக்ஸல் கிடைக்கப் பெறவில்லை"
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:66
-msgid ""
-"The metapixel executable was not found in path. Please check that you have "
-"it installed and that you have permissions to execute it"
-msgstr ""
-"இந்த metapixel இயங்கக்கூடிய பாதை காணப்படவில்லை. நீங்கள் நிறுவினீர்களா என சரிபார்த்து அதன் "
-"அனுமதியையும் பார்க்கவும்"
-
-#. There is no photo for the selected tags! :(
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:121
-msgid "No photos for the selection"
-msgstr "தேர்ந்தெடுத்தலுக்கு எந்த நிழற்படங்களும் இல்லை"
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:122
-msgid "The tags selected provided no pictures. Please select different tags"
-msgstr "ஒட்டுகள் தேர்ந்தெடுத்த படங்களை தரவில்லை. பல்வேறான ஒட்டுகளை தேர்ந்தெடுக்கவும்"
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:129
-msgid "Creating miniatures"
-msgstr "சிறியவற்றை உருவாக்குகிறது"
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:180
-msgid "Creating photomosaics"
-msgstr "photomosaicகளை உருவாக்குகிறது"
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:187
-#: ../extensions/Tools/PictureTile/PictureTile.cs:120
-#, csharp-format
-msgid "Processing \"{0}\""
-msgstr "செயல்படுகிறது \"{0}\""
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:236
-msgid "PhotoMosaics generated!"
-msgstr "PhotoMosaics உருவாக்கப்பட்டது!"
-
-#: ../extensions/Tools/MetaPixel/MetaPixel.cs:254
-#, csharp-format
-msgid "PhotoMosaic"
-msgid_plural "PhotoMosaic ({0})"
-msgstr[0] "PhotoMosaic"
-msgstr[1] "PhotoMosaic ({0})"
-
-#: ../extensions/Tools/PictureTile/PictureTile.addin.xml.h:1
-msgid "Create photo_wall"
-msgstr "நிழற்பட சுவரை உருவாக்கு (_w)"
-
-#: ../extensions/Tools/PictureTile/PictureTile.cs:71
-msgid "PictureTile not available"
-msgstr "படஓடு கிடைக்கப் பெறவில்லை"
-
-#: ../extensions/Tools/PictureTile/PictureTile.cs:72
-msgid ""
-"The picturetile.pl executable was not found in path. Please check that you "
-"have it installed and that you have permissions to execute it"
-msgstr ""
-"இந்த picturetile.pl இயங்கக்கூடிய பாதை காணப்படவில்லை. நீங்கள் நிறுவினீர்களா என "
-"சரிபார்த்து அதன் அனுமதியையும் பார்க்கவும்"
-
-#: ../extensions/Tools/PictureTile/PictureTile.cs:110
-msgid "Preparing selected pictures"
-msgstr "தேர்ந்தெடுக்கப்பட்ட படங்களை தயாராக்குகிறது"
-
-#: ../extensions/Tools/PictureTile/PictureTile.cs:201
-msgid "PhotoWall generated!"
-msgstr "நிழற்படசுவர் உற்பத்தி செய்யப்படுகிறது!"
-
-#: ../extensions/Tools/PictureTile/PictureTile.cs:202
-msgid ""
-"Your photo wall have been generated and imported in F-Spot. Select the last "
-"roll to see it"
-msgstr ""
-"உங்களுடைய நிழற்படச் சுவர் F-Spotல் உற்பத்தி செய்யப்படுகிறது. கடைசி ரோலை தேர்ந்தெடுத்து "
-"அவற்றை பார்க்கவும்"
-
-#: ../extensions/Tools/PictureTile/PictureTile.cs:205
-msgid "Error importing photowall"
-msgstr "நிழற்படசுவரை இறக்குவதில் பிழை"
-
-#: ../extensions/Tools/PictureTile/PictureTile.cs:206
-msgid "An error occurred while importing the newly generated photowall to F-Spot"
-msgstr "F-Spotவிற்கு புதியதாக உற்பத்தி செய்யப்பட்ட நிழற்படச்சுவரை இறக்கப்படும் போது பிழை ஏற்பட்டது"
-
-#: ../extensions/Tools/HashJob/HashJob.cs:53
-msgid ""
-"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
-"needs to analyze your image collection. This is not done by default as it's "
-"time consuming. You can Start or Pause this update process using this dialog."
-msgstr ""
-"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
-"needs to analyze your image collection. This is not done by default as it's "
-"time consuming. You can Start or Pause this update process using this dialog."
-
-#: ../extensions/Tools/HashJob/HashJob.cs:102
-msgid "Processing images..."
-msgstr "பணங்களை செயல்பாட்டில் உள்ளது..."
-
-#: ../extensions/Tools/HashJob/HashJob.cs:108
-msgid "Stopped"
-msgstr "நிறுத்தப்பட்டது"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb..."
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "ஆல்பத்தை உருவாக்கும் போது பிழை"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid "The following error was encountered while attempting to create an album: {0}"
-msgstr "ஒரு ஆல்பத்தை உருவாக்கும் போது பின்வரும் பிழை ஏற்பட்டது: {0}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} அனுப்பு"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{0} தோராயமாக. {1}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "படத்தொகுப்பில் பதிவேற்றும் போது பிழை: {0}"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
-#, csharp-format
-msgid "Available space: {0}, {1}% used out of {2}"
-msgstr "இருக்கும் இடம்: {0}, {1}% {2}இல் பயன்படுத்தப்பட்டது"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
-#, csharp-format
-msgid ""
-"The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images"
-msgstr ""
-"தேர்ந்தெடுக்கப்பட்ட ஆல்பம் {0} படங்களை கொண்டுள்ளது,\n"
-"இது நடப்பு தேர்ந்தெடுக்கப்பட்ட {1} படங்களுடன் கொடுக்கப்பட்டுள்ளது"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>PicasaWeb ஏற்றுமதி</b>"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr "<span weight='bold' size='larger'>உங்கள் கூகுள் கணக்கு பூட்டப்பட்டுள்ளது</span>\n"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-"இந்தப் படத்தொகுப்பின் அமைவுகள் சரியா என சரிபார்க்கவும்.\n"
-"படத்தில் காட்டிய எழுத்துக்களை போல 'Captcha' புலத்தில் \n"
-"உள்ளிடவும். <i>எழுத்துக்கள் உணர்வறிதல் இல்லை</i>"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "பொதுவான ஆல்பம்"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "ஆல்பம் தலைப்பு (_A):"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "தானாகசுழலுதல் (_A)"
-
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr "_Captcha:"
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>SmugMug ஏற்றுமதி</b>"
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "கணக்கு (_A):"
-
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug..."
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
-#, csharp-format
-msgid "Uploading photo \"{0}\""
-msgstr "நிழற்படம் மேம்படுத்தப்படுகிறது \"{0}\""
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
-msgid "Logging into Tabblo"
-msgstr "Tabbloஇல் புகுபதிவு செய்கிறது"
-
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
-msgid "Obtaining URL for upload"
-msgstr "URLஐ பதிவேற்ற எடுக்கிறது"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr "_Tabblo..."
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
-msgid "Done sending photos"
-msgstr "நிழற்படங்களை அனுப்புவது முடிவடைந்தது"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
-msgid "Upload complete"
-msgstr "மேம்படுத்துதல் முடிவடைந்தது"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
-msgid "Error uploading to Tabblo: "
-msgstr "Tabbloக்கு பதிவேற்றுவதில் பிழை: "
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
-msgid "<b>F-Spot tags</b>"
-msgstr "<b>F-Spot டேக்குகள்</b>"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
-msgid "<b>Tabblo account</b>"
-msgstr "<b>Tabblo கணக்கு</b>"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
-msgid ""
-"<small><i>F-Spot tags can help you track the export status of photos. "
-"Example: Use one tag for the photos that you plan to export, and another one "
-"for those already exported. Here, you can tell F-Spot to automatically "
-"replace these tags as appropriate.</i></small>"
-msgstr ""
-"<small><i>F-Spot tags can help you track the export status of photos. "
-"Example: Use one tag for the photos that you plan to export, and another one "
-"for those already exported. Here, you can tell F-Spot to automatically "
-"replace these tags as appropriate.</i></small>"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:6
-msgid "Rem_ove from exported photos:"
-msgstr "ஏற்றப்பட்ட நிழற்படங்களிலிருந்து நீக்கு (_o):"
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:7
-msgid "Select..."
-msgstr "தேர்ந்தெடு..."
-
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:8
-msgid "_Attach to exported photos:"
-msgstr "ஏற்றப்பட்ட நிழற்படங்களிலிருந்து இணை (_A):"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
-msgid "<b>{0}</b>."
-msgstr "<b>{0}</b>."
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
-msgid "A trust error occured while attempting to access"
-msgstr "ஒரு நம்பக பிழை அணுகும் போது ஏற்படுகிறது"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
-msgid "Abort this session"
-msgstr "இந்த அமர்வைப் பற்றி"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
-msgid "Always trust this site's certificate"
-msgstr "இந்த தள சான்றிதழை எப்போதும் நம்பவும்"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
-msgid "Do you wish to:"
-msgstr "இதற்கு நீ விரும்புகிறாயா:"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
-msgid "Trust Error"
-msgstr "நம்பப்பட்ட பிழை"
-
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
-msgid "Trust the site's certificate this once"
-msgstr "இந்த தள சான்றதழை ஒரு முறை நம்பவும்"
-
diff --git a/po/uk.po b/po/uk.po
index 1809f4d..d452525 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,14 +2,15 @@
# Copyright (C) 1999 Free Software Foundation, Inc.
# Yuri Syrota <rasta at renome.rovno.ua>, 1999.
# Maxim Dziumanenko <mvd at mylinux.com.ua>, 2004
-#
+# Maxim V. Dziumanenko <dziumanenko at gmail.com>, 2010.
+# Sergiy Gavrylov <sergiovana at bigmir.net>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: gimp 2.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 13:54+0000\n"
-"PO-Revision-Date: 2008-06-24 10:18-0000\n"
-"Last-Translator: Maxim V. Dziumanenko <dziumanenko at gmail.com>\n"
+"POT-Creation-Date: 2010-04-04 07:17+0300\n"
+"PO-Revision-Date: 2010-04-01 22:54+0300\n"
+"Last-Translator: Sergiy Gavrylov <sergiovana at bigmir.net>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,374 +18,1411 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "Версія:"
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "Передача зображень"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "Передача зображення \"{0}\" до CD"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} з {1}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "Надсилання знімків завершено"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "Передачу завершено"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "Помилка під час передачі файлів"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "Помилка передачі файлів"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "копіюється..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>Чи є раніше заплановані для запису елементи</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Знімки, що записуються на диск</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "Автоматично обернути"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "Створити CD"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "Розмір"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "Обсяг експортованих знімків: "
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Переглянути раніше відкладені знімки"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "_Експортувати"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "_Записати лише ці знімки на CD"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "Очікування автентифікації"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
+msgstr ""
+"F-Spot зараз запустить браузер, щоб ви призначили дозвіл на тільки що "
+"вибрані знімки.\n"
+"\n"
+"Після того, як Facebook запропонує повернутися до цієї програми, натисніть "
+"внизу кнопку «Гаразд»."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "Надто багато зображень для експорту"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+"Facebook дозволяє лише {0} фотографій для кожного альбому. Очистіть "
+"виділенні та спробуйте ще раз."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "Триває вивантаження знімків"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "Альбому необхідна назва"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "Дайте альбому назву чи виберіть наявний альбом."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "Не вдається створити новий альбом"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"Помилка під час створення нового альбому.\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "Автор:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "Передається знімок \"{0}\" ({1} з {2})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "Авторські права:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Помилка при завантаженні знімків до Facebook: {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "Залежності розширення:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "Помилка"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "Всі зареєстровані репозиторії"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "Вивантаження завершено"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "Ви дійсно бажаєте скасувати встановлення?"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "Відвідайте групу F-Spot на Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "Наступні пакети будуть видалені:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "Очікується завершення автентифікації"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
msgid ""
-"There are other extensions that depend on the previous ones which will also "
-"be uninstalled:"
-msgstr "Є розширення, що залежать від попередніх, і вони теж будуть видалені:"
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"Зараз F-Spot запустить браузер, щоб ви змогли зайти у Facebook.\n"
+"\n"
+"Після того, як Facebook запропонує повернутись до цієї програми, натисніть "
+"внизу кнопку «Гаразд». F-Spot збереже ваш сеанс в gnome-keyring (якщо "
+"можливо), і в подальшому використовуватиме його під час експорту в Facebook."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "Автентифікація..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "Помилка авторизації на Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
msgid ""
-"The selected extensions can't be installed because there are dependency "
-"conflicts."
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
msgstr ""
-"Вибрані розширення не можуть бути встановлені через конфлікт залежностей."
+"Виникла помилка при авторизації на Facebook. Перевірте ваші реєстраційні "
+"дані."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "Будуть встановлені наступні пакети:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "Сеанс авторизації"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr " (у каталог користувача)"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "Сеанс встановлений, витяг інфо користувача..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "Наступні пакети будуть видалені:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "Сеанс встановлений, витяг списку друзів..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "Не вдалося задовольнити наступні залежності:"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "Сеанс встановлений, витяг деталей про друзів..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "Встановлення успішно завершено."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "Сеанс встановлений, витяг фотоальбомів..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "Помилка при встановленні!"
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} авторизовано на Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "Встановлення завершилось з попередженням."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Помилка під час під’єднання до Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "Видалення успішно завершено."
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"Сталася помилка під час завантаження вашої інформації з Facebook.\n"
+"\n"
+"Facebook повідомив: {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "Видалення завершилось помилкою!"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "Ви не авторизовані"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Авто-підтвердження фото"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "Видалення завершилось з попередженням!"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Підпис"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "Репозиторій"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Створити новий альбом"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "Встановлення скасовано"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Опис:"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "Декілька потрібних розширень не знайдено"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Експорт до Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "Помилка при встановленні"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "На цьому знімку"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-msgid "Extension"
-msgstr "Розширення"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "Розташування"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-#: ../src/Widgets/InfoBox.cs:211
-msgid "Version"
-msgstr "Версія"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Зайти"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "Інше"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Вийти"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
-#: ../src/Widgets/InfoBox.cs:208
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:9
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "Назва"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "URL"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Ви не авторизовані"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Дозволи:"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Залишайтеся на зв'язку"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Використовувати існуючий шаблон"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Хто це?"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "Авторизувати"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
+#, csharp-format
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr ""
+"Повернутися до цього вікна після завершення процесу авторизації на {0} та "
+"натисніть наведену нижче кнопку \"Завершити авторизацію\""
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "Завершити авторизацію"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Виконується авторизація на \"{0}\""
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "Перевірка прав доступу..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "Виникла виняткова ситуація: {0}"
+msgid "Welcome {0} you are connected to {1}"
+msgstr "Ласкаво просимо {0} ви з'єдналися з {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "Пакет"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Авторизуватися під іншим ім'ям"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "Встановлення розширення"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "Використано {0} вашої місячної квоти у {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>Виберіть розширення для встановлення та натисніть «Далі»</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "Не вдається увійти до системи"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "Встановити з:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Очікування відповіді {0} з {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "_Репозиторії..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "Вивантажується знімок \"{0}\""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "Показати вс_і пакети"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Помилка при вивантаженні до {0}: {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "Показувати лише нові файли"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "Не вдається увійти до системи."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "Показувати лише оновлення"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr ""
+"F-Spot не може авторизуватися {0}. Перевірте, що ви проходите "
+"автентифікацію використовуючи {0} інтерфейс веб-оглядача."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "Зн_яти виділення"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>Обліковий запис</b>"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:153
-msgid "Select _All"
-msgstr "Виді_лити все"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>Знімки</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>Стиль</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Доступ до перегляду</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "Експорт"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "_Експортувати ієрархію позначок"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"F-Spot потрібна ваша авторизація для завантаження знімків у каталог вашого "
+"облікового запису. Натисніть кнопку «Авторизувати», щоб відкрити веб-оглядач "
+"та дозволити F-Spot зв'язуватися з Flickr."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "Ігнорувати позначки _верхнього рівня"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "Особисті"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "Публічні"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "Загальний поступ:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "_Прибрати метадані"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "Завантажуються розширення..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "Видимі членам родини"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "Видимі друзям"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "Керування розширеннями"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "Е_кспортувати позначки"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "_Масштабувати до: "
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "Треба встановити додаткові розширення для виконання цієї операції."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "Відкрити _альбом у оглядачі при завершені завантаження"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "Будуть встановлені наступні розширення:"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "точок"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>Керування розширеннями F-Spot</b></big>"
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "У _теку..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "Вже установлені наступні розширення:"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "Виберіть теку для експорту"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "_Встановити розширення..."
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "Створення галереї"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "В_идалити..."
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "Помилка при вивантаженні знімку \"{0}\" до галереї:{2}{1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-#: ../src/f-spot.glade.h:89
-msgid "Enable"
-msgstr "Увімкнути"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "Помилка: помилка при передачі; виконання перервано"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "Вимкнути"
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "Помилка: файл вже існує; виконання перервано"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:249
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:799
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:544
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:694
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:595
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:176
-msgid "Error"
-msgstr "Помилка"
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "Світлий"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "Темний"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "Попередній"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "Індекс"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "Позначки"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "Далі"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "Галерею створено"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "Показувати стилі"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "Сховати стилі"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "Позначки: "
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "Сторінка:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>Ціль</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>Спосіб експорту</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "_Створити галерею використовуючи Original"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "Створити окрему _веб-галерею..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "Подробиці"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "О_пис:"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "Експортувати _позначки"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "Експортувати _значки позначок"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "Експорту до теки"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "_Назва галереї:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "Керування репозиторіями розширеннями"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "Відкрити _сторінку з галереєю при завершенні експорту"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "Додати репозиторій"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "_Тека:"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "Виберіть розташування репозиторію, що реєструється:"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "З_берегти лише файли"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "Зареєструвати мережний репозиторій"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "_Веб-галерея..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "URL:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Не вдається з'єднатися з Gallery, оскільки невідома її версія.\n"
+"Перевірте, що встановлено модуль Remote версії 1.0.8 або старшої later"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "Зареєструвати локальний репозиторій"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "Неправильний URL"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "Шлях:"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "Очевидно, URL галереї некоректний"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "Огляд..."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "Помилка під час з'єднання з галереєю"
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
#, csharp-format
-msgid "(provided by {0})"
-msgstr "(надано {0})"
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "При спробі авторизації виникла наступна помилка: {0}"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "Вимкнені розширення неможливо завантажити."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "Галерея з такою назвою вже існує"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
#, csharp-format
-msgid "Loading {0} extension"
-msgstr "Завантажується розширення {0}"
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr ""
+"У списку зареєстрованих галерей вже є галерея з такою самою назвою.Виберіть "
+"унікальну назву."
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(ВерхнійРівень)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "Неправильна назва галереї"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Назва галереї містить неправильні символи.\n"
+"Дозволяються лише літери, цифри, та знак підкреслення _"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "Необхідне розширення '{0}' вимкнено."
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Помилка при завантаженні знімку \"{0}\" до Gallery: {1}"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(немає галереї)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(немає з'єднання)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(немає альбомів)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "Не вибраний обліковий запис"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>Альбом</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>Галерея</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Помилка при з'єднанні з Gallery</span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "Е_кспортувати назви та коментарі"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "Відкрити _альбом у веб-оглядачеві при завершенні завантаження"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Перевірте, що параметри галереї є коректними."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "_Назва альбому:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "_Опис:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "Експортувати до _альбому:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "Назва _галереї:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "_Галерея:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "_Альбом верхнього рівня:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "_Назва:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "_Ім'я користувача:"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "Помилка при читанні відповіді сервера"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "Сервер повернув відповідь без вмісту Gallery"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "Помилка при створені нового альбому"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "Необхідне розширення '{0}' не встановлено."
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"При спробі виконати запитану авторизацію виникла наступна помилка:\n"
+"{0} ({1})"
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "Перегляд фотографій F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "Перегляд фотографій"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "Помилка при створені альбому"
-#: ../f-spot-import.desktop.in.in.h:1 ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "Керування фотографіями у F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr "При спробі створити альбом виникла наступна помилка: {0}"
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "Імпортувати до F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} передано"
-#: ../f-spot-import.desktop.in.in.h:3 ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "Керування фотографіями"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} з приблизно {1}"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
-msgstr "Організація, перегляд та передача фотографій"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Помилка при завантаженні знімків до Gallery: {0}"
-#: ../libeog/eog-image.c:773
-#, c-format
-msgid "No image loaded."
-msgstr "Немає зображень."
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Доступний простір: {0}, {1}% використовувати з {2}"
-#: ../libeog/eog-image.c:780
-#, c-format
-msgid "Can't save non local files."
-msgstr "Збереження нелокальних файлів не підтримується."
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"<small>Для обраного альбому встановлено межу у {0} знімків,\n"
+"яку буде перевищено при поточному виділенні у {1} знімків.</small>"
-#: ../libeog/eog-image.c:803
-#, c-format
-msgid "Unsupported image type for saving."
-msgstr "Непідтримуваний тип файлів для зображення."
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>Експорт на PicasaWeb</b>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr ""
+"<span weight='bold' size='larger'>Ваш обліковий запис Google заблоковано</"
+"span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Перевірте, що параметри цієї галереї є коректними.\n"
+"Введіть літери, як вони показані на зображенні у полі\n"
+"'Captcha'. <i>Літери не залежать від регістру</i>"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "Загальнодоступний альбом"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "_Назва альбому:"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "А_втоматично обернути"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Код підтвердження:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>Експорт на SmugMug</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "_Обліковий запис:"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "Вивантажується знімок \"{0}\""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Виконується авторизація на Tabblo"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Отримується URL для завантаження"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "Надсилання знімків завершено"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "Вивантаження на сервер завершено"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "Помилка при завантаженні знімків до Tabblo: "
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Позначки F-Spot</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Обліковий рахунок Tabblo</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>Позначки F-Spot можуть допомогти вам відслідковувати стан експорту "
+"фотографій. Приклад: використовуйте одну позначку для фото, які плануєте "
+"експортувати, іншу для вже експортованих. Тут, можна вказати, щоб F-Spot "
+"автоматично замінював ці позначки відповідним чином.</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "Вилучити з експортованих фото:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Вибрати..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Прикріпити до експортованих фото:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>."
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "Помилка встановлення довіри при спробі доступу"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "Перервати цей сеанс"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "Завжди довіряти сертифікату цього сайту"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "Бажаєте:"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "Помилка довіри"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "Довіряти сертифікату сайту на цей раз"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "_У стиснутий файл..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "Нічого не виділено"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr ""
+"Для цього інструменту потрібно активне виділення. Виділіть один або кілька "
+"знімків та спробуйте ще раз."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "Виберіть теку для експорту"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "Виконується експорт файлів"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Готується знімок \"{0}\""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "_Створити"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "_Назва файла:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "_Розташування:"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "_Масштаб:"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"Щоб знайти дублікати знімків, імпортованих у ранішу версію, ніж 0.5.0, F-"
+"Spot має проаналізувати вашу колекцію знімків. Це не типова операція, "
+"оскільки вимагає часу. Ви можете почати або припинити процес оновлення у "
+"цьому діалоговому вікні."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr ""
+"Зараз у вас {0} фото, що потребують обчислення суми md5 та {1} завдань у "
+"черзі"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Закрити"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "Обробка зображень..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "Зупинено"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "Перевірка на дублікати..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "Галерея F-Spot"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "Здається, веб-галерея зараз в оффлайні"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "Показати все"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} фото"
+msgstr[1] "{0} фото"
+msgstr[2] "{0} фото"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Поточна дата"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "Вибрано"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Live Web Gallery"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Галерея залишається активною поки ви або не деактивуєте її,\n"
+"або не закриєте F-Spot. Переконайтеся, чи локальні переглядачі не\n"
+"звертаються до неї в обхід HTTP проксі-сервера.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Якщо галерея активна, через URL у верхній частині вікна можна \n"
+"отримати доступ до спільних фото на іншому комп’ютері.</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "Активує та деактивує веб-галерею"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Дозволити переглядачам додавати позначки"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Копіювати URL до буферу обміну"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spot Live Web Gallery"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL галереї:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Обмежити кількість спільних фото до"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "Варіанти:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Фото з позначками"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Вибрані фото"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Спільне користування:"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Види:"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "(Немає)"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Галерея: {0}, Фото: {1}, Останній клієнт: {3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "Галерею створено"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "Об'єднати бази даних"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "Помилка під час відкривання вибраного файла"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"Обраний файл не є коректною чи підтримуваною базою даних.\n"
+"\n"
+"Отримано переривання \"{0}\"."
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr ""
+"<small><i>Виберіть теку з базою даних, яку ви хочете імпортувати</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>Виберіть, що саме імпортувати з бази даних.\n"
+"«Лише нові сеанси імпорту» — імпортувати все нове, що\n"
+"з'явилося з моменту останнього імпорту з цієї бази даних.\n"
+"«Один сеанс імпорту» — обрати конкретний сеанс імпорту.\n"
+"«Все» — імпортувати все, що може призвести до створення \n"
+"дублікатів, якщо імпорт з цієї бази даних вже виконався.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>Скопіювати знімки на локальний диск чи залишити їх на місці.\n"
+"У останньому випадку перевірте, що вони завжди доступні F-Spot.</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "Один сеанс імпорту"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "Копіювати файли до теки зі знімками"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "Розташування бази даних"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "Все"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "Імпорт:"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "Залишити знімки на місці"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "Додати ще одну колекцію F-Spot"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "Лише нові сеанси імпорту"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "Пропустити"
-#: ../libeog/image-view.c:2128
-msgid "interpolation type"
-msgstr "тип інтерполяції"
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>Ця база даних посилається на файли з теки <b>{0}</b>.\n"
+"Виберіть цю теку для зв'язування файлів із записами у базі даних.</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "Налаштування зберігача екрана"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "Усі знімки"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Затримка:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Показ:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Позначені знімки:"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "Зробити F-Spot програмою зберігання екрану"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Принцип організації даних"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
-#: ../libeog/image-view.c:2129
-msgid "the type of interpolation to use"
-msgstr "який тип інтерполяції використати"
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "Керування фотографіями у F-Spot"
-#: ../libeog/image-view.c:2135 ../libeog/image-view.c:2142
-msgid "check type"
-msgstr "перевірити тип"
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Організація, перегляд та передача фотографій"
-#: ../libeog/image-view.c:2136
-msgid "the type of chequering to use"
-msgstr "тип використаних шахових клітин"
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Керування фотографіями"
-#: ../libeog/image-view.c:2143
-msgid "the size of chequers to use"
-msgstr "розмір шахових клітин"
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Імпортувати до F-Spot"
-#: ../libeog/image-view.c:2149
-msgid "dither"
-msgstr "дізрінг"
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "Перегляд фотографій F-Spot"
-#: ../libeog/image-view.c:2150
-msgid "dither type"
-msgstr "тип дізерінгу"
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Перегляд фотографій"
-#: ../libfspot/f-jpeg-utils.c:445 ../src/RotateCommand.cs:222
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
msgstr "Файл не знайдено"
-#: ../libfspot/f-jpeg-utils.c:468
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr "Невідомий тип перетворення %d"
-#: ../libfspot/f-jpeg-utils.c:476
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
msgstr "Операція закінчилась помилкою"
@@ -396,16 +1434,10 @@ msgstr "Перегляд"
msgid "Path"
msgstr "Шлях"
-#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:95
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "Файл"
-#: ../src/CameraFileSelectionDialog.cs:82
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:992
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1233
-msgid "Index"
-msgstr "Індекс"
-
#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
msgstr "Виберіть позначку"
@@ -419,12 +1451,6 @@ msgstr "Завантажуються мініатюри"
msgid "Downloading Preview of {0}"
msgstr "Завантажується мініатюра {0}"
-#: ../src/CameraFileSelectionDialog.cs:199
-#: ../extensions/Exporters/CDExport/CDExport.cs:342
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:391
-msgid "Transferring Pictures"
-msgstr "Триває копіювання зображень"
-
#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
@@ -435,19 +1461,19 @@ msgid "Error transferring file"
msgstr "Помилка при передачі файлів"
#: ../src/CameraFileSelectionDialog.cs:244
-msgid "Done Copying Files"
-msgstr "Копіювання файлів завершено"
-
-#: ../src/CameraFileSelectionDialog.cs:246
msgid "Download Complete"
msgstr "Завантаження завершено"
-#: ../src/CameraFileSelectionDialog.cs:271
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "Копіювання файлів завершено"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "Копіюється \"{0}\" з фотоапарату"
-#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:227
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "Фотоапарат"
@@ -455,12 +1481,12 @@ msgstr "Фотоапарат"
msgid "Port"
msgstr "Порт"
-#: ../src/Core.cs:200
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "Знімків з позначкою {0} не знайдено"
-#: ../src/Core.cs:201
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
@@ -471,11 +1497,11 @@ msgstr ""
"застосувати її до яких-ось знімків або вибрати іншу позначку\n"
"у діалозі параметрів F-Spot."
-#: ../src/Core.cs:205
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
msgstr "Нічого не знайдено"
-#: ../src/Core.cs:206
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -486,16 +1512,16 @@ msgstr ""
"параметрів F-Spot."
#. Note for translators: Reparented is a picture becoming a version of another one
-#: ../src/Core/Photo.cs:481
+#: ../src/Core/Photo.cs:473
msgid "Reparented"
msgstr "Змінено версіонність"
-#: ../src/Core/Photo.cs:481
+#: ../src/Core/Photo.cs:473
#, csharp-format
msgid "Reparented ({0})"
msgstr "Змінено версіонність ({0})"
-#: ../src/Core/Photo.cs:500
+#: ../src/Core/Photo.cs:492
#, csharp-format
msgid "Modified"
msgid_plural "Modified ({0})"
@@ -503,62 +1529,22 @@ msgstr[0] "Версія ({0})"
msgstr[1] "Версія ({0})"
msgstr[2] "Версія ({0})"
-#: ../src/Core/Photo.cs:519
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1}"
msgstr "Змінено о {1}"
-#: ../src/Core/Photo.cs:519
+#: ../src/Core/Photo.cs:513
#, csharp-format
msgid "Modified in {1} ({0})"
msgstr "Змінено о {1} ({0})"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:677 ../src/f-spot.glade.h:132
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "Початкова"
-#: ../src/DateCommands.cs:56
-msgid "Today"
-msgstr "Сьогодні"
-
-#: ../src/DateCommands.cs:58
-msgid "Yesterday"
-msgstr "Вчора"
-
-#: ../src/DateCommands.cs:60
-msgid "Last 7 days"
-msgstr "Останні 7 діб"
-
-#: ../src/DateCommands.cs:62
-msgid "Last 30 days"
-msgstr "Останні 30 діб"
-
-#: ../src/DateCommands.cs:64
-msgid "Last 90 days"
-msgstr "Останні 90 діб"
-
-#: ../src/DateCommands.cs:66
-msgid "Last 360 days"
-msgstr "Останні 360 діб"
-
-#: ../src/DateCommands.cs:68
-msgid "Current Week (Mon-Sun)"
-msgstr "Поточний тиждень (ПН-НД)"
-
-#: ../src/DateCommands.cs:70
-msgid "Previous Week (Mon-Sun)"
-msgstr "Попередня тиждень (ПН-НД)"
-
-#: ../src/DateCommands.cs:86 ../src/f-spot.glade.h:54
-msgid "All Images"
-msgstr "Усі знімки"
-
-#: ../src/DateCommands.cs:88
-msgid "Customized Range"
-msgstr "Інший діапазон"
-
#: ../src/Editors/AutoStretchEditor.cs:17
msgid "Auto Color"
msgstr "Автокорекція кольору"
@@ -631,21 +1617,35 @@ msgstr "Виділіть очі з червоними плямами."
msgid "Sepia Tone"
msgstr "Тонувати у сепію"
-#: ../src/Editors/SoftFocusEditor.cs:28
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "М'який фокус"
-#: ../src/Editors/TiltEditor.cs:28
+#: ../src/Editors/TiltEditor.cs:30
msgid "Straighten"
msgstr "Вирівняти"
-#: ../src/Extensions/OpenWithMenu.cs:92
-msgid "No applications available"
-msgstr "Немає доступних програм"
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "Помилка імпорту"
+
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "Помилка при імпорті {0}{2}{2}{1}"
+
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "Немає способу зберегти файли типу \"{0}\""
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "Виникла виключна ситуація"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "Копіювати _розташування знімків"
+msgid "Copy Photo"
+msgstr "Копіювати фото"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -655,17 +1655,17 @@ msgstr "Експорт"
msgid "Open _With"
msgstr "Відкрити _у"
-#: ../src/FSpot.addin.xml.h:4 ../src/f-spot.glade.h:146
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
-msgstr "В_идалити позначку"
+msgstr "В_илучити позначку"
-#: ../src/FSpot.addin.xml.h:5 ../src/SingleView.cs:438
-#: ../src/f-spot.glade.h:148
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "Обернути _ліворуч"
-#: ../src/FSpot.addin.xml.h:6 ../src/SingleView.cs:439
-#: ../src/f-spot.glade.h:149
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "Обернути _праворуч"
@@ -673,40 +1673,459 @@ msgstr "Обернути _праворуч"
msgid "Tools"
msgstr "Сервіс"
-#: ../src/FSpot.addin.xml.h:8 ../src/f-spot.glade.h:193
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "_Призначити позначку"
-#: ../src/FSpot.addin.xml.h:9 ../src/f-spot.glade.h:205
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
-msgstr "В_идалити з диску"
+msgstr "В_илучити з диска"
-#: ../src/FSpot.addin.xml.h:10 ../src/f-spot.glade.h:239
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
-msgstr "Видалити з _каталогу"
+msgstr "Вилучити з _каталогу"
-#: ../src/FileImportBackend.cs:285
-msgid "Import error"
-msgstr "Помилка імпорту"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:286
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr "Помилка при імпорті {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
-#: ../src/FileImportBackend.cs:287 ../src/ThreadProgressDialog.cs:68
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
-msgid "Skip"
-msgstr "Пропустити"
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
-#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "Немає способу зберегти файли типу \"{0}\""
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
-#: ../src/FormClient.cs:297
-msgid "Unhandled exception"
-msgstr "Виникла виключна ситуація"
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>_Зміни</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Інтерполяція знімку</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>Розмір</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>Зведення</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Прозорі області відображаються</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Переглядати усі імпортовані знімки</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>_Баланс білого</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr ""
+"<small><i>Увімкніть цей параметр для використання інтерполяції при "
+"масштабуванні знімків. Вимикати цю функцію при перегляду знімків не варто, "
+"хоча при перегляді значків вона буде зайвою.</i></small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>Ви можете обрати спосіб показу прозорих областей у зображеннях. Це "
+"не має відношення до фотографій, але при перегляді значків та інших "
+"предметів дизайну шахові клітини або власний колір заповнення прозорих "
+"областей можуть бути корисні.</i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "Кольором _тла"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "_Вказаним кольором: "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "_Шаховими клітинами"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "Призначити позначки:"
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "Призначити позначку:"
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "_Контраст:"
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "_Створити"
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "Вибір фотоапарату"
+
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "Копіювати файли у теку Photos"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "Створити поштове повідомлення"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr "Створити _значок для цієї позначки під час першого використання"
+
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr ""
+"Створити поштове повідомлення з вкладеними обраними знімками (за потреби — "
+"зменшеного розміру)"
+
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr "Визначати та відсіювати дублікати"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "Показувати _імена файлів"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "Показувати лише ті знімки, що були імпортовані у певний момент часу"
+
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "Не надсилати повідомлення"
+
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "Ел._пошта:"
+
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "_Експортувати назви та коментарі"
+
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "Обчислений новий розмір"
+
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "Дуже великий"
+
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "Перегляд у F-Spot"
+
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr "Фільтр за вибраними сеансам імпорту"
+
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "_Галерея:"
+
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "Галерея"
+
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "Імпорт"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "Звідки додати:"
+
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "Включати підтеки"
+
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "Великий"
+
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr "Керування набором відношень сторін"
+
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "Середній"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "Кількість знімків у вибраних сеансах імпорту:"
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "Кількість знімків"
+
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "Відкрити _теку..."
+
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "Початковий розмір (розмір файла може бути дуже великим)"
+
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "_Батьківська позначка:"
+
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "Пауза"
+
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "Параметри"
+
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "Назад"
+
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "Відновити"
+
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr "Виберіть знімки для копіювання з камери..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "Виберіть позначку..."
+
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "Виберіть фотоапарат, з якого треба забрати знімки"
+
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "Вибраний фотоапарат: "
+
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "Відношення сторін"
+
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "_Встановити як тло"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "Показувати всі фото."
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "Показати чи сховати бічну панель"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "Показати/сховати панель інструментів"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "_Бічна панель"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "Малий"
+
+#: ../src/f-spot.glade.h:82
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr ""
+"Вкажіть, чи обертати знімок первинного розміру. Знімки меншого розміру "
+"обертаються автоматично."
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "П_рибрати метадані знімку"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr "Т_емпература:"
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "Крихітний"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr "Загальний розмір оригіналів"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "З_більшити"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "З_меншити"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "Збільшити"
+
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "Зменшити"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "_Яскравість:"
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "_Створити повідомлення"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "_Експозиція"
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "На весь _екран"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Галерея"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "_Довідка"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "Від_тінок:"
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "_Виконати інтерполяцію при зміні масштабу"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "_Нове вікно"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "Відкрити _альбом у оглядачі при завершені завантаження"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "Відкрити _каталог при завершенні експорту"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "_Фото"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "_Насиченість:"
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "_Масштабувати знімок до не більш ніж: "
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "Показ _слайдів"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "_Прибрати метадані"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "Назва _позначки:"
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "Від_тінок:"
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "Панель _інструментів"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI:"
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "_Вигляд"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "_Віртуальна файлова система"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "та"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"під час\n"
+"після\n"
+"між"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
#: ../src/FullScreenView.cs:58
msgid "Hide"
@@ -720,80 +2139,36 @@ msgstr "Сховати панель інструментів"
msgid "Info"
msgstr "Інфо"
-#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:197
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
-msgstr "Інформація про знімок"
+msgstr "Інформація про зображення"
#: ../src/FullScreenView.cs:73
msgid "Exit fullscreen"
msgstr "Повернутися"
-#: ../src/FullScreenView.cs:83 ../src/MainWindow.cs:318
-#: ../src/SingleView.cs:97
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "Показ слайдів"
-#: ../src/FullScreenView.cs:84
+#: ../src/FullScreenView.cs:82
msgid "Start slideshow"
msgstr "Почати показ слайдів"
-#: ../src/FullScreenView.cs:149
+#: ../src/FullScreenView.cs:128
msgid "Slide transition:"
msgstr "Ефект переходу слайдів:"
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "Розчинення"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "Обертання кубу"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "Перекриття"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "Виявлення"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "Розчищення"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "Розділення"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "Виштовхування"
-
#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "Більше дат"
#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "Більше каталогів"
-
-#: ../src/GroupSelector.cs:63 ../src/GroupSelector.cs:64
msgid "More"
msgstr "Більше"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "Сортувати за _місяцями"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "Сортувати за _теками"
-
-#: ../src/GroupSelector.cs:523 ../src/f-spot.glade.h:243
-msgid "_Reverse Order"
-msgstr "_Зворотній напрямок"
-
-#: ../src/GroupSelector.cs:529 ../src/f-spot.glade.h:197
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "О_чистити діапазон дат"
@@ -821,7 +2196,7 @@ msgstr "Розділ про сумісність"
msgid "Unknown Directory"
msgstr "Невідомий каталог"
-#: ../src/Imaging/ImageFile.cs:87
+#: ../src/Imaging/ImageFile.cs:117
msgid "Writing to this file format is not supported"
msgstr "Запис у файли цього формату не підтримується"
@@ -886,19 +2261,19 @@ msgstr ""
#: ../src/Imaging/IptcFile.cs:177
msgid "Object type reference"
-msgstr "Посилання на тип об'єкту"
+msgstr "Посилання на тип об'єкта"
#: ../src/Imaging/IptcFile.cs:182
msgid "Object attribute reference"
-msgstr "Посилання на атрибут об'єкту"
+msgstr "Посилання на атрибут об'єкта"
#: ../src/Imaging/IptcFile.cs:188 ../src/Imaging/IptcFile.cs:192
msgid "Object name"
-msgstr "Назва об'єкту"
+msgstr "Назва об'єкта"
#: ../src/Imaging/IptcFile.cs:190
msgid "Status of the objectdata according to the provider"
-msgstr "Статус даних об'єкту згідно наданої інформації"
+msgstr "Статус даних об'єкта згідно наданої інформації"
#: ../src/Imaging/IptcFile.cs:194
msgid "Location within a city or area where the object originates"
@@ -927,7 +2302,7 @@ msgstr "Автор вмісту"
#: ../src/Imaging/IptcFile.cs:212
msgid "Provider of the object"
-msgstr "Постачальник об'єкту"
+msgstr "Постачальник об'єкта"
#: ../src/Imaging/IptcFile.cs:215
msgid "The title of the author or creator"
@@ -958,7 +2333,7 @@ msgstr "Інтелектуальний жанр об'єкту"
msgid "Unknown IIM DataSet"
msgstr "Невідомий IIM DataSet"
-#: ../src/ImportCommand.cs:47 ../src/SingleView.cs:344
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "Вибрати теку"
@@ -975,185 +2350,127 @@ msgstr "Копіюється файл {0} з {1}"
msgid "Done Loading"
msgstr "Завантаження завершено"
-#: ../src/ImportCommand.cs:668
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
-msgstr "Каталог не існує."
+msgstr "Каталогу не існує."
-#: ../src/ImportCommand.cs:669
+#: ../src/ImportCommand.cs:685
#, csharp-format
msgid ""
"The directory you selected \"{0}\" does not exist. Please choose a "
"different directory"
msgstr "Вибраний вами каталог \"{0}\" не існує. Виберіть інший"
-#. Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-#: ../src/ImportCommand.cs:722 ../src/ImportCommand.cs:724
-#: ../src/XmpTagsImporter.cs:88
-msgid "Import Tags"
-msgstr "Імпортовані позначки"
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
+#: ../src/XmpTagsImporter.cs:89
+msgid "Imported Tags"
+msgstr "Імпортовані теґи"
-#: ../src/ItemAction.cs:81 ../src/MainWindow.cs:285 ../src/SingleView.cs:80
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
msgstr "Обернути ліворуч"
-#: ../src/ItemAction.cs:82
+#: ../src/ItemAction.cs:80
msgid "Rotate picture left"
msgstr "Обернути знімок ліворуч"
-#: ../src/ItemAction.cs:93 ../src/MainWindow.cs:289 ../src/SingleView.cs:85
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
msgstr "Обернути праворуч"
-#: ../src/ItemAction.cs:94
+#: ../src/ItemAction.cs:92
msgid "Rotate picture right"
msgstr "Обернути знімок праворуч"
-#: ../src/ItemAction.cs:104 ../src/f-spot.glade.h:121
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:998
-msgid "Next"
-msgstr "Далі"
-
-#: ../src/ItemAction.cs:105
+#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "Наступний знімок"
-#: ../src/ItemAction.cs:126 ../src/f-spot.glade.h:142
-msgid "Previous"
-msgstr "Назад"
-
-#: ../src/ItemAction.cs:127
+#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "Попередній знімок"
-#: ../src/Loupe.cs:60
-msgid "Error saving sharpened photo"
-msgstr "Помилка при збереженні знімку із збільшеною контрастністю"
-
-#: ../src/Loupe.cs:61 ../src/PhotoView.cs:165
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "Отримано переривання «{0}». Неможливо зберегти знімок {1}"
-
-#: ../src/Loupe.cs:90
-msgid "Sharpen"
-msgstr "Збільшення різкості"
-
-#: ../src/Loupe.cs:100
-msgid "Amount:"
-msgstr "Величина:"
-
-#: ../src/Loupe.cs:101
-msgid "Radius:"
-msgstr "Радіус:"
-
-#: ../src/Loupe.cs:102
-msgid "Threshold:"
-msgstr "Поріг:"
-
-#: ../src/MainWindow.cs:278 ../src/f-spot.glade.h:111
-msgid "Import"
-msgstr "Імпорт"
-
-#: ../src/MainWindow.cs:280
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "Імпортувати нові знімки"
-#: ../src/MainWindow.cs:296 ../src/f-spot.glade.h:62
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
-msgstr "Переглянути"
+msgstr "Перегляд"
-#: ../src/MainWindow.cs:300
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
-msgstr "Переглянути декілька знімків одночасно"
+msgstr "Перегляд декількох знімків одночасно"
-#: ../src/MainWindow.cs:304
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "Змінити знімок"
-#: ../src/MainWindow.cs:308
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "Переглянути та змінити один знімок"
-#: ../src/MainWindow.cs:313 ../src/SingleView.cs:92
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "На весь екран"
-#: ../src/MainWindow.cs:315 ../src/SingleView.cs:94
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "Розгорнути на весь екран"
-#: ../src/MainWindow.cs:320 ../src/SingleView.cs:99
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
-msgstr "Переглянути у режимі показу слайдів"
+msgstr "Перегляд у режимі показу слайдів"
-#: ../src/MainWindow.cs:335
+#: ../src/MainWindow.cs:358
msgid "Previous photo"
msgstr "Попередній знімок"
-#: ../src/MainWindow.cs:340
+#: ../src/MainWindow.cs:363
msgid "Next photo"
msgstr "Наступний знімок"
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/MainWindow.cs:353 ../src/Widgets/Sidebar.cs:73
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:995
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1167
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1207
-msgid "Tags"
-msgstr "Позначки"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/MainWindow.cs:661 ../src/ProgressDialog.cs:81
-#: ../src/TimeDialog.cs:142 ../extensions/Exporters/CDExport/CDExport.cs:221
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:244
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:783
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} з {1}"
-
-#: ../src/MainWindow.cs:1671
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "Фотоапарат не знайдено."
-#: ../src/MainWindow.cs:1672
+#: ../src/MainWindow.cs:1519
msgid ""
"F-Spot was unable to find any cameras attached to this system. Double check "
"that the camera is connected and has power"
msgstr ""
-"Не вдається виявити підключений до ком'ютера фотоапарат. Перевірте, чи він "
-"увімкнений та з'єднаний з комп'ютером."
+"Не вдається виявити під’єднаний до комп’ютера фотоапарат. Двічі перевірте чи "
+"камера під’єднана і чи має живлення."
-#: ../src/MainWindow.cs:1711
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "Помилка при з'єднані з фотоапаратом."
-#: ../src/MainWindow.cs:1712
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "Помилка \"{0}\" при з'єднанні з камерою"
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:2057
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
-msgstr[0] "В_идалити {0} обрану позначку"
-msgstr[1] "_Удалить {0} обрані позначки"
-msgstr[2] "_Удалить {0} обраних позначок"
+msgstr[0] "Об'єднати {0} вибраний теґ?"
+msgstr[1] "Об'єднати {0} вибраних теґи?"
+msgstr[2] "Об'єднати {0} вибраних теґів?"
-#: ../src/MainWindow.cs:2084
+#: ../src/MainWindow.cs:1873
msgid ""
"This operation will merge the selected tags and any sub-tags into a single "
"tag."
msgstr "Це призведе до об'єднання усіх вибраних міток у одну."
-#: ../src/MainWindow.cs:2086
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "О_б'єднати позначки"
-#: ../src/MainWindow.cs:2291
+#: ../src/MainWindow.cs:2080
#, csharp-format
msgid "{0} Photo out of {1}"
msgid_plural "{0} Photos out of {1}"
@@ -1161,7 +2478,7 @@ msgstr[0] "{0} знімок з {1}"
msgstr[1] "{0} знімки з {1}"
msgstr[2] "{0} знімків з {1}"
-#: ../src/MainWindow.cs:2293 ../src/SingleView.cs:481
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
@@ -1169,7 +2486,7 @@ msgstr[0] "{0} знімок"
msgstr[1] "{0} знімок"
msgstr[2] "{0} знімок"
-#: ../src/MainWindow.cs:2296
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
@@ -1177,131 +2494,131 @@ msgstr[0] " ({0} вибрано)"
msgstr[1] " ({0} вибрано)"
msgstr[2] " ({0} вибрано)"
-#: ../src/MainWindow.cs:2377
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "_Гаразд"
-#: ../src/MainWindow.cs:2378
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
-msgstr "Помилка при видаленні знімку"
+msgstr "Помилка під час вилучення знімка"
-#: ../src/MainWindow.cs:2383
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
-msgstr "Немає прав на видалення файлу:{1}{0}"
+msgstr "Немає прав на вилучення файла:{1}{0}"
-#: ../src/MainWindow.cs:2387
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
-msgstr "Помилка типу {0} при видаленні файлу: {2}{1}"
+msgstr "Помилка типу {0} під час вилучення файла: {2}{1}"
-#: ../src/MainWindow.cs:2413
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
-msgstr[0] "Видалити {0} вибраний знімок назовсім?"
-msgstr[1] "Видалити {0} вибрані знімки назовсім?"
-msgstr[2] "Видалити {0} вибраних знімків назовсім?"
+msgstr[0] "Вилучити {0} вибраний знімок назавжди?"
+msgstr[1] "Вилучити {0} вибраних знімки назавжди?"
+msgstr[2] "Вилучити {0} вибраних знімків назавжди?"
-#: ../src/MainWindow.cs:2417
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
msgid_plural ""
"This deletes all versions of the selected photos from your drive."
-msgstr[0] "Це призведе до видалення обраного знімку з диску"
-msgstr[1] "Це призведе до видалення обраних знімків з диску"
-msgstr[2] "Це призведе до видалення обраних знімків з диску"
+msgstr[0] "Це призведе до вилучення виділеного знімка з диска."
+msgstr[1] "Це призведе до вилучення виділених знімків з диска."
+msgstr[2] "Це призведе до вилучення виділених знімків з диска."
-#: ../src/MainWindow.cs:2420
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
-msgstr[0] "Видалити знімок"
-msgstr[1] "Видалити знімки"
-msgstr[2] "Видалити знімки"
+msgstr[0] "_Вилучити знімок"
+msgstr[1] "_Вилучити знімки"
+msgstr[2] "_Вилучити знімки"
-#: ../src/MainWindow.cs:2450
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
-msgstr[0] "Видалити {0} вибраний знімок з F-Spot?"
-msgstr[1] "Видалити {0} вибрані знімки з F-Spot?"
-msgstr[2] "Видалити {0} вибраних знімків з F-Spot?"
+msgstr[0] "Вилучити {0} виділений знімок з F-Spot?"
+msgstr[1] "Вилучити {0} виділених знімки з F-Spot?"
+msgstr[2] "Вилучити {0} виділених знімків з F-Spot?"
-#: ../src/MainWindow.cs:2455
+#: ../src/MainWindow.cs:2256
msgid ""
"If you remove photos from the F-Spot catalog all tag information will be "
"lost. The photos remain on your computer and can be imported into F-Spot "
"again."
msgstr ""
-"Якщо ви видалите знімки з каталогу F‑Spot, всю інформацію про позначки буде "
+"Якщо ви вилучите знімки з каталогу F‑Spot, всю інформацію про позначки буде "
"втрачено. Знімки залишаться на вашому комп'ютері; їх можна буде імпортувати "
"знову."
-#: ../src/MainWindow.cs:2456
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
-msgstr "В_идалити з каталогу"
+msgstr "В_илучити з каталогу"
-#: ../src/MainWindow.cs:2519
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
-msgstr "Видалити позначку \"{0}\"?"
+msgstr "Вилучити позначку \"{0}\"?"
-#: ../src/MainWindow.cs:2521
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
-msgstr "Видалити вибрані позначки ({0})?"
+msgstr "Вилучити вибрані позначки ({0})?"
-#: ../src/MainWindow.cs:2526
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
-msgstr[0] "зніком"
+msgstr[0] "знімок"
msgstr[1] "знімки"
msgstr[2] "знімків"
-#: ../src/MainWindow.cs:2528
+#: ../src/MainWindow.cs:2329
#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
msgid_plural ""
"If you delete these tags, the association with {0} {1} will be lost."
-msgstr[0] "Якщо видалити цю позначку, зв'язок з {0} {1} буде втрачено."
-msgstr[1] "Якщо видалити ці позначки, зв'язок з {0} {1} буде втрачено."
-msgstr[2] "Якщо видалити ці позначки, зв'язок з {0} {1} буде втрачено."
+msgstr[0] "Якщо вилучити цю позначку, зв'язок з {0} {1} буде втрачено."
+msgstr[1] "Якщо вилучити ці позначки, зв'язок з {0} {1} буде втрачено."
+msgstr[2] "Якщо вилучити ці позначки, зв'язок з {0} {1} буде втрачено."
-#: ../src/MainWindow.cs:2533
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
-msgstr[0] "В_идалити позначку"
-msgstr[1] "В_идалити позначки"
-msgstr[2] "В_идалити позначки"
+msgstr[0] "В_илучити позначку"
+msgstr[1] "В_илучити позначки"
+msgstr[2] "В_илучити позначки"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2547
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "Позначка не порожня"
-#: ../src/MainWindow.cs:2548
+#: ../src/MainWindow.cs:2349
#, csharp-format
msgid ""
"Can not delete tags that have tags within them. Please delete tags under "
"\"{0}\" first"
msgstr ""
-"Не можна видаляти позначки із вкладеними у них позначками. Спочатку видаліть "
+"Не можна вилучати позначки із вкладеними у них позначками. Спочатку вилучіть "
"позначки рівнем нижче \"{0}\"."
-#: ../src/MainWindow.cs:2991
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "Обернути {0} обраний знімок ліворуч"
msgstr[1] "Обернути {0} обрані знімки ліворуч"
msgstr[2] "Обернути {0} обраних знімків ліворуч"
-#: ../src/MainWindow.cs:3004
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "Обернути {0} обраний знімок праворуч"
msgstr[1] "Обернути {0} обрані знімки праворуч"
msgstr[2] "Обернути {0} обраних знімків праворуч"
-#: ../src/MainWindow.cs:3012
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
@@ -1309,7 +2626,7 @@ msgstr[0] "Знайти _обрану позначку"
msgstr[1] "Знайти _обрані позначки"
msgstr[2] "Знайти _обрані позначки"
-#: ../src/MainWindow.cs:3016
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
@@ -1317,14 +2634,14 @@ msgstr[0] "Знайти о_брану позначку з"
msgstr[1] "Знайти о_брані позначки з"
msgstr[2] "Знайти о_брані позначки з"
-#: ../src/MainWindow.cs:3054
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "Створити нову версію?"
msgstr[1] "Створити нові версії?"
msgstr[2] "Створити нові версії?"
-#: ../src/MainWindow.cs:3056
+#: ../src/MainWindow.cs:2860
#, csharp-format
msgid ""
"Before launching {1}, should F-Spot create a new version of the selected "
@@ -1342,107 +2659,117 @@ msgstr[2] ""
"Чи треба створювати F-Spot нову версію обраних знімків перед відкриттям їх у "
"{1}, щоб оригінали збереглися у первинному вигляді?"
-#: ../src/MetadataStore.cs:18
+#: ../src/MainWindow.cs:2882
+msgid "XCF version"
+msgstr "Версія"
+
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "Автор"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "Назва"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "Авторські права"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "Тема та ключові слова"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "Стиснення"
-#: ../src/MetadataStore.cs:24
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
msgstr "Принцип організації даних"
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "Орієнтація"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
-msgstr "Кольорова модель"
+msgstr "Фотометрична інтерпретація"
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
msgstr "Одиниця роздільної здатності"
-#: ../src/MetadataStore.cs:32
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
msgstr "Програма експозиції"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
msgstr "Режим вимірювання експозиції"
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "Режим вибору експозиції"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
msgstr "Додаткова обробка"
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "Конфігурація кольорових компонентів"
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "Джерело світла"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
msgstr "Тип сенсору"
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "Кольоровий простір"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "Баланс білого"
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
msgstr "Одиниця виміру роздільної здатності у фокальній площині"
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "Тип джерела файла"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
msgstr "Тип сцени при зйомці"
-#: ../src/MetadataStore.cs:56
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "Підвищення яскравості"
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "Контрастність"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "Насиченість"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
msgstr "Різкість"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
msgstr "Тип сцени"
@@ -1452,80 +2779,86 @@ msgstr "Тип сцени"
msgid "(No Tags)"
msgstr "(без позначок)"
-#: ../src/PhotoVersionCommands.cs:57
+#: ../src/PhotoVersionCommands.cs:58
msgid "Create New Version"
msgstr "Створити нову версію"
-#: ../src/PhotoVersionCommands.cs:58
+#: ../src/PhotoVersionCommands.cs:59
msgid "Name:"
msgstr "Назва:"
-#: ../src/PhotoVersionCommands.cs:62
+#: ../src/PhotoVersionCommands.cs:63
msgid "Rename Version"
msgstr "Перейменувати версію"
-#: ../src/PhotoVersionCommands.cs:63
+#: ../src/PhotoVersionCommands.cs:64
msgid "New name:"
msgstr "Нова назва:"
-#: ../src/PhotoVersionCommands.cs:109
+#: ../src/PhotoVersionCommands.cs:110
msgid "Could not create a new version"
msgstr "Неможливо створити нову версію"
-#: ../src/PhotoVersionCommands.cs:110
+#: ../src/PhotoVersionCommands.cs:111
#, csharp-format
msgid "Received exception \"{0}\". Unable to create version \"{1}\""
msgstr "Отримано переривання \"{0}\". Неможливо створити версію \"{1}\""
-#: ../src/PhotoVersionCommands.cs:137
+#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
-msgstr "Дійсно видалити?"
+msgstr "Дійсно вилучити?"
-#: ../src/PhotoVersionCommands.cs:138
+#: ../src/PhotoVersionCommands.cs:139
msgid "Cancel"
msgstr "Скасувати"
-#: ../src/PhotoVersionCommands.cs:139
+#: ../src/PhotoVersionCommands.cs:140
msgid "Delete"
-msgstr "Видалити"
+msgstr "Вилучити"
-#: ../src/PhotoVersionCommands.cs:143
+#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
-msgstr "Дійсно видалити версію \"{0}\"?"
+msgstr "Дійсно вилучити версію \"{0}\"?"
-#. FIXME show error dialog.
-#: ../src/PhotoVersionCommands.cs:153
+#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
-msgstr "Не вдається видалити версію"
+msgstr "Не вдається вилучити версію"
-#: ../src/PhotoVersionCommands.cs:154
+#: ../src/PhotoVersionCommands.cs:155
#, csharp-format
msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
-msgstr "Отримано переривання \"{0}\". Неможливо видалити версію \"{1}\""
+msgstr "Отримано переривання \"{0}\". Неможливо вилучити версію \"{1}\""
-#: ../src/PhotoVersionCommands.cs:195
+#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
msgstr "Не вдається перейменувати версію"
-#: ../src/PhotoVersionCommands.cs:196
+#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "Отримано переривання \"{0}\". Неможливо перейменувати версію у \"{1}\""
-#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:546
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(без редагування)"
-#: ../src/PhotoView.cs:164 ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
-msgstr "Помилка при редагуванні знімку"
+msgstr "Помилка під час редагування знімка"
+
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "Отримано переривання «{0}». Неможливо зберегти знімок {1}"
-#: ../src/PhotoView.cs:302
+#: ../src/PhotoView.cs:356
msgid "Comment:"
msgstr "Коментар:"
-#: ../src/Preferences.cs:162
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "Фотографії"
@@ -1533,65 +2866,65 @@ msgstr "Фотографії"
msgid "Image Settings"
msgstr "Параметри знімків"
-#: ../src/QueryWidget.cs:40
+#: ../src/QueryWidget.cs:58
msgid "Find: "
msgstr "Знайти: "
-#: ../src/QueryWidget.cs:45
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "Не віднесені до категорій знімки"
-#: ../src/QueryWidget.cs:53
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "Знімки з оцінкою"
#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/QueryWidget.cs:62
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
msgstr "Сеанс імпорту"
-#: ../src/QueryWidget.cs:82
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "Очистити результат пошуку"
-#: ../src/QueryWidget.cs:89
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "Оновити результат пошуку"
-#: ../src/QueryWidget.cs:91
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "Знімків, що відповідають умовам пошуку не знайдено"
-#: ../src/QueryWidget.cs:128
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "С_ховати панель пошуку"
-#: ../src/QueryWidget.cs:134
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "_Показати панель пошуку"
-#: ../src/RotateCommand.cs:94 ../src/RotateCommand.cs:109
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
msgid "Unable to rotate this type of photo"
msgstr "Неможливо обернути знімок у цьому форматі"
-#: ../src/RotateCommand.cs:129
+#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
msgstr "Неможливо обернути знімок з правами лише для читання"
-#: ../src/RotateCommand.cs:196
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
msgstr "Знімки обертаються"
-#: ../src/RotateCommand.cs:207
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
msgstr "Обертається знімок \"{0}\""
-#: ../src/RotateCommand.cs:220
+#: ../src/RotateCommand.cs:222
msgid "Directory not found"
msgstr "Каталог не знайдено"
-#: ../src/RotateCommand.cs:240
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
@@ -1599,7 +2932,7 @@ msgstr[0] "Неможливо обернути ({0}) знімок"
msgstr[1] "Неможливо обернути ({0}) знімки"
msgstr[2] "Неможливо обернути ({0}) знімків"
-#: ../src/RotateCommand.cs:242
+#: ../src/RotateCommand.cs:244
#, csharp-format
msgid ""
"The photo could not be rotated because it is on a read only file system or "
@@ -1620,49 +2953,67 @@ msgstr[2] ""
"немає прав на запис, або на пристрої, який може лише читати — наприклад, на "
"компакт-дискові. Перевірте права на файли та спробуйте ще раз."
-#: ../src/RotateCommand.cs:269
+#: ../src/RotateCommand.cs:271
#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
msgstr "Отримано помилку \"{0}\" при спробі обернути {1}"
-#: ../src/RotateCommand.cs:274
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
-msgstr "Помилка при обертанні знімку."
+msgstr "Помилка під час обертання знімка."
-#: ../src/SendEmail.cs:239
+#: ../src/SendEmail.cs:240
msgid "Preparing email"
msgstr "Готується лист"
-#: ../src/SendEmail.cs:291
+#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
msgstr "Експортується знімок \"{0}\""
-#: ../src/SendEmail.cs:313
+#: ../src/SendEmail.cs:314
msgid "Error processing image"
msgstr "Помилка при обробці знімку"
-#: ../src/SendEmail.cs:314
+#: ../src/SendEmail.cs:315
#, csharp-format
msgid "An error occured while processing \"{0}\": {1}"
msgstr "Помилка при обробці \"{0}\": {1}"
#. Send the mail :)
-#: ../src/SendEmail.cs:329
-msgid "my photos"
-msgstr "мої знімки"
+#: ../src/SendEmail.cs:330
+msgid "My Photos"
+msgstr "Мої фото"
+
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "Помилка при збереженні знімку із збільшеною контрастністю"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "Збільшення різкості"
-#: ../src/SingleView.cs:82
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "Величина:"
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "Радіус:"
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "Поріг:"
+
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "Обернути знімок ліворуч"
-#: ../src/SingleView.cs:87
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "Обернути знімок праворуч"
-#. Obsolete, remove after db rev4
-#: ../src/SingleView.cs:122 ../src/Widgets/MetadataDisplay.cs:219
-#: ../src/Widgets/MetadataDisplay.cs:221 ../src/f-spot.glade.h:98
+#: ../src/SingleView.cs:115
msgid "Folder"
msgstr "Тека"
@@ -1670,71 +3021,23 @@ msgstr "Тека"
msgid "Open"
msgstr "Відкрити"
-#: ../src/SingleView.cs:441
+#: ../src/SingleView.cs:428
msgid "Set as Background"
-msgstr "Помістити на робочий стіл"
+msgstr "Встановити як тло"
-#: ../src/TagCommands.cs:91 ../src/TagCommands.cs:219
-#: ../src/TagSelectionWidget.cs:511
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "Ця назва вже використовується"
-#: ../src/TagCommands.cs:138
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "Створити нову позначку"
-#: ../src/TagCommands.cs:139
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "Назва нової позначки:"
-#: ../src/TagCommands.cs:285
-msgid "Edit Tag"
-msgstr "Змінити позначку..."
-
-#: ../src/TagCommands.cs:286
-msgid "Tag Name:"
-msgstr "Назва позначки:"
-
-#: ../src/TagCommands.cs:402
-msgid "Unable to load image"
-msgstr "Неможливо завантажити зображення"
-
-#: ../src/TagCommands.cs:403
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "Неможливо завантажити \"{0}\" як значок цієї позначки"
-
-#: ../src/TagCommands.cs:447
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "Фотографія {0} з {1}"
-
-#: ../src/TagCommands.cs:477
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "Змінити значок позначки {0}"
-
-#: ../src/TagCommands.cs:493
-msgid "Select Photo from file"
-msgstr "Виберіть файл зі знімком"
-
-#: ../src/TagCommands.cs:516
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-"\n"
-"<b>Зі знімку</b>\n"
-"Ви можете використовувати будь-який зі знімків у каталозі як\n"
-"значок позначки. Проте, для цього спочатку треба зв'язати з цією позначкою\n"
-"принаймні один знімок. Застосуйте позначку '{0}' до одного чи іншого знімку\n"
-"та знову відкрийте цей діалог."
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
@@ -1748,15 +3051,15 @@ msgid "Create New Tag..."
msgstr "Створити нову позначку..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "Змінити обрану позначку..."
+msgid "Edit Tag..."
+msgstr "Змінити позначку..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
msgid_plural "Delete Tags"
-msgstr[0] "Видалити позначку"
-msgstr[1] "Видалити позначки"
-msgstr[2] "Видалити позначки"
+msgstr[0] "Вилучити позначку"
+msgstr[1] "Вилучити позначки"
+msgstr[2] "Вилучити позначки"
#: ../src/TagPopup.cs:52
msgid "Attach Tag to Selection"
@@ -1776,21 +3079,21 @@ msgstr[2] "Прибрати позначки з виділеного"
msgid "Merge Tags"
msgstr "Об'єднати позначки"
-#: ../src/TagQueryWidget.cs:32
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr "Включаючи знімки з позначкою \"{0}\""
-#: ../src/TagQueryWidget.cs:37
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr "Виключаючи знімки з позначкою \"{0}\""
-#: ../src/TagQueryWidget.cs:42
+#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
-msgstr "Видалити з пошуку"
+msgstr "Вилучити з пошуку"
-#: ../src/TagQueryWidget.cs:86
+#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
@@ -1798,2372 +3101,1355 @@ msgstr[0] "Шукати _з"
msgstr[1] "Шукати _з"
msgstr[2] "Шукати _з"
-#: ../src/TagQueryWidget.cs:112
+#: ../src/TagQueryWidget.cs:114
msgid "All"
msgstr "Усіма"
-#: ../src/TagQueryWidget.cs:147 ../src/Term.cs:591
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "Не {0}"
-#: ../src/TagQueryWidget.cs:277
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr "Перетягніть сюди позначки для пошуку за ними"
-#: ../src/TagSelectionWidget.cs:510
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "Помилка при перейменуванні знімку"
-#: ../src/TagStore.cs:199
+#: ../src/TagStore.cs:203
msgid "Favorites"
-msgstr "Улюблене"
+msgstr "Улюблені"
-#: ../src/TagStore.cs:204
+#: ../src/TagStore.cs:208
msgid "Hidden"
msgstr "Приховане"
-#: ../src/TagStore.cs:212
+#: ../src/TagStore.cs:216
msgid "People"
msgstr "Люди"
-#: ../src/TagStore.cs:217
+#: ../src/TagStore.cs:221
msgid "Places"
msgstr "Місця"
-#: ../src/TagStore.cs:222
+#: ../src/TagStore.cs:226
msgid "Events"
msgstr "Події"
#. The label for the root category is used in new and edit tag dialogs
-#: ../src/TagStore.cs:235 ../src/Widgets/InfoBox.cs:397
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
msgid "(None)"
msgstr "(Немає)"
-#: ../src/Term.cs:297
+#: ../src/Term.cs:298
msgid " and "
msgstr " та "
#. operators.Add (Catalog.GetString (" && "));
-#: ../src/Term.cs:299
+#: ../src/Term.cs:300
msgid ", "
msgstr ", "
-#: ../src/Term.cs:355
+#: ../src/Term.cs:356
msgid " or "
msgstr " або "
#. OPS The operators we support, case insensitive
#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Term.cs:379 ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:273
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "або"
-#: ../src/ThreadProgressDialog.cs:66
-msgid "Retry"
-msgstr "Спробувати знову"
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "Оновлення мініатюр"
-#: ../src/TimeDialog.cs:125 ../src/f-spot.glade.h:166
+#: ../src/ThumbnailCommand.cs:28
#, csharp-format
-msgid "Shift all photos by {0}"
-msgstr "Зсунути усі знімки на {0}"
+msgid "Updating picture \"{0}\""
+msgstr "Вивантажується знімок \"{0}\""
-#: ../src/UI.Dialog/AboutDialog.cs:70
+#: ../src/UI.Dialog/AboutDialog.cs:76
msgid "Photo management for GNOME"
-msgstr "Керування фотографіями у GNOME"
+msgstr "Керування фотографіями в середовищі GNOME"
-#: ../src/UI.Dialog/AboutDialog.cs:71
-msgid "Copyright © 2003-2008 Novell Inc."
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
msgstr "Авторські права © 2003-2008 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:96
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
-msgstr "Максим Дзюманенко <dziumanenko at gmail.com>"
+msgstr ""
+"Максим Дзюманенко <dziumanenko at gmail.com>\n"
+"Sergiy Gavrylov <sergiovana at bigmir.net>, 2010."
-#: ../src/UI.Dialog/AboutDialog.cs:101
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "Веб-сайт F-Spot"
-#: ../src/UI.Dialog/ExceptionDialog.cs:24
-msgid "F-Spot Encountered a Fatal Error"
-msgstr "Критична помилка у роботі F-Spot"
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:60
-msgid "Error Details"
-msgstr "Відомості про помилку"
-
-#: ../src/UI.Dialog/ExceptionDialog.cs:104
-msgid "An unhandled exception was thrown: "
-msgstr "Отримано необроблене переривання:"
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:20
-msgid "Error loading database."
-msgstr "Помилка при завантаженні бази даних."
-
-#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
#, csharp-format
-msgid ""
-"F-Spot encountered an error while loading the photo database. The old "
-"database has be moved to {0} and a new database has been created."
-msgstr ""
-"У роботі F-Spot виникла помилка при завантаженні бази даних знімків. Стару "
-"базу даних переміщено до {0} та натомість створено нову."
-
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
-msgid "Label"
-msgstr "Назва"
-
-#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
-msgid "Ratio"
-msgstr "Відношення"
-
-#: ../src/Updater.cs:501
-msgid "Updating F-Spot Database"
-msgstr "Оновлюється база даних F-Spot"
-
-#: ../src/Updater.cs:502
-msgid ""
-"Please wait while your F-Spot gallery's database is updated. This may take "
-"some time."
-msgstr ""
-"Зачекайте, поки оновиться база даних галереї F-Spot. Це може зайняти деякий "
-"час."
-
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:35
-msgid "Unable to create temporary file"
-msgstr "Неможливо створити тимчасовий файл"
-
-#: ../src/Utils/GnomeUtil.cs:49
-msgid ""
-"The \"F-Spot Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Не вдається знайти «Посібник з F-Spot». Перевірте, що встановлення програми "
-"пройшло успішно."
-
-#: ../src/Widgets/CustomPrintWidget.cs:99
-msgid "Page Setup"
-msgstr "Параметри сторінки"
-
-#: ../src/Widgets/CustomPrintWidget.cs:103
-#: ../src/Widgets/CustomPrintWidget.cs:105
-#: ../src/Widgets/CustomPrintWidget.cs:111
-#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr "Розмір паперу: {0} x {1} мм"
-
-#: ../src/Widgets/CustomPrintWidget.cs:121
-msgid "Photos per page"
-msgstr "Зображень на сторінку"
-
-#. ppp1.Toggled += TriggerChanged;
-#. ppp2.Toggled += TriggerChanged;
-#. ppp4.Toggled += TriggerChanged;
-#. ppp9.Toggled += TriggerChanged;
-#: ../src/Widgets/CustomPrintWidget.cs:133
-msgid "Repeat"
-msgstr "Повторити"
+msgid "Shift all photos by {0}"
+msgstr "Зсунути усі знімки на {0}"
-#: ../src/Widgets/CustomPrintWidget.cs:134
-msgid "Print cut marks"
-msgstr "Позначки під обрізку"
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "Сьогодні"
-#: ../src/Widgets/CustomPrintWidget.cs:142
-msgid "Full Page (no margin)"
-msgstr "На всю сторінку без полів"
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "Вчора"
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Widgets/CustomPrintWidget.cs:146
-msgid "Zoom"
-msgstr "Масштаб"
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "Останні 7 діб"
-#: ../src/Widgets/CustomPrintWidget.cs:147
-msgid "Fill"
-msgstr "Заповнити"
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "Останні 30 діб"
-#: ../src/Widgets/CustomPrintWidget.cs:148
-msgid "Scaled"
-msgstr "Масштабувати"
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "Останні 90 діб"
-#: ../src/Widgets/CustomPrintWidget.cs:154
-msgid "White borders"
-msgstr "З білими полями"
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "Останні 360 діб"
-#: ../src/Widgets/CustomPrintWidget.cs:158
-msgid "Custom Text: "
-msgstr "Інший текст:"
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "Поточний тиждень (ПН-НД)"
-#: ../src/Widgets/EditorPage.cs:29 ../src/Widgets/Sidebar.cs:71
-msgid "Edit"
-msgstr "Правка"
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "Попередня тиждень (ПН-НД)"
-#: ../src/Widgets/EditorPage.cs:201
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:46
-msgid "No selection available"
-msgstr "Нічого не виділено"
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "Інший діапазон"
-#: ../src/Widgets/EditorPage.cs:202
-msgid ""
-"This tool requires an active selection. Please select a region of the photo "
-"and try the operation again"
-msgstr ""
-"Для цього інструменту потрібно активне виділення. Спочатку виділіть область "
-"знімку, а потім спробуйте застосувати інструмент ще раз."
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Змінити значок позначки {0}"
-#: ../src/Widgets/EditorPage.cs:219
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] "Помилка при збереженні зміненого знімку"
-msgstr[1] "Помилка при збереженні зміненого знімку"
-msgstr[2] "Помилка при збереженні зміненого знімку"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "Виберіть файл зі знімком"
-#: ../src/Widgets/EditorPage.cs:221
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
#, csharp-format
msgid ""
-"Received exception \"{0}\". Note that you have to develop RAW files into "
-"JPEG before you can edit them."
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
msgstr ""
-"Отримано переривання \"{0}\". Зауважте, що слід перетворити RAW-файли на формат "
-"JPEG, перш ніж їх можна буде редагувати."
-
-#: ../src/Widgets/FindBar.cs:58
-msgid "Find:"
-msgstr "Знайти:"
-
-#: ../src/Widgets/FindBar.cs:177 ../src/f-spot.glade.h:265
-msgid "and"
-msgstr "та"
-
-#: ../src/Widgets/InfoBox.cs:179
-msgid "Histogram"
-msgstr "Гістограма"
-
-#: ../src/Widgets/InfoBox.cs:214
-msgid "Date"
-msgstr "Дата"
-
-#: ../src/Widgets/InfoBox.cs:217
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:5
-msgid "Size"
-msgstr "Розмір"
-
-#: ../src/Widgets/InfoBox.cs:220
-msgid "Exposure"
-msgstr "Експозиція"
-
-#: ../src/Widgets/InfoBox.cs:224
-msgid "Focal Length"
-msgstr "Фокусна відстань"
-
-#: ../src/Widgets/InfoBox.cs:230
-msgid "File Size"
-msgstr "Розмір файлу"
-
-#: ../src/Widgets/InfoBox.cs:233
-msgid "Rating"
-msgstr "Оцінка"
-
-#: ../src/Widgets/InfoBox.cs:406 ../src/Widgets/InfoBox.cs:429
-#: ../src/Widgets/InfoBox.cs:439 ../src/Widgets/InfoBox.cs:448
-msgid "(Unknown)"
-msgstr "(Невідомо)"
-
-#: ../src/Widgets/InfoBox.cs:416
-msgid "(wrong format)"
-msgstr "(неправильний формат)"
-
-#: ../src/Widgets/InfoBox.cs:554
-msgid "(File not found)"
-msgstr "(Файл не знайдено)"
+"\n"
+"<b>Зі знімку</b>\n"
+"Ви можете використовувати будь-який зі знімків у каталозі як\n"
+"значок позначки. Проте, для цього спочатку треба зв'язати з цією позначкою\n"
+"принаймні один знімок. Застосуйте позначку '{0}' до одного чи іншого знімку\n"
+"та знову відкрийте цей діалог."
-#: ../src/Widgets/InfoBox.cs:598
-#, csharp-format
-msgid "{0} Photos"
-msgstr "{0} Фотографій"
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "Неможливо завантажити зображення"
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Widgets/InfoBox.cs:618
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
#, csharp-format
-msgid ""
-"On {0} between \n"
-"{1} and {2}"
-msgstr ""
-"{0} між \n"
-"{1} та {2}"
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "Неможливо завантажити \"{0}\" як значок цієї позначки"
-#: ../src/Widgets/InfoBox.cs:623
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
#, csharp-format
-msgid ""
-"Between {0} \n"
-"and {1}"
-msgstr ""
-"Між {0} \n"
-"та {1}"
-
-#: ../src/Widgets/InfoBox.cs:647
-msgid "(At least one File not found)"
-msgstr "(Принаймні один файл не знайдено)"
-
-#: ../src/Widgets/InfoBox.cs:761
-msgid "Show Photo Name"
-msgstr "Показувати назву файлу"
-
-#: ../src/Widgets/InfoBox.cs:770
-msgid "Show Date"
-msgstr "Показувати дату"
-
-#: ../src/Widgets/InfoBox.cs:779
-msgid "Show Size"
-msgstr "Показувати розмір"
-
-#: ../src/Widgets/InfoBox.cs:788
-msgid "Show Exposure"
-msgstr "Показувати експозицію"
-
-#: ../src/Widgets/InfoBox.cs:797
-msgid "Show Focal Length"
-msgstr "Показувати фокусну відстань"
-
-#: ../src/Widgets/InfoBox.cs:806
-msgid "Show Camera"
-msgstr "Показувати модель фотоапарату"
-
-#: ../src/Widgets/InfoBox.cs:815
-msgid "Show File Size"
-msgstr "Показувати розмір файлу"
+msgid "Photo {0} of {1}"
+msgstr "Фотографія {0} з {1}"
-#: ../src/Widgets/MetadataDisplay.cs:23
-msgid "Metadata"
-msgstr "Метадані"
+#: ../src/UI.Dialog/ExceptionDialog.cs:24
+msgid "F-Spot Encountered a Fatal Error"
+msgstr "Критична помилка у роботі F-Spot"
-#: ../src/Widgets/MetadataDisplay.cs:104
-msgid "Extended Metadata"
-msgstr "Інші метадані"
+#: ../src/UI.Dialog/ExceptionDialog.cs:60
+msgid "Error Details"
+msgstr "Відомості про помилку"
-#: ../src/Widgets/MetadataDisplay.cs:223
-msgid "Picasaweb"
-msgstr "Picasaweb"
+#: ../src/UI.Dialog/ExceptionDialog.cs:104
+msgid "An unhandled exception was thrown: "
+msgstr "Отримано необроблене переривання:"
-#: ../src/Widgets/MetadataDisplay.cs:225
-msgid "SmugMug"
-msgstr "SmugMug"
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "(Немає)"
-#: ../src/Widgets/MetadataDisplay.cs:227
-msgid "Gallery2"
-msgstr "Gallery2"
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "Системний"
-#. clear Extended Metadata
-#: ../src/Widgets/MetadataDisplay.cs:387
-msgid "No Extended Metadata Available"
-msgstr "Немає розширених метаданих"
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "Типова тема"
-#: ../src/Widgets/MetadataDisplay.cs:405
-msgid "No active photo"
-msgstr "Немає активного знімку"
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "Помилка при завантаженні бази даних."
-#: ../src/Widgets/MetadataDisplay.cs:407
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "Знімок \"{0}\" не існує"
-
-#: ../src/Widgets/MetadataDisplay.cs:410
-msgid "No metadata available"
-msgstr "Метадані недоступні"
-
-#: ../src/Widgets/RatingMenuItem.cs:56
-msgid "Rating:"
-msgstr "Оцінка:"
-
-#: ../src/XmpTagsImporter.cs:89
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:6
-msgid "Location"
-msgstr "Розташування"
-
-#: ../src/XmpTagsImporter.cs:90
-msgid "Country"
-msgstr "Країна"
+msgid ""
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
+msgstr ""
+"У роботі F-Spot виникла помилка при завантаженні бази даних знімків. Стару "
+"базу даних переміщено до {0} та натомість створено нову."
-#: ../src/XmpTagsImporter.cs:91
-msgid "City"
-msgstr "Місто"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
+msgid "Label"
+msgstr "Назва"
-#: ../src/XmpTagsImporter.cs:92
-msgid "State"
-msgstr "Область"
+#: ../src/UI.Dialog/SelectionRatioDialog.cs:64
+msgid "Ratio"
+msgstr "Відношення"
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "Спробувати знову"
-#: ../src/f-spot.glade.h:2
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
msgid "0000:00:00 00:00:00"
msgstr "0000:00:00 00:00:00"
-#: ../src/f-spot.glade.h:3
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
msgid "00:00:00"
msgstr "00:00:00"
-#: ../src/f-spot.glade.h:4
-msgid "1 of 1"
-msgstr "1 з 1"
-
-#: ../src/f-spot.glade.h:5
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/f-spot.glade.h:6
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/f-spot.glade.h:7
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/f-spot.glade.h:8
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
msgid "5"
msgstr "5"
-#: ../src/f-spot.glade.h:9
-msgid "640 px"
-msgstr "640 px"
-
-#: ../src/f-spot.glade.h:10
-msgid "800 px"
-msgstr "800 px"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Дія</b>"
-#: ../src/f-spot.glade.h:11
-msgid "<b></b>"
-msgstr "<b></b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>Первинний знімок</b>"
-#: ../src/f-spot.glade.h:12
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>Обліковий рахунок</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Коригувати час"
-#: ../src/f-spot.glade.h:13
-msgid "<b>Action</b>"
-msgstr "<b>Дія</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Новий час: "
-#: ../src/f-spot.glade.h:14
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>Альбом</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Поточна дата"
-#: ../src/f-spot.glade.h:15
-msgid "<b>Co_rrections</b>"
-msgstr "<b>_Зміни</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Встановити часовий інтервал між знімками у"
-#: ../src/f-spot.glade.h:16
-msgid "<b>Color Management</b>"
-msgstr "<b>Керування кольором</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "з різницею у:"
-#: ../src/f-spot.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>Ціль</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "хв. Починаючи з {0}"
-#: ../src/f-spot.glade.h:18
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
msgid "<b>End Date</b>"
msgstr "<b>Дата завершення</b>"
-#: ../src/f-spot.glade.h:19
-msgid "<b>From External Photo</b>"
-msgstr "<b>Із зовнішнього знімку</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Виберіть період</b>"
-#: ../src/f-spot.glade.h:20
-msgid "<b>From Photo</b>"
-msgstr "<b>Із знімку</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>Початкова дата</b>"
-#: ../src/f-spot.glade.h:21
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>Галерея</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "Скасувати, нічого не міняти у шкалі часу."
-#: ../src/f-spot.glade.h:22
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>Інтерполяція знімку</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Будуть показані фотографії лише за вказаний період часу"
-#: ../src/f-spot.glade.h:23
-msgid "<b>Import Settings</b>"
-msgstr "<b>Параметри імпорту</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Встановіть діапазон дат"
-#: ../src/f-spot.glade.h:24
-msgid "<b>Max Rating</b>"
-msgstr "<b>Макс. оцінка</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#: ../src/f-spot.glade.h:25
-msgid "<b>Metadata</b>"
-msgstr "<b>Метадані</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "Змінити позначку..."
-#: ../src/f-spot.glade.h:26
-msgid "<b>Min Rating</b>"
-msgstr "<b>Мін. оцінка</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "Змінити значок"
-#: ../src/f-spot.glade.h:27
-msgid "<b>Photograph Layout</b>"
-msgstr "<b>Вид фотографії</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "_Значок:"
-#: ../src/f-spot.glade.h:28
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:1
-msgid "<b>Photos</b>"
-msgstr "<b>Знімки</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Із зовнішнього знімку</b>"
-#: ../src/f-spot.glade.h:29
-msgid "<b>Predefined</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Із знімку</b>"
+
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
msgstr "<b>Встановлено заздалегідь</b>"
-#: ../src/f-spot.glade.h:30
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
msgid "<b>Preview</b>"
msgstr "<b>Попередній перегляд</b>"
-#: ../src/f-spot.glade.h:31
-msgid "<b>Printer Details</b>"
-msgstr "<b>Подробиці про принтер</b>"
-
-#: ../src/f-spot.glade.h:32
-msgid "<b>Reference Photo</b>"
-msgstr "<b>Первинний знімок</b>"
-
-#: ../src/f-spot.glade.h:33
-msgid "<b>Screensaver</b>"
-msgstr "<b>Збереження екрану</b>"
-
-#: ../src/f-spot.glade.h:34
-msgid "<b>Select period</b>"
-msgstr "<b>Виберіть період</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Створити значок з:"
-#: ../src/f-spot.glade.h:35
-msgid "<b>Size</b>"
-msgstr "<b>Розмір</b>"
-
-#: ../src/f-spot.glade.h:36
-msgid "<b>Start Date</b>"
-msgstr "<b>Початкова дата</b>"
-
-#: ../src/f-spot.glade.h:37
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>Стиль</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Змінити значок позначки"
-#: ../src/f-spot.glade.h:38
-msgid "<b>Summary</b>"
-msgstr "<b>Зведення</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "Немає _зображень"
-#: ../src/f-spot.glade.h:39
-msgid "<b>Theming</b>"
-msgstr "<b>Стиль оформлення</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "Знімок 0 з 0"
-#: ../src/f-spot.glade.h:40
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>Прозорі області відображаються</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Колірний профіль монітора:"
-#: ../src/f-spot.glade.h:41
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>Переглядати усі імпортовані знімки</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Колірний профіль для друку:"
-#: ../src/f-spot.glade.h:42
-msgid "<b>_White Balance</b>"
-msgstr "<b>_Баланс білого</b>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "Параметри F-Spot"
-#: ../src/f-spot.glade.h:43
-msgid "<small></small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "Зовнішній вигляд F-Spot:"
-#: ../src/f-spot.glade.h:44
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
-"<small><i>Choose the folder where F-Spot should store newly imported photos</"
-"i></small>"
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
-"<small><i>Виберіть теку, у якій F-Spot буде зберігати імпортовані знімки</"
-"i></small>"
+"Всередині файлів зображення, якщо можливо\n"
+"<small>Інші програми отримують доступ до них.</small>"
-#: ../src/f-spot.glade.h:45
-msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr ""
-"<small><i>Увімкніть цей параметр, щоб зберігати позначки та описи всередині "
-"файлів підтримуваних форматів.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "Виберіть теку"
-#: ../src/f-spot.glade.h:47
-msgid ""
-"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
-"disable this for viewing photos, but disabling the interpolation could be "
-"usefull in icon design.</i></small>"
-msgstr ""
-"<small><i>Увімкніть цей параметр для використання інтерполяції при "
-"масштабуванні знімків. Вимикати цю функцію при перегляду знімків не варто, "
-"хоча при перегляді значків вона буде зайвою.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "Окремо від файлів зображення"
-#: ../src/f-spot.glade.h:48
-msgid ""
-"<small><i>While acting as a screensaver, F-Spot can display all of your "
-"images, or a small subset based on tags.</i></small>"
-msgstr ""
-"<small><i>Працюючи зберігачем екрану, F-Spot може показувати всі знімки або "
-"лише деяку обрану підмножину.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "Зберігати позначки та опис фото:"
-#: ../src/f-spot.glade.h:49
-msgid ""
-"<small><i>You can choose how to display transparent parts in images. This "
-"option has no effect on photos, but setting this as check pattern or custom "
-"color could be usefull when viewing icons or other artworks with transparent "
-"parts.</i></small>"
-msgstr ""
-"<small><i>Ви можете обрати спосіб показу прозорих областей у зображеннях. Це "
-"не має відношення до фотографій, але при перегляді значків та інших "
-"предметів дизайну шахові клітини або власний колір заповнення прозорих "
-"областей можуть бути корисні.</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "Під час імпорту копіювати фото до:"
-#: ../src/f-spot.glade.h:50
-msgid ""
-"<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
-msgstr ""
-"<small><i>Вам доведеться перезапустити F-Spot, щоб використати новий стиль.</"
-"i></small>"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>Макс. оцінка</b>"
-#: ../src/f-spot.glade.h:51
-msgid "Adjust Time"
-msgstr "Коригувати час"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>Мін. оцінка</b>"
-#: ../src/f-spot.glade.h:52
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Фільтр оцінки"
+
+#: ../src/ui/main_window.ui.h:1
msgid "Adjust _Time..."
msgstr "Коригувати _час..."
-#: ../src/f-spot.glade.h:53
-msgid "Adjusted date: "
-msgstr "Новий час: "
-
-#: ../src/f-spot.glade.h:55
+#: ../src/ui/main_window.ui.h:2
msgid "Arrange _by"
-msgstr "С_ортувати за"
-
-#: ../src/f-spot.glade.h:56
-msgid "As _background"
-msgstr "Кольором _тла"
+msgstr "Уп_орядкувати за"
-#: ../src/f-spot.glade.h:57
-msgid "As _custom color: "
-msgstr "_Вказаним кольором: "
-
-#: ../src/f-spot.glade.h:58
-msgid "As check _pattern"
-msgstr "_Шаховими клітинами"
-
-#: ../src/f-spot.glade.h:59
-msgid "Attach Tags:"
-msgstr "Призначити позначки:"
-
-#: ../src/f-spot.glade.h:60
-msgid "Attach tag:"
-msgstr "Призначити позначку:"
-
-#: ../src/f-spot.glade.h:61
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:3
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "Автоматично обернути"
-
-#: ../src/f-spot.glade.h:63
+#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
msgstr "за _датою"
-#: ../src/f-spot.glade.h:64
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
msgstr "за сеансом _імпорту"
-#: ../src/f-spot.glade.h:65
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
msgstr "за _оцінкою"
-#: ../src/f-spot.glade.h:66
-msgid "CD"
-msgstr "CD"
-
-#: ../src/f-spot.glade.h:67
-msgid "C_aption:"
-msgstr "_Підпис"
-
-#: ../src/f-spot.glade.h:68
-msgid "C_ontrast:"
-msgstr "_Контраст:"
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "Копія"
-#: ../src/f-spot.glade.h:69
-msgid "Camera Selection"
-msgstr "Вибір фотоапарату"
-
-#: ../src/f-spot.glade.h:70
-msgid "Cancel, do not change the current timeline. "
-msgstr "Скасувати, нічого не міняти у шкалі часу часу."
-
-#: ../src/f-spot.glade.h:71
-msgid "Co_nfigure"
-msgstr "На_лаштувати"
-
-#: ../src/f-spot.glade.h:72
-msgid "Copy Locat_ion"
-msgstr "Копіювати _місце розташування"
-
-#: ../src/f-spot.glade.h:73
-msgid "Copy files to the Photos folder"
-msgstr "Копіювати файли у теку Photos"
-
-#: ../src/f-spot.glade.h:74
-msgid "Create Mail"
-msgstr "Створити поштове повідомлення"
-
-#: ../src/f-spot.glade.h:75
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "Створити _нову позначку..."
-#: ../src/f-spot.glade.h:76
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "Створити _нову версію..."
-#: ../src/f-spot.glade.h:77
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr ""
-"Створити поштове повідомлення з вкладеними обраними знімками (за потреби — "
-"зменшеного розміру)"
-
-#: ../src/f-spot.glade.h:78
-msgid "Crop photo to _fit"
-msgstr "Обрізати, _щоб умістити"
-
-#: ../src/f-spot.glade.h:79
-msgid "Current date:"
-msgstr "Поточна дата"
-
-#: ../src/f-spot.glade.h:80
-msgid "Custom Theme"
-msgstr "Інший стиль оформлення"
-
-#: ../src/f-spot.glade.h:81
-msgid "Detect duplicates"
-msgstr "Визначати та відсіювати дублікати"
-
-#: ../src/f-spot.glade.h:82
-msgid "Display File _Names"
-msgstr "Показувати _імена файлів"
-
-#: ../src/f-spot.glade.h:83
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "Показувати лише ті знімки, що були імпортовані у певний момент часу"
-
-#: ../src/f-spot.glade.h:84
-msgid "Do not send a mail"
-msgstr "Не надсилати повідомлення"
-
-#: ../src/f-spot.glade.h:85
-msgid "E-_Mail:"
-msgstr "Ел._пошта:"
-
-#: ../src/f-spot.glade.h:86
-msgid "E_xport titles and comments"
-msgstr "_Експортувати назви та коментарі"
-
-#: ../src/f-spot.glade.h:87
-msgid "Edit Tag Icon"
-msgstr "Змінити значок позначки"
-
-#: ../src/f-spot.glade.h:88
-msgid "Edit icon"
-msgstr "Змінити значок"
-
-#: ../src/f-spot.glade.h:90
-msgid "Estimated new size"
-msgstr "Обчислений новий розмір"
-
-#: ../src/f-spot.glade.h:91
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:3
-msgid "Export"
-msgstr "Експорт"
-
-#: ../src/f-spot.glade.h:92
-msgid "Extra large"
-msgstr "Дуже великий"
-
-#: ../src/f-spot.glade.h:93
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:94
-msgid "F-Spot View"
-msgstr "Перегляд у F-Spot"
-
-#: ../src/f-spot.glade.h:96
-msgid "Filter on selected rolls"
-msgstr "Фільтр за вибраними сеансам імпорту"
-
-#: ../src/f-spot.glade.h:97
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "З_найти"
-#: ../src/f-spot.glade.h:99
-msgid "From List:"
-msgstr " Зісписку:"
-
-#: ../src/f-spot.glade.h:100
-msgid "From gtkrc File:"
-msgstr "З файлу gtkrc:"
-
-#: ../src/f-spot.glade.h:101
-msgid ""
-"Full Page\n"
-"Standard - 4x6"
-msgstr ""
-"Ціла сторінка\n"
-"Стандарт - 4x6"
-
-#: ../src/f-spot.glade.h:103
-msgid "G_allery:"
-msgstr "_Галерея:"
-
-#: ../src/f-spot.glade.h:104
-msgid "Gallery"
-msgstr "Галерея"
-
-#: ../src/f-spot.glade.h:105
-msgid ""
-"Hairline\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-msgstr ""
-"Волос\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-
-#: ../src/f-spot.glade.h:110
-msgid "Images tagged with:"
-msgstr "Позначені знімки:"
-
-#. Translators: this string means 'source of import'
-#: ../src/f-spot.glade.h:113
-msgid "Import Source:"
-msgstr "Звідки додати:"
-
-#: ../src/f-spot.glade.h:114
-msgid "Include subfolders"
-msgstr "Включати підтеки"
-
-#: ../src/f-spot.glade.h:115
-msgid "Large"
-msgstr "Великий"
-
-#: ../src/f-spot.glade.h:116
-msgid "Make F-Spot your screensaver"
-msgstr "Зробити F-Spot програмою зберігання екрану"
-
-#: ../src/f-spot.glade.h:117
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
msgstr "Налаштувати роз_ширення"
-#: ../src/f-spot.glade.h:118
-msgid "Manage your custom selection ratios"
-msgstr "Керування набором відношень сторін"
-
-#: ../src/f-spot.glade.h:119
-msgid "Medium"
-msgstr "Середній"
-
-#: ../src/f-spot.glade.h:120
-msgid "N_umber of Copies:"
-msgstr "_Кількість копій:"
-
-#: ../src/f-spot.glade.h:122
-msgid "No _image"
-msgstr "Немає _зображень"
-
-#: ../src/f-spot.glade.h:123
-msgid ""
-"None\n"
-"Title\n"
-"Filename\n"
-"Date\n"
-"Photo Details"
-msgstr ""
-"Нічого\n"
-"Назва\n"
-"Назва файлу\n"
-"Дата\n"
-"Подробиці про знімок"
-
-#: ../src/f-spot.glade.h:128
-msgid "Number of photos in selected rolls:"
-msgstr "Кількість знімків у вибраних сеансах імпорту:"
-
-#: ../src/f-spot.glade.h:129
-msgid "Number of pictures"
-msgstr "Кількість знімків"
-
-#: ../src/f-spot.glade.h:130
-msgid "Only photos taken within these dates will be displayed."
-msgstr "Будуть показані фотографії лише за вказаний період часу"
-
-#: ../src/f-spot.glade.h:131
-msgid "Open _Folder..."
-msgstr "Відкрити _теку..."
-
-#: ../src/f-spot.glade.h:133
-msgid "Original size (possible very large file size)"
-msgstr "Первинний розмір (розмір файлу може бути дуже великим)"
-
-#: ../src/f-spot.glade.h:134
-msgid "P_arent Tag:"
-msgstr "_Батьківська позначка:"
-
-#: ../src/f-spot.glade.h:135
-msgid "P_hoto Source:"
-msgstr "_Джерело знімків:"
-
-#: ../src/f-spot.glade.h:136
-msgid "Page 1 of 3"
-msgstr "Сторінка 1 з 3"
-
-#: ../src/f-spot.glade.h:137
+#: ../src/ui/main_window.ui.h:13
msgid "Page Set_up..."
msgstr "Пара_метри сторінки"
-#: ../src/f-spot.glade.h:138
-msgid "Pause"
-msgstr "Пауза"
-
-#: ../src/f-spot.glade.h:139
-msgid "Photo 0 of 0"
-msgstr "Знімок 0 з 0"
-
-#: ../src/f-spot.glade.h:140
-msgid "Photo _Size:"
-msgstr "_Розмір знімку:"
-
-#: ../src/f-spot.glade.h:141
-msgid "Preferences"
-msgstr "Параметри"
-
-#: ../src/f-spot.glade.h:143
-msgid "Print crop _marks"
-msgstr "Надрукувати знімки під о_брізку"
-
-#: ../src/f-spot.glade.h:144
-msgid "Print..."
-msgstr "Друк..."
-
-#: ../src/f-spot.glade.h:145
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
-msgstr "_Оновити ескіз"
+msgstr "_Оновити мініатюру"
-#: ../src/f-spot.glade.h:147
-msgid "Repair"
-msgstr "Відновити"
-
-#: ../src/f-spot.glade.h:150
-msgid "Select A Folder"
-msgstr "Виберіть теку"
-
-#: ../src/f-spot.glade.h:151
-msgid "Select A gtkrc File"
-msgstr "Виберіть файл gtkrc"
-
-#: ../src/f-spot.glade.h:152
-msgid "Select Photos to Copy From Camera..."
-msgstr "Виберіть знімки для копіювання з камери..."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Виді_лити все"
-#: ../src/f-spot.glade.h:154
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "_Зняти виділення"
-#: ../src/f-spot.glade.h:155
-msgid "Select a Tag..."
-msgstr "Виберіть позначку..."
-
-#: ../src/f-spot.glade.h:156
-msgid "Select the camera from which you want to transfer files"
-msgstr "Виберіть фотоапарат, з якого треба забрати знімки"
-
-#: ../src/f-spot.glade.h:157
-msgid "Selected Camera: "
-msgstr "Вибраний фотоапарат: "
-
-#: ../src/f-spot.glade.h:158
-msgid ""
-"Selection\n"
-"Gallery\n"
-"Viewport"
-msgstr ""
-"Вибране\n"
-"Галерея\n"
-"Область перегляду"
-
-#: ../src/f-spot.glade.h:161
-msgid "Selection Constraints"
-msgstr "Відношення сторін"
-
-#: ../src/f-spot.glade.h:162
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
msgstr "Надіслати по_штою..."
-#: ../src/f-spot.glade.h:163
-msgid "Set Rating Filter"
-msgstr "Фільтр оцінки"
-
-#: ../src/f-spot.glade.h:164
-msgid "Set as _Background"
-msgstr "Помістити на _робочий стіл"
-
-#: ../src/f-spot.glade.h:165
-msgid "Set date range"
-msgstr "Встановіть діапазон дат"
-
-#: ../src/f-spot.glade.h:167
-msgid "Show all photos."
-msgstr "Показувати всі знімки."
-
-#: ../src/f-spot.glade.h:168
-msgid "Show or hide the side pane"
-msgstr "Показати чи сховати бічну панель"
-
-#: ../src/f-spot.glade.h:169
-msgid "Show or hide the toolbar"
-msgstr "Показати/сховати панель інструментів"
-
-#: ../src/f-spot.glade.h:170
-msgid "Side _pane"
-msgstr "_Бічна панель"
-
-#: ../src/f-spot.glade.h:171
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "Бічна _панель"
-#: ../src/f-spot.glade.h:172
-msgid "Small"
-msgstr "Малий"
-
-#: ../src/f-spot.glade.h:173
-msgid "Space all photos by"
-msgstr "Встановити часовий інтервал між знімками у"
-
-#: ../src/f-spot.glade.h:174
-msgid ""
-"Specify if an original size picture should be rotated or not. Smaller sizes "
-"are automatically rotated."
-msgstr ""
-"Вкажіть, чи обертати знімок первинного розміру. Знімки меншого розміру "
-"обертаються автоматично."
-
-#: ../src/f-spot.glade.h:175
-msgid "Strip image _metadata"
-msgstr "П_рибрати метадані знімку"
-
-#: ../src/f-spot.glade.h:176
-msgid "System Theme"
-msgstr "Системний"
-
-#: ../src/f-spot.glade.h:177
+#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
msgstr "_Позначки"
-#: ../src/f-spot.glade.h:178
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1178
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1179
-msgid "Tags: "
-msgstr "Позначки: "
-
-#. Note for translators: meant as Temperature
-#: ../src/f-spot.glade.h:180
-msgid "Te_mp:"
-msgstr "Т_емпература:"
-
-#: ../src/f-spot.glade.h:181
+#: ../src/ui/main_window.ui.h:25
msgid "Thumbnail _elements"
-msgstr "_Ескізи містять"
+msgstr "_Елементи мініатюр"
-#: ../src/f-spot.glade.h:182
-msgid "Tiny"
-msgstr "Крихітний"
-
-#: ../src/f-spot.glade.h:183
+#: ../src/ui/main_window.ui.h:26
msgid "Too_lbar"
msgstr "_Панель інструментів"
-#: ../src/f-spot.glade.h:184
-msgid "Total original size"
-msgstr "Загальний розмір оригіналів"
-
-#: ../src/f-spot.glade.h:185
-msgid "Try to use the system display profile"
-msgstr "Використовувати системний профіль"
-
-#: ../src/f-spot.glade.h:186
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "Вигляд"
-#: ../src/f-spot.glade.h:187
-msgid "Will print using: US Letter size on Generic Postscript"
-msgstr "Надрукує: на папері US Letter у Generic Postscript"
-
-#: ../src/f-spot.glade.h:188
-msgid "Write _metadata to file"
-msgstr "Записувати _метадані у файли"
-
-#: ../src/f-spot.glade.h:189
-msgid "Zoom _in"
-msgstr "З_більшити"
-
-#: ../src/f-spot.glade.h:190
-msgid "Zoom _out"
-msgstr "З_меншити"
-
-#: ../src/f-spot.glade.h:191
-msgid "Zoom in"
-msgstr "Збільшити"
-
-#: ../src/f-spot.glade.h:192
-msgid "Zoom out"
-msgstr "Зменшити"
-
-#: ../src/f-spot.glade.h:194
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
msgstr "_Призначити позначку виділеному"
-#: ../src/f-spot.glade.h:195
-msgid "_Border:"
-msgstr "_Рамка:"
-
-#: ../src/f-spot.glade.h:196
-msgid "_Brightness:"
-msgstr "_Яскравість:"
-
-#: ../src/f-spot.glade.h:198
+#: ../src/ui/main_window.ui.h:35
msgid "_Clear Rating Filter"
msgstr "_Прибрати фільтр оцінки"
-#: ../src/f-spot.glade.h:199
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
msgstr "_Прибрати фільтр сеансів імпорту"
-#: ../src/f-spot.glade.h:200
+#: ../src/ui/main_window.ui.h:38
msgid "_Components"
msgstr "П_анелі"
-#: ../src/f-spot.glade.h:201
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
msgstr "_Зміст"
-#: ../src/f-spot.glade.h:202
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
-msgid "_Create"
-msgstr "_Створити"
-
-#: ../src/f-spot.glade.h:203
-msgid "_Create Mail"
-msgstr "_Створити повідомлення"
-
-#: ../src/f-spot.glade.h:204
+#: ../src/ui/main_window.ui.h:40
msgid "_Dates"
msgstr "_Дату"
-#: ../src/f-spot.glade.h:206
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
-msgstr "В_идалити вибрану позначку"
+msgstr "В_илучити виділену позначку"
-#: ../src/f-spot.glade.h:207
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
-msgstr "В_идалити версію"
+msgstr "В_илучити версію"
-#: ../src/f-spot.glade.h:208
-msgid "_Display:"
-msgstr "_Монітор:"
-
-#: ../src/f-spot.glade.h:209
-msgid "_Edit"
-msgstr "_Правка"
-
-#: ../src/f-spot.glade.h:210
-msgid "_Edit Selected Tag..."
-msgstr "_Змінити виділену позначку..."
-
-#: ../src/f-spot.glade.h:211
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
-msgid "_Export"
-msgstr "_Експортувати"
-
-#: ../src/f-spot.glade.h:212
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "Е_кспортувати позначки"
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "Змінити позначку..."
-#: ../src/f-spot.glade.h:213
+#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
msgstr "_Експортувати до"
-#: ../src/f-spot.glade.h:214
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export to Album:"
-msgstr "Експортувати до _альбому:"
-
-#: ../src/f-spot.glade.h:215
-msgid "_Exposure:"
-msgstr "_Експозиція"
-
-#: ../src/f-spot.glade.h:216
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
msgstr "_Фотоплівка"
-#: ../src/f-spot.glade.h:217
-msgid "_Flickr"
-msgstr "_Дзеркало"
-
-#: ../src/f-spot.glade.h:218
-msgid "_Folder"
-msgstr "_Тека"
-
-#: ../src/f-spot.glade.h:219
-msgid "_Fullscreen"
-msgstr "На весь _екран"
-
-#: ../src/f-spot.glade.h:220
-msgid "_Gallery"
-msgstr "_Галерея"
-
-#: ../src/f-spot.glade.h:221
-msgid "_Help"
-msgstr "_Довідка"
-
-#: ../src/f-spot.glade.h:222
+#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
msgstr "_Приховані"
-#: ../src/f-spot.glade.h:223
-msgid "_Hue:"
-msgstr "Від_тінок:"
-
-#: ../src/f-spot.glade.h:224
-msgid "_Icon:"
-msgstr "_Значок:"
-
-#: ../src/f-spot.glade.h:225
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
msgstr "_Імпорт..."
-#: ../src/f-spot.glade.h:226
-msgid "_Interpolate image on zoom"
-msgstr "_Виконати інтерполяцію при зміні масштабу"
-
-#: ../src/f-spot.glade.h:227
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
msgstr "_Великі"
-#: ../src/f-spot.glade.h:228
+#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
msgstr "_Останній сеанс імпорту"
-#: ../src/f-spot.glade.h:229
+#: ../src/ui/main_window.ui.h:54
msgid "_Loupe"
msgstr "_Лупа"
-#: ../src/f-spot.glade.h:230
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
msgstr "_Середні"
-#: ../src/f-spot.glade.h:231
-msgid "_Month"
-msgstr "_Місяць"
-
-#: ../src/f-spot.glade.h:232
-msgid "_New Window"
-msgstr "_Нове вікно"
-
-#: ../src/f-spot.glade.h:233
-msgid "_Open album in browser when done uploading"
-msgstr "Відкрити _альбом у оглядачі при завершені завантаження"
-
-#: ../src/f-spot.glade.h:234
-msgid "_Open destination when done exporting"
-msgstr "Відкрити _каталог при завершенні експорту"
-
-#: ../src/f-spot.glade.h:235
-msgid "_Photo"
-msgstr "_Фото"
-
-#: ../src/f-spot.glade.h:236
-msgid "_Print output:"
-msgstr "_Вивід друку:"
-
-#: ../src/f-spot.glade.h:237
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
msgstr "Ви_йти"
-#: ../src/f-spot.glade.h:238
+#: ../src/ui/main_window.ui.h:58
msgid "_Ratings"
msgstr "О_цінки"
-#: ../src/f-spot.glade.h:240
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
msgstr "Зняти _позначку з виділеного"
-#: ../src/f-spot.glade.h:241
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
msgstr "Перей_менувати версію"
-#: ../src/f-spot.glade.h:242
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
-msgid "_Resize to: "
-msgstr "_Масштабувати до: "
-
-#: ../src/f-spot.glade.h:244
-msgid "_Saturation:"
-msgstr "_Насиченість:"
-
-#: ../src/f-spot.glade.h:245
-msgid "_Scale photos to no larger than: "
-msgstr "_Масштабувати знімок до не більш ніж: "
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "_Зворотній напрямок"
-#: ../src/f-spot.glade.h:246
+#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
msgstr "_Вибрати сеанси імпорту..."
-#: ../src/f-spot.glade.h:247
+#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
msgstr "_Встановити діапазон дат..."
-#: ../src/f-spot.glade.h:248
+#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
msgstr "_Увімкнути фільтр оцінок..."
-#: ../src/f-spot.glade.h:249
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "_Підвищити різкість..."
-#: ../src/f-spot.glade.h:250
-msgid "_Slideshow"
-msgstr "Показ _слайдів"
-
-#: ../src/f-spot.glade.h:251
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
msgstr "_Малий"
-#: ../src/f-spot.glade.h:252
-msgid "_Strip metadata"
-msgstr "_Прибрати метадані"
-
-#: ../src/f-spot.glade.h:253
+#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
msgstr "Значки _позначок"
-#: ../src/f-spot.glade.h:254
-msgid "_Tag Name:"
-msgstr "Назва _позначки:"
-
-#: ../src/f-spot.glade.h:255
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
msgstr "_Позначки"
-#: ../src/f-spot.glade.h:256
+#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
msgstr "_Шкала часу"
-#: ../src/f-spot.glade.h:257
-msgid "_Tint:"
-msgstr "Від_тінок:"
-
-#: ../src/f-spot.glade.h:258
-msgid "_Toolbar"
-msgstr "Панель _інструментів"
-
-#: ../src/f-spot.glade.h:259
+#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
msgstr "С_ервіс"
-#: ../src/f-spot.glade.h:260
-msgid "_URI:"
-msgstr "_URI:"
-
-#: ../src/f-spot.glade.h:261
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
msgstr "Знімки _без категорій"
-#: ../src/f-spot.glade.h:262
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
msgstr "_Версія"
-#: ../src/f-spot.glade.h:263
-msgid "_View"
-msgstr "_Вигляд"
-
-#: ../src/f-spot.glade.h:264
-msgid "_Virtual Filesystem"
-msgstr "_Віртуальна файлова система"
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "Оновлюється база даних F-Spot"
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:267
+#: ../src/Updater.cs:623
msgid ""
-"at\n"
-"after\n"
-"between"
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
msgstr ""
-"під час\n"
-"після\n"
-"між"
-
-#: ../src/f-spot.glade.h:270
-msgid "difference:"
-msgstr "з різницею у:"
-
-#: ../src/f-spot.glade.h:271
-msgid "img_000.jpg"
-msgstr "img_000.jpg"
-
-#: ../src/f-spot.glade.h:272
-msgid "min. Starting at {0}"
-msgstr "хв. Починаючи з {0}"
-
-#: ../src/f-spot.glade.h:274
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
-msgid "pixels"
-msgstr "точок"
-
-#: ../src/f-spot.glade.h:275
-msgid "x"
-msgstr "x"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "Показ слайдів за допомогою F-Spot"
+"Зачекайте, поки оновиться база даних галереї F-Spot. Це може зайняти деякий "
+"час."
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "Знімки у F-Spot"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "Неможливо створити тимчасовий файл"
-#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_CD..."
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "Параметри сторінки"
-#: ../extensions/Exporters/CDExport/CDExport.cs:219
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "Триває копіювання знімку \"{0}\" на CD"
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Розмір паперу: {0} x {1} мм"
-#: ../extensions/Exporters/CDExport/CDExport.cs:246
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:284
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:552
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:702
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:606
-msgid "Done Sending Photos"
-msgstr "Надсилання знімків завершено"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "Встановити розмір сторінки та орієнтацію"
-#: ../extensions/Exporters/CDExport/CDExport.cs:248
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:286
-msgid "Transfer Complete"
-msgstr "Передачу завершено"
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "Зображень на сторінку"
-#: ../extensions/Exporters/CDExport/CDExport.cs:255
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:291
-msgid "Error While Transferring"
-msgstr "Помилка при передачі файлів"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "Повторити"
-#: ../extensions/Exporters/CDExport/CDExport.cs:262
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:310
-msgid "Error Transferring"
-msgstr "Помилка при передачі файлів"
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "Позначки під обрізку"
-#: ../extensions/Exporters/CDExport/CDExport.cs:280
-msgid "copying..."
-msgstr "копіюється..."
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "Фотографії"
-#: ../extensions/Exporters/CDExport/CDExport.cs:296
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:332
-msgid "Error: Error while transferring; Aborting"
-msgstr "Помилка: помилка при передачі; виконання перервано"
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "На всю сторінку без полів"
-#: ../extensions/Exporters/CDExport/CDExport.cs:299
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:335
-msgid "Error: File Already Exists; Aborting"
-msgstr "Помилка: файл вже існує; виконання перервано"
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "Масштаб"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:1
-msgid "<b><i>There is some previously scheduled items to write</i></b>"
-msgstr "<b><i>Чи є раніше заплановані для запису елементи</i></b>"
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "Заповнити"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>Знімки, що записуються на диск</b>"
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "Масштабувати"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:4
-msgid "Create CD"
-msgstr "Створити CD"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "З білими полями"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:6
-msgid "Size of the exported selection:"
-msgstr "Обсяг експортованих знімків: "
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "Інший текст:"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:7
-msgid "_Browse Previously Scheduled Files"
-msgstr "_Переглянути раніше відкладені знімки"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "Дані фотографій"
-#: ../extensions/Exporters/CDExport/CDExport.glade.h:8
-msgid "_Write only these photos to CD"
-msgstr "_Записати лише ці знімки на CD"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "Друкувати назву файла"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "Друкувати дату створення фото"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr"
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "Друкувати час створення фото"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
-msgid "_Zooomr..."
-msgstr "_Zooomr..."
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "Друкувати позначки фото"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "Авторизувати"
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "Друкувати коментар фото"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
-#, csharp-format
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "Правка"
+
+#: ../src/Widgets/EditorPage.cs:198
msgid ""
-"Return to this window after you have finished the authorization process on "
-"{0} and click the \"Complete Authorization\" button below"
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
msgstr ""
-"Повернутися до цього вікна після завершення процесу авторизації на {0} та "
-"натисніть наведену нижче кнопку \"Завершити авторизацію\""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
-msgid "Complete Authorization"
-msgstr "Завершити авторизацію"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "Виконується авторизація на \"{0}\""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
-msgid "Checking credentials..."
-msgstr "Перевірка прав доступу..."
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "Ласкаво просимо {0} ви з'єдналися з {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "Авторизуватися під іншим ім'ям"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "Використано {0} вашої місячної квоти у {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
-msgid "Unable to log on"
-msgstr "Не вдається увійти до системи"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "Очікування відповіді {0} з {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:241
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:779
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "Вивантажується знімок \"{0}\""
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "Помилка при вивантаженні до {0}: {1}"
-
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:810
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:554
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:608
-msgid "Upload Complete"
-msgstr "Вивантаження завершено"
+"Для цього інструмента потрібно активне виділення. Спочатку виділіть область "
+"знімка, а потім спробуйте застосувати інструмент ще раз."
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
-msgid "Unable to log on."
-msgstr "Не вдається увійти до системи."
+#: ../src/Widgets/EditorPage.cs:216
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Помилка збереження зміненого знімка"
+msgstr[1] "Помилка збереження змінених знімків"
+msgstr[2] "Помилка збереження змінених знімків"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#: ../src/Widgets/EditorPage.cs:218
#, csharp-format
msgid ""
-"F-Spot was unable to log on to {0}. Make sure you have given the "
-"authentication using {0} web browser interface."
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
msgstr ""
-"F-Spot не може авторизуватися {0}. Перевірте, що ви проходите "
-"автентифікацію використовуючи {0} інтерфейс веб-оглядача."
+"Отримано переривання \"{0}\". Зауважте, що слід перетворити RAW-файли на "
+"формат JPEG, перш ніж їх можна буде редагувати."
-#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:732
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:478
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:598
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:521
-msgid "Uploading Pictures"
-msgstr "Триває вивантаження знімків"
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "_Горизонтально"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>Доступ до перегляду</b>"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "_Вертикально"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "_Експортувати ієрархію позначок"
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "Знайти:"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
-msgid ""
-"F-Spot needs your authorization in order to upload photos to your {0} "
-"account. Press the \"Authorize\" button to open a web browser and give F-"
-"Spot the authorization. "
-msgstr ""
-"F-Spot потрібна ваша авторизація для завантаження знімків у каталог вашого "
-"облікового запису. Натисніть кнопку «Авторизувати», щоб відкрити веб-оглядач "
-"та дозволити F-Spot зв'язуватися з Flickr."
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "Теки"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "Ігнорувати позначки _верхнього рівня"
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "Файлова система"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "Особисті"
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "Гістограма"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "Публічні"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "Версія"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "_Прибрати метадані"
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "Дата"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr "Видимі членам родини"
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "Експозиція"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr "Видимі друзям"
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "Фокусна відстань"
-#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
-msgid "_View photos in browser when done uploading"
-msgstr "Відкрити _альбом у оглядачі при завершені завантаження"
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "Розмір файла"
-#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "У _теку..."
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "Оцінка"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:139
-msgid "Select Export Folder"
-msgstr "Виберіть теку для експорту"
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(неправильний формат)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:197
-msgid "Building Gallery"
-msgstr "Створення галереї"
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(Невідомо)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:247
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "Помилка при вивантаженні знімку \"{0}\" до галереї:{2}{1}"
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "({0} редагування)"
+msgstr[1] "({0} редагування)"
+msgstr[2] "({0} редагувань)"
-#. Note for translators: light as clear, opposite as dark
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:809
-msgid "Light"
-msgstr "Світлий"
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(Помилка читання файла)"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:810
-msgid "Dark"
-msgstr "Темний"
-
-#. Abbreviation of previous
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
-msgid "Prev"
-msgstr "Попередній"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1102
-msgid "Gallery generated by"
-msgstr "Галерею створено"
-
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1142
-msgid "Show Styles"
-msgstr "Показувати стилі"
+#: ../src/Widgets/InfoBox.cs:620
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0} Фото"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1143
-msgid "Hide Styles"
-msgstr "Сховати стилі"
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"{0} між \n"
+"{1} та {2}"
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1310
-#: ../extensions/Exporters/FolderExport/FolderExport.cs:1443
-msgid "Page:"
-msgstr "Сторінка:"
+#: ../src/Widgets/InfoBox.cs:645
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"Між {0} \n"
+"та {1}"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(Принаймні один файл не знайдено)"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>Спосіб експорту</b>"
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "Показувати назву файла"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr "_Створити галерею використовуючи Original"
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "Показувати дату"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr "Створити окрему _веб-галерею..."
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "Показувати розмір"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "О_пис:"
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "Показувати експозицію"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
-msgid "Export _tags"
-msgstr "Експортувати _позначки"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "Показувати фокусну відстань"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
-msgid "Export tag _icons"
-msgstr "Експортувати _значки позначок"
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "Показувати модель фотоапарата"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
-msgid "Folder Export"
-msgstr "Експорту до теки"
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "Показувати розмір файла"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
-msgid "G_allery Name:"
-msgstr "_Назва галереї:"
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "Метадані"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
-msgid "Open _destination when done exporting"
-msgstr "Відкрити _сторінку з галереєю при завершенні експорту"
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "Інші метадані"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
-msgid "_Folder:"
-msgstr "_Тека:"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "Немає розширених метаданих"
-#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
-msgid "_Save the files only"
-msgstr "З_берегти лише файли"
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "Немає активного знімка"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
-msgid "Web _Gallery..."
-msgstr "_Веб-галерея..."
+#: ../src/Widgets/MetadataDisplay.cs:414
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "Знімок \"{0}\" не існує"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
-msgstr ""
-"Не вдається з'єднатися з Gallery, оскільки невідома її версія.\n"
-"Перевірте, що встановлено модуль Remote версії 1.0.8 або старшої later"
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "Метадані недоступні"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:393
-msgid "Invalid URL"
-msgstr "Неправильний URL"
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "Немає доступних програм"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:394
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "Очевидно, URL галереї некоректний"
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "Оцінка:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:404
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:431
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:442
-msgid "Error while connecting to Gallery"
-msgstr "Помилка під час з'єднання з галереєю"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "Країна"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:405
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:432
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:443
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "При спробі авторизації виникла наступна помилка: {0}"
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "Місто"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:419
-msgid "A Gallery with this name already exists"
-msgstr "Галерея з такою назвою вже існує"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "Область"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:420
-#, csharp-format
-msgid ""
-"There is already a Gallery with the same name in your registered Galleries. "
-"Please choose a unique name."
-msgstr ""
-"У списку зареєстрованих галерей вже є галерея з такою самою назвою.Виберіть "
-"унікальну назву."
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "Показ слайдів за допомогою F-Spot"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:530
-msgid "(TopLevel)"
-msgstr "(ВерхнійРівень)"
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "Знімки у F-Spot"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:592
-msgid "Invalid Gallery name"
-msgstr "Неправильна назва галереї"
+#~ msgid "Author:"
+#~ msgstr "Автор:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:593
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
-"Назва галереї містить неправильні символи.\n"
-"Дозволяються лише літери, цифри, та знак підкреслення _"
+#~ msgid "Copyright:"
+#~ msgstr "Авторські права:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:798
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Помилка при завантаженні знімку \"{0}\" до Gallery: {1}"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Залежності розширення:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:826
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:725
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:629
-msgid "(No Gallery)"
-msgstr "(немає галереї)"
+#~ msgid "All registered repositories"
+#~ msgstr "Всі зареєстровані репозиторії"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:918
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:852
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:725
-msgid "(Not Connected)"
-msgstr "(немає з'єднання)"
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Ви дійсно бажаєте скасувати встановлення?"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:919
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:853
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
-msgid "(No Albums)"
-msgstr "(немає альбомів)"
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "Наступні пакети будуть видалені:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:971
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:767
-msgid "No account selected"
-msgstr "Не обрано обліковий рахунок"
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr ""
+#~ "Є розширення, що залежать від попередніх, і вони теж будуть видалені:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr ""
-"<span weight='bold' size='larger'>Помилка при з'єднанні з Gallery</span>\n"
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Вибрані розширення не можуть бути встановлені через конфлікт залежностей."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
-msgid "Export _titles and comments"
-msgstr "Е_кспортувати назви та коментарі"
+#~ msgid "The following packages will be installed:"
+#~ msgstr "Будуть встановлені наступні пакети:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "Відкрити _альбом у веб-оглядачеві при завершенні завантаження"
+#~ msgid " (in user directory)"
+#~ msgstr " (у каталог користувача)"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "Перевірте, що параметри галереї є коректними."
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Наступні пакети будуть видалені:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
-msgid "U_RL:"
-msgstr "U_RL:"
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Не вдалося задовольнити наступні залежності:"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
-msgid "_Album Name:"
-msgstr "_Назва альбому:"
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Встановлення успішно завершено."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "_Опис:"
+#~ msgid "The installation failed!"
+#~ msgstr "Помилка при встановленні!"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
-msgid "_Gallery Name:"
-msgstr "Назва _галереї:"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Встановлення завершилось з попередженням."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "_Галерея:"
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Видалення успішно завершено."
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
-msgid "_Parent Album:"
-msgstr "_Альбом верхнього рівня:"
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Видалення завершилось помилкою!"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:4
-msgid "_Password:"
-msgstr "_Пароль:"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Видалення завершилось з попередженням!"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
-msgid "_Title:"
-msgstr "_Назва:"
+#~ msgid "Repository"
+#~ msgstr "Репозиторій"
-#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:5
-msgid "_Username:"
-msgstr "_Ім'я користувача:"
+#~ msgid "Installation cancelled"
+#~ msgstr "Встановлення скасовано"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
-msgid "Error reading server response"
-msgstr "Помилка при читанні відповіді сервера"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Декілька потрібних розширень не знайдено"
-#. failed to find the response
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
-msgid "Server returned response without Gallery content"
-msgstr "Сервер повернув відповідь без вмісту Gallery"
+#~ msgid "Installation failed"
+#~ msgstr "Помилка при встановленні"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
-msgid "Error while creating new album"
-msgstr "Помилка при створені нового альбому"
+#~ msgid "Extension"
+#~ msgstr "Розширення"
-#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to perform the "
-"requested operation:\n"
-"{0} ({1})"
-msgstr "При спробі виконати запитану авторизацію виникла наступна помилка:\n"
-"{0} ({1})"
+#~ msgid "Other"
+#~ msgstr "Інше"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
-msgid "F_acebook..."
-msgstr "F_acebook..."
+#~ msgid "Url"
+#~ msgstr "URL"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:256
-msgid "Too many images to export"
-msgstr "Надто багато зображень для експорту"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "Виникла виняткова ситуація: {0}"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:256
-msgid ""
-"Facebook only permits 60 photographs per album. Please refine your "
-"selection and try again."
-msgstr "Facebook дозволяє зберігати у кожному альбомі не більше 60 фотографій. Зменшіть кількість знімків у виділенні та спробуйте ще раз."
+#~ msgid "Package"
+#~ msgstr "Пакет"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:279
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:365
-msgid "You are not logged in."
-msgstr "Ви не авторизовані"
+#~ msgid "Extension Installation"
+#~ msgstr "Встановлення розширення"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
-msgid "Waiting for authentication"
-msgstr "Очікується завершення автентифікації"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Виберіть розширення для встановлення та натисніть «Далі»</b>"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook. Turn "
-"on the \"Save my login information\" checkbox on Facebook and F-Spot will "
-"log into Facebook automatically from now on."
-msgstr "Зараз F-Spot запустить веб-оглядач, щоб ви могли авторизуватися на Facebook. Увімкніть параметр \"Save my login information\" при авторизації, таи F-Spot надалі буде проходити авторизацію автоматично ."
+#~ msgid "Install from:"
+#~ msgstr "Встановити з:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:326
-msgid "Error logging into Facebook"
-msgstr "Помилка авторизації на Facebook"
+#~ msgid "_Repositories..."
+#~ msgstr "_Репозиторії..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:326
-msgid ""
-"There was a problem logging into Facebook. Check your credentials and try "
-"again."
-msgstr "Виникла помилка при авторизації на Facebook. Перевірте ваші реєстраційні дані."
+#~ msgid "Show all packages"
+#~ msgstr "Показати вс_і пакети"
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:339
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr "{0} {1} авторизовано на Facebook"
+#~ msgid "Show new versions only"
+#~ msgstr "Показувати лише нові файли"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:492
-msgid "Album must have a name"
-msgstr "У альбому повинна бути назва"
+#~ msgid "Show updates only"
+#~ msgstr "Показувати лише оновлення"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:492
-msgid "Please name your album or choose an existing album."
-msgstr "Дайте альбому назву чи виберіть існуючий альбом."
+#~ msgid "_Unselect All"
+#~ msgstr "Зн_яти виділення"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:505
-msgid "Creating a new album failed"
-msgstr "Не вдається створити новий альбом"
+#~ msgid "label124"
+#~ msgstr "label124"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:505
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
-"Помилка при створенні нового альбомую.\n"
-"\n"
-"{0}"
+#~ msgid "Overall Progress:"
+#~ msgstr "Загальний поступ:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:529
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:661
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:564
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "Передається знімок \"{0}\" ({1} з {2})"
+#~ msgid "Downloading extensions..."
+#~ msgstr "Завантажуються розширення..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:543
-#, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr "Помилка при завантаженні знімків до Facebook: {0}"
+#~ msgid "Extension Manager"
+#~ msgstr "Керування розширеннями"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:1
-msgid "Caption"
-msgstr "Підпис"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "Треба встановити додаткові розширення для виконання цієї операції."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:2
-msgid "Create a new album"
-msgstr "Створити новий альбом"
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "Будуть встановлені наступні розширення:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:3
-msgid "Description"
-msgstr "Опис:"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Керування розширеннями F-Spot</b></big>"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:4
-msgid "Export to Facebook"
-msgstr "Експорт до Facebook"
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Вже установлені наступні розширення:"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:5
-msgid "In this photo"
-msgstr "На цьому знімку"
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Встановити розширення..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:7
-msgid "Login"
-msgstr "Зайти"
+#~ msgid "_Uninstall..."
+#~ msgstr "В_идалити..."
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:8
-msgid "Logout"
-msgstr "Вийти"
+#~ msgid "Enable"
+#~ msgstr "Увімкнути"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:10
-msgid "This is who I am"
-msgstr "Так, це я"
+#~ msgid "Disable"
+#~ msgstr "Вимкнути"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:11
-msgid "Use an existing album"
-msgstr "Використовувати існуючий шаблон"
+#~ msgid "Details"
+#~ msgstr "Подробиці"
-#: ../extensions/Exporters/FacebookExport/FacebookExport.glade.h:12
-msgid "Who is this?"
-msgstr "Хто це?"
+#~ msgid "Extension Repository Management"
+#~ msgstr "Керування репозиторіями розширеннями"
-#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
-msgid "Compressed fil_e..."
-msgstr "_У стиснутий файл..."
+#~ msgid "Add New Repository"
+#~ msgstr "Додати репозиторій"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
-msgid ""
-"This tool requires an active selection. Please select one or more pictures "
-"and try again"
-msgstr ""
-"Для цього інструменту потрібно активне виділення. Виділіть один або кілька знімків та спробуйте ще раз."
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Виберіть розташування репозиторію, що реєструється:"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:63
-msgid "Select export folder"
-msgstr "Виберіть теку для експорту"
+#~ msgid "Register an on-line repository"
+#~ msgstr "Зареєструвати мережний репозиторій"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:101
-msgid "Exporting files"
-msgstr "Виконується експорт файлів"
+#~ msgid "Url:"
+#~ msgstr "URL:"
-#: ../extensions/Exporters/ZipExport/ZipExport.cs:107
-#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "Готується знімок \"{0}\""
+#~ msgid "Register a local repository"
+#~ msgstr "Зареєструвати локальний репозиторій"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
-msgid "_File name:"
-msgstr "_Назва файлу:"
+#~ msgid "Path:"
+#~ msgstr "Шлях:"
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
-msgid "_Location:"
-msgstr "_Розташування:"
+#~ msgid "Browse..."
+#~ msgstr "Огляд..."
-#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
-msgid "_Scale:"
-msgstr "_Масштаб:"
+#~ msgid "(provided by {0})"
+#~ msgstr "(надано {0})"
-#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
-msgid "Merge Db"
-msgstr "Об'єднати бази даних"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "Вимкнені розширення неможливо завантажити."
-#: ../extensions/Tools/MergeDb/MergeDb.cs:73
-msgid "Error opening the selected file"
-msgstr "Помилка при відкритті обраного файлу"
+#~ msgid "Loading {0} extension"
+#~ msgstr "Завантажується розширення {0}"
-#: ../extensions/Tools/MergeDb/MergeDb.cs:74
-#, csharp-format
-msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-"Обраний файл не є коректною чи підтримуваною базою даних.\n"
-"\n"
-"Отримано переривання \"{0}\"."
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Необхідне розширення '{0}' вимкнено."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
-msgid ""
-"<small><i>Choose the location of the database you want to import from</i></"
-"small>"
-msgstr "<small><i>Виберіть теку з базою даних, яку ви хочете імпортувати</i></small>"
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Необхідне розширення '{0}' не встановлено."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
-"you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already "
-"imported from that database.</i></small>"
-msgstr ""
-"<small><i>Виберіть, що саме імпортувати з бази даних.\n"
-"«Лише нові сеанси імпорту» — імпортувати все нове, що\n"
-"з'явилося з моменту останнього імпорту з цієї бази даних.\n"
-"«Один сеанс імпорту» — обрати конкретний сеанс імпорту.\n"
-"«Все» — імпортувати все, що може призвести до створення \n"
-"дублікатів, якщо імпорт з цієї бази даних вже виконався.</i></small>"
+#~ msgid "No image loaded."
+#~ msgstr "Немає зображень."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
-msgid ""
-"<small><i>Copy the images locally or keep them where they are. If you chose "
-"the later, be sure that this location will stay accessible from f-spot.</i></"
-"small>"
-msgstr ""
-"<small><i>Скопіювати знімки на локальний диск чи залишити їх на місці.\n"
-"У останньому випадку перевірте, що вони завжди доступні F-Spot.</i></small>"
+#~ msgid "Can't save non local files."
+#~ msgstr "Збереження нелокальних файлів не підтримується."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
-msgid "A Single Import Roll"
-msgstr "Один сеанс імпорту"
+#~ msgid "Unsupported image type for saving."
+#~ msgstr "Непідтримуваний тип файлів для зображення."
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
-msgid "Copy images to photos folder"
-msgstr "Копіювати файли до теки зі знімками"
+#~ msgid "interpolation type"
+#~ msgstr "тип інтерполяції"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
-msgid "Database Location:"
-msgstr "Розташування бази даних"
+#~ msgid "the type of interpolation to use"
+#~ msgstr "який тип інтерполяції використати"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
-msgid "Everything"
-msgstr "Все"
+#~ msgid "check type"
+#~ msgstr "перевірити тип"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
-msgid "Import:"
-msgstr "Імпорт:"
+#~ msgid "the type of chequering to use"
+#~ msgstr "тип використаних шахових клітин"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
-msgid "Keep the images at their original location"
-msgstr "Залишити знімки на місці"
+#~ msgid "the size of chequers to use"
+#~ msgstr "розмір шахових клітин"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
-msgid "Merge another f-spot collection"
-msgstr "Додати ще одну колекцію F-Spot"
+#~ msgid "dither"
+#~ msgstr "дізрінг"
-#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
-msgid "New Rolls Only"
-msgstr "Лише нові сеанси імпорту"
+#~ msgid "dither type"
+#~ msgstr "тип дізерінгу"
-#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-"<big>Ця база даних посилається на файли з теки <b>{0}</b>.\n"
-"Виберіть цю теку для зв'язування файлів із записами у базі даних.</big>"
+#~ msgid "Dissolve"
+#~ msgstr "Розчинення"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb..."
+#~ msgid "Flip"
+#~ msgstr "Обертання кубу"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "Помилка при створені альбому"
+#~ msgid "Cover"
+#~ msgstr "Перекриття"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to create an album: {0}"
-msgstr "При спробі створити альбом виникла наступна помилка: {0}"
+#~ msgid "Reveal"
+#~ msgstr "Виявлення"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:621
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} передано"
+#~ msgid "Wipe"
+#~ msgstr "Розчищення"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:623
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{0} з приблизно {1}"
+#~ msgid "Split"
+#~ msgstr "Розділення"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:692
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:593
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "Помилка при завантаженні знімків до Gallery: {0}"
+#~ msgid "Push"
+#~ msgstr "Виштовхування"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:776
-msgid "Available space:"
-msgstr "Наявний простір:"
+#~ msgid "More directories"
+#~ msgstr "Більше каталогів"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:893
-#, csharp-format
-msgid ""
-"<small>The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images</small>"
-msgstr ""
-"<small>Для обраного альбому встановлено межу у {0} знімків,\n"
-"яку буде перевищено при поточному виділенні у {1} знімків.</small>"
+#~ msgid "Arrange by _Month"
+#~ msgstr "Сортувати за _місяцями"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>Експорт на PicasaWeb</b>"
+#~ msgid "Arrange by _Folder"
+#~ msgstr "Сортувати за _теками"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid ""
-"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr ""
-"<span weight='bold' size='larger'>Ваш обліковий запис Google заблоковано</"
-"span>\n"
+#~ msgid "my photos"
+#~ msgstr "мої знімки"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-"Перевірте, що параметри цієї галереї є коректними.\n"
-"Введіть літери, як вони показані на зображенні у полі\n"
-"'Captcha'. <i>Літери не залежать від регістру</i>"
+#~ msgid "Tag Name:"
+#~ msgstr "Назва позначки:"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "Загальнодоступний альбом"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Змінити обрану позначку..."
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "_Назва альбому:"
+#~ msgid ""
+#~ "The \"F-Spot Manual\" could not be found. Please verify that your "
+#~ "installation has been completed successfully."
+#~ msgstr ""
+#~ "Не вдається знайти «Посібник з F-Spot». Перевірте, що встановлення "
+#~ "програми пройшло успішно."
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "А_втоматично обернути"
+#~ msgid "(File not found)"
+#~ msgstr "(Файл не знайдено)"
-#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr "_Код підтвердження:"
+#~ msgid "Picasaweb"
+#~ msgstr "Picasaweb"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>Експорт на SmugMug</b>"
+#~ msgid "SmugMug"
+#~ msgstr "SmugMug"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "_Обліковий запис:"
+#~ msgid "Gallery2"
+#~ msgstr "Gallery2"
-#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug"
+#~ msgid "1 of 1"
+#~ msgstr "1 з 1"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:126
-#, csharp-format
-msgid "Uploading photo \"{0}\""
-msgstr "Вивантажується знімок \"{0}\""
+#~ msgid "<b>Color Management</b>"
+#~ msgstr "<b>Керування кольором</b>"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:181
-msgid "Logging into Tabblo"
-msgstr "Виконується авторизація на Tabblo"
+#~ msgid "<b>Metadata</b>"
+#~ msgstr "<b>Метадані</b>"
-#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:241
-msgid "Obtaining URL for upload"
-msgstr "Отримується URL для завантаження"
+#~ msgid "<b>Photograph Layout</b>"
+#~ msgstr "<b>Вид фотографії</b>"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
-msgid "_Tabblo..."
-msgstr "_Tabblo..."
+#~ msgid "<b>Printer Details</b>"
+#~ msgstr "<b>Подробиці про принтер</b>"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:165
-msgid "Done sending photos"
-msgstr "Надсилання знімків завершено"
+#~ msgid "<b>Screensaver</b>"
+#~ msgstr "<b>Збереження екрану</b>"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:167
-msgid "Upload complete"
-msgstr "Вивантаження на сервер завершено"
+#~ msgid "<b>Theming</b>"
+#~ msgstr "<b>Стиль оформлення</b>"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:173
-msgid "Error uploading to Tabblo: "
-msgstr "Помилка при завантаженні знімків до Tabblo: "
+#~ msgid ""
+#~ "<small><i>Choose the folder where F-Spot should store newly imported "
+#~ "photos</i></small>"
+#~ msgstr ""
+#~ "<small><i>Виберіть теку, у якій F-Spot буде зберігати імпортовані знімки</"
+#~ "i></small>"
-#: ../extensions/Exporters/TabbloExport/TabbloExport.glade.h:2
-msgid "<b>Tabblo account</b>"
-msgstr "<b>Обліковий рахунок Tabblo</b>"
+#~ msgid ""
+#~ "<small><i>Enable this option to store tags and descriptions inside \n"
+#~ "supported image formats.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Увімкніть цей параметр, щоб зберігати позначки та описи "
+#~ "всередині файлів підтримуваних форматів.</i></small>"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:1
-msgid "<b>{0}</b>."
-msgstr "<b>{0}</b>."
+#~ msgid ""
+#~ "<small><i>While acting as a screensaver, F-Spot can display all of your "
+#~ "images, or a small subset based on tags.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Працюючи зберігачем екрану, F-Spot може показувати всі знімки "
+#~ "або лише деяку обрану підмножину.</i></small>"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:2
-msgid "A trust error occured while attempting to access"
-msgstr "Помилка встановлення довіри при спробі доступу"
+#~ msgid ""
+#~ "<small><i>You'll have to restart f-spot to load the new theme.</i></small>"
+#~ msgstr ""
+#~ "<small><i>Вам доведеться перезапустити F-Spot, щоб використати новий "
+#~ "стиль.</i></small>"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:3
-msgid "Abort this session"
-msgstr "Перервати цей сеанс"
+#~ msgid "Co_nfigure"
+#~ msgstr "На_лаштувати"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:4
-msgid "Always trust this site's certificate"
-msgstr "Завжди довіряти сертифікату цього сайту"
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Копіювати _місце розташування"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:5
-msgid "Do you wish to:"
-msgstr "Бажаєте:"
+#~ msgid "Crop photo to _fit"
+#~ msgstr "Обрізати, _щоб умістити"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:6
-msgid "Trust Error"
-msgstr "Помилка довіри"
+#~ msgid "Custom Theme"
+#~ msgstr "Інший стиль оформлення"
-#: ../extensions/Exporters/TabbloExport/TrustError.glade.h:7
-msgid "Trust the site's certificate this once"
-msgstr "Довіряти сертифікату сайту на цей раз"
+#~ msgid "From List:"
+#~ msgstr " Зісписку:"
+#~ msgid "From gtkrc File:"
+#~ msgstr "З файлу gtkrc:"
+#~ msgid ""
+#~ "Full Page\n"
+#~ "Standard - 4x6"
+#~ msgstr ""
+#~ "Ціла сторінка\n"
+#~ "Стандарт - 4x6"
+
+#~ msgid ""
+#~ "Hairline\n"
+#~ "0.25\"\n"
+#~ "0.5\"\n"
+#~ "1\"\n"
+#~ msgstr ""
+#~ "Волос\n"
+#~ "0.25\"\n"
+#~ "0.5\"\n"
+#~ "1\"\n"
+
+#~ msgid "N_umber of Copies:"
+#~ msgstr "_Кількість копій:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Title\n"
+#~ "Filename\n"
+#~ "Date\n"
+#~ "Photo Details"
+#~ msgstr ""
+#~ "Нічого\n"
+#~ "Назва\n"
+#~ "Назва файлу\n"
+#~ "Дата\n"
+#~ "Подробиці про знімок"
+
+#~ msgid "P_hoto Source:"
+#~ msgstr "_Джерело знімків:"
+
+#~ msgid "Page 1 of 3"
+#~ msgstr "Сторінка 1 з 3"
+
+#~ msgid "Photo _Size:"
+#~ msgstr "_Розмір знімку:"
+
+#~ msgid "Print crop _marks"
+#~ msgstr "Надрукувати знімки під о_брізку"
+
+#~ msgid "Print..."
+#~ msgstr "Друк..."
+
+#~ msgid "Select A gtkrc File"
+#~ msgstr "Виберіть файл gtkrc"
+
+#~ msgid ""
+#~ "Selection\n"
+#~ "Gallery\n"
+#~ "Viewport"
+#~ msgstr ""
+#~ "Вибране\n"
+#~ "Галерея\n"
+#~ "Область перегляду"
+
+#~ msgid "Try to use the system display profile"
+#~ msgstr "Використовувати системний профіль"
+
+#~ msgid "Will print using: US Letter size on Generic Postscript"
+#~ msgstr "Надрукує: на папері US Letter у Generic Postscript"
+
+#~ msgid "Write _metadata to file"
+#~ msgstr "Записувати _метадані у файли"
+
+#~ msgid "_Border:"
+#~ msgstr "_Рамка:"
+
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Змінити виділену позначку..."
+
+#~ msgid "_Folder"
+#~ msgstr "_Тека"
+
+#~ msgid "_Month"
+#~ msgstr "_Місяць"
+
+#~ msgid "_Print output:"
+#~ msgstr "_Вивід друку:"
+
+#~ msgid "img_000.jpg"
+#~ msgstr "img_000.jpg"
+
+#~ msgid ""
+#~ "F-Spot will now launch your browser so that you can log into Facebook. "
+#~ "Turn on the \"Save my login information\" checkbox on Facebook and F-Spot "
+#~ "will log into Facebook automatically from now on."
+#~ msgstr ""
+#~ "Зараз F-Spot запустить веб-оглядач, щоб ви могли авторизуватися на "
+#~ "Facebook. Увімкніть параметр \"Save my login information\" при "
+#~ "авторизації, таи F-Spot надалі буде проходити авторизацію автоматично ."
+
+#~ msgid "This is who I am"
+#~ msgstr "Так, це я"
+
+#~ msgid "Available space:"
+#~ msgstr "Наявний простір:"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1bdf278..291084f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,488 +1,1464 @@
-# Chinese (Hong Kong) translation for marlin.
+# Chinese (Hong Kong) translation for f-spot.
# Copyright (C) 2005 Free Software Foundation, Inc.
#
-## Translate Dictionary: http://animebox.myweb.hinet.net/teach/AE_Effects.html
+# # Translate Dictionary: http://animebox.myweb.hinet.net/teach/AE_Effects.html
#
# Stanley Wong <stanley18fan0k at yahoo.com.hk>, 2005.
-# Hialan Liu <hialan.liu at gmail.com>,2007.
+# Hialan Liu <hialan.liu at gmail.com>, 2007.
+# Cheng-Chia Tseng <pswo10680 at gmail.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: f-spot 0.4.3.1\n"
+"Project-Id-Version: f-spot 0.6.1.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-30 14:24+0000\n"
-"PO-Revision-Date: 2008-05-05 20:07+0800\n"
-"Last-Translator: Hialan Liu <hialan.liu at gmail.com>\n"
+"POT-Creation-Date: 2010-05-08 19:12+0800\n"
+"PO-Revision-Date: 2010-05-08 19:12+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\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"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "版本："
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "正在傳輸圖片"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "傳送圖片 \"{0}\" 到 CD"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{1} 之 {0}"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "傳送相片完成"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "傳輸完畢"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "傳輸時發生錯誤"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "傳輸發生錯誤"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "正在複製..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>有一些之前規劃好的項目要寫入</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>要燒錄的圖片</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "自動旋轉"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "建立 CD"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "作者："
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "大小"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "版權："
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "匯出的選取項目大小："
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "附加套件相根據性："
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "瀏覽之前規劃好的檔案(_B)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "匯出(_E)"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "所有已註冊的套件庫"
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "僅把這些相片寫入到 CD 中(_W)"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "你確定要取消安裝程序？"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "下列套件將被解除安裝："
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "正在等候授權"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid "There are other extensions that depend on the previous ones which will also be uninstalled:"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
msgstr ""
+"F-Spot 現在將會啟動你的瀏覽器，以便你啟用你剛選取好的許可。\n"
+"\n"
+"一旦你被導入 Facebook 後再返回此應用程式，請點擊下方的「確認」。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid "The selected extensions can't be installed because there are dependency conflicts."
-msgstr "因為相根據性衝突，無法安裝選擇的附加套件。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "太多要匯出的相片"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "下列套件將被安裝："
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr "Fackebook 只許可每個相簿內存放 {0} 張相片。請精挑細選你的選取項目，並重試。"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "正在上傳圖片"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr "(於使用者目錄)"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "相簿必須要有名稱"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "下列套件需要被解除安裝："
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "請命名你的相簿或是選擇已存在的相簿。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "無法解決下列的相根據性問題："
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "建立新相簿失敗"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "已成功的完成安裝程序。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"建立新相簿時發生錯誤。\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "安裝程序失敗！"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "正在上傳圖片 \"{0}\" ({2} 之 {1})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "安裝程序帶着警告訊息完成。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "上傳到 Facebook 時發生錯誤：{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "錯誤"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "解除安裝程序已成功完成。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "上傳完畢"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "解除安裝程序失敗！"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "造訪 Facebook 上的 F-Spot 羣組"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "解除安裝程序帶着警告訊息完成。"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "正在等候認證"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "套件庫"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"F-Spot 現在將會啟動你的瀏覽器，以便你登入 Facebook。\n"
+"\n"
+"一旦你被導入 Facebook 後再返回此應用程式，請點擊下方的「確認」。F-Spot 將會對你在 gnome-keyring 內的作業階段製作快取；若可能的話，在未來的 Facebook 匯出中都會重複使用它。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "已取消安裝程序"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "正在認證..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "找不到某些需要的附加套件"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "登入到 Facebook 時發生錯誤"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "安裝程序失敗"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr "登入 Facebook 時發生問題。請確認你的認證，並重試。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-#, fuzzy
-msgid "Extension"
-msgstr "以副檔案名"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "正在授權作業階段"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-msgid "Version"
-msgstr "版本"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "作業階段已建立，正在擷取使用者資訊..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "作業階段已建立，正在擷取朋友清單..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "作業階段已建立，正在擷取朋友詳細資料..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "作業階段已建立，正在擷取相簿..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} 已登入 Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Facebook 連線錯誤"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"從 Facebook 下載你的資訊時發生錯誤。\n"
+"\n"
+"Facebook 說：{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "你並未登入。"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "自動確認相片"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "相片說明"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "建立新相簿"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "描述"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "其他"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "匯出到 Facebook"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "於此相片"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "位置"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "登入"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "登出"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "名稱"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "網址"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "未登入"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "許可："
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "保持連線"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "使用現存的相簿"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "這位是誰？"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "授權"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "發生異常: {0}"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr "在你於 {0} 完成認證程序後請返回本視窗，並點擊下方的「完成認證」按鈕"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "套件"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "完成授權"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "附加套件安裝程序"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "正在登入 {0}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>選擇要安裝的附加套件並點下一步</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "正在檢查證書..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "安裝來源："
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "歡迎 {0} 你已連線到 {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "套件庫(_R)..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "以不同使用者登入"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "顯示所有套件"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "已使用你被允許的 {1} 每月配額中的 {0}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "只顯示新版本"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "無法登入"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "只顯示更新"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "正在等待回應 {1} 個中的第 {0} 個"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "取消選擇全部(_U)"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "正在上傳圖片 \"{0}\""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:163
-msgid "Select _All"
-msgstr "選擇全部(_A)"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "上傳至 {0} 時發生錯誤: {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "總體流程："
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "正在下載附加套件..."
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "附加套件管理員"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "需要額外的附加套件來完成此操作。"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "將安裝下列附加套件："
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>附加套件管理員</b></big>"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "目前已安裝下列附加套件："
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "安裝附加套件(_I)..."
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "解除安裝(_U)..."
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "啟用"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "停用"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/FlickrExport/FlickrExport.cs:359
-#: ../extensions/FolderExport/FolderExport.cs:223
-#: ../extensions/GalleryExport/GalleryExport.cs:760
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:694
-#: ../extensions/SmugMugExport/SmugMugExport.cs:597
-msgid "Error"
-msgstr "錯誤"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "無法登入。"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr "F-Spot 無法登入至 {0}。請確定你已使用 {0} 的網頁瀏覽介面進行驗證。"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>帳號</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>相片</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>風格</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>檢視權限</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "匯出"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "匯出標籤層級(_H)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr "F-Spot 需要你的認證才能上傳相片到你的 {0} 帳號。請按下「認證」按鈕來開啟網絡瀏覽器並給予 F-Spot 認證。 "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "忽略頂層標籤(_T)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "私人"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "公開"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "除去中介資料(_M)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "家人可以看到"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "朋友可以看到"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "匯出標籤(_E)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "重新調整大小為(_R)："
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "完成上傳後用瀏覽器檢視相片(_V)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "像素"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "資料夾(_O)..."
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "選取匯出資料夾"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "正在建立圖庫"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "上傳照片 \"{0}\" 到圖庫 {2}{1} 時發生錯誤"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "錯誤：傳輸時發生錯誤；正在中止"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "錯誤：檔案已存在；正在中止"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "亮"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "暗"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "上一步"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "索引"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "標籤"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "下一步"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "產生圖庫由"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "顯示風格"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "隱藏風格"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "標籤："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "頁："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>目的地</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>匯出方式</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "使用「原始版本」建立圖庫(_G)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "建立獨立的網絡圖庫(_W)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "描述(_D)："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "匯出標籤(_T)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "匯出標籤圖示(_I)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "匯出資料夾"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "圖庫名稱(_A)："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "完成匯出後開啟目的地(_D)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "資料夾(_F)："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "只儲存檔案(_S)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "網絡圖庫(_G)..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr "無"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "細節"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "無效的 URL"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "管理附加套件套件庫"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "這個圖庫網址條目不是有效的網址"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "加入新套件庫"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "連接到圖庫時發生錯誤"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "選擇你想註冊的套件庫的位置："
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "試圖登入時遭遇到下列錯誤：{0}"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "註冊網絡套件庫"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "已存在相同名稱的圖庫"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url："
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
+#, csharp-format
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr "在你註冊的圖庫中已經有相同名稱的圖庫。請選擇不同的名稱。"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "註冊本地套件庫"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(最頂層)"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "路徑："
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "不正確的相簿名稱"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "瀏覽..."
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"圖庫名稱包含無效的字符。\n"
+"只允許使用字母、數字，- 與 _"
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
#, csharp-format
-msgid "(provided by {0})"
-msgstr "(由 {0} 提供)"
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "上傳照片 \"{0}\" 到圖庫 {1} 時發生錯誤"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(無圖庫)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(沒有連接)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(無相簿)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "沒有選取任何帳號"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>相簿</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>圖庫</b>"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "無法載入已停用的附加套件。"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr "<span weight='bold' size='larger'>連接到圖庫時發生錯誤</span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "匯出標題和註解(_T)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "完成上傳後在瀏覽器中開啟圖庫(_A)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "請確定這個圖庫的設定是正確的。"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "相簿名稱(_A)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "描述(_D)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "匯出到相簿(_E)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "圖庫名稱(_G)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "圖庫(_G)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "父相簿(_P)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "密碼(_P)："
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "標題(_T)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "用戶名稱(_U)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "伺服器回應讀取錯誤"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "伺服器回應無圖庫內容"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "建立新相簿時發生錯誤"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
#, csharp-format
-msgid "Loading {0} extension"
-msgstr "正在載入 {0} 附加套件"
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"試圖執行請求的操作時遭遇到下列錯誤：\n"
+"{0} ({1})"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "建立相簿時發生錯誤"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "需要的附加套件 '{0}' 已停用。"
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr "試圖建立相簿時遭遇到下列錯誤：{0}"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "需要的附加套件 '{0}' 尚未安裝。"
+msgid "{0} Sent"
+msgstr "已送出{0}"
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "F-Spot 相片檢視器"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} / 大約 {1}"
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "相片檢視器"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "上傳到圖庫時發生錯誤：{0}"
-#: ../f-spot-import.desktop.in.in.h:1
-#: ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "F-Spot 相片管理員"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "可用空間：{0}，已使用 {2} 中的 {1}%"
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "匯入至 F-Spot"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"所選的相簿限制 {0} 張圖片，\n"
+"目前所選的 {1} 個圖像將會被忽略"
-#: ../f-spot-import.desktop.in.in.h:3
-#: ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "相片管理員"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>PicasaWeb 匯出</b>"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>你的 Google 帳號已被鎖定</span>\n"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
msgstr ""
+"請驗證此圖庫的設定值是否都正確。\n"
+"輸入「Captcha」欄位內圖像的\n"
+"字母。<i>字母大小寫都可以</i>"
-#: ../libeog/eog-image.c:773
-#, c-format
-msgid "No image loaded."
-msgstr "沒有載入圖片。"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "公開相簿"
-#: ../libeog/eog-image.c:780
-#, c-format
-msgid "Can't save non local files."
-msgstr "無法儲存非本地檔案。"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "相簿標題(_A)："
-#: ../libeog/eog-image.c:803
-#, c-format
-msgid "Unsupported image type for saving."
-msgstr "圖片格式未支援儲存功能。"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "自動旋轉(_A)"
-#: ../libeog/image-view.c:2128
-msgid "interpolation type"
-msgstr "補點類型(Interpolation)："
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
-#: ../libeog/image-view.c:2129
-msgid "the type of interpolation to use"
-msgstr "要使用的補點類型"
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
-#: ../libeog/image-view.c:2135
-#: ../libeog/image-view.c:2142
-msgid "check type"
-msgstr "檢查類型"
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>SmugMug 匯出</b>"
-#: ../libeog/image-view.c:2136
-msgid "the type of chequering to use"
-msgstr "要使用的審核類型"
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "帳號(_A)："
-#: ../libeog/image-view.c:2143
-msgid "the size of chequers to use"
-msgstr "要使用審核者大小"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "正在上傳相片 \"{0}\""
-#: ../libeog/image-view.c:2149
-msgid "dither"
-msgstr "遞色(dither)"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "正在登入 Tabblo"
-#: ../libeog/image-view.c:2150
-msgid "dither type"
-msgstr "遞色類型"
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "正在取得供上傳的網址"
-#: ../libfspot/f-jpeg-utils.c:445
-#: ../src/RotateCommand.cs:222
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "相片傳送完成"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "上傳完畢"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "上傳到 Tabblo 時發生錯誤： "
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot 標籤</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo 帳號</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr "<small><i>F-Spot 標籤能幫助你追蹤相片的匯出狀態。例：為你打算匯出的這些相片套用一種標籤，並為那些已經匯出過的相片套上另外一種。在這裏，你可以請 F-Spot 將這些標籤取代為合適的。</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "從匯出的相片中移除(_O)："
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "選取..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "附加到匯出的相片中(_A)："
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>。"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "試圖存取時發生信任上的錯誤"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "中止此作業階段"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "總是信任此網站的證書"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "你希望："
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "信任上的錯誤"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "只有這次才信任這個網站的證書"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "壓縮的檔案(_E)..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "無可用的選取項目"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr "此工具需要作用中的選取項目。請選取一個或是更多圖片，並重試"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "選取匯出資料夾"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "正在匯出檔案"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "正在準備相片 \"{0}\""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "建立(_C)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "檔案名稱(_F)："
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "位置(_L)："
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "縮放(_S)："
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr "為了要偵測你在 0.5.0 版之前匯入的圖片是否有複本，F-Spot 需要分析你的圖像收藏。因為這相當耗費時間，所以預設上不會執行。你可以使用此對話方塊來「開始」或「暫停」此更新程序。"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr "你目前有 {0} 張相片需要 md5 計算，以及 {1} 個擱置的工作"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "正在處理圖像..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "已停止"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "檢查有無複本..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "F-Spot 圖庫"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "該網絡圖庫現在似乎離線"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "顯示全部"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} 張相片"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "目前檢視"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "已選"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Live 網絡圖庫"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>圖庫會維持啟用直到你停用它或是關閉 F-Spot。\n"
+"請確保本機的檢視者繞過 HTTP proxy 以檢視圖庫。</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr "<small><i>當圖庫啟用時，上方為從其它電腦要存取所分享相片所需要開啟的 URL</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "啟用與停用該網絡圖庫"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "允許檢視者加入標籤"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "複製 URL 到剪貼簿"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spot Live 網絡圖庫"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "圖庫 URL："
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "限制照片分享的張數"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "選項："
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "有一個標籤的相片"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "所選的相片"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "分享："
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "檢視數："
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "無"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr "圖庫：{0}，相片：{1}，上個用戶端：{3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "圖庫未啟用"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "合併資料庫"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "開啟所選的檔案時發生錯誤"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"你選取的檔案不是有效的或受支援的資料庫。\n"
+"\n"
+"接收到例外「{0}」。"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr "<small><i>選擇你想從哪個位置匯入資料庫</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>選擇想要從所選資料庫匯入的項目。\n"
+"「只有新的膠卷」是智慧型選項，能避免重複匯入你在之前的操作已經匯入過的相片。\n"
+"「單一的匯入膠卷」讓你選擇你想要合併回去的膠卷。\n"
+"「每一張」會匯入每張相片。如果你已經從該資料庫匯入過相片，則會建立該相片的複本。</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr "<small><i>在本機複製這些圖像，或是將它們維持在它們的地方。如果你選擇了後者，請確保該位置對 f-spot 維持在可存取的狀態。</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "單一的匯入膠卷"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "複製圖像至相片資料夾"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "資料庫位置："
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "每個東西"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "匯入："
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "維持這些圖像在它們原本的位置"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "管理另一份 F-Spot 收藏"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "只有新的膠卷"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "跳過"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>這個資料庫參照包含在 <b>{0}</b> 資料夾內的檔案。\n"
+" 請選取該資料夾，這樣我才能執行對應處理。</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "組態螢幕保護程式"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "所有圖像"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "延遲："
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "顯示："
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "含有標籤的圖像："
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "讓 F-Spot 做為你的螢幕保護程式"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "螢幕保護程式組態"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-Spot 相片管理員"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "組織、享受、並分享你的相片"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "相片管理員"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "匯入至 F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-Spot 相片檢視器"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "相片檢視器"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
msgstr "找不到檔案"
-#: ../libfspot/f-jpeg-utils.c:468
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr "未知的轉換類型 %d"
-#: ../libfspot/f-jpeg-utils.c:476
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
-msgstr "動作失敗"
+msgstr "操作失敗"
-#: ../src/CameraFileSelectionDialog.cs:73
+#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "預覽"
-#: ../src/CameraFileSelectionDialog.cs:75
+#: ../src/CameraFileSelectionDialog.cs:78
msgid "Path"
msgstr "路徑"
-#: ../src/CameraFileSelectionDialog.cs:77
-#: ../src/f-spot.glade.h:107
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "檔案"
-#: ../src/CameraFileSelectionDialog.cs:79
-#: ../extensions/FolderExport/FolderExport.cs:885
-msgid "Index"
-msgstr "索引(Index)"
-
-#: ../src/CameraFileSelectionDialog.cs:99
+#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
-msgstr "選擇標籤"
+msgstr "選取標籤"
-#: ../src/CameraFileSelectionDialog.cs:135
+#: ../src/CameraFileSelectionDialog.cs:138
msgid "Downloading Previews"
msgstr "正在下載預覽"
-#: ../src/CameraFileSelectionDialog.cs:143
+#: ../src/CameraFileSelectionDialog.cs:148
#, csharp-format
msgid "Downloading Preview of {0}"
msgstr "正在下載 {0} 的預覽"
-#: ../src/CameraFileSelectionDialog.cs:194
-#: ../extensions/CDExport/CDExport.cs:222
-#: ../extensions/FolderExport/FolderExport.cs:352
-msgid "Transferring Pictures"
-msgstr "正在傳輸圖片"
-
-#: ../src/CameraFileSelectionDialog.cs:215
+#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
-msgstr "正在複製 {1} 之 {0} "
+msgstr "正在複製 {1} 之 {0}"
-#: ../src/CameraFileSelectionDialog.cs:225
+#: ../src/CameraFileSelectionDialog.cs:235
msgid "Error transferring file"
msgstr "傳輸檔案時發生錯誤"
-#: ../src/CameraFileSelectionDialog.cs:234
-msgid "Done Copying Files"
-msgstr "複製檔案完成"
-
-#: ../src/CameraFileSelectionDialog.cs:236
+#: ../src/CameraFileSelectionDialog.cs:244
msgid "Download Complete"
msgstr "下載完畢"
-#: ../src/CameraFileSelectionDialog.cs:261
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "複製檔案完成"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "從數碼相機傳輸 \"{0}\""
-#: ../src/CameraSelectionDialog.cs:28
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "數碼相機"
-#: ../src/CameraSelectionDialog.cs:29
+#: ../src/CameraSelectionDialog.cs:30
msgid "Port"
msgstr "連接埠"
-#: ../src/ColorDialog.cs:212
-msgid "Error saving adjusted photo"
-msgstr "儲存調整過的相片時發生錯誤"
-
-#: ../src/ColorDialog.cs:213
-#: ../src/Loupe.cs:65
-#: ../src/PhotoView.cs:256
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "收到異常 \"{0}\"。無法儲存相片 {1}"
-
-#: ../src/Core.cs:192
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "找不到符合 {0} 的相片"
-#: ../src/Core.cs:193
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
"the tag to some photos or selecting a different tag in the\n"
"F-Spot preference dialog."
msgstr ""
-"標籤「{0}」並沒有套用到任何標籤。\n"
-"試試將標籤加入一些圖片或於 F-Spot 偏好對話方塊選擇其他標籤。"
+"沒有任何標示為 \"{0}\" 的相片。你可以標示一些\n"
+"相片，或着在 F-Spot 的選項中選擇其他的標籤。"
-#: ../src/Core.cs:197
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
-msgstr "沒有搜尋結果"
+msgstr "沒有找到搜尋結果"
-#: ../src/Core.cs:198
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -491,106 +1467,140 @@ msgstr ""
"F-Spot 正在尋找的標籤不存在。\n"
"請試試在 F-Spot 偏好對話方塊選擇其他標籤。"
-#: ../src/Core/Photo.cs:417
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Core/Photo.cs:473
msgid "Reparented"
-msgstr ""
+msgstr "重定母本"
-#: ../src/Core/Photo.cs:417
+#: ../src/Core/Photo.cs:473
#, csharp-format
msgid "Reparented ({0})"
-msgstr ""
+msgstr "重定母本 ({0})"
-#: ../src/Core/Photo.cs:434
+#: ../src/Core/Photo.cs:492
#, csharp-format
msgid "Modified"
msgid_plural "Modified ({0})"
-msgstr[0] "已修改"
-msgstr[1] "已修改({0}個)"
+msgstr[0] "已修改 ({0})"
-#: ../src/Core/Photo.cs:453
-#, fuzzy, csharp-format
+#: ../src/Core/Photo.cs:513
+#, csharp-format
msgid "Modified in {1}"
-msgstr "已修改"
+msgstr "在 {1} 中已修改"
-#: ../src/Core/Photo.cs:453
-#, fuzzy, csharp-format
+#: ../src/Core/Photo.cs:513
+#, csharp-format
msgid "Modified in {1} ({0})"
-msgstr "已修改"
+msgstr "在 {1} ({0})中已修改"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:561
-#: ../src/f-spot.glade.h:143
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "原始版本"
-#: ../src/DateCommands.cs:56
-msgid "Today"
-msgstr "今天"
+#: ../src/Editors/AutoStretchEditor.cs:17
+msgid "Auto Color"
+msgstr "自動校色"
-#: ../src/DateCommands.cs:58
-msgid "Yesterday"
-msgstr "昨天"
+#: ../src/Editors/ColorEditor.cs:38
+msgid "Adjust Colors"
+msgstr "調節色彩"
-#: ../src/DateCommands.cs:60
-msgid "Last 7 days"
-msgstr "最後 7 天"
+#: ../src/Editors/ColorEditor.cs:41
+msgid "Adjust"
+msgstr "調整"
-#: ../src/DateCommands.cs:62
-msgid "Last 30 days"
-msgstr "最後 30 天"
+#: ../src/Editors/CropEditor.cs:35
+msgid "4 x 3 (Book)"
+msgstr "4 x 3 (書本)"
-#: ../src/DateCommands.cs:64
-msgid "Last 90 days"
-msgstr "最後 90 天"
+#: ../src/Editors/CropEditor.cs:36
+msgid "4 x 6 (Postcard)"
+msgstr "4 x 6 (明信片)"
-#: ../src/DateCommands.cs:66
-msgid "Last 360 days"
-msgstr "最後 360 天"
+#: ../src/Editors/CropEditor.cs:37
+msgid "5 x 7 (L, 2L)"
+msgstr "5 x 7 (L, 2L)"
-#: ../src/DateCommands.cs:68
-msgid "Current Week (Mon-Sun)"
-msgstr "當週 (星期一～星期日)"
+#: ../src/Editors/CropEditor.cs:38
+msgid "8 x 10"
+msgstr "8 x 10"
-#: ../src/DateCommands.cs:70
-msgid "Previous Week (Mon-Sun)"
-msgstr "前一週 (星期一～星期日)"
+#: ../src/Editors/CropEditor.cs:39
+msgid "Square"
+msgstr "正方形"
-#: ../src/DateCommands.cs:86
-#: ../src/f-spot.glade.h:68
-msgid "All Images"
-msgstr "所有圖片"
+#: ../src/Editors/CropEditor.cs:42
+msgid "Crop"
+msgstr "裁剪"
-#: ../src/DateCommands.cs:88
-msgid "Customized Range"
-msgstr "自選範圍"
+#: ../src/Editors/CropEditor.cs:73
+msgid "Select the area that needs cropping."
+msgstr "選取需要剪裁的區域。"
+
+#: ../src/Editors/CropEditor.cs:98
+msgid "No Constraint"
+msgstr "無限制"
+
+#: ../src/Editors/CropEditor.cs:99
+msgid "Same as photo"
+msgstr "與相片一樣"
+
+#: ../src/Editors/CropEditor.cs:104
+msgid "Custom Ratios..."
+msgstr "自選比例..."
+
+#: ../src/Editors/DesaturateEditor.cs:17
+msgid "Desaturate"
+msgstr "去飽和"
+
+#: ../src/Editors/RedEyeEditor.cs:19
+msgid "Red-eye Reduction"
+msgstr "移除紅眼"
-#: ../src/Editors/SoftFocus.cs:27
-#: ../src/ItemAction.cs:342
+#: ../src/Editors/RedEyeEditor.cs:21
+msgid "Fix!"
+msgstr "修正！"
+
+#: ../src/Editors/RedEyeEditor.cs:25
+msgid "Select the eyes you wish to fix."
+msgstr "選取你希望修正的眼睛。"
+
+#: ../src/Editors/SepiaEditor.cs:17
+msgid "Sepia Tone"
+msgstr "棕褐色調"
+
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "柔焦"
-#: ../src/Editors/SoftFocus.cs:57
-#: ../src/PhotoVersionCommands.cs:138
-msgid "Cancel"
-msgstr "取消"
+#: ../src/Editors/TiltEditor.cs:30
+#, fuzzy
+msgid "Straighten"
+msgstr "拉直"
-#: ../src/Editors/SoftFocus.cs:60
-msgid "Apply"
-msgstr "套用"
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "匯入發生錯誤"
-#: ../src/Editors/Tilt.cs:28
-#: ../src/ItemAction.cs:326
-msgid "Straighten"
-msgstr ""
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "匯入 {0}{2}{2}{1} 時發生錯誤"
-#: ../src/Extensions/OpenWithMenu.cs:93
-msgid "No applications available"
-msgstr "無可用的應用程式"
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "無法儲存 \"{0}\" 類型的檔案"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "預期外的錯誤"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "複製相片位置(_I)"
+msgid "Copy Photo"
+msgstr "複製相片"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -600,20 +1610,17 @@ msgstr "匯出至"
msgid "Open _With"
msgstr "開啟以(_W)"
-#: ../src/FSpot.addin.xml.h:4
-#: ../src/f-spot.glade.h:156
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
msgstr "移除標記(_O)"
-#: ../src/FSpot.addin.xml.h:5
-#: ../src/SingleView.cs:426
-#: ../src/f-spot.glade.h:159
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "往左旋轉(_L)"
-#: ../src/FSpot.addin.xml.h:6
-#: ../src/SingleView.cs:427
-#: ../src/f-spot.glade.h:160
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "往右旋轉(_R)"
@@ -621,143 +1628,497 @@ msgstr "往右旋轉(_R)"
msgid "Tools"
msgstr "工具"
-#: ../src/FSpot.addin.xml.h:8
-#: ../src/f-spot.glade.h:204
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "附加標籤(_A)"
-#: ../src/FSpot.addin.xml.h:9
-#: ../src/f-spot.glade.h:215
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
msgstr "從磁碟機中刪除(_D)"
-#: ../src/FSpot.addin.xml.h:10
-#: ../src/f-spot.glade.h:249
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
-msgstr "從型錄中移除(_R)"
+msgstr "從編目中移除(_R)"
-#: ../src/FileImportBackend.cs:262
-msgid "Import error"
-msgstr "匯入錯誤"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:263
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
-msgstr ""
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
-#: ../src/FileImportBackend.cs:264
-#: ../src/ThreadProgressDialog.cs:68
-msgid "Skip"
-msgstr "跳過"
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
-#: ../src/Filters/ResizeFilter.cs:70
-#: ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "無法儲存檔案類型 \"{0}\""
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
-#: ../src/FormClient.cs:297
-msgid "Unhandled exception"
-msgstr "未處理的異常"
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>校正(_R)</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>圖像插補</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>大小</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>摘要</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>透明部份</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>檢視匯入的所有圖片</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>白平衡(_W)</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
+msgstr "<small><i>啟用此選項來允許針對拉近拉遠的圖像進行插補處理。你不應該停用此選項以檢視相片，但是停用插補處理可能對於圖示設定很有用處。</i></small>"
+
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr "<small><i>你可以選擇要如何顯示圖像內的透明部份。此選項對相片不會造成任何影響，但是當檢視含有透明部份的圖示或是其他美工時，將此設為格子花紋或是自選色彩應該很有用。</i></small>"
+
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "設為背景(_B)"
+
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "設為自選色彩(_C)： "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "設為格子花紋(_P)"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "附加標籤："
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "附加標籤："
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "對比(_O)："
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "建立(_R)"
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "數碼相機選取"
+
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "複製檔案至相片資料夾"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "建立郵件"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr "當第一次使用時為此標籤建立圖示(_I)"
+
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "建立郵件並將所選相片（可能會被縮放）作為附件"
+
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr "偵測複本"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "顯示檔案名稱(_N)"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "只顯示那些被匯入指定膠卷內的相片。"
+
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "不要寄出郵件"
+
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "電子郵件(_M)："
+
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "匯出標題和註解(_X)"
+
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "估計新大小"
+
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "非常大"
+
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "F-Spot 檢視"
+
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr "所選膠卷的過濾條件"
+
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "G_allery:"
+
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "圖庫"
+
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "匯入"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "匯入來源："
+
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "包括子目錄(_C)"
+
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "大"
+
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr "管理你自選的選取比例"
+
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "中"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "所選膠卷內的相片數量："
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "圖片數目："
+
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "開啟資料夾(_F)..."
+
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "原始大小(檔案可能非常大)"
+
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "父標籤(_A)："
+
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "暫停"
+
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "上一次"
+
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "修復"
+
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr "選擇要從數碼相機複製的相片..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "選擇標籤..."
+
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "請選擇你要傳輸檔案的數碼相機"
+
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "選擇的相機： "
-#: ../src/FullScreenView.cs:57
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "選取限制"
+
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "設定為背景(_B)"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "顯示所有相片。"
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "顯示或隱藏側面的長方格"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "顯示或隱藏工具列"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "側面的長方格(_P)"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "小"
+
+#: ../src/f-spot.glade.h:82
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr "指定原始大小的圖片是否該被旋轉。大小較小的會被自動旋轉。"
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "除去圖像的中介資料(_M)"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr "溫度(_M)："
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "極小"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr "總計原始大小"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "拉近(_I)"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "拉遠(_O)"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "拉近"
+
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "拉遠"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "亮度(_B)："
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "建立郵件(_C)"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "曝光(_E)："
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "全螢幕(_F)"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Gallery"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "色調(_H)："
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "拉近或拉遠圖片時對圖像進行插補(_I)"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "新視窗(_N)"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "完成上傳後在瀏覽器中開啟圖庫(_O)"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "完成匯出後開啟目的地(_O)"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "相片(_P)"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "飽和度(_S)："
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "相片縮放不能超過(_S)："
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "幻燈片(_8)"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "除去中介資料(_S)"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "標籤名稱(_T)："
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "色相(_T)："
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "工具列(_T)"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI："
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "檢視(_V)"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "虛擬檔案系統(_V)"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "及"
+
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"於\n"
+"晚於\n"
+"介於"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
+
+#: ../src/FullScreenView.cs:58
msgid "Hide"
msgstr "隱藏"
-#: ../src/FullScreenView.cs:59
+#: ../src/FullScreenView.cs:60
msgid "Hide Toolbar"
msgstr "隱藏工具列"
-#: ../src/FullScreenView.cs:65
+#: ../src/FullScreenView.cs:66
msgid "Info"
msgstr "資訊"
-#: ../src/FullScreenView.cs:67
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
-msgstr "圖片資訊"
+msgstr "圖像資訊"
-#: ../src/FullScreenView.cs:72
+#: ../src/FullScreenView.cs:73
msgid "Exit fullscreen"
msgstr "退出全螢幕"
-#: ../src/FullScreenView.cs:82
-#: ../src/MainWindow.cs:294
-#: ../src/SingleView.cs:92
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "幻燈片"
-#: ../src/FullScreenView.cs:83
+#: ../src/FullScreenView.cs:82
msgid "Start slideshow"
msgstr "開始幻燈片"
-#: ../src/FullScreenView.cs:148
-msgid "Slide transition: "
+#: ../src/FullScreenView.cs:128
+msgid "Slide transition:"
msgstr "投影片切換："
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "疊化"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "翻轉"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "覆蓋"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "揭露"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "轉場"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "分割"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "推移"
-
-#: ../src/GroupSelector.cs:57
-#: ../src/GroupSelector.cs:58
+#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "更多日期"
-#: ../src/GroupSelector.cs:60
-#: ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "更多目錄"
-
-#: ../src/GroupSelector.cs:63
-#: ../src/GroupSelector.cs:64
+#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
msgid "More"
msgstr "更多"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "根據月份排列(_M)"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "根據資料夾排列(_F)"
-
-#: ../src/GroupSelector.cs:523
-#: ../src/f-spot.glade.h:253
-msgid "_Reverse Order"
-msgstr "順序反轉(_R)"
-
-#: ../src/GroupSelector.cs:529
-#: ../src/f-spot.glade.h:208
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "清除日期範圍(_C)"
#: ../src/Imaging/Exif.cs:228
msgid "Image Directory"
-msgstr "圖片目錄"
+msgstr "圖像目錄"
#: ../src/Imaging/Exif.cs:230
msgid "Thumbnail Directory"
@@ -779,13 +2140,17 @@ msgstr "互通目錄"
msgid "Unknown Directory"
msgstr "未知目錄"
+#: ../src/Imaging/ImageFile.cs:117
+msgid "Writing to this file format is not supported"
+msgstr "不支援寫入此檔案格式"
+
#: ../src/Imaging/IptcFile.cs:145
msgid "IPTC Information Interchange Model (IIM) Version number"
-msgstr "IPTC 資訊交換模型 (IIM) 版本號"
+msgstr "IPTC Information Interchange Model (IIM) 版本號碼"
#: ../src/Imaging/IptcFile.cs:147
msgid "OSI Destination routing information"
-msgstr ""
+msgstr "OSI 目標路由資訊"
#: ../src/Imaging/IptcFile.cs:149
msgid "IPTC file format"
@@ -793,7 +2158,7 @@ msgstr "IPTC 檔案格式"
#: ../src/Imaging/IptcFile.cs:151
msgid "Identifies the provider and product"
-msgstr "辨別提供者與產品"
+msgstr "識別供應商與產品"
#: ../src/Imaging/IptcFile.cs:153
msgid "A unique number identifying the envelope"
@@ -801,40 +2166,40 @@ msgstr "用來辨別信封的唯一編號"
#: ../src/Imaging/IptcFile.cs:155
msgid "A unique number"
-msgstr "唯一的編號"
+msgstr "一個獨特的號碼"
#: ../src/Imaging/IptcFile.cs:157
-msgid "The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
-msgstr ""
+msgid ""
+"The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
+msgstr "信封處理優先序介於 1 (最緊急) 與 9 (最不緊急) 之間"
#: ../src/Imaging/IptcFile.cs:159
-#, fuzzy
msgid "The year, month and day (CCYYMMDD) the service sent the material"
-msgstr "年，月及日 (CCYYMMDD) 格式，"
+msgstr "附註年月日 (CCYYMMDD) 的服務"
#: ../src/Imaging/IptcFile.cs:161
msgid "The hour, minute and second (HHMMSS) the service sent the material"
-msgstr ""
+msgstr "這個服務送出該資料的時間，以時、分與秒標記 (HHMMSS)"
#: ../src/Imaging/IptcFile.cs:163
msgid "The character set designation"
-msgstr ""
+msgstr "設定的字符編碼"
#: ../src/Imaging/IptcFile.cs:165
msgid "External globally unique object identifier"
-msgstr ""
+msgstr "外部全域獨立物件識別碼"
#: ../src/Imaging/IptcFile.cs:170
msgid "Abstract Relationship Method (ARM) identifier"
-msgstr ""
+msgstr "抽象關聯模式 (ARM) 識別碼"
#: ../src/Imaging/IptcFile.cs:172
msgid "Abstract Relationship Method (ARM) version number."
-msgstr ""
+msgstr "抽象關係方法 (ARM) 版本編號。"
#: ../src/Imaging/IptcFile.cs:175
msgid "Number identifying the IIM version this application record uses"
-msgstr ""
+msgstr "作為辨識此應用程式紀錄所使用的 IIM 版本之用的編號"
#: ../src/Imaging/IptcFile.cs:177
msgid "Object type reference"
@@ -844,34 +2209,34 @@ msgstr "物件型態參考"
msgid "Object attribute reference"
msgstr "物件屬性參考"
-#: ../src/Imaging/IptcFile.cs:188
-#: ../src/Imaging/IptcFile.cs:192
+#: ../src/Imaging/IptcFile.cs:188 ../src/Imaging/IptcFile.cs:192
msgid "Object name"
msgstr "物件名稱"
#: ../src/Imaging/IptcFile.cs:190
msgid "Status of the objectdata according to the provider"
-msgstr ""
+msgstr "根據供應商物件資料提供的狀態"
#: ../src/Imaging/IptcFile.cs:194
msgid "Location within a city or area where the object originates"
-msgstr ""
+msgstr "該物件起源自何城市或區域"
#: ../src/Imaging/IptcFile.cs:197
msgid "Name of the city the content is focussing on"
-msgstr ""
+msgstr "內容所聚焦的城市其名稱"
#: ../src/Imaging/IptcFile.cs:200
msgid "Copyright information for"
-msgstr ""
+msgstr "其版權資訊"
#: ../src/Imaging/IptcFile.cs:203
msgid "Full name of the country of the focus of the content"
-msgstr ""
+msgstr "內容所聚焦的地區其全名"
#: ../src/Imaging/IptcFile.cs:206
-msgid "Two or three letter ISO3166 code of the country of the focus of the content"
-msgstr ""
+msgid ""
+"Two or three letter ISO3166 code of the country of the focus of the content"
+msgstr "內容所聚焦的地區其 ISO3166 代碼，由 2-3 個字母組成"
#: ../src/Imaging/IptcFile.cs:209
msgid "Creator of the content"
@@ -886,552 +2251,424 @@ msgid "The title of the author or creator"
msgstr "作者或建立者的標題"
#: ../src/Imaging/IptcFile.cs:218
-msgid "The person involved in writing, editing or correcting the object data or caption/abstract"
-msgstr ""
+msgid ""
+"The person involved in writing, editing or correcting the object data or "
+"caption/abstract"
+msgstr "這個人參與過寫作、編輯、或是校正這個物件資料或是相片說明/摘要"
#: ../src/Imaging/IptcFile.cs:222
msgid "Headline of the content"
-msgstr ""
+msgstr "內容的標題"
#: ../src/Imaging/IptcFile.cs:225
-msgid "Instructions from the creator to the receiver not covered by other fields"
-msgstr ""
+msgid ""
+"Instructions from the creator to the receiver not covered by other fields"
+msgstr "來自建立者給予接收者的指示，沒有被其他領域涵蓋"
#: ../src/Imaging/IptcFile.cs:228
msgid "Intellectual genre of the object"
-msgstr ""
+msgstr "物件的智慧類型"
#: ../src/Imaging/IptcFile.cs:241
-#, fuzzy
msgid "Unknown IIM DataSet"
-msgstr "未知目錄"
+msgstr "不明的 IIM DataSet"
-#: ../src/ImportCommand.cs:49
-#: ../src/SingleView.cs:327
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "選擇資料夾"
-#: ../src/ImportCommand.cs:261
+#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
msgstr "(偵測不到數碼相機)"
-#: ../src/ImportCommand.cs:405
+#: ../src/ImportCommand.cs:404
#, csharp-format
msgid "Loading {0} of {1}"
msgstr "正在載入 {1} 之 {0}"
-#: ../src/ImportCommand.cs:473
+#: ../src/ImportCommand.cs:470
msgid "Done Loading"
msgstr "完成載入"
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "目錄不存在。"
-#: ../src/ImportCommand.cs:671
+#: ../src/ImportCommand.cs:685
#, csharp-format
-msgid "The directory you selected \"{0}\" does not exist. Please choose a different directory"
+msgid ""
+"The directory you selected \"{0}\" does not exist. Please choose a "
+"different directory"
msgstr "你選擇的目錄 \"{0}\" 不存在。請選擇另外的目錄"
-#. Prepare the Last Import root tag
-#: ../src/ImportCommand.cs:723
-#: ../src/ImportCommand.cs:725
-#: ../src/XmpTagsImporter.cs:88
-msgid "Import Tags"
-msgstr "匯入標籤"
-
-#: ../src/InfoBox.cs:81
-msgid "name"
-msgstr "名稱"
-
-#: ../src/InfoBox.cs:83
-msgid "version"
-msgstr "版本"
-
-#: ../src/InfoBox.cs:85
-msgid "date"
-msgstr "日期"
-
-#: ../src/InfoBox.cs:87
-msgid "size"
-msgstr "大小"
-
-#: ../src/InfoBox.cs:89
-msgid "exposure"
-msgstr "曝光"
-
-#. The label for the root category is used in new and edit tag dialogs
-#: ../src/InfoBox.cs:232
-#: ../src/TagStore.cs:258
-msgid "(None)"
-msgstr "(無)"
-
-#: ../src/InfoBox.cs:243
-#: ../src/InfoBox.cs:252
-msgid "(Unknown)"
-msgstr "(未知)"
-
-#: ../src/InfoDisplay.cs:14
-#: ../src/MainWindow.cs:1579
-msgid "Metadata Browser"
-msgstr "Metadata 瀏覽器"
-
-#. Obsolete, remove after db rev4
-#: ../src/InfoDisplay.cs:135
-#: ../src/InfoDisplay.cs:137
-#: ../src/f-spot.glade.h:110
-msgid "Folder"
-msgstr "資料夾"
-
-#: ../src/InfoDisplay.cs:139
-msgid "Picasaweb"
-msgstr "Picasaweb"
-
-#: ../src/InfoDisplay.cs:141
-msgid "SmugMug"
-msgstr "SmugMug"
-
-#: ../src/InfoDisplay.cs:143
-msgid "Gallery2"
-msgstr "Gallery2"
-
-#: ../src/InfoDisplay.cs:239
-msgid "Extended Metadata"
-msgstr "延伸的 Metadata"
-
-#: ../src/InfoDisplay.cs:271
-msgid "Exported Locations"
-msgstr "匯出過的位置"
-
-#: ../src/InfoDisplay.cs:294
-msgid "No active photo"
-msgstr "沒有活動中的相片"
-
-#: ../src/InfoDisplay.cs:296
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "相片 \"{0}\" 不存在"
-
-#: ../src/InfoDisplay.cs:302
-msgid "No metadata available"
-msgstr "無可用的 Metadata"
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
+#: ../src/XmpTagsImporter.cs:89
+msgid "Imported Tags"
+msgstr "匯入的標籤"
-#: ../src/ItemAction.cs:81
-#: ../src/MainWindow.cs:261
-#: ../src/SingleView.cs:75
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
-msgstr "往左旋轉"
+msgstr "向左旋轉"
-#: ../src/ItemAction.cs:82
-#: ../src/ItemAction.cs:94
+#: ../src/ItemAction.cs:80
msgid "Rotate picture left"
-msgstr "將圖片往左選轉"
+msgstr "將圖片向左旋轉"
-#: ../src/ItemAction.cs:93
-#: ../src/MainWindow.cs:265
-#: ../src/SingleView.cs:80
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
-msgstr "往右旋轉"
+msgstr "向右旋轉"
-#: ../src/ItemAction.cs:104
-#: ../src/f-spot.glade.h:132
-#: ../extensions/FolderExport/FolderExport.cs:888
-msgid "Next"
-msgstr "下一步"
+#: ../src/ItemAction.cs:92
+msgid "Rotate picture right"
+msgstr "將圖片向右旋轉"
-#: ../src/ItemAction.cs:105
+#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "下一張圖片"
-#: ../src/ItemAction.cs:126
-#: ../src/f-spot.glade.h:152
-msgid "Previous"
-msgstr "上一次"
-
-#: ../src/ItemAction.cs:127
+#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "上一張圖片"
-#: ../src/ItemAction.cs:257
-msgid "Auto Color"
-msgstr "自動校色"
-
-#: ../src/ItemAction.cs:258
-msgid "Automatically adjust the colors"
-msgstr "自動調整色彩"
-
-#: ../src/ItemAction.cs:273
-msgid "Apply straightening"
-msgstr ""
-
-#: ../src/ItemAction.cs:274
-msgid "Apply straightening to image"
-msgstr ""
-
-#: ../src/ItemAction.cs:327
-msgid "Adjust the angle of the image to straighten the horizon"
-msgstr ""
-
-#: ../src/ItemAction.cs:343
-msgid "Create a soft focus visual effect"
-msgstr "建立柔焦視覺特效"
-
-#: ../src/Loupe.cs:64
-msgid "Error saving sharpened photo"
-msgstr "儲存銳化相片時發生錯誤"
-
-#: ../src/Loupe.cs:94
-msgid "Sharpen"
-msgstr "銳化"
-
-#: ../src/Loupe.cs:104
-msgid "Amount:"
-msgstr "數量："
-
-#: ../src/Loupe.cs:105
-msgid "Radius:"
-msgstr "半徑："
-
-#: ../src/Loupe.cs:106
-msgid "Threshold:"
-msgstr "門檻值："
-
-#: ../src/MainWindow.cs:254
-#: ../src/f-spot.glade.h:123
-msgid "Import"
-msgstr "匯入"
-
-#: ../src/MainWindow.cs:256
+#: ../src/MainWindow.cs:303
msgid "Import new images"
-msgstr "匯入新圖片"
+msgstr "匯入新圖像"
-#: ../src/MainWindow.cs:272
-#: ../src/f-spot.glade.h:77
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "瀏覽"
-#: ../src/MainWindow.cs:276
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "同時瀏覽多個相片"
-#: ../src/MainWindow.cs:280
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
-msgstr "編輯圖片"
+msgstr "編輯圖像"
-#: ../src/MainWindow.cs:284
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "檢視及編輯相片"
-#: ../src/MainWindow.cs:289
-#: ../src/SingleView.cs:87
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "全螢幕"
-#: ../src/MainWindow.cs:291
-#: ../src/SingleView.cs:89
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "全螢幕檢視相片"
-#: ../src/MainWindow.cs:296
-#: ../src/SingleView.cs:94
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "於幻燈片中檢視相片"
-#: ../src/MainWindow.cs:876
-msgid "Error loading database."
-msgstr "載入資料庫時發生錯誤。"
+#: ../src/MainWindow.cs:358
+msgid "Previous photo"
+msgstr "上一張相片"
-#: ../src/MainWindow.cs:877
-#, csharp-format
-msgid "F-Spot encountered an error while loading the photo database. The old database has be moved to {0} and a new database has been created."
-msgstr ""
+#: ../src/MainWindow.cs:363
+msgid "Next photo"
+msgstr "下一張相片"
-#: ../src/MainWindow.cs:1492
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "偵測不到數碼相機。"
-#: ../src/MainWindow.cs:1493
-msgid "F-Spot was unable to find any cameras attached to this system. Double check that the camera is connected and has power"
+#: ../src/MainWindow.cs:1519
+msgid ""
+"F-Spot was unable to find any cameras attached to this system. Double check "
+"that the camera is connected and has power"
msgstr "F-Spot 無法找到任何連接到系統的數碼相機。請再次確定它已連接並且電源已開啟。"
-#: ../src/MainWindow.cs:1533
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "連接數碼相機時發生錯誤"
-#: ../src/MainWindow.cs:1534
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "連接數碼相機時收到錯誤 \"{0}\""
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1901
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
-msgstr[0] "合併選定的標籤?"
-msgstr[1] "合併選定的 {0} 個標籤?"
+msgstr[0] "合併選定的 {0} 個標籤？"
-#: ../src/MainWindow.cs:1928
-msgid "This operation will merge the selected tags and any sub-tags into a single tag."
-msgstr ""
+#: ../src/MainWindow.cs:1873
+msgid ""
+"This operation will merge the selected tags and any sub-tags into a single "
+"tag."
+msgstr "此操作將合併所選的標籤與任何子標籤為單一標籤。"
-#: ../src/MainWindow.cs:1930
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "合併標籤(_M)"
-#: ../src/MainWindow.cs:2130
-#: ../src/SingleView.cs:469
+#: ../src/MainWindow.cs:2080
+#, csharp-format
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] "{1} 張相片中的第 {0} 張"
+
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} 張相片"
-msgstr[1] "{0} 張相片"
-
-#: ../src/MainWindow.cs:2137
-#, csharp-format
-msgid " out of {0}"
-msgstr "，共有 {0} 張"
-#: ../src/MainWindow.cs:2140
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " (已選 {0} 張)"
-msgstr[1] " (已選 {0} 張)"
-#: ../src/MainWindow.cs:2227
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "確定(_O)"
-#: ../src/MainWindow.cs:2228
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "刪除圖片時發生錯誤"
-#: ../src/MainWindow.cs:2233
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "沒有刪除檔案的權限：{1}{0}"
-#: ../src/MainWindow.cs:2237
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
-msgstr ""
+msgstr "刪除檔案時發生類型 {0} 的錯誤：{2}{1}"
-#: ../src/MainWindow.cs:2263
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
-msgstr[0] "要永久刪除選擇的相片嗎?"
-msgstr[1] "要永久刪除選擇的 {0} 張相片嗎?"
+msgstr[0] ""
+"要永久刪除選擇的相片嗎？\n"
+"要永久刪除選擇的 {0} 張相片嗎？"
-#: ../src/MainWindow.cs:2267
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
-msgid_plural "This deletes all versions of the selected photos from your drive."
-msgstr[0] "這樣會從磁碟中刪除已選相片的所有版本。"
-msgstr[1] "這樣會從磁碟中刪除已選相片的所有版本。"
+msgid_plural ""
+"This deletes all versions of the selected photos from your drive."
+msgstr[0] "這樣會從磁碟機中刪除這張相片的所有版本。"
-#: ../src/MainWindow.cs:2270
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "刪除相片(_D)"
-msgstr[1] "刪除相片(_D)"
-#: ../src/MainWindow.cs:2301
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
-msgstr[0] "要從 F-Spot 移除已選的相片嗎?"
-msgstr[1] "要從 F-Spot 移除已選的 {0} 張相片嗎?"
+msgstr[0] ""
+"要從 F-Spot 移除已選的相片嗎？\n"
+"要從 F-Spot 移除已選的 {0} 張相片嗎？"
-#: ../src/MainWindow.cs:2306
-msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
-msgstr "如果你要從 F-Spot 型錄中移除相片，那麼所有標籤資訊都會一併消失。不過，你仍然可以再次把相片匯入至 F-Spot 中。"
+#: ../src/MainWindow.cs:2256
+msgid ""
+"If you remove photos from the F-Spot catalog all tag information will be "
+"lost. The photos remain on your computer and can be imported into F-Spot "
+"again."
+msgstr "如果你要從 F-Spot 編目中移除相片，那麼所有標籤資訊都會一併消失。不過，你仍然可以再次把相片匯入至 F-Spot 中。"
-#: ../src/MainWindow.cs:2307
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
-msgstr "從型錄中移除(_R)"
+msgstr "從編目中移除(_R)"
-#: ../src/MainWindow.cs:2370
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "刪除標籤\"{0}\"?"
-#: ../src/MainWindow.cs:2372
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "刪除選定的標籤 {0} ?"
-#: ../src/MainWindow.cs:2377
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "相片"
-msgstr[1] "相片"
-#: ../src/MainWindow.cs:2379
-#, fuzzy, csharp-format
+#: ../src/MainWindow.cs:2329
+#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
-msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
-msgstr[0] "如果你刪除一個標籤，那麼相片的所有關聯都會消失。"
+msgid_plural ""
+"If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] "如果你刪除此標籤，那麼與 {0} {1} 的關聯都會消失。"
-#: ../src/MainWindow.cs:2384
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "刪除標籤(_D)"
-msgstr[1] "刪除標籤(_D)"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2398
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "標籤不是空的"
-#: ../src/MainWindow.cs:2399
+#: ../src/MainWindow.cs:2349
#, csharp-format
-msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
-msgstr ""
+msgid ""
+"Can not delete tags that have tags within them. Please delete tags under "
+"\"{0}\" first"
+msgstr "無法刪除內含標籤的標籤。請先刪除「{0}」下的標籤"
-#: ../src/MainWindow.cs:2851
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "將已選的相片向左旋轉"
-msgstr[1] "將已選的相片向左旋轉"
-#: ../src/MainWindow.cs:2864
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "將已選的相片向右旋轉"
-msgstr[1] "將已選的相片向右旋轉"
-#: ../src/MainWindow.cs:2872
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "尋找選定的標籤(_S)"
-msgstr[1] "尋找選定的標籤(_S)"
-#: ../src/MainWindow.cs:2876
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
-msgstr[0] "尋找選定的標籤以"
-msgstr[1] "尋找選定的標籤以"
+msgstr[0] "尋找選定的標籤以(_W)"
-#: ../src/MainWindow.cs:2914
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "建立新版本？"
-msgstr[1] "建立新版本？"
-#: ../src/MainWindow.cs:2916
+#: ../src/MainWindow.cs:2860
#, csharp-format
-msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
-msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"Before launching {1}, should F-Spot create a new version of the selected "
+"photo to preserve the original?"
+msgid_plural ""
+"Before launching {1}, should F-Spot create new versions of the selected "
+"photos to preserve the originals?"
+msgstr[0] "在啟動 {1} 之前，F-Spot 應該為所選相片建立新的版本以保留原始版本嗎？"
-#: ../src/MetadataStore.cs:18
+#: ../src/MainWindow.cs:2882
+msgid "XCF version"
+msgstr "XCF 版本"
+
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "建立者"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "標題"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "版權"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "主題與關鍵字"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "壓縮"
-#: ../src/MetadataStore.cs:24
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
-msgstr ""
+msgstr "平面設定"
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "方向"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
-msgstr ""
+msgstr "光度解譯"
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
-msgstr ""
+msgstr "解像度單位"
-#: ../src/MetadataStore.cs:32
-#, fuzzy
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
-msgstr "曝光率："
+msgstr "曝光模式"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
-msgstr ""
+msgstr "測量模式"
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "曝光模式"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
-msgstr ""
+msgstr "自選繪製"
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "元件設定"
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "光源"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
-msgstr ""
+msgstr "感測方法"
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "色彩空間"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "白平衡"
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
-msgstr ""
+msgstr "對焦平面解像度單位"
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "來源檔案類型"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
-msgstr ""
+msgstr "情境捕捉類型"
-#: ../src/MetadataStore.cs:56
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "取得控制"
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "對比度"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "飽和度"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
-msgstr ""
+msgstr "銳利"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
-msgstr ""
+msgstr "情境類型"
#. Fixme this should really set parent menu
#. items insensitve
@@ -1439,512 +2676,495 @@ msgstr ""
msgid "(No Tags)"
msgstr "(無標籤)"
-#: ../src/PhotoVersionCommands.cs:57
+#: ../src/PhotoVersionCommands.cs:58
msgid "Create New Version"
msgstr "建立新的版本"
-#: ../src/PhotoVersionCommands.cs:58
+#: ../src/PhotoVersionCommands.cs:59
msgid "Name:"
msgstr "名稱："
-#: ../src/PhotoVersionCommands.cs:62
+#: ../src/PhotoVersionCommands.cs:63
msgid "Rename Version"
msgstr "重新命名版本"
-#: ../src/PhotoVersionCommands.cs:63
+#: ../src/PhotoVersionCommands.cs:64
msgid "New name:"
msgstr "新的名稱："
-#: ../src/PhotoVersionCommands.cs:109
+#: ../src/PhotoVersionCommands.cs:110
msgid "Could not create a new version"
msgstr "無法建立新版本"
-#: ../src/PhotoVersionCommands.cs:110
+#: ../src/PhotoVersionCommands.cs:111
#, csharp-format
msgid "Received exception \"{0}\". Unable to create version \"{1}\""
msgstr "收到異常 \"{0}\"。無法建立版本 \"{1}\""
-#: ../src/PhotoVersionCommands.cs:137
+#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
msgstr "真的要刪除?"
#: ../src/PhotoVersionCommands.cs:139
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/PhotoVersionCommands.cs:140
msgid "Delete"
msgstr "刪除"
-#: ../src/PhotoVersionCommands.cs:143
+#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
msgstr "真的要刪除版本 \"{0}\" ?"
-#. FIXME show error dialog.
-#: ../src/PhotoVersionCommands.cs:153
+#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
msgstr "無法刪除版本"
-#: ../src/PhotoVersionCommands.cs:154
+#: ../src/PhotoVersionCommands.cs:155
#, csharp-format
msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
msgstr "收到異常 \"{0}\"。無法刪除版本 \"{1}\""
-#: ../src/PhotoVersionCommands.cs:195
+#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
msgstr "無法將版本重新命名"
-#: ../src/PhotoVersionCommands.cs:196
+#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "收到異常 \"{0}\"。無法重新命名版本 \"{1}\""
-#: ../src/PhotoVersionMenu.cs:67
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(無修改)"
-#: ../src/PhotoView.cs:75
-msgid "4 x 3 (Book)"
-msgstr "4 x 3 (書本)"
-
-#: ../src/PhotoView.cs:76
-msgid "4 x 6 (Postcard)"
-msgstr "4 x 6 (明信片)"
-
-#: ../src/PhotoView.cs:77
-msgid "5 x 7 (L, 2L)"
-msgstr "5 x 7 (L, 2L)"
-
-#: ../src/PhotoView.cs:78
-msgid "8 x 10"
-msgstr "8 x 10"
-
-#: ../src/PhotoView.cs:79
-msgid "Square"
-msgstr "正方形"
-
-#: ../src/PhotoView.cs:126
-msgid "Crop photo to selected area"
-msgstr "剪裁相片中所選區域"
-
-#: ../src/PhotoView.cs:127
-msgid "Remove redeye from selected area"
-msgstr "從選擇區域中移除紅眼"
-
-#: ../src/PhotoView.cs:129
-msgid "Select an area to crop"
-msgstr "選擇區域以剪裁"
-
-#: ../src/PhotoView.cs:130
-msgid "Select an area to remove redeye"
-msgstr "選擇區域以移除紅眼"
-
-#: ../src/PhotoView.cs:255
-#: ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "編輯相片時發生錯誤"
-#: ../src/PhotoView.cs:307
-msgid "No selection available"
-msgstr "無可用的選取區域"
-
-#: ../src/PhotoView.cs:308
-msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
-msgstr ""
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "收到異常 \"{0}\"。無法儲存相片 {1}"
-#: ../src/PhotoView.cs:496
+#: ../src/PhotoView.cs:357
msgid "Comment:"
msgstr "註解："
-#: ../src/PhotoView.cs:528
-msgid "Constrain the aspect ratio of the selection"
-msgstr ""
-
-#: ../src/PhotoView.cs:530
-msgid "Crop"
-msgstr "裁剪"
-
-#: ../src/PhotoView.cs:534
-msgid "Reduce Red-Eye"
-msgstr "減少紅眼"
-
-#: ../src/PhotoView.cs:538
-msgid "Adjust Colors"
-msgstr "調節色彩"
-
-#: ../src/PhotoView.cs:540
-msgid "Adjust the photo colors"
-msgstr "調整相片色彩"
-
-#: ../src/PhotoView.cs:543
-msgid "Desaturate"
-msgstr ""
-
-#: ../src/PhotoView.cs:545
-msgid "Convert the photo to black and white"
-msgstr "轉換為黑白相片"
-
-#: ../src/PhotoView.cs:548
-msgid "Sepia Tone"
-msgstr "棕褐色調"
-
-#: ../src/PhotoView.cs:550
-msgid "Convert the photo to sepia tones"
-msgstr "轉換相片為棕褐色調"
-
-#: ../src/PhotoView.cs:580
-msgid "Previous photo"
-msgstr "上一張相片"
-
-#: ../src/PhotoView.cs:585
-msgid "Next photo"
-msgstr "下一張相片"
-
-#: ../src/PhotoView.cs:622
-msgid "No Constraint"
-msgstr "無限制"
-
-#: ../src/PhotoView.cs:623
-#, fuzzy
-msgid "Same as photo"
-msgstr "已評分的相片"
-
-#: ../src/PhotoView.cs:628
-msgid "Custom Ratios..."
-msgstr "自選比例..."
-
-#: ../src/Preferences.cs:157
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "相片"
-#. This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/ProgressDialog.cs:82
-#: ../src/TimeDialog.cs:141
-#: ../extensions/CDExport/CDExport.cs:130
-#: ../extensions/FlickrExport/FlickrExport.cs:338
-#: ../extensions/FolderExport/FolderExport.cs:218
-#: ../extensions/GalleryExport/GalleryExport.cs:744
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{1} 之 {0}"
+#: ../src/PrintOperation.cs:32
+msgid "Image Settings"
+msgstr "圖像設定"
-#: ../src/QueryWidget.cs:40
+#: ../src/QueryWidget.cs:58
msgid "Find: "
-msgstr "尋找："
+msgstr "尋找： "
-#: ../src/QueryWidget.cs:45
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "未標籤的相片"
-#: ../src/QueryWidget.cs:53
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "已評分的相片"
-#: ../src/QueryWidget.cs:61
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
-msgstr "匯入清單"
+msgstr "匯入膠卷"
-#: ../src/QueryWidget.cs:81
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "清除搜尋"
-#: ../src/QueryWidget.cs:88
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "更新搜尋"
-#: ../src/QueryWidget.cs:90
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "找不到符合的相片"
-#: ../src/QueryWidget.cs:127
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "隱藏搜尋列(_F)"
-#: ../src/QueryWidget.cs:133
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "顯示搜尋列(_F)"
-#: ../src/RotateCommand.cs:94
-#: ../src/RotateCommand.cs:109
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
msgid "Unable to rotate this type of photo"
msgstr "無法旋轉這種相片"
-#: ../src/RotateCommand.cs:129
+#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
msgstr "無法旋轉唯讀檔"
-#: ../src/RotateCommand.cs:196
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
msgstr "正在旋轉相片"
-#: ../src/RotateCommand.cs:207
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
msgstr "正在旋轉圖片\"{0}\""
-#: ../src/RotateCommand.cs:220
+#: ../src/RotateCommand.cs:222
msgid "Directory not found"
msgstr "找不到目錄"
-#: ../src/RotateCommand.cs:240
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
-msgstr[0] "無法旋轉這張相片"
-msgstr[1] "無法旋轉這 {0} 張相片"
+msgstr[0] ""
+"無法旋轉這張相片\n"
+"無法旋轉這 {0} 張相片"
-#: ../src/RotateCommand.cs:242
+#: ../src/RotateCommand.cs:244
#, csharp-format
-msgid "The photo could not be rotated because it is on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgid_plural "{0} photos could not be rotated because they are on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgstr[0] "無法旋轉這張相片，因為它位於一個唯讀的檔案系統例如 CDROM 。請檢查權限，然後再試一次。"
-msgstr[1] "無法旋轉 {0} 相片，因為它們位於一個唯讀的檔案系統或媒體例如 CDROM。請檢查權限，然後再試一次。"
+msgid ""
+"The photo could not be rotated because it is on a read only file system or "
+"media such as a CDROM. Please check the permissions and try again."
+msgid_plural ""
+"{0} photos could not be rotated because they are on a read only file system "
+"or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] ""
+"無法旋轉這張相片，因為它位於一個唯讀的檔案系統，例如光碟片。請檢查權限，然後再試一次。\n"
+"無法旋轉這 {0} 張相片，因為它位於一個唯讀的檔案系統，例如光碟片。請檢查權限，然後再試一次。"
-#: ../src/RotateCommand.cs:269
-#, fuzzy, csharp-format
+#: ../src/RotateCommand.cs:271
+#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
-msgstr "連接數碼相機時收到錯誤 \"{0}\""
+msgstr "試圖旋轉 {1} 時接收到錯誤 \"{0}\""
-#: ../src/RotateCommand.cs:274
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
msgstr "旋轉相片時發生錯誤。"
-#: ../src/SendEmail.cs:237
+#: ../src/SendEmail.cs:240
msgid "Preparing email"
msgstr "正在準備電子郵件"
-#: ../src/SendEmail.cs:289
+#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
msgstr "正在匯出圖片\"{0}\""
-#: ../src/SendEmail.cs:311
+#: ../src/SendEmail.cs:314
msgid "Error processing image"
-msgstr "處理圖片時錯誤"
+msgstr "處理圖像時錯誤"
-#: ../src/SendEmail.cs:312
+#: ../src/SendEmail.cs:315
#, csharp-format
msgid "An error occured while processing \"{0}\": {1}"
msgstr "當處理「{0}」時發生錯誤：{1}"
#. Send the mail :)
-#: ../src/SendEmail.cs:327
-msgid "my photos"
+#: ../src/SendEmail.cs:330
+msgid "My Photos"
msgstr "我的相片"
-#: ../src/SingleView.cs:77
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "儲存銳化相片時發生錯誤"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "銳化"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "數量："
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "半徑："
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "門檻值："
+
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "往左旋轉相片"
-#: ../src/SingleView.cs:82
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "往右旋轉相片"
-#: ../src/SingleView.cs:324
+#: ../src/SingleView.cs:115
+msgid "Folder"
+msgstr "資料夾"
+
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "開啟"
-#: ../src/SingleView.cs:429
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "設為背景"
-#: ../src/TagCommands.cs:92
-#: ../src/TagCommands.cs:220
-#: ../src/TagSelectionWidget.cs:508
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "這個名稱已被使用"
-#: ../src/TagCommands.cs:139
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "建立新標籤"
-#: ../src/TagCommands.cs:140
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "新標籤名稱："
-#: ../src/TagCommands.cs:279
-msgid "Edit Tag"
-msgstr "編輯標籤"
-
-#: ../src/TagCommands.cs:280
-msgid "Tag Name:"
-msgstr "標籤名稱："
-
-#: ../src/TagCommands.cs:388
-msgid "Unable to load image"
-msgstr "無法載入圖片"
-
-#: ../src/TagCommands.cs:389
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "無法讀取「{0}」作為標籤圖示"
-
-#: ../src/TagCommands.cs:427
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "{1}張相片中的第{0}張"
-
-#: ../src/TagCommands.cs:457
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "修改標籤 {0} 的圖示"
-
-#: ../src/TagCommands.cs:473
-msgid "Select Photo from file"
-msgstr "從檔案選擇相片"
-
-#: ../src/TagCommands.cs:496
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-
-#: ../src/TagMenu.cs:91
-#: ../src/TagPopup.cs:36
-msgid "Create New Tag..."
-msgstr "建立新標籤..."
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
msgid_plural "Find"
msgstr[0] "尋找"
-msgstr[1] "尋找"
+
+#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
+msgid "Create New Tag..."
+msgstr "建立新標籤..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "編輯選定的標籤..."
+msgid "Edit Tag..."
+msgstr "編輯標籤..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
msgid_plural "Delete Tags"
msgstr[0] "刪除標籤"
-msgstr[1] "刪除標籤"
#: ../src/TagPopup.cs:52
msgid "Attach Tag to Selection"
msgid_plural "Attach Tags to Selection"
-msgstr[0] "附加標籤到選擇的項目"
-msgstr[1] "附加標籤到選擇的項目"
+msgstr[0] "附加標籤到選取的項目"
#: ../src/TagPopup.cs:56
msgid "Remove Tag From Selection"
msgid_plural "Remove Tags From Selection"
-msgstr[0] "從選擇項目移除標籤"
-msgstr[1] "從選擇項目移除標籤"
+msgstr[0] "從選取項目移除標籤"
#: ../src/TagPopup.cs:62
msgid "Merge Tags"
msgstr "合併標籤"
-#: ../src/TagQueryWidget.cs:32
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr "包含被標為 \"{0}\" 的相片"
-#: ../src/TagQueryWidget.cs:37
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr "不包含被標為 \"{0}\" 的相片"
-#: ../src/TagQueryWidget.cs:42
+#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
msgstr "從搜尋中移除"
-#: ../src/TagQueryWidget.cs:86
+#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
msgstr[0] "尋找以(_W)"
-msgstr[1] "尋找以(_W)"
-#: ../src/TagQueryWidget.cs:112
+#: ../src/TagQueryWidget.cs:114
msgid "All"
msgstr "全部"
-#: ../src/TagQueryWidget.cs:147
-#: ../src/Term.cs:591
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "非 {0}"
-#: ../src/TagQueryWidget.cs:277
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr "拖曳標籤至此來為他們搜尋"
-#: ../src/TagSelectionWidget.cs:507
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "重新命名標籤時發生錯誤"
-#: ../src/TagStore.cs:222
+#: ../src/TagStore.cs:203
msgid "Favorites"
msgstr "最愛"
-#: ../src/TagStore.cs:227
+#: ../src/TagStore.cs:208
msgid "Hidden"
msgstr "隱藏"
-#: ../src/TagStore.cs:235
+#: ../src/TagStore.cs:216
msgid "People"
msgstr "人物"
-#: ../src/TagStore.cs:240
+#: ../src/TagStore.cs:221
msgid "Places"
msgstr "地方"
-#: ../src/TagStore.cs:245
+#: ../src/TagStore.cs:226
msgid "Events"
msgstr "事件"
-#: ../src/Term.cs:297
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
+msgid "(None)"
+msgstr "(無)"
+
+#: ../src/Term.cs:298
msgid " and "
msgstr " 及 "
#. operators.Add (Catalog.GetString (" && "));
-#: ../src/Term.cs:299
+#: ../src/Term.cs:300
msgid ", "
msgstr "， "
-#: ../src/Term.cs:355
+#: ../src/Term.cs:356
msgid " or "
msgstr " 或 "
-#: ../src/Term.cs:379
-#: ../src/f-spot.glade.h:282
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "或"
-#: ../src/ThreadProgressDialog.cs:66
-msgid "Retry"
-msgstr "重試"
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "正在更新縮圖"
-#: ../src/TimeDialog.cs:124
-#: ../src/f-spot.glade.h:176
+#: ../src/ThumbnailCommand.cs:28
#, csharp-format
-msgid "Shift all photos by {0}"
-msgstr ""
+msgid "Updating picture \"{0}\""
+msgstr "正在上傳圖片 \"{0}\""
+
+#: ../src/UI.Dialog/AboutDialog.cs:76
+msgid "Photo management for GNOME"
+msgstr "GNOME 的相片管理"
-#: ../src/UI.Dialog/AboutDialog.cs:68
-msgid "Copyright © 2003-2008 Novell Inc."
-msgstr "Copyright © 2003-2008 Novell Inc."
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Copyright © 2003-2009 Novell Inc."
-#: ../src/UI.Dialog/AboutDialog.cs:93
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"GNOME 程式中文化郵件論壇\n"
"community at linuxhall.org\n"
"\n"
-"Hialan Liu <hialan.liu at gmail.com>, 2007Stanley Wong <stanley18fan0k at yahoo.com.hk>, 2005"
-
-#: ../src/UI.Dialog/AboutDialog.cs:98
+"Hialan Liu <hialan.liu at gmail.com>, 2007Stanley Wong <stanley18fan0k at yahoo.com.hk>, 2005\n"
+"\n"
+"Launchpad Contributions:\n"
+" Accord Tsai https://launchpad.net/~accordtsai\n"
+" Cheng-Chia Tseng https://launchpad.net/~zerng07\n"
+" Elmaz Yu https://launchpad.net/~elmazyu\n"
+" Jackden https://launchpad.net/~jackden\n"
+" Janelin https://launchpad.net/~wgl1242254\n"
+" Kevin-Wei-2 https://launchpad.net/~kevin-wei3\n"
+" Tenki https://launchpad.net/~tenki-jih\n"
+" nckuhuahua https://launchpad.net/~nckuhuahua"
+
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "F-Spot 網站"
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
+#, csharp-format
+msgid "Shift all photos by {0}"
+msgstr "根據 {0} 轉換所有相片"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "今天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "昨天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "最近 7 天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "最近 30 天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "最近 90 天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "最近 360 天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "本週 (星期一～星期日)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "前一週 (星期一～星期日)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "自選範圍"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "修改標籤 {0} 的圖示"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "從檔案選擇相片"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>從相片</b>\n"
+" 你可以使用你相片庫中的一張相片作為此標籤的圖示。\n"
+" 然而，首先你必須有至少一張相片和此標籤相關聯。\n"
+" 請將某相片加上「{0}」標籤，並返回這裏\n"
+" 以將它作為圖示使用。"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "無法載入圖像"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "無法讀取「{0}」作為標籤圖示"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "{1}張相片中的第{0}張"
+
#: ../src/UI.Dialog/ExceptionDialog.cs:24
msgid "F-Spot Encountered a Fatal Error"
-msgstr ""
+msgstr "F-Spot 遭遇到嚴重錯誤"
#: ../src/UI.Dialog/ExceptionDialog.cs:60
msgid "Error Details"
@@ -1952,7 +3172,31 @@ msgstr "錯誤細節"
#: ../src/UI.Dialog/ExceptionDialog.cs:104
msgid "An unhandled exception was thrown: "
-msgstr "發生未處理的異常："
+msgstr "出現了預期外的錯誤： "
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "無"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "系統個人設定檔"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "標準主題"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "載入資料庫時發生錯誤。"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#, csharp-format
+msgid ""
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
+msgstr "當 F-Spot 載入相片資料庫時遭遇到錯誤。舊的資料庫已經被移至 {0}，新的資料庫已經建立。"
#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
msgid "Label"
@@ -1962,1826 +3206,924 @@ msgstr "標籤"
msgid "Ratio"
msgstr "比例"
-#: ../src/Updater.cs:284
-msgid "Updating F-Spot Database"
-msgstr "正在更新 F-Spot 資料庫"
-
-#: ../src/Updater.cs:285
-msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
-msgstr "你的 F-Spot 圖庫資料庫正在更新，請稍後。這或許會需要一些時間。"
-
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:25
-msgid "Unable to create temporary file"
-msgstr "無法建立暫存檔"
-
-#: ../src/Utils/GnomeUtil.cs:49
-msgid "The \"F-Spot Manual\" could not be found. Please verify that your installation has been completed successfully."
-msgstr "找不到「F-Spot 手冊」。請確認你的安裝過程完整成功。"
-
-#: ../src/Widgets/RatingMenuItem.cs:48
-msgid "Rating:"
-msgstr "評分："
-
-#: ../src/Widgets/FindBar.cs:83
-msgid "Find:"
-msgstr "尋找："
-
-#: ../src/XmpTagsImporter.cs:89
-msgid "Location"
-msgstr "位置"
-
-#: ../src/XmpTagsImporter.cs:90
-msgid "Country"
-msgstr "國家"
-
-#: ../src/XmpTagsImporter.cs:91
-msgid "City"
-msgstr "城市"
-
-#: ../src/XmpTagsImporter.cs:92
-msgid "State"
-msgstr "州"
-
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "重試"
-#: ../src/f-spot.glade.h:2
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
msgid "0000:00:00 00:00:00"
msgstr "0000:00:00 00:00:00"
-#: ../src/f-spot.glade.h:3
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
msgid "00:00:00"
msgstr "00:00:00"
-#: ../src/f-spot.glade.h:4
-msgid "1 of 1"
-msgstr "1 之中的第 1"
-
-#: ../src/f-spot.glade.h:5
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/f-spot.glade.h:6
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/f-spot.glade.h:7
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/f-spot.glade.h:8
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
msgid "5"
msgstr "5"
-#: ../src/f-spot.glade.h:9
-msgid "640 px"
-msgstr "640 px"
-
-#: ../src/f-spot.glade.h:10
-msgid "800 px"
-msgstr "800 px"
-
-#: ../src/f-spot.glade.h:11
-msgid "<b></b>"
-msgstr "<b></b>"
-
-#: ../src/f-spot.glade.h:12
-#: ../extensions/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>帳號</b>"
-
-#: ../src/f-spot.glade.h:13
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
msgid "<b>Action</b>"
msgstr "<b>行為</b>"
-#: ../src/f-spot.glade.h:14
-#: ../extensions/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>相簿</b>"
-
-#: ../src/f-spot.glade.h:15
-#, fuzzy
-msgid "<b>Co_rrections</b>"
-msgstr "<b>相片</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>參考相片</b>"
-#: ../src/f-spot.glade.h:16
-msgid "<b>Color Management</b>"
-msgstr "<b>色彩管理</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "調整時間"
-#: ../src/f-spot.glade.h:17
-msgid "<b>Color Temperature</b>"
-msgstr "<b>色溫</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "調整後的日期： "
-#: ../src/f-spot.glade.h:18
-#: ../extensions/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>目的地</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "目前日期："
-#: ../src/f-spot.glade.h:19
-msgid "<b>End Date</b>"
-msgstr "<b>結束日期</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "將所有相片的間隔設為"
-#: ../src/f-spot.glade.h:20
-msgid "<b>Exposure</b>"
-msgstr "<b>曝光率</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "差異："
-#: ../src/f-spot.glade.h:21
-msgid "<b>From External Photo</b>"
-msgstr "<b>從外部相片</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "分。開始於 {0}"
-#: ../src/f-spot.glade.h:22
-#, fuzzy
-msgid "<b>From Photo</b>"
-msgstr "<b>相片</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>結束日期</b>"
-#: ../src/f-spot.glade.h:23
-#: ../extensions/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>圖庫</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>選擇期間</b>"
-#: ../src/f-spot.glade.h:24
-msgid "<b>Histo_gram</b>"
-msgstr "<b>長條圖(_G)</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>開始日期</b>"
-#: ../src/f-spot.glade.h:25
-msgid "<b>Histogram</b>"
-msgstr "<b>長條圖</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "取消，不改變目前的時間軸。"
-#: ../src/f-spot.glade.h:26
-#, fuzzy
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>目的地</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "只顯示在這些日期中的相片。"
-#: ../src/f-spot.glade.h:27
-msgid "<b>Import Settings</b>"
-msgstr "<b>匯入設定</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "設定日期範圍"
-#: ../src/f-spot.glade.h:28
-#, fuzzy
-msgid "<b>Interoperability</b>"
-msgstr "<b>打印機細節</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#: ../src/f-spot.glade.h:29
-msgid "<b>Max Rating</b>"
-msgstr "<b>最高評分</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "編輯標籤"
-#: ../src/f-spot.glade.h:30
-msgid "<b>Metadata</b>"
-msgstr "<b>Metadata</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "編輯圖示"
-#: ../src/f-spot.glade.h:31
-msgid "<b>Min Rating</b>"
-msgstr "<b>最低評分</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "圖示(_I)："
-#: ../src/f-spot.glade.h:32
-msgid "<b>Photograph Layout</b>"
-msgstr "<b>相片布局</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>從外部相片</b>"
-#: ../src/f-spot.glade.h:33
-#: ../extensions/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/FolderExport/FolderExport.glade.h:5
-#: ../extensions/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:2
-msgid "<b>Photos</b>"
-msgstr "<b>相片</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>從相片</b>"
-#: ../src/f-spot.glade.h:34
-msgid "<b>Predefined</b>"
-msgstr "<b>預先定義</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>預先定義的圖示</b>"
-#: ../src/f-spot.glade.h:35
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
msgid "<b>Preview</b>"
msgstr "<b>預覽</b>"
-#: ../src/f-spot.glade.h:36
-msgid "<b>Printer Details</b>"
-msgstr "<b>打印機細節</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "設計圖示從"
-#: ../src/f-spot.glade.h:37
-msgid "<b>Reference Photo</b>"
-msgstr "<b>參考相片</b>"
-
-#: ../src/f-spot.glade.h:38
-msgid "<b>Screensaver</b>"
-msgstr "<b>螢幕保護程式</b>"
-
-#: ../src/f-spot.glade.h:39
-msgid "<b>Select period</b>"
-msgstr "<b>選擇期間</b>"
-
-#: ../src/f-spot.glade.h:40
-msgid "<b>Size</b>"
-msgstr "<b>大小</b>"
-
-#: ../src/f-spot.glade.h:41
-msgid "<b>Start Date</b>"
-msgstr "<b>開始日期</b>"
-
-#: ../src/f-spot.glade.h:42
-#: ../extensions/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/FolderExport/FolderExport.glade.h:6
-#: ../extensions/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>風格</b>"
-
-#: ../src/f-spot.glade.h:43
-msgid "<b>Summary</b>"
-msgstr "<b>摘要</b>"
-
-#: ../src/f-spot.glade.h:44
-#, fuzzy
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>開始日期</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "編輯標籤圖示"
-#: ../src/f-spot.glade.h:45
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>檢視匯入的所有圖片</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "沒有圖像(_I)"
-#: ../src/f-spot.glade.h:46
-msgid "<b>_White Balance</b>"
-msgstr "<b>白平衡(_W)</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "0 張中的第 0 張相片"
-#: ../src/f-spot.glade.h:47
-msgid "<small> </small>"
-msgstr "<small> </small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "供顯示用的色彩個人設定檔："
-#: ../src/f-spot.glade.h:48
-msgid "<small></small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "供打印用的色彩個人設定檔："
-#: ../src/f-spot.glade.h:49
-msgid "<small><i>Choose the folder where F-Spot should store newly imported photos</i></small>"
-msgstr "<small><i>選擇 F-Spot 匯入新相片時儲存的資料夾</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "F-Spot 偏好設定"
-#: ../src/f-spot.glade.h:50
-#, fuzzy
-msgid "<small><i>Enable this option if you want to allow other programs to import or delete photos and tags over DBus.</i></small>"
-msgstr "<small><i>啟用這個選項以儲存標籤及描述資訊於支援的圖片格式中。</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-Spot 外觀："
-#: ../src/f-spot.glade.h:51
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr "<small><i>啟用這個選項以儲存標籤及描述資訊於支援的圖片格式中。</i></small>"
-
-#: ../src/f-spot.glade.h:53
-msgid "<small><i>Enable this to allow interpolation on zoomed images. You shouldn't disable this for viewing photos, but disabling the interpolation could be usefull in icon design.</i></small>"
-msgstr ""
-
-#: ../src/f-spot.glade.h:54
-msgid "<small><i>While acting as a screensaver, F-Spot can display all of your images, or a small subset based on tags.</i></small>"
-msgstr "<small><i>當作為螢幕保護程式時，F-Spot 可以顯示你所有的圖片，或是根據據標籤顯示一小部份。</i></small>"
-
-#: ../src/f-spot.glade.h:55
-msgid "<small><i>You can choose how to display transparent parts in images. This option has no effect on photos, but setting this as check pattern or custom color could be usefull when viewing icons or other artworks with transparent parts.</i></small>"
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
+"如果可以的話放在圖像檔內\n"
+"<small>讓其他圖像編輯程式可以存取。</small>"
-#: ../src/f-spot.glade.h:56
-msgid "<small>C_ontrast:</small>"
-msgstr "<small>對比(_O)：</small>"
-
-#: ../src/f-spot.glade.h:57
-msgid "<small>Te_mp:</small>"
-msgstr "<small>色溫(M)：</small>"
-
-#: ../src/f-spot.glade.h:58
-msgid "<small>_Brightness:</small>"
-msgstr "<small>_亮度：</small>"
-
-#: ../src/f-spot.glade.h:59
-msgid "<small>_Exposure:</small>"
-msgstr "<small>曝光(_E)：</small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "選擇資料夾"
-#: ../src/f-spot.glade.h:60
-msgid "<small>_Hue:</small>"
-msgstr "<small>色調(_H)：</small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "從圖像檔分離"
-#: ../src/f-spot.glade.h:61
-msgid "<small>_Saturation:</small>"
-msgstr "<small>色彩飽和(_S)</small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "為這些相片儲存標籤與描述："
-#: ../src/f-spot.glade.h:62
-#, fuzzy
-msgid "<small>_Tint:</small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "當匯入相片時，將它們複製到："
-#: ../src/f-spot.glade.h:63
-msgid "Ad_just Color..."
-msgstr "調節色彩(_J)..."
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>最高評分</b>"
-#: ../src/f-spot.glade.h:64
-msgid "Adjust Color"
-msgstr "調節色彩"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>最低評分</b>"
-#: ../src/f-spot.glade.h:65
-msgid "Adjust Time"
-msgstr "調整時間"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "設定評分過濾器"
-#: ../src/f-spot.glade.h:66
+#: ../src/ui/main_window.ui.h:1
msgid "Adjust _Time..."
msgstr "調整時間(_T)..."
-#: ../src/f-spot.glade.h:67
-msgid "Adjusted date: "
-msgstr "調整後的日期："
-
-#: ../src/f-spot.glade.h:69
-msgid "Allow other programs to manipulate F-Spot"
-msgstr ""
-
-#: ../src/f-spot.glade.h:70
+#: ../src/ui/main_window.ui.h:2
msgid "Arrange _by"
msgstr "排列根據(_B)"
-#: ../src/f-spot.glade.h:71
-#, fuzzy
-msgid "As _background"
-msgstr "設定為背景(_B)"
-
-#: ../src/f-spot.glade.h:72
-#, fuzzy
-msgid "As _custom color: "
-msgstr "調節色彩"
-
-#: ../src/f-spot.glade.h:73
-#, fuzzy
-msgid "As check _pattern"
-msgstr "檢查類型"
-
-#: ../src/f-spot.glade.h:74
-msgid "Attach Tags:"
-msgstr "附加標籤："
-
-#: ../src/f-spot.glade.h:75
-msgid "Attach tag:"
-msgstr "附加標籤："
-
-#: ../src/f-spot.glade.h:76
-#: ../extensions/CDExport/CDExport.glade.h:2
-#: ../extensions/FolderExport/FolderExport.glade.h:7
-#: ../extensions/GalleryExport/GalleryExport.glade.h:9
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "自動旋轉"
-
-#: ../src/f-spot.glade.h:78
+#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
msgstr "根據日期(_D)"
-#: ../src/f-spot.glade.h:79
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
-msgstr "根據匯入清單(_I)"
+msgstr "根據匯入膠卷(_I)"
-#: ../src/f-spot.glade.h:80
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
msgstr "根據評分(_R)"
-#: ../src/f-spot.glade.h:81
-msgid "CD"
-msgstr "CD"
-
-#: ../src/f-spot.glade.h:82
-msgid "C_aption:"
-msgstr "標題(_A)："
-
-#: ../src/f-spot.glade.h:83
-msgid "C_ontrast:"
-msgstr "對比(_O)："
-
-#: ../src/f-spot.glade.h:84
-msgid "Camera Selection"
-msgstr "選擇的數碼相機"
-
-#: ../src/f-spot.glade.h:85
-msgid "Cancel, do not change the current timeline. "
-msgstr "取消，不改變目前的時間線。"
-
-#: ../src/f-spot.glade.h:86
-msgid "Co_nfigure"
-msgstr "組態(_N)"
-
-#: ../src/f-spot.glade.h:87
-msgid "Copy Locat_ion"
-msgstr "複製圖片位置(_I)"
-
-#: ../src/f-spot.glade.h:88
-msgid "Copy files to the Photos folder"
-msgstr "複製檔案至相片資料夾"
-
-#: ../src/f-spot.glade.h:89
-msgid "Create Mail"
-msgstr "建立郵件"
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "複製"
-#: ../src/f-spot.glade.h:90
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "建立新標籤(_T)..."
-#: ../src/f-spot.glade.h:91
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "建立新版本(_N)..."
-#: ../src/f-spot.glade.h:92
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr "建立郵件並將所選相片（可能會被縮放）作為附件"
-
-#: ../src/f-spot.glade.h:93
-msgid "Crop photo to _fit"
-msgstr "剪裁相片以符合(_F)"
-
-#: ../src/f-spot.glade.h:94
-msgid "Current date:"
-msgstr "目前日期："
-
-#: ../src/f-spot.glade.h:95
-msgid "Display File _Names"
-msgstr "顯示檔案名稱(_N)"
-
-#: ../src/f-spot.glade.h:96
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "只顯示那些匯入指定清單的相片。"
-
-#: ../src/f-spot.glade.h:97
-msgid "Do not send a mail"
-msgstr "不要寄出郵件"
-
-#: ../src/f-spot.glade.h:98
-msgid "E-_Mail:"
-msgstr "電子郵件(_M)："
-
-#: ../src/f-spot.glade.h:99
-msgid "E_xport titles and comments"
-msgstr "匯出標題和註解(_X)"
-
-#: ../src/f-spot.glade.h:100
-msgid "Edit Tag Icon"
-msgstr "編輯標籤圖示"
-
-#: ../src/f-spot.glade.h:101
-msgid "Edit icon"
-msgstr "編輯圖示"
-
-#: ../src/f-spot.glade.h:102
-msgid "Estimated new size"
-msgstr "估計新大小"
-
-#: ../src/f-spot.glade.h:103
-#: ../extensions/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:6
-msgid "Export"
-msgstr "匯出"
-
-#: ../src/f-spot.glade.h:104
-msgid "Extra large"
-msgstr "非常大"
-
-#: ../src/f-spot.glade.h:105
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:106
-msgid "F-Spot View"
-msgstr "F-Spot 檢視"
-
-#: ../src/f-spot.glade.h:108
-msgid "Filter on selected rolls"
-msgstr "過濾所選清單"
-
-#: ../src/f-spot.glade.h:109
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "尋找(_D)"
-#: ../src/f-spot.glade.h:111
-msgid ""
-"From Screen\n"
-"Standard RGB"
-msgstr ""
-"從螢幕\n"
-"標準 RGB"
-
-#: ../src/f-spot.glade.h:113
-msgid ""
-"Full Page\n"
-"Standard - 4x6"
-msgstr ""
-"全頁\n"
-"標準 - 4x6"
-
-#: ../src/f-spot.glade.h:115
-msgid "G_allery:"
-msgstr "G_allery:"
-
-#: ../src/f-spot.glade.h:116
-msgid "Gallery"
-msgstr "圖庫"
-
-#: ../src/f-spot.glade.h:117
-msgid ""
-"Hairline\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-msgstr ""
-"十字線\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-
-#: ../src/f-spot.glade.h:122
-msgid "Images tagged with:"
-msgstr "含有標籤的圖片："
-
-#: ../src/f-spot.glade.h:124
-msgid "Import Source:"
-msgstr "匯入來源："
-
-#: ../src/f-spot.glade.h:125
-msgid "Include subfolders"
-msgstr "包括子目錄(_C)"
-
-#: ../src/f-spot.glade.h:126
-msgid "Large"
-msgstr "大"
-
-#: ../src/f-spot.glade.h:127
-msgid "Make F-Spot your screensaver"
-msgstr "使 F-Spot 做為你的螢幕保護程式"
-
-#: ../src/f-spot.glade.h:128
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
-msgstr "管理延伸套件(_E)"
-
-#: ../src/f-spot.glade.h:129
-msgid "Manage your custom selection ratios"
-msgstr ""
-
-#: ../src/f-spot.glade.h:130
-msgid "Medium"
-msgstr "中"
+msgstr "管理擴充套件(_E)"
-#: ../src/f-spot.glade.h:131
-msgid "N_umber of Copies:"
-msgstr "副本數目(_U)："
-
-#: ../src/f-spot.glade.h:133
-msgid "No _image"
-msgstr "沒有圖片(_I)"
-
-#: ../src/f-spot.glade.h:134
-msgid ""
-"None\n"
-"Title\n"
-"Filename\n"
-"Date\n"
-"Photo Details"
-msgstr ""
-"無\n"
-"標題\n"
-"檔案名稱\n"
-"日期\n"
-"相片細節"
-
-#: ../src/f-spot.glade.h:139
-msgid "Number of photos in selected rolls :"
-msgstr "所選清單的相片張數："
-
-#: ../src/f-spot.glade.h:140
-msgid "Number of pictures"
-msgstr "圖片數目："
-
-#: ../src/f-spot.glade.h:141
-msgid "Only photos taken within these dates will be displayed."
-msgstr "只顯示在這些日期中的相片。"
-
-#: ../src/f-spot.glade.h:142
-msgid "Open _Folder..."
-msgstr "開啟資料夾(_F)..."
-
-#: ../src/f-spot.glade.h:144
-msgid "Original size (possible very large file size)"
-msgstr "原始大小(檔案可能非常大)"
+#: ../src/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "頁面設定(_U)..."
-#: ../src/f-spot.glade.h:145
-msgid "P_arent Tag:"
-msgstr "父標籤(_A)："
-
-#: ../src/f-spot.glade.h:146
-msgid "P_hoto Source:"
-msgstr "相片來源(_H)："
-
-#: ../src/f-spot.glade.h:147
-msgid "Page 1 of 3"
-msgstr "3 頁中的第 1 頁"
-
-#: ../src/f-spot.glade.h:148
-msgid "Pause"
-msgstr "暫停"
-
-#: ../src/f-spot.glade.h:149
-msgid "Photo 0 of 0"
-msgstr "0 張中的第 0 張相片"
-
-#: ../src/f-spot.glade.h:150
-msgid "Photo _Size:"
-msgstr "相片大小(_S)："
-
-#: ../src/f-spot.glade.h:151
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../src/f-spot.glade.h:153
-msgid "Print"
-msgstr "打印"
-
-#: ../src/f-spot.glade.h:154
-msgid "Print crop _marks"
-msgstr "打印裁剪標記(_M)"
-
-#: ../src/f-spot.glade.h:155
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
msgstr "更新縮圖(_F)"
-#: ../src/f-spot.glade.h:157
-msgid "Repair"
-msgstr ""
-
-#: ../src/f-spot.glade.h:158
-msgid "Reset"
-msgstr "重新設定"
-
-#: ../src/f-spot.glade.h:161
-msgid "Select A Folder"
-msgstr "選擇資料夾"
-
-#: ../src/f-spot.glade.h:162
-msgid "Select Photos to Copy From Camera..."
-msgstr "選擇要從數碼相機複製的相片..."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "選擇全部(_A)"
-#: ../src/f-spot.glade.h:164
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "取消選擇(_N)"
-#: ../src/f-spot.glade.h:165
-msgid "Select a Tag..."
-msgstr "選擇標籤..."
-
-#: ../src/f-spot.glade.h:166
-msgid "Select the camera from which you want to transfer files"
-msgstr "請選擇你要傳輸檔案的數碼相機"
-
-#: ../src/f-spot.glade.h:167
-msgid "Selected Camera: "
-msgstr "選擇的相機："
-
-#: ../src/f-spot.glade.h:168
-msgid ""
-"Selection\n"
-"Gallery\n"
-"Viewport"
-msgstr ""
-"選擇\n"
-"圖庫\n"
-"Viewport"
-
-#: ../src/f-spot.glade.h:171
-msgid "Selection Constraints"
-msgstr "選擇限制"
-
-#: ../src/f-spot.glade.h:172
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
msgstr "以郵件傳送(_M)..."
-#: ../src/f-spot.glade.h:173
-msgid "Set Rating Filter"
-msgstr "設定評分過濾器"
-
-#: ../src/f-spot.glade.h:174
-msgid "Set as _Background"
-msgstr "設定為背景(_B)"
-
-#: ../src/f-spot.glade.h:175
-msgid "Set date range"
-msgstr "設定日期範圍"
-
-#: ../src/f-spot.glade.h:177
-msgid "Show all photos."
-msgstr "顯示所有相片。"
-
-#: ../src/f-spot.glade.h:178
-msgid "Show or hide the side pane"
-msgstr "顯示或隱藏側面的長方格"
-
-#: ../src/f-spot.glade.h:179
-msgid "Show or hide the toolbar"
-msgstr "顯示或隱藏工具列"
-
-#: ../src/f-spot.glade.h:180
-msgid "Side _pane"
-msgstr "側面的長方格(_P)"
-
-#: ../src/f-spot.glade.h:181
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "側邊列(_B)"
-#: ../src/f-spot.glade.h:182
-msgid "Small"
-msgstr "小"
-
-#: ../src/f-spot.glade.h:183
-msgid "So_urce Temp"
-msgstr "來源色溫(_U)"
-
-#: ../src/f-spot.glade.h:184
-msgid "Space all photos by"
-msgstr ""
-
-#: ../src/f-spot.glade.h:185
-msgid "Specify if an original size picture should be rotated or not. Smaller sizes are automatically rotated."
-msgstr ""
-
-#: ../src/f-spot.glade.h:186
-msgid ""
-"Standard RGB\n"
-"Image Profile\n"
-"Custom\n"
-msgstr ""
-
-#: ../src/f-spot.glade.h:190
-msgid "Strip image _metadata"
-msgstr "除去圖片的 Metadata(_M)"
-
-#: ../src/f-spot.glade.h:191
+#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
msgstr "標籤(_A)"
-#: ../src/f-spot.glade.h:192
-msgid "Tags: "
-msgstr "標籤："
-
-#: ../src/f-spot.glade.h:193
-#, fuzzy
+#: ../src/ui/main_window.ui.h:25
msgid "Thumbnail _elements"
-msgstr "縮圖目錄"
+msgstr "縮圖元素(_E)"
-#: ../src/f-spot.glade.h:194
-msgid "Tiny"
-msgstr "極小"
-
-#: ../src/f-spot.glade.h:195
+#: ../src/ui/main_window.ui.h:26
msgid "Too_lbar"
msgstr "工具列(_L)"
-#: ../src/f-spot.glade.h:196
-msgid "Total original size"
-msgstr "總計原始大小"
-
-#: ../src/f-spot.glade.h:197
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "檢視"
-#: ../src/f-spot.glade.h:198
-#, fuzzy
-msgid "Will print using: US Letter size on Generic Postscript"
-msgstr "將會在通用 Postscript 使用 US 字母大小"
-
-#: ../src/f-spot.glade.h:199
-msgid "Write _metadata to file"
-msgstr "將 _Metadata 寫入檔案"
-
-#: ../src/f-spot.glade.h:200
-msgid "Zoom _in"
-msgstr "放大(_I)"
-
-#: ../src/f-spot.glade.h:201
-msgid "Zoom _out"
-msgstr "縮小(_O)"
-
-#: ../src/f-spot.glade.h:202
-msgid "Zoom in"
-msgstr "放大"
-
-#: ../src/f-spot.glade.h:203
-msgid "Zoom out"
-msgstr "縮小"
-
-#: ../src/f-spot.glade.h:205
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
-msgstr "將選擇項目附上標籤(_A)"
+msgstr "將選取項目附上標籤(_A)"
-#: ../src/f-spot.glade.h:206
-msgid "_Border:"
-msgstr "邊框(_B)："
-
-#: ../src/f-spot.glade.h:207
-msgid "_Brightness:"
-msgstr "亮度(_B)："
-
-#: ../src/f-spot.glade.h:209
+#: ../src/ui/main_window.ui.h:35
msgid "_Clear Rating Filter"
msgstr "清除評分過濾器(_C)"
-#: ../src/f-spot.glade.h:210
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
-msgstr "清除清單過濾器(_C)"
+msgstr "清除膠卷過濾條件(_C)"
-#: ../src/f-spot.glade.h:211
+#: ../src/ui/main_window.ui.h:38
msgid "_Components"
msgstr "元件(_C)"
-#: ../src/f-spot.glade.h:212
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
msgstr "內容(_C)"
-#: ../src/f-spot.glade.h:213
-msgid "_Create Mail"
-msgstr "建立郵件(_C)"
-
-#: ../src/f-spot.glade.h:214
+#: ../src/ui/main_window.ui.h:40
msgid "_Dates"
msgstr "日期(_D)"
-#: ../src/f-spot.glade.h:216
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
msgstr "刪除選定的標籤(_D)"
-#: ../src/f-spot.glade.h:217
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
msgstr "刪除版本(_D)"
-#: ../src/f-spot.glade.h:218
-msgid "_Destination Temp"
-msgstr "目標色溫(_D)"
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "編輯標籤(_E)..."
-#: ../src/f-spot.glade.h:219
-msgid "_Display:"
-msgstr "顯示(_D)："
-
-#: ../src/f-spot.glade.h:220
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../src/f-spot.glade.h:221
-msgid "_Edit Selected Tag..."
-msgstr "編輯選定的標籤(_E)..."
-
-#: ../src/f-spot.glade.h:222
-msgid "_Export"
-msgstr "匯出(_E)"
-
-#: ../src/f-spot.glade.h:223
-#: ../extensions/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "匯出標籤(_E)"
-
-#: ../src/f-spot.glade.h:224
+#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
msgstr "匯出至(_E)"
-#: ../src/f-spot.glade.h:225
-#: ../extensions/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export to Album:"
-msgstr "匯出到相簿(_E)："
-
-#: ../src/f-spot.glade.h:226
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
-msgstr ""
+msgstr "幻燈片帶(_F)"
-#: ../src/f-spot.glade.h:227
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:228
-msgid "_Folder"
-msgstr "資料夾(_F)"
-
-#: ../src/f-spot.glade.h:229
-msgid "_Fullscreen"
-msgstr "全螢幕(_F)"
-
-#: ../src/f-spot.glade.h:230
-msgid "_Gallery"
-msgstr "_Gallery"
-
-#: ../src/f-spot.glade.h:231
-msgid "_Help"
-msgstr "說明(_H)"
-
-#: ../src/f-spot.glade.h:232
+#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
msgstr "隱藏(_H)"
-#: ../src/f-spot.glade.h:233
-msgid "_Hue:"
-msgstr "色調(_H)："
-
-#: ../src/f-spot.glade.h:234
-msgid "_Icon:"
-msgstr "圖示(_I)："
-
-#: ../src/f-spot.glade.h:235
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
msgstr "匯入(_I)..."
-#: ../src/f-spot.glade.h:236
-#, fuzzy
-msgid "_Interpolate image on zoom"
-msgstr "補點類型(Interpolation)："
-
-#: ../src/f-spot.glade.h:237
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
msgstr "大(_L)"
-#: ../src/f-spot.glade.h:238
+#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
-msgstr "最後匯入清單(_L)"
+msgstr "最近匯入膠卷(_L)"
+
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr "放大鏡(_L)"
-#: ../src/f-spot.glade.h:239
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
msgstr "中(_M)"
-#: ../src/f-spot.glade.h:240
-msgid "_Metadata Browser"
-msgstr "_Metadata 瀏覽器"
-
-#: ../src/f-spot.glade.h:241
-msgid "_Month"
-msgstr "月份(_M)"
-
-#: ../src/f-spot.glade.h:242
-msgid "_New Window"
-msgstr "新視窗(_N)"
-
-#: ../src/f-spot.glade.h:243
-msgid "_Open album in browser when done uploading"
-msgstr "完成上傳後在瀏覽器中開啟圖庫(_O)"
-
-#: ../src/f-spot.glade.h:244
-msgid "_Open destination when done exporting"
-msgstr "完成匯出後開啟目的地(_O)"
-
-#: ../src/f-spot.glade.h:245
-msgid "_Output:"
-msgstr "輸出(_O)："
-
-#: ../src/f-spot.glade.h:246
-msgid "_Photo"
-msgstr "相片(_P)"
-
-#: ../src/f-spot.glade.h:247
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
msgstr "離開(_Q)"
-#: ../src/f-spot.glade.h:248
+#: ../src/ui/main_window.ui.h:58
msgid "_Ratings"
msgstr "評分(_R)"
-#: ../src/f-spot.glade.h:250
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
-msgstr "從選擇項目中移附標籤(_R)"
+msgstr "從選取項目中移附標籤(_R)"
-#: ../src/f-spot.glade.h:251
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
msgstr "重新命名版本(_R)"
-#: ../src/f-spot.glade.h:252
-#: ../extensions/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/FolderExport/FolderExport.glade.h:15
-#: ../extensions/GalleryExport/GalleryExport.glade.h:28
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:14
-msgid "_Resize to: "
-msgstr "重新調整大小為(_R)："
-
-#: ../src/f-spot.glade.h:254
-msgid "_Saturation:"
-msgstr "飽和度(_S)："
-
-#: ../src/f-spot.glade.h:255
-msgid "_Scale photos to no larger than: "
-msgstr "相片縮放不能超過(_S)："
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "順序反轉(_R)"
-#: ../src/f-spot.glade.h:256
+#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
-msgstr "選擇匯入清單(_S)..."
+msgstr "選擇匯入膠卷(_S)..."
-#: ../src/f-spot.glade.h:257
+#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
msgstr "設定日期範圍(_S)..."
-#: ../src/f-spot.glade.h:258
+#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
msgstr "設定評分過濾器(_S)..."
-#: ../src/f-spot.glade.h:259
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "銳化(_S)..."
-#: ../src/f-spot.glade.h:260
-msgid "_Slideshow"
-msgstr "幻燈片(_8)"
-
-#: ../src/f-spot.glade.h:261
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
msgstr "小(_S)"
-#: ../src/f-spot.glade.h:262
-msgid "_Strip metadata"
-msgstr "除去 Metadata(_S)"
-
-#: ../src/f-spot.glade.h:263
+#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
msgstr "標籤圖示(_T)"
-#: ../src/f-spot.glade.h:264
-msgid "_Tag Name:"
-msgstr "標籤名稱(_T)："
-
-#: ../src/f-spot.glade.h:265
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
msgstr "標籤(_T)"
-#: ../src/f-spot.glade.h:266
+#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
-msgstr "時間線(_T)"
-
-#: ../src/f-spot.glade.h:267
-msgid "_Toolbar"
-msgstr "工具列(_T)"
+msgstr "時間軸(_T)"
-#: ../src/f-spot.glade.h:268
+#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
msgstr "工具(_T)"
-#: ../src/f-spot.glade.h:269
-msgid "_URI:"
-msgstr "_URI："
-
-#: ../src/f-spot.glade.h:270
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
msgstr "未標籤的相片(_U)"
-#: ../src/f-spot.glade.h:271
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
msgstr "版本(_V)"
-#: ../src/f-spot.glade.h:272
-msgid "_View"
-msgstr "檢視(_V)"
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "正在更新 F-Spot 資料庫"
-#: ../src/f-spot.glade.h:273
-msgid "_Virtual Filesystem"
-msgstr "虛擬檔案系統(_V)"
+#: ../src/Updater.cs:623
+msgid ""
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
+msgstr "你的 F-Spot 圖庫資料庫正在更新，請稍後。這或許會需要一些時間。"
-#: ../src/f-spot.glade.h:274
-msgid "and"
-msgstr "及"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "無法建立暫存檔"
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:276
-msgid ""
-"at\n"
-"after\n"
-"between"
-msgstr ""
-"於\n"
-"之後\n"
-"之間"
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "頁面設定"
-#: ../src/f-spot.glade.h:279
-msgid "difference:"
-msgstr "差異："
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "紙張大小：{0} x {1} mm"
-#: ../src/f-spot.glade.h:280
-msgid "img_000.jpg"
-msgstr "img_000.jpg"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "設定頁面大小與方向"
-#: ../src/f-spot.glade.h:281
-msgid "min. Starting at {0}"
-msgstr "分。開始於 {0}"
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "每頁照片張數"
-#: ../src/f-spot.glade.h:283
-#: ../extensions/FlickrExport/FlickrExport.glade.h:18
-#: ../extensions/FolderExport/FolderExport.glade.h:17
-#: ../extensions/GalleryExport/GalleryExport.glade.h:31
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:16
-msgid "pixels"
-msgstr "像素"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "重複"
-#: ../src/f-spot.glade.h:284
-msgid "x"
-msgstr "x"
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "打印裁剪標記"
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "從 F-Spot 播放幻燈片"
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "相片配置"
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "F-Spot 相片"
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "全頁(無邊緣)"
-#: ../extensions/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_CD..."
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "拉近拉遠"
-#: ../extensions/CDExport/CDExport.cs:128
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "傳送圖片 \"{0}\" 到 CD"
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "填滿"
-#: ../extensions/CDExport/CDExport.cs:143
-#: ../extensions/FlickrExport/FlickrExport.cs:368
-#: ../extensions/FolderExport/FolderExport.cs:249
-#: ../extensions/GalleryExport/GalleryExport.cs:769
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:702
-#: ../extensions/SmugMugExport/SmugMugExport.cs:605
-msgid "Done Sending Photos"
-msgstr "傳送相片完成"
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "已縮放"
-#: ../extensions/CDExport/CDExport.cs:145
-#: ../extensions/FolderExport/FolderExport.cs:251
-msgid "Transfer Complete"
-msgstr "傳輸完畢"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "白色邊緣"
-#: ../extensions/CDExport/CDExport.cs:152
-#: ../extensions/FolderExport/FolderExport.cs:256
-msgid "Error While Transferring"
-msgstr "傳輸時發生錯誤"
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "自選文字"
-#: ../extensions/CDExport/CDExport.cs:159
-#: ../extensions/FolderExport/FolderExport.cs:273
-msgid "Error Transferring"
-msgstr "傳輸發生錯誤"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "相片資訊"
-#: ../extensions/CDExport/CDExport.cs:180
-#: ../extensions/FolderExport/FolderExport.cs:295
-msgid "Error: Error while transferring; Aborting"
-msgstr "錯誤：傳輸時發生錯誤；正在中止"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "打印檔案名稱"
-#: ../extensions/CDExport/CDExport.cs:183
-#: ../extensions/FolderExport/FolderExport.cs:298
-msgid "Error: File Already Exists; Aborting"
-msgstr "錯誤：檔案已存在；正在中止"
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "打印相片日期"
-#: ../extensions/CDExport/CDExport.glade.h:1
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>要燒錄的圖片</b>"
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "打印相片時間"
-#: ../extensions/CDExport/CDExport.glade.h:3
-msgid "Create CD"
-msgstr "建立 CD"
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "打印相片標籤"
-#: ../extensions/CDExport/CDExport.glade.h:4
-msgid "Size"
-msgstr "大小"
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "打印相片註解"
-#: ../extensions/CDExport/CDExport.glade.h:5
-msgid "Size of the exported selection :"
-msgstr "選擇相片中已匯出的大小："
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "編輯"
-#: ../extensions/CDExport/CDExport.glade.h:6
-msgid "_Browse Previously Scheduled Files"
-msgstr "瀏覽以往排程的檔案(_B)"
+#: ../src/Widgets/EditorPage.cs:198
+msgid ""
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
+msgstr "此工具需要作用中的選取項目。請選取一個圖片的區域，或是重試操作"
-#: ../extensions/CDExport/CDExport.glade.h:7
-msgid "_Write only these photos to CD"
-msgstr "僅把這些相片寫入到 CD 中(_W)"
+#: ../src/Widgets/EditorPage.cs:216
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "儲存調整過的相片時發生錯誤"
-#: ../extensions/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
+#: ../src/Widgets/EditorPage.cs:218
+#, csharp-format
+msgid ""
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
+msgstr "接收到例外「{0}」。請注意你在編輯它們之前必須先將 RAW 檔轉換為 JPEG。"
-#: ../extensions/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr..."
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "水平(_H)"
-#: ../extensions/FlickrExport/FlickrExport.cs:97
-#: ../extensions/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "授權"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "垂直(_V)"
-#: ../extensions/FlickrExport/FlickrExport.cs:103
-#, csharp-format
-msgid "Return to this window after you have finished the authorization process on {0} and click the \"Complete Authorization\" button below"
-msgstr ""
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "尋找："
-#: ../extensions/FlickrExport/FlickrExport.cs:104
-msgid "Complete Authorization"
-msgstr "完成授權"
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "資料夾"
-#: ../extensions/FlickrExport/FlickrExport.cs:109
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "正在登入 {0}"
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "檔案系統"
-#: ../extensions/FlickrExport/FlickrExport.cs:110
-msgid "Checking credentials..."
-msgstr "正在檢查證書..."
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "長條圖"
-#: ../extensions/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "歡迎 {0} 你已連線至 {1}"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "版本"
-#: ../extensions/FlickrExport/FlickrExport.cs:120
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "以不同使用者登入"
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "日期"
+
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "曝光"
+
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "焦距"
+
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "檔案大小"
-#: ../extensions/FlickrExport/FlickrExport.cs:123
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "評等"
+
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(錯誤的格式)"
+
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(未知)"
+
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr ""
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(編輯 {0} 次)"
-#: ../extensions/FlickrExport/FlickrExport.cs:286
-msgid "Unable to log on"
-msgstr "無法登入"
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(檔案讀取錯誤)"
-#: ../extensions/FlickrExport/FlickrExport.cs:306
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "正在等待回應 {1} 個中的第 {0} 個"
+msgid "{0} Photos"
+msgstr "{0} 張相片"
-#: ../extensions/FlickrExport/FlickrExport.cs:333
-#: ../extensions/FolderExport/FolderExport.cs:215
-#: ../extensions/GalleryExport/GalleryExport.cs:740
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "正在上傳圖片 \"{0}\""
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"於 {0} 介於 \n"
+"{1} 與 {2}"
-#: ../extensions/FlickrExport/FlickrExport.cs:356
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "上傳至 {0} 錯誤: {1}"
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"介於 {0} \n"
+"以及 {1}"
-#: ../extensions/FlickrExport/FlickrExport.cs:370
-#: ../extensions/GalleryExport/GalleryExport.cs:771
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/SmugMugExport/SmugMugExport.cs:607
-msgid "Upload Complete"
-msgstr "上傳完畢"
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(至少有一個檔案找不到)"
-#: ../extensions/FlickrExport/FlickrExport.cs:438
-msgid "Unable to log on."
-msgstr "無法登入。"
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "顯示相片名稱"
-#: ../extensions/FlickrExport/FlickrExport.cs:439
-#, csharp-format
-msgid "F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."
-msgstr "F-Spot 無法登入至 {0}。請確定你已使用 {0} 的網頁瀏覽介面進行驗證。"
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "顯示日期"
-#: ../extensions/FlickrExport/FlickrExport.cs:459
-#: ../extensions/GalleryExport/GalleryExport.cs:693
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:598
-#: ../extensions/SmugMugExport/SmugMugExport.cs:523
-msgid "Uploading Pictures"
-msgstr "正在上傳圖片"
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "顯示大小"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>檢視權限</b>"
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "顯示曝光"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "匯出標籤層級(_H)"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "顯示焦距"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:8
-msgid "F-Spot needs your authorization in order to upload photos to your {0} account. Press the \"Authorize\" button to open a web browser and give F-Spot the authorization. "
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "顯示相機"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "忽略頂層標籤(_T)"
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "顯示檔案大小"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "私人"
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "中介資料"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "公開"
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "擴展的中介資料"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "除去 Metadata(_M)"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "無可用的擴展式中介資料"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr ""
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "沒有活動中的相片"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr ""
+#: ../src/Widgets/MetadataDisplay.cs:414
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "相片 \"{0}\" 並不存在"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:17
-msgid "_View photos in browser when done uploading"
-msgstr "完成上傳後用瀏覽器檢視相片(_V)"
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "無可用的中介資料"
-#: ../extensions/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "資料夾(_O)..."
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "無可用的應用程式"
-#: ../extensions/FolderExport/FolderExport.cs:132
-msgid "Select Export Folder"
-msgstr "選擇匯出資料夾"
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "評分："
-#: ../extensions/FolderExport/FolderExport.cs:177
-msgid "Building Gallery"
-msgstr "正在建立圖庫"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "國家"
-#: ../extensions/FolderExport/FolderExport.cs:221
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "上傳圖片「{0}」至圖庫錯誤：{2}{1}"
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "城市"
-#: ../extensions/FolderExport/FolderExport.cs:739
-msgid "Light"
-msgstr "亮"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "州"
-#: ../extensions/FolderExport/FolderExport.cs:740
-msgid "Dark"
-msgstr "暗"
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "從 F-Spot 播放幻燈片"
-#. Abbreviation of previous
-#: ../extensions/FolderExport/FolderExport.cs:883
-msgid "Prev"
-msgstr "上一步"
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot 相片"
-#: ../extensions/FolderExport/FolderExport.cs:941
-#: ../extensions/FolderExport/FolderExport.cs:1114
-msgid "Show Styles"
-msgstr "顯示風格"
+#~ msgid "Package"
+#~ msgstr "套件"
-#: ../extensions/FolderExport/FolderExport.cs:942
-#: ../extensions/FolderExport/FolderExport.cs:1115
-msgid "Hide Styles"
-msgstr "隱藏風格"
+#~ msgid "Extension Installation"
+#~ msgstr "擴充套件安裝程序"
-#: ../extensions/FolderExport/FolderExport.cs:999
-msgid "Gallery generated by"
-msgstr "產生圖庫由"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>選擇要安裝的擴充套件並點擊「下一步」</b>"
-#: ../extensions/FolderExport/FolderExport.cs:1044
-msgid "Page:"
-msgstr "頁："
+#~ msgid "Install from:"
+#~ msgstr "安裝來源："
-#: ../extensions/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
+#~ msgid "_Repositories..."
+#~ msgstr "套件庫(_R)..."
-#: ../extensions/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>匯出方式</b>"
+#~ msgid "Show all packages"
+#~ msgstr "顯示所有套件"
-#: ../extensions/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr "使用「原始版本」建立圖庫(_G)"
+#~ msgid "Show new versions only"
+#~ msgstr "只顯示新版本"
-#: ../extensions/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr ""
+#~ msgid "Show updates only"
+#~ msgstr "只顯示更新"
-#: ../extensions/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "描述(_D)："
+#~ msgid "_Unselect All"
+#~ msgstr "全部不選(_U)"
-#: ../extensions/FolderExport/FolderExport.glade.h:11
-msgid "Folder Export"
-msgstr "匯出資料夾"
+#~ msgid "label124"
+#~ msgstr "label124"
-#: ../extensions/FolderExport/FolderExport.glade.h:12
-msgid "G_allery Name:"
-msgstr "圖庫名稱(_A)："
+#~ msgid "Overall Progress:"
+#~ msgstr "整體進度："
-#: ../extensions/FolderExport/FolderExport.glade.h:13
-msgid "Open _destination when done exporting"
-msgstr "完成匯出後開啟目的地(_D)"
+#~ msgid "Downloading extensions..."
+#~ msgstr "正在下載擴充套件..."
-#: ../extensions/FolderExport/FolderExport.glade.h:14
-msgid "_Folder:"
-msgstr "資料夾(_F)："
+#~ msgid "Extension Manager"
+#~ msgstr "擴充套件管理員"
-#: ../extensions/FolderExport/FolderExport.glade.h:16
-msgid "_Save the files only"
-msgstr "只儲存檔案(_S)"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "需要額外的擴充套件來完成此操作。"
-#: ../extensions/GalleryExport/GalleryExport.addin.xml.h:1
-#, fuzzy
-msgid "Web _Gallery..."
-msgstr "網上圖庫(_W)..."
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "將安裝下列擴充套件："
-#: ../extensions/GalleryExport/GalleryExport.cs:384
-msgid "Invalid URL"
-msgstr "無效的 URL"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>擴充套件管理員</b></big>"
-#: ../extensions/GalleryExport/GalleryExport.cs:385
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr ""
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "目前已安裝下列擴充套件："
-#: ../extensions/GalleryExport/GalleryExport.cs:395
-#: ../extensions/GalleryExport/GalleryExport.cs:410
-msgid "Error while connecting to Gallery"
-msgstr "連接 Gallery 時發生錯誤"
+#~ msgid "_Install Extensions..."
+#~ msgstr "安裝擴充套件(_I)..."
-#: ../extensions/GalleryExport/GalleryExport.cs:396
-#: ../extensions/GalleryExport/GalleryExport.cs:411
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr ""
+#~ msgid "_Uninstall..."
+#~ msgstr "解除安裝(_U)..."
-#: ../extensions/GalleryExport/GalleryExport.cs:497
-msgid "(TopLevel)"
-msgstr "(最頂層)"
+#~ msgid "Enable"
+#~ msgstr "啟用"
-#: ../extensions/GalleryExport/GalleryExport.cs:559
-msgid "Invalid Gallery name"
-msgstr "無效的 Gallery 名稱"
+#~ msgid "Disable"
+#~ msgstr "停用"
-#: ../extensions/GalleryExport/GalleryExport.cs:560
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
+#~ msgid "Details"
+#~ msgstr "細節"
-#: ../extensions/GalleryExport/GalleryExport.cs:759
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "上傳圖片「{0}」至圖庫錯誤：{1}"
+#~ msgid "Extension Repository Management"
+#~ msgstr "擴充套件庫管理"
-#: ../extensions/GalleryExport/GalleryExport.cs:787
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:725
-#: ../extensions/SmugMugExport/SmugMugExport.cs:628
-msgid "(No Gallery)"
-msgstr "(無圖庫)"
+#~ msgid "Add New Repository"
+#~ msgstr "新增新的套件庫"
-#: ../extensions/GalleryExport/GalleryExport.cs:874
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:852
-#: ../extensions/SmugMugExport/SmugMugExport.cs:725
-msgid "(Not Connected)"
-msgstr "(沒有連接)"
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "選擇您想註冊的套件庫的位置："
-#: ../extensions/GalleryExport/GalleryExport.cs:875
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:853
-#: ../extensions/SmugMugExport/SmugMugExport.cs:726
-msgid "(No Albums)"
-msgstr "(無相簿)"
+#~ msgid "Register an on-line repository"
+#~ msgstr "註冊一個線上套件庫"
-#: ../extensions/GalleryExport/GalleryExport.cs:927
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:912
-#: ../extensions/SmugMugExport/SmugMugExport.cs:767
-msgid "No account selected"
-msgstr "未選取任何帳號"
+#~ msgid "Url:"
+#~ msgstr "Url："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr "<span weight='bold' size='larger'>連接到圖庫時發生錯誤</span>\n"
+#~ msgid "Register a local repository"
+#~ msgstr "註冊本地套件庫"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr "<span weight='bold' size='larger'>你的 Google 帳號已被鎖定</span>\n"
+#~ msgid "Path:"
+#~ msgstr "路徑："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:11
-msgid "Export _titles and comments"
-msgstr "匯出標題和註解(_T)"
+#~ msgid "Browse..."
+#~ msgstr "瀏覽..."
-#: ../extensions/GalleryExport/GalleryExport.glade.h:12
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "完成上傳後在瀏覽器中開啟圖庫(_A)"
+#~ msgid "Version:"
+#~ msgstr "版本："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:13
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "請確定這個圖庫的設定是正確的。"
+#~ msgid "Author:"
+#~ msgstr "作者："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
+#~ msgid "Copyright:"
+#~ msgstr "版權:"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "公開相簿"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "擴充套件相依性："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:18
-msgid "U_RL:"
-msgstr "U_RL："
+#~ msgid "All registered repositories"
+#~ msgstr "所有已註冊的套件庫"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:19
-msgid "_Album Name:"
-msgstr "相簿名稱(_A)："
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "您確定您想取消安裝？"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "相簿標題(_A)："
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "下列套件將被解除安裝："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:21
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr ""
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr "其他依賴於前幾項擴充套件的項目也將一併解除安裝："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "描述(_D)："
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr "因為相依性衝突，無法安裝選擇的擴充套件。"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:24
-msgid "_Gallery Name:"
-msgstr "圖庫名稱(_G)："
+#~ msgid "The following packages will be installed:"
+#~ msgstr "下列套件將被安裝："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:25
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "圖庫(_G)："
+#~ msgid " (in user directory)"
+#~ msgstr " (在使用者目錄中)"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:26
-msgid "_Parent Album:"
-msgstr "父相簿(_P)："
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "下列套件需要被解除安裝："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:27
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:13
-msgid "_Password:"
-msgstr "密碼(_P)："
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "以下的相依性需求無法解決："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:29
-msgid "_Title:"
-msgstr "標題(_T)："
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "安裝已成功完成。"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:30
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:15
-msgid "_Username:"
-msgstr "用戶名稱(_U)："
+#~ msgid "The installation failed!"
+#~ msgstr "安裝失敗！"
-#: ../extensions/GalleryExport/GalleryRemote.cs:357
-msgid "Error reading server response"
-msgstr "Error reading server response"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "安裝程序帶著警告訊息完成。"
-#. failed to find the response
-#: ../extensions/GalleryExport/GalleryRemote.cs:369
-msgid "Server returned response without Gallery content"
-msgstr ""
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "解除安裝已成功完成。"
-#: ../extensions/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb..."
+#~ msgid "The uninstallation failed!"
+#~ msgstr "解除安裝失敗！"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "建立相簿時發生錯誤"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "解除安裝程序帶著警告訊息完成。"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid "The following error was encountered while attempting to create an album: {0}"
-msgstr ""
+#~ msgid "Repository"
+#~ msgstr "套件庫"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:621
-#, csharp-format
-msgid "{0} Sent"
-msgstr "已送出{0}"
+#~ msgid "Installation cancelled"
+#~ msgstr "安裝已取消"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:623
-#, fuzzy, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{1} 之中的第 {0}"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "找不到某些需要的擴充套件"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:661
-#: ../extensions/SmugMugExport/SmugMugExport.cs:566
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "正在上傳圖片 \"{0}\" ({2} 之 {1})"
+#~ msgid "Installation failed"
+#~ msgstr "安裝失敗"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:692
-#: ../extensions/SmugMugExport/SmugMugExport.cs:595
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "上傳到圖庫時發生錯誤：{0}"
+#~ msgid "Extension"
+#~ msgstr "擴充套件"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:776
-msgid "Available space :"
-msgstr "可用空間："
+#~ msgid "Other"
+#~ msgstr "其它"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:890
-#, csharp-format
-msgid ""
-"<small>The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images</small>"
-msgstr ""
+#~ msgid "Url"
+#~ msgstr "網址"
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>PicasaWeb 匯出</b>"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "發生異常: {0}"
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "自動旋轉(_A)"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "無法載入已停用的擴充套件。"
-#: ../extensions/PicasaWebExport/google-sharp/CaptchaException.cs:58
-msgid "url"
-msgstr "網址"
+#~ msgid "Loading {0} extension"
+#~ msgstr "正在載入 {0} 擴充套件"
-#: ../extensions/PicasaWebExport/google-sharp/CaptchaException.cs:59
-msgid "token"
-msgstr ""
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "需要的擴充套件 '{0}' 已停用。"
-#: ../extensions/PicasaWebExport/google-sharp/CaptchaException.cs:60
-msgid "captcha_url"
-msgstr ""
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "需要的擴充套件 '{0}' 尚未安裝。"
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>SmugMug 匯出</b>"
+#~ msgid "(provided by {0})"
+#~ msgstr "(由 {0} 提供)"
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "帳號(_A)："
+#~ msgid "Copy Photo Locat_ion"
+#~ msgstr "複製相片位置(_I)"
-#: ../extensions/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug..."
+#~ msgid "Choose destination directory"
+#~ msgstr "選擇目的端目錄"
+
+#~ msgid "Target location:\t"
+#~ msgstr "目標位置：\t"
+
+#~ msgid "Save As..."
+#~ msgstr "另存新檔..."
+
+#~ msgid "Save changes to image: {0} before closing?"
+#~ msgid_plural ""
+#~ "Save changes to images:\n"
+#~ "{0}\n"
+#~ "before closing?"
+#~ msgstr[0] ""
+#~ "在關閉之前要儲存變更到影像：\n"
+#~ "{0}\n"
+#~ "嗎？"
-#~ msgid "By Extension"
-#~ msgstr "以副檔案名"
-#~ msgid "BMP"
-#~ msgstr "BMP"
-#~ msgid "GIF"
-#~ msgstr "GIF"
-#~ msgid "ICO"
-#~ msgstr "ICO"
-#~ msgid "JPEG"
-#~ msgstr "JPEG"
-#~ msgid "PNG"
-#~ msgstr "PNG"
-#~ msgid "PNM"
-#~ msgstr "PNM"
-#~ msgid "RAS"
-#~ msgstr "RAS"
-#~ msgid "SVG"
-#~ msgstr "SVG"
-#~ msgid "TGA"
-#~ msgstr "TGA"
-#~ msgid "TIFF"
-#~ msgstr "TIFF"
-#~ msgid "XBM"
-#~ msgstr "XBM"
-#~ msgid "XPM"
-#~ msgstr "XPM"
-#~ msgid "Unsupported file format."
-#~ msgstr "未支援的檔案格式。"
-#~ msgid "Determine File Type:"
-#~ msgstr "判斷檔案類型："
-#~ msgid "Load Image"
-#~ msgstr "載入影像"
-#~ msgid "Save Image"
-#~ msgstr "儲存影像"
-#~ msgid "Unsharp Mask"
-#~ msgstr "銳化濾鏡"
-#~ msgid "Unrated photos"
-#~ msgstr "未評分的相片"
-#~ msgid "Edit"
-#~ msgstr "編輯"
-#~ msgid "_File"
-#~ msgstr "檔案(_F)"
-#~ msgid "_Unrated Photos"
-#~ msgstr "未評分的相片(_U)"
-#~ msgid "Add-in"
-#~ msgstr "附加套件"
-#~ msgid "Add-in Manager"
-#~ msgstr "附加套件管理員"
-#~ msgid "F-Spot Add-in Manager"
-#~ msgstr "F-Spot 附加套件管理員"
-#~ msgid "Attach Tag"
-#~ msgstr "附加標籤"
-#~ msgid "Delete From Drive"
-#~ msgstr "從磁碟中刪除"
-#~ msgid "Remove From Catalog"
-#~ msgstr "從型錄中移除"
-#~ msgid "Remove Tag"
-#~ msgstr "移除標籤"
-#~ msgid "There was an error invoking the external handler"
-#~ msgstr "發生外部錯誤"
-#~ msgid "Received error:{1}\"{0}\"{1}"
-#~ msgstr "收到錯誤：{1}\"{0}\"{1}"
-#~ msgid "Help not found"
-#~ msgstr "找不到說明"
-#~ msgid "Clea_r Date Range"
-#~ msgstr "清除日期範圍(_R)"
-#~ msgid "Unknown destination."
-#~ msgstr "未知的目的端."
-#~ msgid ""
-#~ "When copying files from a camera you must select a valid destination on "
-#~ "the local filesystem"
-#~ msgstr "從數位相機複製檔案時您需要選擇一個有效的本地目的地。"
#~ msgid ""
-#~ "Error \"{0}\" while creating directory \"{1}\". Check that the path and "
-#~ "permissions are correct and try again"
-#~ msgstr ""
-#~ "建立目錄 \"{1}\" 時發生錯誤 \"{0}\"。請確定路徑和權限是否正確，然後再試一"
-#~ "次。"
-#~ msgid "Select Destination"
-#~ msgstr "選擇目的地"
-#~ msgid "Enter Password"
-#~ msgstr "輸入密碼"
-#~ msgid "Enter Password for "
-#~ msgstr "輸入密碼給"
-#~ msgid "Transfering Pictures"
-#~ msgstr "正在傳輸圖片"
-#~ msgid "<b>From Image</b>"
-#~ msgstr "<b>從圖片</b>"
-#~ msgid "Copy Files To: "
-#~ msgstr "複製檔案到："
-#~ msgid "Create New _Category..."
-#~ msgstr "建立新的分類(_C)..."
-#~ msgid "Directory"
-#~ msgstr "目錄"
-#~ msgid "E_xport To CD..."
-#~ msgstr "匯出到 CD(_X)..."
-#~ msgid "Export Tags and Categories"
-#~ msgstr "匯出標籤和分類"
-#~ msgid "Export tags and categories"
-#~ msgstr "匯出標籤和分類"
-#~ msgid "Export to _Flickr..."
-#~ msgstr "匯出到 _Flickr..."
-#~ msgid "Find by _Tag"
-#~ msgstr "依標籤尋找(_T)"
-#~ msgid "Import files after copy."
-#~ msgstr "複製之後匯入檔案。"
-#~ msgid "Import from C_amera..."
-#~ msgstr "從數位相機匯入(_C)..."
-#~ msgid "Plain Files."
-#~ msgstr "一般檔案。"
-#~ msgid "Prefix: "
-#~ msgstr "前綴："
-#~ msgid "Use Original."
-#~ msgstr "以原樣匯出。"
-#~ msgid "Use static HTML."
-#~ msgstr "以 HTML 匯出。"
-#~ msgid "_Close"
-#~ msgstr "關閉(_C)"
-#~ msgid "_Delete from Drive"
-#~ msgstr "從磁碟機刪除(_D)"
-#~ msgid "_Directory"
-#~ msgstr "依目錄(_D)"
-#~ msgid "_EXIF Data"
-#~ msgstr "_EXIF 資料"
-#~ msgid "dialog1"
-#~ msgstr "dialog1"
-#~ msgid "Size:"
-#~ msgstr "大小："
-#~ msgid "4 x 3 Portrait (Book)"
-#~ msgstr "4 x 3 寫照(書本)"
-#~ msgid "4 x 6 Portrait (Postcard)"
-#~ msgstr "4 x 6 寫照(明信片)"
-#~ msgid "5 x 7 Portrait (L, 2L)"
-#~ msgstr "5 x 7 寫照(L, 2L)"
-#~ msgid "8 x 10 Portrait"
-#~ msgstr "8 x 10 寫照"
-#~ msgid "Received exception \"{0}\" while rotating image {1}"
-#~ msgstr "旋轉影像{1}時接收到異常\"{0}\""
-#~ msgid "Unknown Error while Rotating Image."
-#~ msgstr "旋轉影像時發生未知的錯誤。"
-#~ msgid "Logo"
-#~ msgstr "圖標"
-#~ msgid "Question"
-#~ msgstr "問題"
-#~ msgid "(No categories)"
-#~ msgstr "(沒有分類)"
-#~ msgid "Create New Category"
-#~ msgstr "建立新的分類"
-#~ msgid "Name of new category:"
-#~ msgstr "新分類的名稱："
-#~ msgid "Edit Category"
-#~ msgstr "編輯分類"
-#~ msgid "Category name:"
-#~ msgstr "分類名稱："
-#~ msgid "Edit icon For category {0}"
-#~ msgstr "修改分類{0}的圖示"
-#~ msgid "Scaling picture \"{0}\""
-#~ msgstr "正在縮放圖片\"{0}\""
-#~ msgid "Transferring picture \"{0}\""
-#~ msgstr "正在傳輸圖片\"{0}\""
+#~ "If you don't save, the changes you have made to this image will be "
+#~ "permanently lost"
+#~ msgid_plural ""
+#~ "If you don't save, the changes you have made to these images will be "
+#~ "permanently lost"
+#~ msgstr[0] "如果您不儲存，您對這些影像所做出的變更將會永久喪失"
+
+#~ msgid "Discard changes"
+#~ msgstr "捨棄變更"
+
+#~ msgid "Continue editing"
+#~ msgstr "繼續編輯"
+
+#~ msgid "Save"
+#~ msgid_plural "Save all"
+#~ msgstr[0] "儲存所有"
+
+#~ msgid "Copy Locat_ion"
+#~ msgstr "複製影像位置(_I)"
+
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "編輯選定的標籤(_E)..."
+
+#~ msgid "my photos"
+#~ msgstr "我的相片"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "編輯選定的標籤..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d915564..a390ad4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,488 +1,1481 @@
-# traditional Chinese translation for marlin.
+# traditional Chinese translation for f-spot.
# Copyright (C) 2005 Free Software Foundation, Inc.
#
-## Translate Dictionary: http://animebox.myweb.hinet.net/teach/AE_Effects.html
+# # Translate Dictionary: http://animebox.myweb.hinet.net/teach/AE_Effects.html
#
# Stanley Wong <stanley18fan0k at yahoo.com.hk>, 2005.
-# Hialan Liu <hialan.liu at gmail.com>,2007.
+# Hialan Liu <hialan.liu at gmail.com>, 2007.
+# Cheng-Chia Tseng <pswo10680 at gmail.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: f-spot 0.4.3.1\n"
+"Project-Id-Version: f-spot 0.6.1.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-30 14:24+0000\n"
-"PO-Revision-Date: 2008-05-02 10:52+0800\n"
-"Last-Translator: Hialan Liu <hialan.liu at gmail.com>\n"
-"Language-Team: Chinese(Traditional) <community at linuxhall.org>\n"
+"POT-Creation-Date: 2010-05-08 19:12+0800\n"
+"PO-Revision-Date: 2010-05-08 08:25+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
+"Language-Team: Chinese-l10n <chinese-l10n at googlegroups.com>\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"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:62
-msgid "Version:"
-msgstr "版本："
+#: ../extensions/Exporters/CDExport/CDExport.addin.xml.h:1
+msgid "_CD..."
+msgstr "_CD..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:65
-msgid "Author:"
-msgstr "作者："
+#: ../extensions/Exporters/CDExport/CDExport.cs:162
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:392
+#: ../src/CameraFileSelectionDialog.cs:199
+msgid "Transferring Pictures"
+msgstr "正在傳輸圖片"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:68
-msgid "Copyright:"
-msgstr "版權："
+#: ../extensions/Exporters/CDExport/CDExport.cs:218
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "傳送圖片 \"{0}\" 到 CD"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs:71
-msgid "Extension Dependencies:"
-msgstr "附加套件相依性："
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../extensions/Exporters/CDExport/CDExport.cs:220
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:349
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:245
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:781
+#: ../src/MainWindow.cs:673 ../src/UI.Dialog/AdjustTimeDialog.cs:129
+#: ../src/UI.Dialog/ProgressDialog.cs:92
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{1} 之 {0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:97
-msgid "All registered repositories"
-msgstr "所有已註冊的套件庫"
+#: ../extensions/Exporters/CDExport/CDExport.cs:233
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:380
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:379
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:285
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:806
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:704
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:607
+msgid "Done Sending Photos"
+msgstr "傳送相片完成"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:184
-msgid "Are you sure you want to cancel the installation?"
-msgstr "您確定要取消安裝程序？"
+#: ../extensions/Exporters/CDExport/CDExport.cs:235
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:287
+msgid "Transfer Complete"
+msgstr "傳輸完畢"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:308
-msgid "The following packages will be uninstalled:"
-msgstr "下列套件將被解除安裝："
+#: ../extensions/Exporters/CDExport/CDExport.cs:242
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:292
+msgid "Error While Transferring"
+msgstr "傳輸時發生錯誤"
+
+#: ../extensions/Exporters/CDExport/CDExport.cs:250
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:311
+msgid "Error Transferring"
+msgstr "傳輸發生錯誤"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:313
-msgid "There are other extensions that depend on the previous ones which will also be uninstalled:"
+#: ../extensions/Exporters/CDExport/CDExport.cs:263
+msgid "copying..."
+msgstr "正在複製..."
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:1
+msgid "<b><i>There is some previously scheduled items to write</i></b>"
+msgstr "<b><i>有一些之前規劃好的項目要寫入</i></b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>要燒錄的圖片</b>"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:7
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:7
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:5
+#: ../src/f-spot.glade.h:28
+msgid "Autorotate"
+msgstr "自動旋轉"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:4
+msgid "Create CD"
+msgstr "建立 CD"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:5
+#: ../src/Widgets/InfoBox.cs:221
+msgid "Size"
+msgstr "大小"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:6
+msgid "Size of the exported selection:"
+msgstr "匯出的選取項目大小："
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:7
+msgid "_Browse Previously Scheduled Files"
+msgstr "瀏覽之前規劃好的檔案(_B)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:8
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:15
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:16
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:15
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:20
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:12
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:9
+#: ../src/f-spot.glade.h:95
+msgid "_Export"
+msgstr "匯出(_E)"
+
+#: ../extensions/Exporters/CDExport/CDExport.ui.h:9
+msgid "_Write only these photos to CD"
+msgstr "僅把這些相片寫入到 CD 中(_W)"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.addin.xml.h:1
+msgid "F_acebook..."
+msgstr "F_acebook..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:99
+msgid "Waiting for authorization"
+msgstr "正在等候授權"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:100
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission "
+"you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below."
msgstr ""
+"F-Spot 現在將會啟動您的瀏覽器，以便您啟用您剛選取好的許可。\n"
+"\n"
+"一旦您被導入 Facebook 後再返回此應用程式，請點擊下方的「確認」。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:384
-msgid "The selected extensions can't be installed because there are dependency conflicts."
-msgstr "因為相依性衝突，無法安裝選擇的附加套件。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:280
+msgid "Too many images to export"
+msgstr "太多要匯出的相片"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:398
-msgid "The following packages will be installed:"
-msgstr "下列套件將被安裝："
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:281
+#, csharp-format
+msgid ""
+"Facebook only permits {0} photographs per album. Please refine your "
+"selection and try again."
+msgstr ""
+"Fackebook 只許可每個相簿內存放 {0} 張相片。請精挑細選您的選取項目，並重試。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:402
-msgid " (in user directory)"
-msgstr "(於使用者目錄)"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:298
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:475
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:730
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:597
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:522
+msgid "Uploading Pictures"
+msgstr "正在上載圖片"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:408
-msgid "The following packages need to be uninstalled:"
-msgstr "下列套件需要被解除安裝："
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:319
+msgid "Album must have a name"
+msgstr "相簿必須要有名稱"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:416
-msgid "The following dependencies could not be resolved:"
-msgstr "無法解決下列的相依性問題："
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:320
+msgid "Please name your album or choose an existing album."
+msgstr "請命名您的相簿或是選擇已存在的相簿。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:441
-msgid "The installation has been successfully completed."
-msgstr "已成功的完成安裝程序。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:334
+msgid "Creating a new album failed"
+msgstr "建立新相簿失敗"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:442
-msgid "The installation failed!"
-msgstr "安裝程序失敗！"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:335
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"建立新相簿時發生錯誤。\n"
+"\n"
+"{0}"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:443
-msgid "The installation has completed with warnings."
-msgstr "安裝程序帶著警告訊息完成。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:357
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:660
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:565
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "正在上傳圖片 \"{0}\" ({2} 之 {1})"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:446
-msgid "The uninstallation has been successfully completed."
-msgstr "解除安裝程序已成功完成。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:371
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "上傳到 Facebook 時發生錯誤：{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:372
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:370
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:250
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:797
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:693
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:596
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:319
+msgid "Error"
+msgstr "錯誤"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:447
-msgid "The uninstallation failed!"
-msgstr "解除安裝程序失敗！"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:382
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:381
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:808
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:706
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:609
+msgid "Upload Complete"
+msgstr "上載完畢"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:448
-msgid "The uninstallation has completed with warnings."
-msgstr "解除安裝程序帶著警告訊息完成。"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.cs:385
+msgid "Visit F-Spot group on Facebook"
+msgstr "造訪 Facebook 上的 F-Spot 群組"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs:616
-msgid "Repository"
-msgstr "套件庫"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:211
+msgid "Waiting for authentication"
+msgstr "正在等候認證"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs:16
-msgid "Installation cancelled"
-msgstr "已取消安裝程序"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:212
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok"
+"\" below. F-Spot will cache your session in gnome-keyring, if possible, and "
+"re-use it on future Facebook exports."
+msgstr ""
+"F-Spot 現在將會啟動您的瀏覽器，以便您登入 Facebook。\n"
+"\n"
+"一旦您被導入 Facebook 後再返回此應用程式，請點擊下方的「確認」。F-Spot 將會對"
+"您在 gnome-keyring 內的作業階段製作快取；若可能的話，在未來的 Facebook 匯出中"
+"都會重複使用它。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:159
-msgid "Some of the required extensions were not found"
-msgstr "找不到某些需要的附加套件"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:217
+msgid "Authenticating..."
+msgstr "正在認證..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs:171
-msgid "Installation failed"
-msgstr "安裝程序失敗"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:227
+msgid "Error logging into Facebook"
+msgstr "登入到 Facebook 時發生錯誤"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:91
-#, fuzzy
-msgid "Extension"
-msgstr "以副檔案名"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:228
+msgid ""
+"There was a problem logging into Facebook. Check your credentials and try "
+"again."
+msgstr "登入 Facebook 時發生問題。請確認您的認證，並重試。"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:112
-msgid "Version"
-msgstr "版本"
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:237
+msgid "Authorizing Session"
+msgstr "正在授權作業階段"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:246
+msgid "Session established, fetching user info..."
+msgstr "作業階段已建立，正在擷取使用者資訊..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:252
+msgid "Session established, fetching friend list..."
+msgstr "作業階段已建立，正在擷取朋友清單..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:262
+msgid "Session established, fetching friend details..."
+msgstr "作業階段已建立，正在擷取朋友詳細資料..."
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:272
+msgid "Session established, fetching photo albums..."
+msgstr "作業階段已建立，正在擷取相簿..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:285
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} 已登入 Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:291
+msgid "Facebook Connection Error"
+msgstr "Facebook 連線錯誤"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:292
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"從 Facebook 下載您的資訊時發生錯誤。\n"
+"\n"
+"Facebook 說：{0}"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExportDialog.cs:321
+msgid "You are not logged in."
+msgstr "您並未登入。"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "自動確認相片"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "相片說明"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "建立新相簿"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:168
-msgid "Other"
-msgstr "其他"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "描述"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:51
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "匯出到 Facebook"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "於此相片"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:7
+#: ../src/XmpTagsImporter.cs:90
+msgid "Location"
+msgstr "位置"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "登入"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "登出"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:10
+#: ../src/Widgets/InfoBox.cs:212
msgid "Name"
msgstr "名稱"
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs:52
-msgid "Url"
-msgstr "網址"
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "未登入"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "許可："
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "保持連線"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "使用現存的相簿"
+
+#: ../extensions/Exporters/FacebookExport/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "這位是誰？"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:1
+msgid "_23hq..."
+msgstr "_23hq..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:2
+msgid "_Flickr..."
+msgstr "_Flickr..."
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.addin.xml.h:3
+msgid "_Zooomr..."
+msgstr "_Zooomr..."
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:61
-#: ../mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs:70
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:105
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:5
+msgid "Authorize"
+msgstr "授權"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:111
#, csharp-format
-msgid "Exception occurred: {0}"
-msgstr "發生異常: {0}"
+msgid ""
+"Return to this window after you have finished the authorization process on "
+"{0} and click the \"Complete Authorization\" button below"
+msgstr "在您於 {0} 完成認證程序後請返回本視窗，並點擊下方的「完成認證」按鈕"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs:32
-msgid "Package"
-msgstr "套件"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:112
+msgid "Complete Authorization"
+msgstr "完成授權"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:110
-msgid "Extension Installation"
-msgstr "附加套件安裝程序"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:117
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "正在登入 {0}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:136
-msgid "<b>Select the extensions to install and click on Next</b>"
-msgstr "<b>選擇要安裝的附加套件並點下一步</b>"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:118
+msgid "Checking credentials..."
+msgstr "正在檢查憑證..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:150
-msgid "Install from:"
-msgstr "安裝來源："
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:125
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "歡迎 {0} 您已連線到 {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:179
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:180
-msgid "_Repositories..."
-msgstr "套件庫(_R)..."
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:128
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "以不同使用者登入"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:220
-msgid "Show all packages"
-msgstr "顯示所有套件"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:133
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "已使用您被允許的 {1} 每月配額中的 {0}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:221
-msgid "Show new versions only"
-msgstr "只顯示新版本"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:297
+msgid "Unable to log on"
+msgstr "無法登入"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:222
-msgid "Show updates only"
-msgstr "只顯示更新"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:317
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "正在等待回應 {1} 個中的第 {0} 個"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:247
-msgid "_Unselect All"
-msgstr "取消選擇全部(_U)"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:344
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:242
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:777
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "正在上載圖片 \"{0}\""
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:259
-#: ../src/f-spot.glade.h:163
-msgid "Select _All"
-msgstr "選擇全部(_A)"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:367
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "上傳至 {0} 時發生錯誤: {1}"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:334
-msgid "label124"
-msgstr "label124"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:346
-msgid "Overall Progress:"
-msgstr "總體流程："
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs:374
-msgid "Downloading extensions..."
-msgstr "正在下載附加套件..."
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:36
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:58
-msgid "Extension Manager"
-msgstr "附加套件管理員"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:54
-msgid "Additional extensions are required to perform this operation."
-msgstr "需要額外的附加套件來完成此操作。"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs:64
-msgid "The following extensions will be installed:"
-msgstr "將安裝下列附加套件："
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:90
-msgid "<big><b>Extension Manager</b></big>"
-msgstr "<big><b>附加套件管理員</b></big>"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:110
-msgid "The following extensions are currently installed:"
-msgstr "目前已安裝下列附加套件："
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:165
-msgid "_Install Extensions..."
-msgstr "安裝附加套件(_I)..."
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:210
-msgid "_Uninstall..."
-msgstr "解除安裝(_U)..."
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:236
-msgid "Enable"
-msgstr "啟用"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs:262
-msgid "Disable"
-msgstr "停用"
-
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:40
-#: ../extensions/FlickrExport/FlickrExport.cs:359
-#: ../extensions/FolderExport/FolderExport.cs:223
-#: ../extensions/GalleryExport/GalleryExport.cs:760
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:694
-#: ../extensions/SmugMugExport/SmugMugExport.cs:597
-msgid "Error"
-msgstr "錯誤"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:454
+msgid "Unable to log on."
+msgstr "無法登入。"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:111
-msgid "Details"
-msgstr "細節"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.cs:455
+#, csharp-format
+msgid ""
+"F-Spot was unable to log on to {0}. Make sure you have given the "
+"authentication using {0} web browser interface."
+msgstr "F-Spot 無法登入至 {0}。請確定您已使用 {0} 的網頁瀏覽介面進行驗證。"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:1
+#: ../src/f-spot.glade.h:8
+msgid "<b>Account</b>"
+msgstr "<b>帳號</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:2
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:5
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:3
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:2
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:2
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:2
+#: ../src/f-spot.glade.h:14 ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+msgid "<b>Photos</b>"
+msgstr "<b>相片</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:3
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:4
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:4
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:4
+#: ../src/f-spot.glade.h:16
+msgid "<b>Style</b>"
+msgstr "<b>風格</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>檢視權限</b>"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:6
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:8
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:9
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:6
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:5
+#: ../src/f-spot.glade.h:44
+msgid "Export"
+msgstr "匯出"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:7
+msgid "Export tag _hierarchy"
+msgstr "匯出標籤層級(_H)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:8
+msgid ""
+"F-Spot needs your authorization in order to upload photos to your {0} "
+"account. Press the \"Authorize\" button to open a web browser and give F-"
+"Spot the authorization. "
+msgstr ""
+"F-Spot 需要您的認證才能上傳相片到您的 {0} 帳號。請按下「認證」按鈕來開啟網路"
+"瀏覽器並給予 F-Spot 認證。 "
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:9
+msgid "Ignore _top level tags"
+msgstr "忽略頂層標籤(_T)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:10
+msgid "Private"
+msgstr "私人"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:11
+msgid "Public"
+msgstr "公開"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:12
+msgid "Strip _metadata"
+msgstr "除去中介資料(_M)"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs:34
-msgid "Extension Repository Management"
-msgstr "管理附加套件套件庫"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:13
+msgid "Visible to Family"
+msgstr "家人可以看到"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:52
-msgid "Add New Repository"
-msgstr "加入新套件庫"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:14
+msgid "Visible to Friends"
+msgstr "朋友可以看到"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:70
-msgid "Select the location of the repository you want to register:"
-msgstr "選擇您想註冊的套件庫的位置："
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:21
+#: ../src/f-spot.glade.h:96
+msgid "_Export tags"
+msgstr "匯出標籤(_E)"
+
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:17
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:18
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:21
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:25
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:15
+#: ../src/f-spot.glade.h:109
+msgid "_Resize to: "
+msgstr "重新調整大小為(_R)："
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:77
-msgid "Register an on-line repository"
-msgstr "註冊網路套件庫"
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:18
+msgid "_View photos in browser when done uploading"
+msgstr "完成上傳後用瀏覽器檢視相片(_V)"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:106
-msgid "Url:"
-msgstr "Url："
+#: ../extensions/Exporters/FlickrExport/FlickrExport.glade.h:19
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:20
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:24
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:27
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:17
+#: ../src/f-spot.glade.h:125
+msgid "pixels"
+msgstr "像素"
-#. Container child vbox89.Gtk.Box+BoxChild
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:127
-msgid "Register a local repository"
-msgstr "註冊本地套件庫"
+#: ../extensions/Exporters/FolderExport/FolderExport.addin.xml.h:1
+msgid "F_older..."
+msgstr "資料夾(_O)..."
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:155
-msgid "Path:"
-msgstr "路徑："
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:140
+msgid "Select Export Folder"
+msgstr "選取匯出資料夾"
-#: ../mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs:179
-msgid "Browse..."
-msgstr "瀏覽..."
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:198
+msgid "Building Gallery"
+msgstr "正在建立圖庫"
-#: ../mono-addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs:79
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:248
#, csharp-format
-msgid "(provided by {0})"
-msgstr "(由 {0} 提供)"
+msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
+msgstr "上傳照片 \"{0}\" 到圖庫 {2}{1} 時發生錯誤"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:333
+msgid "Error: Error while transferring; Aborting"
+msgstr "錯誤：傳輸時發生錯誤；正在中止"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:336
+msgid "Error: File Already Exists; Aborting"
+msgstr "錯誤：檔案已存在；正在中止"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:807
+msgid "Light"
+msgstr "亮"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:808
+msgid "Dark"
+msgstr "暗"
+
+#. Abbreviation of previous
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:988
+msgid "Prev"
+msgstr "上一步"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:990
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1231
+#: ../src/CameraFileSelectionDialog.cs:82
+msgid "Index"
+msgstr "索引"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:993
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1165
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1205
+#: ../src/MainWindow.cs:376 ../src/Widgets/Sidebar.cs:56
+msgid "Tags"
+msgstr "標籤"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:996
+#: ../src/f-spot.glade.h:58 ../src/ItemAction.cs:102
+msgid "Next"
+msgstr "下一步"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1100
+msgid "Gallery generated by"
+msgstr "產生圖庫由"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1140
+msgid "Show Styles"
+msgstr "顯示風格"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1141
+msgid "Hide Styles"
+msgstr "隱藏風格"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1176
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1177
+#: ../src/ui/main_window.ui.h:24
+msgid "Tags: "
+msgstr "標籤："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1308
+#: ../extensions/Exporters/FolderExport/FolderExport.cs:1441
+msgid "Page:"
+msgstr "頁："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:3
+#: ../src/f-spot.glade.h:11
+msgid "<b>Destination</b>"
+msgstr "<b>目的地</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:4
+msgid "<b>Export Method</b>"
+msgstr "<b>匯出方式</b>"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:8
+msgid "Create _gallery using \"Original\""
+msgstr "使用「原始版本」建立圖庫(_G)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:9
+msgid "Create standalone _web gallery"
+msgstr "建立獨立的網路圖庫(_W)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:10
+msgid "D_escription:"
+msgstr "描述(_D)："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:11
+msgid "Export _tags"
+msgstr "匯出標籤(_T)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:12
+msgid "Export tag _icons"
+msgstr "匯出標籤圖示(_I)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:13
+msgid "Folder Export"
+msgstr "匯出資料夾"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:14
+msgid "G_allery Name:"
+msgstr "圖庫名稱(_A)："
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:15
+msgid "Open _destination when done exporting"
+msgstr "完成匯出後開啟目的地(_D)"
+
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:17
+msgid "_Folder:"
+msgstr "資料夾(_F)："
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:154
-msgid "Disabled extensions can't be loaded."
-msgstr "無法載入已停用的附加套件。"
+#: ../extensions/Exporters/FolderExport/FolderExport.glade.h:19
+msgid "_Save the files only"
+msgstr "只儲存檔案(_S)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.addin.xml.h:1
+msgid "Web _Gallery..."
+msgstr "網路圖庫(_G)..."
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:52
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr "無"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:391
+msgid "Invalid URL"
+msgstr "無效的 URL"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:179
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:392
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "這個圖庫網址條目不是有效的網址"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:402
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:429
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:440
+msgid "Error while connecting to Gallery"
+msgstr "連接到圖庫時發生錯誤"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:403
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:430
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:441
#, csharp-format
-msgid "Loading {0} extension"
-msgstr "正在載入 {0} 附加套件"
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "試圖登入時遭遇到下列錯誤：{0}"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:265
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:417
+msgid "A Gallery with this name already exists"
+msgstr "已存在相同名稱的圖庫"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:418
#, csharp-format
-msgid "The required extension '{0}' is disabled."
-msgstr "需要的附加套件 '{0}' 已停用。"
+msgid ""
+"There is already a Gallery with the same name in your registered Galleries. "
+"Please choose a unique name."
+msgstr "在您註冊的圖庫中已經有相同名稱的圖庫。請選擇不同的名稱。"
-#: ../mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs:267
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:528
+msgid "(TopLevel)"
+msgstr "(最頂層)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:590
+msgid "Invalid Gallery name"
+msgstr "不正確的相簿名稱"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:591
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"圖庫名稱包含無效的字元。\n"
+"只允許使用字母、數字，- 與 _"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:796
#, csharp-format
-msgid "The required extension '{0}' is not installed."
-msgstr "需要的附加套件 '{0}' 尚未安裝。"
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "上傳照片 \"{0}\" 到圖庫 {1} 時發生錯誤"
-#: ../f-spot-view.desktop.in.in.h:1
-msgid "F-Spot Photo Viewer"
-msgstr "F-Spot 相片檢視器"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:824
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:727
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:630
+msgid "(No Gallery)"
+msgstr "(無圖庫)"
-#: ../f-spot-view.desktop.in.in.h:2
-msgid "Photo Viewer"
-msgstr "相片檢視器"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:916
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:849
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:726
+msgid "(Not Connected)"
+msgstr "(沒有連接)"
-#: ../f-spot-import.desktop.in.in.h:1
-#: ../f-spot.desktop.in.in.h:1
-msgid "F-Spot Photo Manager"
-msgstr "F-Spot 相片管理員"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:917
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:850
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:727
+msgid "(No Albums)"
+msgstr "(無相簿)"
-#: ../f-spot-import.desktop.in.in.h:2
-msgid "Import into F-Spot"
-msgstr "匯入至 F-Spot"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.cs:969
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:915
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:768
+msgid "No account selected"
+msgstr "沒有選取任何帳號"
-#: ../f-spot-import.desktop.in.in.h:3
-#: ../f-spot.desktop.in.in.h:3
-msgid "Photo Manager"
-msgstr "相片管理員"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:1
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:1
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:1
+#: ../src/f-spot.glade.h:9
+msgid "<b>Album</b>"
+msgstr "<b>相簿</b>"
-#: ../f-spot.desktop.in.in.h:2
-msgid "Organize, enjoy, and share your photos"
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:2
+#: ../src/f-spot.glade.h:12
+msgid "<b>Gallery</b>"
+msgstr "<b>圖庫</b>"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:5
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:5
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr "<span weight='bold' size='larger'>連接到圖庫時發生錯誤</span>\n"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:9
+msgid "Export _titles and comments"
+msgstr "匯出標題和註解(_T)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:10
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:10
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:7
+msgid "Open _album in browser when done uploading"
+msgstr "完成上傳後在瀏覽器中開啟圖庫(_A)"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:11
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:11
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "請確定這個圖庫的設定是正確的。"
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:12
+msgid "U_RL:"
+msgstr "U_RL："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:13
+msgid "_Album Name:"
+msgstr "相簿名稱(_A)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:14
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:19
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:11
+msgid "_Description:"
+msgstr "描述(_D)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:16
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:22
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:13
+#: ../src/f-spot.glade.h:97
+msgid "_Export to Album:"
+msgstr "匯出到相簿(_E)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:17
+msgid "_Gallery Name:"
+msgstr "圖庫名稱(_G)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:18
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:23
+msgid "_Gallery:"
+msgstr "圖庫(_G)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:19
+msgid "_Parent Album:"
+msgstr "父相簿(_P)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:20
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:24
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:14
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "密碼(_P)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:22
+msgid "_Title:"
+msgstr "標題(_T)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryExport.glade.h:23
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:26
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:16
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "用戶名稱(_U)："
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:361
+msgid "Error reading server response"
+msgstr "伺服器回應讀取錯誤"
+
+#. failed to find the response
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:373
+msgid "Server returned response without Gallery content"
+msgstr "伺服器回應無圖庫內容"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:710
+msgid "Error while creating new album"
+msgstr "建立新相簿時發生錯誤"
+
+#: ../extensions/Exporters/GalleryExport/GalleryRemote.cs:711
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the "
+"requested operation:\n"
+"{0} ({1})"
msgstr ""
+"試圖執行請求的操作時遭遇到下列錯誤：\n"
+"{0} ({1})"
-#: ../libeog/eog-image.c:773
-#, c-format
-msgid "No image loaded."
-msgstr "沒有載入影像。"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml.h:1
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb..."
-#: ../libeog/eog-image.c:780
-#, c-format
-msgid "Can't save non local files."
-msgstr "無法儲存非本地檔案。"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:441
+msgid "Error while creating Album"
+msgstr "建立相簿時發生錯誤"
-#: ../libeog/eog-image.c:803
-#, c-format
-msgid "Unsupported image type for saving."
-msgstr "影像格式未支援儲存功能。"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:442
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to create an album: {0}"
+msgstr "試圖建立相簿時遭遇到下列錯誤：{0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:620
+#, csharp-format
+msgid "{0} Sent"
+msgstr "已送出{0}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:622
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} / 大約 {1}"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:691
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.cs:594
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "上傳到圖庫時發生錯誤：{0}"
-#: ../libeog/image-view.c:2128
-msgid "interpolation type"
-msgstr "補點類型(Interpolation)："
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:778
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "可用空間：{0}，已使用 {2} 中的 {1}%"
-#: ../libeog/image-view.c:2129
-msgid "the type of interpolation to use"
-msgstr "要使用的補點類型"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.cs:891
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"所選的相簿限制 {0} 張圖片，\n"
+"目前所選的 {1} 個影像將會被忽略"
-#: ../libeog/image-view.c:2135
-#: ../libeog/image-view.c:2142
-msgid "check type"
-msgstr "檢查類型"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>PicasaWeb 匯出</b>"
-#: ../libeog/image-view.c:2136
-msgid "the type of chequering to use"
-msgstr "要使用的審核類型"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:7
+msgid ""
+"<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>您的 Google 帳號已被鎖定</span>\n"
-#: ../libeog/image-view.c:2143
-msgid "the size of chequers to use"
-msgstr "要使用審核者大小"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:12
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"請驗證此圖庫的設定值是否都正確。\n"
+"輸入「Captcha」欄位內影像的\n"
+"字母。<i>字母大小寫都可以</i>"
-#: ../libeog/image-view.c:2149
-msgid "dither"
-msgstr "遞色(dither)"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:15
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:8
+msgid "Public Album"
+msgstr "公開相簿"
-#: ../libeog/image-view.c:2150
-msgid "dither type"
-msgstr "遞色類型"
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:16
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:10
+msgid "_Album Title:"
+msgstr "相簿標題(_A)："
-#: ../libfspot/f-jpeg-utils.c:445
-#: ../src/RotateCommand.cs:222
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:17
+msgid "_Autorotate"
+msgstr "自動旋轉(_A)"
+
+#: ../extensions/Exporters/PicasaWebExport/PicasaWebExport.glade.h:18
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml.h:1
+msgid "_SmugMug..."
+msgstr "_SmugMug..."
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>SmugMug 匯出</b>"
+
+#: ../extensions/Exporters/SmugMugExport/SmugMugExport.glade.h:9
+msgid "_Account:"
+msgstr "帳號(_A)："
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "正在上傳相片 \"{0}\""
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "正在登入 Tabblo"
+
+#: ../extensions/Exporters/TabbloExport/Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "正在取得供上傳的網址"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.addin.xml.h:1
+msgid "_Tabblo..."
+msgstr "_Tabblo..."
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:308
+msgid "Done sending photos"
+msgstr "相片傳送完成"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:310
+msgid "Upload complete"
+msgstr "上傳完畢"
+
+#: ../extensions/Exporters/TabbloExport/TabbloExport.cs:316
+msgid "Error uploading to Tabblo: "
+msgstr "上傳到 Tabblo 時發生錯誤： "
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>F-Spot 標籤</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>Tabblo 帳號</b>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:4
+msgid ""
+"<small><i>F-Spot tags can help you track the export status of photos. "
+"Example: Use one tag for the photos that you plan to export, and another one "
+"for those already exported. Here, you can tell F-Spot to automatically "
+"replace these tags as appropriate.</i></small>"
+msgstr ""
+"<small><i>F-Spot 標籤能幫助您追蹤相片的匯出狀態。例：為您打算匯出的這些相片套"
+"用一種標籤，並為那些已經匯出過的相片套上另外一種。在這裡，您可以請 F-Spot 將"
+"這些標籤取代為合適的。</i></small>"
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "從匯出的相片中移除(_O)："
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "選取..."
+
+#: ../extensions/Exporters/TabbloExport/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "附加到匯出的相片中(_A)："
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:1
+msgid "<b>{0}</b>."
+msgstr "<b>{0}</b>。"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:2
+msgid "A trust error occured while attempting to access"
+msgstr "試圖存取時發生信任上的錯誤"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:3
+msgid "Abort this session"
+msgstr "中止此作業階段"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:4
+msgid "Always trust this site's certificate"
+msgstr "總是信任此網站的憑證"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:5
+msgid "Do you wish to:"
+msgstr "您希望："
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:6
+msgid "Trust Error"
+msgstr "信任上的錯誤"
+
+#: ../extensions/Exporters/TabbloExport/ui/TrustError.ui.h:7
+msgid "Trust the site's certificate this once"
+msgstr "只有這次才信任這個網站的憑證"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.addin.xml.h:1
+msgid "Compressed fil_e..."
+msgstr "壓縮的檔案(_E)..."
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:47
+#: ../src/Widgets/EditorPage.cs:197
+msgid "No selection available"
+msgstr "無可用的選取項目"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:48
+msgid ""
+"This tool requires an active selection. Please select one or more pictures "
+"and try again"
+msgstr "此工具需要作用中的選取項目。請選取一個或是更多圖片，並重試"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:64
+msgid "Select export folder"
+msgstr "選取匯出資料夾"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:102
+msgid "Exporting files"
+msgstr "正在匯出檔案"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.cs:108
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "正在準備相片 \"{0}\""
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:1
+msgid "_Create"
+msgstr "建立(_C)"
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:2
+msgid "_File name:"
+msgstr "檔案名稱(_F)："
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:3
+msgid "_Location:"
+msgstr "位置(_L)："
+
+#: ../extensions/Exporters/ZipExport/ZipExport.glade.h:4
+msgid "_Scale:"
+msgstr "縮放(_S)："
+
+#: ../extensions/Tools/HashJob/HashJob.cs:53
+msgid ""
+"In order to detect duplicates on pictures you imported before 0.5.0, F-Spot "
+"needs to analyze your image collection. This is not done by default as it's "
+"time consuming. You can Start or Pause this update process using this dialog."
+msgstr ""
+"為了要偵測您在 0.5.0 版之前匯入的圖片是否有複本，F-Spot 需要分析您的影像收"
+"藏。因為這相當耗費時間，所以預設上不會執行。您可以使用此對話方塊來「開始」或"
+"「暫停」此更新程序。"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:59
+#, csharp-format
+msgid ""
+"You currently have {0} photos needing md5 calculation, and {1} pending jobs"
+msgstr "您目前有 {0} 張相片需要 md5 計算，以及 {1} 個擱置的工作"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:75 ../src/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#: ../extensions/Tools/HashJob/HashJob.cs:102
+msgid "Processing images..."
+msgstr "正在處理影像..."
+
+#: ../extensions/Tools/HashJob/HashJob.cs:108
+msgid "Stopped"
+msgstr "已停止"
+
+#: ../extensions/Tools/HashJob/HashJob.addin.xml.h:1
+msgid "Check for Duplicates..."
+msgstr "檢查有無複本..."
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:107
+msgid "F-Spot Gallery"
+msgstr "F-Spot 圖庫"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:108
+msgid "The web gallery seems to be offline now"
+msgstr "該網路圖庫現在似乎離線"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:109
+msgid "Show All"
+msgstr "顯示全部"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:119
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} 張相片"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:161
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "目前檢視"
+
+#: ../extensions/Tools/LiveWebGallery/GalleryRequestHandler.cs:164
+msgid "Selected"
+msgstr "已選"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGallery.addin.xml.h:1
+msgid "Live Web Gallery"
+msgstr "Live 網路圖庫"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>圖庫會維持啟用直到您停用它或是關閉 F-Spot。\n"
+"請確保本機的檢視者繞過 HTTP proxy 以檢視圖庫。</i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>當圖庫啟用時，上方為從其它電腦要存取所分享相片所需要開啟的 URL</"
+"i></small>"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "啟用與停用該網路圖庫"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "允許檢視者加入標籤"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "複製 URL 到剪貼簿"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "F-Spot Live 網路圖庫"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "圖庫 URL："
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "限制照片分享的張數"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "選項："
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "有一個標籤的相片"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "所選的相片"
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "分享："
+
+#: ../extensions/Tools/LiveWebGallery/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "檢視數："
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:89
+msgid "none"
+msgstr "無"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:92
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr "圖庫：{0}，相片：{1}，上個用戶端：{3}"
+
+#: ../extensions/Tools/LiveWebGallery/LiveWebGalleryDialog.cs:156
+msgid "Gallery is inactive"
+msgstr "圖庫未啟用"
+
+#: ../extensions/Tools/MergeDb/MergeDb.addin.xml.h:1
+msgid "Merge Db"
+msgstr "合併資料庫"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:73
+msgid "Error opening the selected file"
+msgstr "開啟所選的檔案時發生錯誤"
+
+#: ../extensions/Tools/MergeDb/MergeDb.cs:74
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"您選取的檔案不是有效的或受支援的資料庫。\n"
+"\n"
+"接收到例外「{0}」。"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:1
+msgid ""
+"<small><i>Choose the location of the database you want to import from</i></"
+"small>"
+msgstr "<small><i>選擇您想從哪個位置匯入資料庫</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos "
+"you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already "
+"imported from that database.</i></small>"
+msgstr ""
+"<small><i>選擇想要從所選資料庫匯入的項目。\n"
+"「只有新的膠卷」是智慧型選項，能避免重複匯入您在之前的操作已經匯入過的相"
+"片。\n"
+"「單一的匯入膠卷」讓您選擇您想要合併回去的膠卷。\n"
+"「每一張」會匯入每張相片。如果您已經從該資料庫匯入過相片，則會建立該相片的複"
+"本。</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:6
+msgid ""
+"<small><i>Copy the images locally or keep them where they are. If you chose "
+"the later, be sure that this location will stay accessible from f-spot.</i></"
+"small>"
+msgstr ""
+"<small><i>在本機複製這些影像，或是將它們維持在它們的地方。如果您選擇了後者，"
+"請確保該位置對 f-spot 維持在可存取的狀態。</i></small>"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:7
+msgid "A Single Import Roll"
+msgstr "單一的匯入膠卷"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:8
+msgid "Copy images to photos folder"
+msgstr "複製影像至相片資料夾"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:9
+msgid "Database Location:"
+msgstr "資料庫位置："
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:10
+msgid "Everything"
+msgstr "每個東西"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:11
+msgid "Import:"
+msgstr "匯入："
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:12
+msgid "Keep the images at their original location"
+msgstr "維持這些影像在它們原本的位置"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:13
+msgid "Merge another F-Spot collection"
+msgstr "管理另一份 F-Spot 收藏"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:14
+msgid "New Rolls Only"
+msgstr "只有新的膠卷"
+
+#: ../extensions/Tools/MergeDb/MergeDb.glade.h:15
+#: ../src/FileImportBackend.cs:291 ../src/UI.Dialog/ThreadProgressDialog.cs:58
+msgid "Skip"
+msgstr "跳過"
+
+#: ../extensions/Tools/MergeDb/PickFolderDialog.cs:33
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>這個資料庫參照包含在 <b>{0}</b> 資料夾內的檔案。\n"
+" 請選取該資料夾，這樣我才能執行對應處理。</big>"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml.h:1
+msgid "Configure Screensaver"
+msgstr "組態螢幕保護程式"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:1
+#: ../src/UI.Dialog/DateRangeDialog.cs:129
+msgid "All Images"
+msgstr "所有影像"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "延遲："
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "顯示："
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "含有標籤的影像："
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "讓 F-Spot 做為您的螢幕保護程式"
+
+#: ../extensions/Tools/ScreensaverConfig/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "螢幕保護程式組態"
+
+#: ../f-spot.desktop.in.in.h:1 ../f-spot-import.desktop.in.in.h:1
+#: ../f-spot-view.desktop.in.in.h:1 ../src/ui/main_window.ui.h:10
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../f-spot.desktop.in.in.h:2 ../f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-Spot 相片管理員"
+
+#: ../f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "組織、享受、並分享您的相片"
+
+#: ../f-spot.desktop.in.in.h:4 ../f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "相片管理員"
+
+#: ../f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "匯入至 F-Spot"
+
+#: ../f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-Spot 相片檢視器"
+
+#: ../f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "相片檢視器"
+
+#: ../lib/libfspot/f-jpeg-utils.c:441 ../src/RotateCommand.cs:224
msgid "File not found"
msgstr "找不到檔案"
-#: ../libfspot/f-jpeg-utils.c:468
+#: ../lib/libfspot/f-jpeg-utils.c:464
#, c-format
msgid "Unknown transform type %d"
msgstr "未知的轉換類型 %d"
-#: ../libfspot/f-jpeg-utils.c:476
+#: ../lib/libfspot/f-jpeg-utils.c:472
msgid "Operation failed"
-msgstr "動作失敗"
+msgstr "操作失敗"
-#: ../src/CameraFileSelectionDialog.cs:73
+#: ../src/CameraFileSelectionDialog.cs:76
msgid "Preview"
msgstr "預覽"
-#: ../src/CameraFileSelectionDialog.cs:75
+#: ../src/CameraFileSelectionDialog.cs:78
msgid "Path"
msgstr "路徑"
-#: ../src/CameraFileSelectionDialog.cs:77
-#: ../src/f-spot.glade.h:107
+#: ../src/CameraFileSelectionDialog.cs:80 ../src/f-spot.glade.h:47
msgid "File"
msgstr "檔案"
-#: ../src/CameraFileSelectionDialog.cs:79
-#: ../extensions/FolderExport/FolderExport.cs:885
-msgid "Index"
-msgstr "索引(Index)"
-
-#: ../src/CameraFileSelectionDialog.cs:99
+#: ../src/CameraFileSelectionDialog.cs:102
msgid "Select Tag"
-msgstr "選擇標籤"
+msgstr "選取標籤"
-#: ../src/CameraFileSelectionDialog.cs:135
+#: ../src/CameraFileSelectionDialog.cs:138
msgid "Downloading Previews"
msgstr "正在下載預覽"
-#: ../src/CameraFileSelectionDialog.cs:143
+#: ../src/CameraFileSelectionDialog.cs:148
#, csharp-format
msgid "Downloading Preview of {0}"
msgstr "正在下載 {0} 的預覽"
-#: ../src/CameraFileSelectionDialog.cs:194
-#: ../extensions/CDExport/CDExport.cs:222
-#: ../extensions/FolderExport/FolderExport.cs:352
-msgid "Transferring Pictures"
-msgstr "正在傳輸圖片"
-
-#: ../src/CameraFileSelectionDialog.cs:215
+#: ../src/CameraFileSelectionDialog.cs:220
#, csharp-format
msgid "Copying file {0} of {1}"
-msgstr "正在複製 {1} 之 {0} "
+msgstr "正在複製 {1} 之 {0}"
-#: ../src/CameraFileSelectionDialog.cs:225
+#: ../src/CameraFileSelectionDialog.cs:235
msgid "Error transferring file"
msgstr "傳輸檔案時發生錯誤"
-#: ../src/CameraFileSelectionDialog.cs:234
-msgid "Done Copying Files"
-msgstr "複製檔案完成"
-
-#: ../src/CameraFileSelectionDialog.cs:236
+#: ../src/CameraFileSelectionDialog.cs:244
msgid "Download Complete"
msgstr "下載完畢"
-#: ../src/CameraFileSelectionDialog.cs:261
+#: ../src/CameraFileSelectionDialog.cs:244
+msgid "Done Copying Files"
+msgstr "複製檔案完成"
+
+#: ../src/CameraFileSelectionDialog.cs:268
#, csharp-format
msgid "Transferring \"{0}\" from camera"
msgstr "從數位相機傳輸 \"{0}\""
-#: ../src/CameraSelectionDialog.cs:28
+#: ../src/CameraSelectionDialog.cs:29 ../src/Widgets/InfoBox.cs:231
msgid "Camera"
msgstr "數位相機"
-#: ../src/CameraSelectionDialog.cs:29
+#: ../src/CameraSelectionDialog.cs:30
msgid "Port"
msgstr "連接埠"
-#: ../src/ColorDialog.cs:212
-msgid "Error saving adjusted photo"
-msgstr "儲存調整過的相片時發生錯誤"
-
-#: ../src/ColorDialog.cs:213
-#: ../src/Loupe.cs:65
-#: ../src/PhotoView.cs:256
-#: ../src/UI.Dialog/EditExceptionDialog.cs:25
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "收到異常 \"{0}\"。無法儲存相片 {1}"
-
-#: ../src/Core.cs:192
+#: ../src/Core/App.cs:278
#, csharp-format
msgid "No photos matching {0} found"
msgstr "找不到符合 {0} 的相片"
-#: ../src/Core.cs:193
+#: ../src/Core/App.cs:279
#, csharp-format
msgid ""
"The tag \"{0}\" is not applied to any photos. Try adding\n"
"the tag to some photos or selecting a different tag in the\n"
"F-Spot preference dialog."
msgstr ""
-"標籤「{0}」並沒有套用到任何標籤。\n"
-"試試將標籤加入一些圖片或於 F-Spot 偏好對話方塊選擇其他標籤。"
+"沒有任何標示為 \"{0}\" 的相片。您可以標示一些\n"
+"相片，或著在 F-Spot 的選項中選擇其他的標籤。"
-#: ../src/Core.cs:197
+#: ../src/Core/App.cs:283
msgid "Search returned no results"
-msgstr "沒有搜尋結果"
+msgstr "沒有找到搜尋結果"
-#: ../src/Core.cs:198
+#: ../src/Core/App.cs:284
msgid ""
"The tag F-Spot is looking for does not exist. Try\n"
"selecting a different tag in the F-Spot preference\n"
@@ -491,106 +1484,140 @@ msgstr ""
"F-Spot 正在尋找的標籤不存在。\n"
"請試試在 F-Spot 偏好對話方塊選擇其他標籤。"
-#: ../src/Core/Photo.cs:417
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Core/Photo.cs:473
msgid "Reparented"
-msgstr ""
+msgstr "重定母本"
-#: ../src/Core/Photo.cs:417
+#: ../src/Core/Photo.cs:473
#, csharp-format
msgid "Reparented ({0})"
-msgstr ""
+msgstr "重定母本 ({0})"
-#: ../src/Core/Photo.cs:434
+#: ../src/Core/Photo.cs:492
#, csharp-format
msgid "Modified"
msgid_plural "Modified ({0})"
-msgstr[0] "已修改"
-msgstr[1] "已修改({0}個)"
+msgstr[0] "已修改 ({0})"
-#: ../src/Core/Photo.cs:453
-#, fuzzy, csharp-format
+#: ../src/Core/Photo.cs:513
+#, csharp-format
msgid "Modified in {1}"
-msgstr "已修改"
+msgstr "在 {1} 中已修改"
-#: ../src/Core/Photo.cs:453
-#, fuzzy, csharp-format
+#: ../src/Core/Photo.cs:513
+#, csharp-format
msgid "Modified in {1} ({0})"
-msgstr "已修改"
+msgstr "在 {1} ({0})中已修改"
#. Note that the original version is never stored in the photo_versions table in the
#. database.
-#: ../src/Core/Photo.cs:561
-#: ../src/f-spot.glade.h:143
+#: ../src/Core/Photo.cs:671 ../src/f-spot.glade.h:62
msgid "Original"
msgstr "原始版本"
-#: ../src/DateCommands.cs:56
-msgid "Today"
-msgstr "今天"
+#: ../src/Editors/AutoStretchEditor.cs:17
+msgid "Auto Color"
+msgstr "自動校色"
-#: ../src/DateCommands.cs:58
-msgid "Yesterday"
-msgstr "昨天"
+#: ../src/Editors/ColorEditor.cs:38
+msgid "Adjust Colors"
+msgstr "調節色彩"
-#: ../src/DateCommands.cs:60
-msgid "Last 7 days"
-msgstr "最後 7 天"
+#: ../src/Editors/ColorEditor.cs:41
+msgid "Adjust"
+msgstr "調整"
-#: ../src/DateCommands.cs:62
-msgid "Last 30 days"
-msgstr "最後 30 天"
+#: ../src/Editors/CropEditor.cs:35
+msgid "4 x 3 (Book)"
+msgstr "4 x 3 (書本)"
-#: ../src/DateCommands.cs:64
-msgid "Last 90 days"
-msgstr "最後 90 天"
+#: ../src/Editors/CropEditor.cs:36
+msgid "4 x 6 (Postcard)"
+msgstr "4 x 6 (明信片)"
-#: ../src/DateCommands.cs:66
-msgid "Last 360 days"
-msgstr "最後 360 天"
+#: ../src/Editors/CropEditor.cs:37
+msgid "5 x 7 (L, 2L)"
+msgstr "5 x 7 (L, 2L)"
-#: ../src/DateCommands.cs:68
-msgid "Current Week (Mon-Sun)"
-msgstr "當週 (星期一～星期日)"
+#: ../src/Editors/CropEditor.cs:38
+msgid "8 x 10"
+msgstr "8 x 10"
-#: ../src/DateCommands.cs:70
-msgid "Previous Week (Mon-Sun)"
-msgstr "前一週 (星期一～星期日)"
+#: ../src/Editors/CropEditor.cs:39
+msgid "Square"
+msgstr "正方形"
-#: ../src/DateCommands.cs:86
-#: ../src/f-spot.glade.h:68
-msgid "All Images"
-msgstr "所有影像"
+#: ../src/Editors/CropEditor.cs:42
+msgid "Crop"
+msgstr "裁剪"
-#: ../src/DateCommands.cs:88
-msgid "Customized Range"
-msgstr "自訂範圍"
+#: ../src/Editors/CropEditor.cs:73
+msgid "Select the area that needs cropping."
+msgstr "選取需要剪裁的區域。"
+
+#: ../src/Editors/CropEditor.cs:98
+msgid "No Constraint"
+msgstr "無限制"
+
+#: ../src/Editors/CropEditor.cs:99
+msgid "Same as photo"
+msgstr "與相片一樣"
+
+#: ../src/Editors/CropEditor.cs:104
+msgid "Custom Ratios..."
+msgstr "自訂比例..."
+
+#: ../src/Editors/DesaturateEditor.cs:17
+msgid "Desaturate"
+msgstr "去飽和"
+
+#: ../src/Editors/RedEyeEditor.cs:19
+msgid "Red-eye Reduction"
+msgstr "移除紅眼"
+
+#: ../src/Editors/RedEyeEditor.cs:21
+msgid "Fix!"
+msgstr "修正！"
+
+#: ../src/Editors/RedEyeEditor.cs:25
+msgid "Select the eyes you wish to fix."
+msgstr "選取您希望修正的眼睛。"
+
+#: ../src/Editors/SepiaEditor.cs:17
+msgid "Sepia Tone"
+msgstr "棕褐色調"
-#: ../src/Editors/SoftFocus.cs:27
-#: ../src/ItemAction.cs:342
+#: ../src/Editors/SoftFocusEditor.cs:32
msgid "Soft Focus"
msgstr "柔焦"
-#: ../src/Editors/SoftFocus.cs:57
-#: ../src/PhotoVersionCommands.cs:138
-msgid "Cancel"
-msgstr "取消"
+#: ../src/Editors/TiltEditor.cs:30
+#, fuzzy
+msgid "Straighten"
+msgstr "拉直"
-#: ../src/Editors/SoftFocus.cs:60
-msgid "Apply"
-msgstr "套用"
+#: ../src/FileImportBackend.cs:289
+msgid "Import error"
+msgstr "匯入發生錯誤"
-#: ../src/Editors/Tilt.cs:28
-#: ../src/ItemAction.cs:326
-msgid "Straighten"
-msgstr ""
+#: ../src/FileImportBackend.cs:290
+#, csharp-format
+msgid "Error importing {0}{2}{2}{1}"
+msgstr "匯入 {0}{2}{2}{1} 時發生錯誤"
-#: ../src/Extensions/OpenWithMenu.cs:93
-msgid "No applications available"
-msgstr "無可用的應用程式"
+#: ../src/Filters/ResizeFilter.cs:70 ../src/Filters/SharpFilter.cs:52
+#, csharp-format
+msgid "No way to save files of type \"{0}\""
+msgstr "無法儲存 \"{0}\" 類型的檔案"
+
+#: ../src/FormClient.cs:295
+msgid "Unhandled exception"
+msgstr "預期外的錯誤"
#: ../src/FSpot.addin.xml.h:1
-msgid "Copy Photo Locat_ion"
-msgstr "複製相片位置(_I)"
+msgid "Copy Photo"
+msgstr "複製相片"
#: ../src/FSpot.addin.xml.h:2
msgid "Export to"
@@ -600,20 +1627,17 @@ msgstr "匯出至"
msgid "Open _With"
msgstr "開啟以(_W)"
-#: ../src/FSpot.addin.xml.h:4
-#: ../src/f-spot.glade.h:156
+#: ../src/FSpot.addin.xml.h:4 ../src/ui/main_window.ui.h:15
msgid "Rem_ove Tag"
msgstr "移除標記(_O)"
-#: ../src/FSpot.addin.xml.h:5
-#: ../src/SingleView.cs:426
-#: ../src/f-spot.glade.h:159
+#: ../src/FSpot.addin.xml.h:5 ../src/f-spot.glade.h:69
+#: ../src/SingleView.cs:425 ../src/ui/main_window.ui.h:16
msgid "Rotate _Left"
msgstr "往左旋轉(_L)"
-#: ../src/FSpot.addin.xml.h:6
-#: ../src/SingleView.cs:427
-#: ../src/f-spot.glade.h:160
+#: ../src/FSpot.addin.xml.h:6 ../src/f-spot.glade.h:70
+#: ../src/SingleView.cs:426 ../src/ui/main_window.ui.h:17
msgid "Rotate _Right"
msgstr "往右旋轉(_R)"
@@ -621,137 +1645,496 @@ msgstr "往右旋轉(_R)"
msgid "Tools"
msgstr "工具"
-#: ../src/FSpot.addin.xml.h:8
-#: ../src/f-spot.glade.h:204
+#: ../src/FSpot.addin.xml.h:8 ../src/ui/main_window.ui.h:32
msgid "_Attach Tag"
msgstr "附加標籤(_A)"
-#: ../src/FSpot.addin.xml.h:9
-#: ../src/f-spot.glade.h:215
+#: ../src/FSpot.addin.xml.h:9 ../src/ui/main_window.ui.h:41
msgid "_Delete From Drive"
msgstr "從磁碟機中刪除(_D)"
-#: ../src/FSpot.addin.xml.h:10
-#: ../src/f-spot.glade.h:249
+#: ../src/FSpot.addin.xml.h:10 ../src/ui/main_window.ui.h:59
msgid "_Remove From Catalog"
-msgstr "從型錄中移除(_R)"
+msgstr "從編目中移除(_R)"
-#: ../src/FileImportBackend.cs:262
-msgid "Import error"
-msgstr "匯入錯誤"
+#: ../src/f-spot.glade.h:1
+msgid " "
+msgstr " "
-#: ../src/FileImportBackend.cs:263
-#, csharp-format
-msgid "Error importing {0}{2}{2}{1}"
+#: ../src/f-spot.glade.h:2
+msgid "1024 px"
+msgstr "1024 px"
+
+#: ../src/f-spot.glade.h:3
+msgid "320 px"
+msgstr "320 px"
+
+#: ../src/f-spot.glade.h:4
+msgid "480 px"
+msgstr "480 px"
+
+#: ../src/f-spot.glade.h:5
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/f-spot.glade.h:6
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/f-spot.glade.h:7
+msgid "<b></b>"
+msgstr "<b></b>"
+
+#: ../src/f-spot.glade.h:10
+msgid "<b>Co_rrections</b>"
+msgstr "<b>校正(_R)</b>"
+
+#: ../src/f-spot.glade.h:13
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>影像插補</b>"
+
+#: ../src/f-spot.glade.h:15
+msgid "<b>Size</b>"
+msgstr "<b>大小</b>"
+
+#: ../src/f-spot.glade.h:17
+msgid "<b>Summary</b>"
+msgstr "<b>摘要</b>"
+
+#: ../src/f-spot.glade.h:18
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>透明部份</b>"
+
+#: ../src/f-spot.glade.h:19
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>檢視匯入的所有圖片</b>"
+
+#: ../src/f-spot.glade.h:20
+msgid "<b>_White Balance</b>"
+msgstr "<b>白平衡(_W)</b>"
+
+#: ../src/f-spot.glade.h:21
+msgid ""
+"<small><i>Enable this to allow interpolation on zoomed images. You shouldn't "
+"disable this for viewing photos, but disabling the interpolation could be "
+"usefull in icon design.</i></small>"
msgstr ""
+"<small><i>啟用此選項來允許針對拉近拉遠的影像進行插補處理。您不應該停用此選項"
+"以檢視相片，但是停用插補處理可能對於圖示設定很有用處。</i></small>"
-#: ../src/FileImportBackend.cs:264
-#: ../src/ThreadProgressDialog.cs:68
-msgid "Skip"
-msgstr "跳過"
+#: ../src/f-spot.glade.h:22
+msgid ""
+"<small><i>You can choose how to display transparent parts in images. This "
+"option has no effect on photos, but setting this as check pattern or custom "
+"color could be usefull when viewing icons or other artworks with transparent "
+"parts.</i></small>"
+msgstr ""
+"<small><i>您可以選擇要如何顯示影像內的透明部份。此選項對相片不會造成任何影"
+"響，但是當檢視含有透明部份的圖示或是其他美工時，將此設為格子花紋或是自訂色彩"
+"應該很有用。</i></small>"
-#: ../src/Filters/ResizeFilter.cs:70
-#: ../src/Filters/SharpFilter.cs:52
-#, csharp-format
-msgid "No way to save files of type \"{0}\""
-msgstr "無法儲存檔案類型 \"{0}\""
+#: ../src/f-spot.glade.h:23
+msgid "As _background"
+msgstr "設為背景(_B)"
-#: ../src/FormClient.cs:297
-msgid "Unhandled exception"
-msgstr "未處理的異常"
+#: ../src/f-spot.glade.h:24
+msgid "As _custom color: "
+msgstr "設為自訂色彩(_C)： "
+
+#: ../src/f-spot.glade.h:25
+msgid "As check _pattern"
+msgstr "設為格子花紋(_P)"
+
+#: ../src/f-spot.glade.h:26
+msgid "Attach Tags:"
+msgstr "附加標籤："
+
+#: ../src/f-spot.glade.h:27
+msgid "Attach tag:"
+msgstr "附加標籤："
+
+#: ../src/f-spot.glade.h:29
+msgid "CD"
+msgstr "CD"
+
+#: ../src/f-spot.glade.h:30
+msgid "C_ontrast:"
+msgstr "對比(_O)："
+
+#: ../src/f-spot.glade.h:31
+msgid "C_reate"
+msgstr "建立(_R)"
+
+#: ../src/f-spot.glade.h:32
+msgid "Camera Selection"
+msgstr "數位相機選取"
+
+#: ../src/f-spot.glade.h:33
+msgid "Copy files to the Photos folder"
+msgstr "複製檔案至相片資料夾"
+
+#: ../src/f-spot.glade.h:34
+msgid "Create Mail"
+msgstr "建立郵件"
+
+#: ../src/f-spot.glade.h:35
+msgid "Create _icon for this tag when first used"
+msgstr "當第一次使用時為此標籤建立圖示(_I)"
+
+#: ../src/f-spot.glade.h:36
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "建立郵件並將所選相片（可能會被縮放）作為附件"
+
+#: ../src/f-spot.glade.h:37
+msgid "Detect duplicates"
+msgstr "偵測複本"
+
+#: ../src/f-spot.glade.h:38
+msgid "Display File _Names"
+msgstr "顯示檔案名稱(_N)"
+
+#: ../src/f-spot.glade.h:39
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "只顯示那些被匯入指定膠卷內的相片。"
+
+#: ../src/f-spot.glade.h:40
+msgid "Do not send a mail"
+msgstr "不要寄出郵件"
+
+#: ../src/f-spot.glade.h:41
+msgid "E-_Mail:"
+msgstr "電子郵件(_M)："
+
+#: ../src/f-spot.glade.h:42
+msgid "E_xport titles and comments"
+msgstr "匯出標題和註解(_X)"
+
+#: ../src/f-spot.glade.h:43
+msgid "Estimated new size"
+msgstr "估計新大小"
+
+#: ../src/f-spot.glade.h:45
+msgid "Extra large"
+msgstr "非常大"
+
+#: ../src/f-spot.glade.h:46
+msgid "F-Spot View"
+msgstr "F-Spot 檢視"
+
+#: ../src/f-spot.glade.h:48
+msgid "Filter on selected rolls"
+msgstr "所選膠卷的過濾條件"
+
+#: ../src/f-spot.glade.h:49
+msgid "G_allery:"
+msgstr "G_allery:"
+
+#: ../src/f-spot.glade.h:50
+msgid "Gallery"
+msgstr "圖庫"
+
+#: ../src/f-spot.glade.h:51 ../src/ImportCommand.cs:547
+#: ../src/MainWindow.cs:301
+msgid "Import"
+msgstr "匯入"
+
+#. Translators: this string means 'source of import'
+#: ../src/f-spot.glade.h:53
+msgid "Import Source:"
+msgstr "匯入來源："
+
+#: ../src/f-spot.glade.h:54
+msgid "Include subfolders"
+msgstr "包括子目錄(_C)"
+
+#: ../src/f-spot.glade.h:55
+msgid "Large"
+msgstr "大"
+
+#: ../src/f-spot.glade.h:56
+msgid "Manage your custom selection ratios"
+msgstr "管理您自訂的選取比例"
+
+#: ../src/f-spot.glade.h:57
+msgid "Medium"
+msgstr "中"
+
+#: ../src/f-spot.glade.h:59
+msgid "Number of photos in selected rolls:"
+msgstr "所選膠卷內的相片數量："
+
+#: ../src/f-spot.glade.h:60
+msgid "Number of pictures"
+msgstr "圖片數目："
+
+#: ../src/f-spot.glade.h:61
+msgid "Open _Folder..."
+msgstr "開啟資料夾(_F)..."
+
+#: ../src/f-spot.glade.h:63
+msgid "Original size (possible very large file size)"
+msgstr "原始大小(檔案可能非常大)"
+
+#: ../src/f-spot.glade.h:64 ../src/UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "P_arent Tag:"
+msgstr "父標籤(_A)："
+
+#: ../src/f-spot.glade.h:65
+msgid "Pause"
+msgstr "暫停"
+
+#: ../src/f-spot.glade.h:66
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../src/f-spot.glade.h:67 ../src/ItemAction.cs:123
+msgid "Previous"
+msgstr "上一次"
+
+#: ../src/f-spot.glade.h:68
+msgid "Repair"
+msgstr "修復"
+
+#: ../src/f-spot.glade.h:71
+msgid "Select Photos to Copy From Camera..."
+msgstr "選擇要從數位相機複製的相片..."
+
+#: ../src/f-spot.glade.h:72
+msgid "Select a Tag..."
+msgstr "選擇標籤..."
+
+#: ../src/f-spot.glade.h:73
+msgid "Select the camera from which you want to transfer files"
+msgstr "請選擇您要傳輸檔案的數位相機"
+
+#: ../src/f-spot.glade.h:74
+msgid "Selected Camera: "
+msgstr "選擇的相機： "
+
+#: ../src/f-spot.glade.h:75
+msgid "Selection Constraints"
+msgstr "選取限制"
+
+#: ../src/f-spot.glade.h:76 ../src/ui/main_window.ui.h:21
+msgid "Set as _Background"
+msgstr "設定為背景(_B)"
+
+#: ../src/f-spot.glade.h:77
+msgid "Show all photos."
+msgstr "顯示所有相片。"
+
+#: ../src/f-spot.glade.h:78
+msgid "Show or hide the side pane"
+msgstr "顯示或隱藏側面的長方格"
+
+#: ../src/f-spot.glade.h:79
+msgid "Show or hide the toolbar"
+msgstr "顯示或隱藏工具列"
+
+#: ../src/f-spot.glade.h:80
+msgid "Side _pane"
+msgstr "側面的長方格(_P)"
+
+#: ../src/f-spot.glade.h:81
+msgid "Small"
+msgstr "小"
+
+#: ../src/f-spot.glade.h:82
+msgid ""
+"Specify if an original size picture should be rotated or not. Smaller sizes "
+"are automatically rotated."
+msgstr "指定原始大小的圖片是否該被旋轉。大小較小的會被自動旋轉。"
+
+#: ../src/f-spot.glade.h:83
+msgid "Strip image _metadata"
+msgstr "除去影像的中介資料(_M)"
+
+#. Note for translators: meant as Temperature
+#: ../src/f-spot.glade.h:85
+msgid "Te_mp:"
+msgstr "溫度(_M)："
+
+#: ../src/f-spot.glade.h:86
+msgid "Tiny"
+msgstr "極小"
+
+#: ../src/f-spot.glade.h:87
+msgid "Total original size"
+msgstr "總計原始大小"
+
+#: ../src/f-spot.glade.h:88 ../src/ui/main_window.ui.h:28
+msgid "Zoom _in"
+msgstr "拉近(_I)"
+
+#: ../src/f-spot.glade.h:89 ../src/ui/main_window.ui.h:29
+msgid "Zoom _out"
+msgstr "拉遠(_O)"
+
+#: ../src/f-spot.glade.h:90 ../src/ui/main_window.ui.h:30
+msgid "Zoom in"
+msgstr "拉近"
+
+#: ../src/f-spot.glade.h:91 ../src/ui/main_window.ui.h:31
+msgid "Zoom out"
+msgstr "拉遠"
+
+#: ../src/f-spot.glade.h:92
+msgid "_Brightness:"
+msgstr "亮度(_B)："
+
+#: ../src/f-spot.glade.h:93
+msgid "_Create Mail"
+msgstr "建立郵件(_C)"
+
+#: ../src/f-spot.glade.h:94 ../src/ui/main_window.ui.h:44
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#: ../src/f-spot.glade.h:98
+msgid "_Exposure:"
+msgstr "曝光(_E)："
+
+#: ../src/f-spot.glade.h:99
+msgid "_Flickr"
+msgstr "_Flickr"
+
+#: ../src/f-spot.glade.h:100 ../src/ui/main_window.ui.h:48
+msgid "_Fullscreen"
+msgstr "全螢幕(_F)"
+
+#: ../src/f-spot.glade.h:101
+msgid "_Gallery"
+msgstr "_Gallery"
+
+#: ../src/f-spot.glade.h:102 ../src/ui/main_window.ui.h:49
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: ../src/f-spot.glade.h:103
+msgid "_Hue:"
+msgstr "色調(_H)："
+
+#: ../src/f-spot.glade.h:104
+msgid "_Interpolate image on zoom"
+msgstr "拉近或拉遠圖片時對影像進行插補(_I)"
+
+#: ../src/f-spot.glade.h:105
+msgid "_New Window"
+msgstr "新視窗(_N)"
+
+#: ../src/f-spot.glade.h:106
+msgid "_Open album in browser when done uploading"
+msgstr "完成上傳後在瀏覽器中開啟圖庫(_O)"
+
+#: ../src/f-spot.glade.h:107
+msgid "_Open destination when done exporting"
+msgstr "完成匯出後開啟目的地(_O)"
+
+#: ../src/f-spot.glade.h:108 ../src/ui/main_window.ui.h:56
+msgid "_Photo"
+msgstr "相片(_P)"
+
+#: ../src/f-spot.glade.h:110
+msgid "_Saturation:"
+msgstr "飽和度(_S)："
+
+#: ../src/f-spot.glade.h:111
+msgid "_Scale photos to no larger than: "
+msgstr "相片縮放不能超過(_S)："
+
+#: ../src/f-spot.glade.h:112 ../src/ui/main_window.ui.h:67
+msgid "_Slideshow"
+msgstr "幻燈片(_8)"
+
+#: ../src/f-spot.glade.h:113
+msgid "_Strip metadata"
+msgstr "除去中介資料(_S)"
+
+#: ../src/f-spot.glade.h:114 ../src/UI.Dialog/ui/EditTagDialog.ui.h:6
+msgid "_Tag Name:"
+msgstr "標籤名稱(_T)："
+
+#: ../src/f-spot.glade.h:115
+msgid "_Tint:"
+msgstr "色相(_T)："
+
+#: ../src/f-spot.glade.h:116
+msgid "_Toolbar"
+msgstr "工具列(_T)"
+
+#: ../src/f-spot.glade.h:117
+msgid "_URI:"
+msgstr "_URI："
+
+#: ../src/f-spot.glade.h:118 ../src/ui/main_window.ui.h:75
+msgid "_View"
+msgstr "檢視(_V)"
+
+#: ../src/f-spot.glade.h:119
+msgid "_Virtual Filesystem"
+msgstr "虛擬檔案系統(_V)"
+
+#: ../src/f-spot.glade.h:120 ../src/Widgets/FindBar.cs:177
+msgid "and"
+msgstr "及"
-#: ../src/FullScreenView.cs:57
+#. at, or after a date, or between dates
+#: ../src/f-spot.glade.h:122
+msgid ""
+"at\n"
+"after\n"
+"between"
+msgstr ""
+"於\n"
+"晚於\n"
+"介於"
+
+#: ../src/f-spot.glade.h:126
+msgid "x"
+msgstr "x"
+
+#: ../src/FullScreenView.cs:58
msgid "Hide"
msgstr "隱藏"
-#: ../src/FullScreenView.cs:59
+#: ../src/FullScreenView.cs:60
msgid "Hide Toolbar"
msgstr "隱藏工具列"
-#: ../src/FullScreenView.cs:65
+#: ../src/FullScreenView.cs:66
msgid "Info"
msgstr "資訊"
-#: ../src/FullScreenView.cs:67
+#: ../src/FullScreenView.cs:68 ../src/Widgets/InfoBox.cs:201
msgid "Image Information"
msgstr "影像資訊"
-#: ../src/FullScreenView.cs:72
+#: ../src/FullScreenView.cs:73
msgid "Exit fullscreen"
msgstr "退出全螢幕"
-#: ../src/FullScreenView.cs:82
-#: ../src/MainWindow.cs:294
-#: ../src/SingleView.cs:92
+#: ../src/FullScreenView.cs:81 ../src/MainWindow.cs:341
+#: ../src/SingleView.cs:88
msgid "Slideshow"
msgstr "幻燈片"
-#: ../src/FullScreenView.cs:83
+#: ../src/FullScreenView.cs:82
msgid "Start slideshow"
msgstr "開始幻燈片"
-#: ../src/FullScreenView.cs:148
-msgid "Slide transition: "
+#: ../src/FullScreenView.cs:128
+msgid "Slide transition:"
msgstr "投影片切換："
-#: ../src/GlTransition.cs:36
-msgid "Dissolve"
-msgstr "疊化"
-
-#: ../src/GlTransition.cs:104
-msgid "Flip"
-msgstr "翻轉"
-
-#: ../src/GlTransition.cs:147
-msgid "Cover"
-msgstr "覆蓋"
-
-#: ../src/GlTransition.cs:174
-msgid "Reveal"
-msgstr "揭露"
-
-#: ../src/GlTransition.cs:201
-msgid "Wipe"
-msgstr "轉場"
-
-#: ../src/GlTransition.cs:259
-msgid "Split"
-msgstr "分割"
-
-#: ../src/GlTransition.cs:370
-msgid "Push"
-msgstr "推移"
-
-#: ../src/GroupSelector.cs:57
-#: ../src/GroupSelector.cs:58
+#: ../src/GroupSelector.cs:57 ../src/GroupSelector.cs:58
msgid "More dates"
msgstr "更多日期"
-#: ../src/GroupSelector.cs:60
-#: ../src/GroupSelector.cs:61
-msgid "More directories"
-msgstr "更多目錄"
-
-#: ../src/GroupSelector.cs:63
-#: ../src/GroupSelector.cs:64
+#: ../src/GroupSelector.cs:60 ../src/GroupSelector.cs:61
msgid "More"
msgstr "更多"
-#: ../src/GroupSelector.cs:515
-msgid "Arrange by _Month"
-msgstr "依月份排列(_M)"
-
-#: ../src/GroupSelector.cs:518
-msgid "Arrange by _Folder"
-msgstr "依資料夾排列(_F)"
-
-#: ../src/GroupSelector.cs:523
-#: ../src/f-spot.glade.h:253
-msgid "_Reverse Order"
-msgstr "順序反轉(_R)"
-
-#: ../src/GroupSelector.cs:529
-#: ../src/f-spot.glade.h:208
+#: ../src/GroupSelector.cs:517 ../src/ui/main_window.ui.h:34
msgid "_Clear Date Range"
msgstr "清除日期範圍(_C)"
@@ -779,13 +2162,17 @@ msgstr "互通目錄"
msgid "Unknown Directory"
msgstr "未知目錄"
+#: ../src/Imaging/ImageFile.cs:117
+msgid "Writing to this file format is not supported"
+msgstr "不支援寫入此檔案格式"
+
#: ../src/Imaging/IptcFile.cs:145
msgid "IPTC Information Interchange Model (IIM) Version number"
-msgstr "IPTC 資訊交換模型 (IIM) 版本號"
+msgstr "IPTC Information Interchange Model (IIM) 版本號碼"
#: ../src/Imaging/IptcFile.cs:147
msgid "OSI Destination routing information"
-msgstr ""
+msgstr "OSI 目標路由資訊"
#: ../src/Imaging/IptcFile.cs:149
msgid "IPTC file format"
@@ -793,7 +2180,7 @@ msgstr "IPTC 檔案格式"
#: ../src/Imaging/IptcFile.cs:151
msgid "Identifies the provider and product"
-msgstr "辨別提供者與產品"
+msgstr "識別供應商與產品"
#: ../src/Imaging/IptcFile.cs:153
msgid "A unique number identifying the envelope"
@@ -801,40 +2188,40 @@ msgstr "用來辨別信封的唯一編號"
#: ../src/Imaging/IptcFile.cs:155
msgid "A unique number"
-msgstr "唯一的編號"
+msgstr "一個獨特的號碼"
#: ../src/Imaging/IptcFile.cs:157
-msgid "The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
-msgstr ""
+msgid ""
+"The envelope handling priority between 1 (most urgent) and 9 (least urgent)"
+msgstr "信封處理優先序介於 1 (最緊急) 與 9 (最不緊急) 之間"
#: ../src/Imaging/IptcFile.cs:159
-#, fuzzy
msgid "The year, month and day (CCYYMMDD) the service sent the material"
-msgstr "年，月及日 (CCYYMMDD) 格式，"
+msgstr "附註年月日 (CCYYMMDD) 的服務"
#: ../src/Imaging/IptcFile.cs:161
msgid "The hour, minute and second (HHMMSS) the service sent the material"
-msgstr ""
+msgstr "這個服務送出該資料的時間，以時、分與秒標記 (HHMMSS)"
#: ../src/Imaging/IptcFile.cs:163
msgid "The character set designation"
-msgstr ""
+msgstr "設定的字元編碼"
#: ../src/Imaging/IptcFile.cs:165
msgid "External globally unique object identifier"
-msgstr ""
+msgstr "外部全域獨立物件識別碼"
#: ../src/Imaging/IptcFile.cs:170
msgid "Abstract Relationship Method (ARM) identifier"
-msgstr ""
+msgstr "抽象關聯模式 (ARM) 識別碼"
#: ../src/Imaging/IptcFile.cs:172
msgid "Abstract Relationship Method (ARM) version number."
-msgstr ""
+msgstr "抽象關係方法 (ARM) 版本編號。"
#: ../src/Imaging/IptcFile.cs:175
msgid "Number identifying the IIM version this application record uses"
-msgstr ""
+msgstr "作為辨識此應用程式紀錄所使用的 IIM 版本之用的編號"
#: ../src/Imaging/IptcFile.cs:177
msgid "Object type reference"
@@ -844,34 +2231,34 @@ msgstr "物件型態參考"
msgid "Object attribute reference"
msgstr "物件屬性參考"
-#: ../src/Imaging/IptcFile.cs:188
-#: ../src/Imaging/IptcFile.cs:192
+#: ../src/Imaging/IptcFile.cs:188 ../src/Imaging/IptcFile.cs:192
msgid "Object name"
msgstr "物件名稱"
#: ../src/Imaging/IptcFile.cs:190
msgid "Status of the objectdata according to the provider"
-msgstr ""
+msgstr "根據供應商物件資料提供的狀態"
#: ../src/Imaging/IptcFile.cs:194
msgid "Location within a city or area where the object originates"
-msgstr ""
+msgstr "該物件起源自何城市或區域"
#: ../src/Imaging/IptcFile.cs:197
msgid "Name of the city the content is focussing on"
-msgstr ""
+msgstr "內容所聚焦的城市其名稱"
#: ../src/Imaging/IptcFile.cs:200
msgid "Copyright information for"
-msgstr ""
+msgstr "其版權資訊"
#: ../src/Imaging/IptcFile.cs:203
msgid "Full name of the country of the focus of the content"
-msgstr ""
+msgstr "內容所聚焦的地區其全名"
#: ../src/Imaging/IptcFile.cs:206
-msgid "Two or three letter ISO3166 code of the country of the focus of the content"
-msgstr ""
+msgid ""
+"Two or three letter ISO3166 code of the country of the focus of the content"
+msgstr "內容所聚焦的地區其 ISO3166 代碼，由 2-3 個字母組成"
#: ../src/Imaging/IptcFile.cs:209
msgid "Creator of the content"
@@ -886,552 +2273,428 @@ msgid "The title of the author or creator"
msgstr "作者或建立者的標題"
#: ../src/Imaging/IptcFile.cs:218
-msgid "The person involved in writing, editing or correcting the object data or caption/abstract"
-msgstr ""
+msgid ""
+"The person involved in writing, editing or correcting the object data or "
+"caption/abstract"
+msgstr "這個人參與過寫作、編輯、或是校正這個物件資料或是相片說明/摘要"
#: ../src/Imaging/IptcFile.cs:222
msgid "Headline of the content"
-msgstr ""
+msgstr "內容的標題"
#: ../src/Imaging/IptcFile.cs:225
-msgid "Instructions from the creator to the receiver not covered by other fields"
-msgstr ""
+msgid ""
+"Instructions from the creator to the receiver not covered by other fields"
+msgstr "來自建立者給予接收者的指示，沒有被其他領域涵蓋"
#: ../src/Imaging/IptcFile.cs:228
msgid "Intellectual genre of the object"
-msgstr ""
+msgstr "物件的智慧類型"
#: ../src/Imaging/IptcFile.cs:241
-#, fuzzy
msgid "Unknown IIM DataSet"
-msgstr "未知目錄"
+msgstr "不明的 IIM DataSet"
-#: ../src/ImportCommand.cs:49
-#: ../src/SingleView.cs:327
+#: ../src/ImportCommand.cs:48 ../src/SingleView.cs:344
msgid "Select Folder"
msgstr "選擇資料夾"
-#: ../src/ImportCommand.cs:261
+#: ../src/ImportCommand.cs:259
msgid "(No Cameras Detected)"
msgstr "(偵測不到數位相機)"
-#: ../src/ImportCommand.cs:405
+#: ../src/ImportCommand.cs:404
#, csharp-format
msgid "Loading {0} of {1}"
msgstr "正在載入 {1} 之 {0}"
-#: ../src/ImportCommand.cs:473
+#: ../src/ImportCommand.cs:470
msgid "Done Loading"
msgstr "完成載入"
-#: ../src/ImportCommand.cs:670
+#: ../src/ImportCommand.cs:684
msgid "Directory does not exist."
msgstr "目錄不存在。"
-#: ../src/ImportCommand.cs:671
+#: ../src/ImportCommand.cs:685
#, csharp-format
-msgid "The directory you selected \"{0}\" does not exist. Please choose a different directory"
+msgid ""
+"The directory you selected \"{0}\" does not exist. Please choose a "
+"different directory"
msgstr "您選擇的目錄 \"{0}\" 不存在。請選擇另外的目錄"
-#. Prepare the Last Import root tag
-#: ../src/ImportCommand.cs:723
-#: ../src/ImportCommand.cs:725
-#: ../src/XmpTagsImporter.cs:88
-msgid "Import Tags"
-msgstr "匯入標籤"
-
-#: ../src/InfoBox.cs:81
-msgid "name"
-msgstr "名稱"
-
-#: ../src/InfoBox.cs:83
-msgid "version"
-msgstr "版本"
-
-#: ../src/InfoBox.cs:85
-msgid "date"
-msgstr "日期"
-
-#: ../src/InfoBox.cs:87
-msgid "size"
-msgstr "大小"
-
-#: ../src/InfoBox.cs:89
-msgid "exposure"
-msgstr "曝光"
-
-#. The label for the root category is used in new and edit tag dialogs
-#: ../src/InfoBox.cs:232
-#: ../src/TagStore.cs:258
-msgid "(None)"
-msgstr "(無)"
-
-#: ../src/InfoBox.cs:243
-#: ../src/InfoBox.cs:252
-msgid "(Unknown)"
-msgstr "(未知)"
-
-#: ../src/InfoDisplay.cs:14
-#: ../src/MainWindow.cs:1579
-msgid "Metadata Browser"
-msgstr "Metadata 瀏覽器"
-
-#. Obsolete, remove after db rev4
-#: ../src/InfoDisplay.cs:135
-#: ../src/InfoDisplay.cs:137
-#: ../src/f-spot.glade.h:110
-msgid "Folder"
-msgstr "資料夾"
-
-#: ../src/InfoDisplay.cs:139
-msgid "Picasaweb"
-msgstr "Picasaweb"
-
-#: ../src/InfoDisplay.cs:141
-msgid "SmugMug"
-msgstr "SmugMug"
-
-#: ../src/InfoDisplay.cs:143
-msgid "Gallery2"
-msgstr "Gallery2"
-
-#: ../src/InfoDisplay.cs:239
-msgid "Extended Metadata"
-msgstr "延伸的 Metadata"
-
-#: ../src/InfoDisplay.cs:271
-msgid "Exported Locations"
-msgstr "匯出過的位置"
-
-#: ../src/InfoDisplay.cs:294
-msgid "No active photo"
-msgstr "沒有活動中的相片"
-
-#: ../src/InfoDisplay.cs:296
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "相片 \"{0}\" 不存在"
-
-#: ../src/InfoDisplay.cs:302
-msgid "No metadata available"
-msgstr "無可用的 Metadata"
+#: ../src/ImportCommand.cs:738 ../src/ImportCommand.cs:740
+#: ../src/XmpTagsImporter.cs:89
+msgid "Imported Tags"
+msgstr "匯入的標籤"
-#: ../src/ItemAction.cs:81
-#: ../src/MainWindow.cs:261
-#: ../src/SingleView.cs:75
+#: ../src/ItemAction.cs:79 ../src/MainWindow.cs:308 ../src/SingleView.cs:71
msgid "Rotate Left"
-msgstr "往左旋轉"
+msgstr "向左旋轉"
-#: ../src/ItemAction.cs:82
-#: ../src/ItemAction.cs:94
+#: ../src/ItemAction.cs:80
msgid "Rotate picture left"
-msgstr "將圖片往左選轉"
+msgstr "將圖片向左旋轉"
-#: ../src/ItemAction.cs:93
-#: ../src/MainWindow.cs:265
-#: ../src/SingleView.cs:80
+#: ../src/ItemAction.cs:91 ../src/MainWindow.cs:312 ../src/SingleView.cs:76
msgid "Rotate Right"
-msgstr "往右旋轉"
+msgstr "向右旋轉"
-#: ../src/ItemAction.cs:104
-#: ../src/f-spot.glade.h:132
-#: ../extensions/FolderExport/FolderExport.cs:888
-msgid "Next"
-msgstr "下一步"
+#: ../src/ItemAction.cs:92
+msgid "Rotate picture right"
+msgstr "將圖片向右旋轉"
-#: ../src/ItemAction.cs:105
+#: ../src/ItemAction.cs:103
msgid "Next picture"
msgstr "下一張圖片"
-#: ../src/ItemAction.cs:126
-#: ../src/f-spot.glade.h:152
-msgid "Previous"
-msgstr "上一次"
-
-#: ../src/ItemAction.cs:127
+#: ../src/ItemAction.cs:124
msgid "Previous picture"
msgstr "上一張圖片"
-#: ../src/ItemAction.cs:257
-msgid "Auto Color"
-msgstr "自動校色"
-
-#: ../src/ItemAction.cs:258
-msgid "Automatically adjust the colors"
-msgstr "自動調整色彩"
-
-#: ../src/ItemAction.cs:273
-msgid "Apply straightening"
-msgstr ""
-
-#: ../src/ItemAction.cs:274
-msgid "Apply straightening to image"
-msgstr ""
-
-#: ../src/ItemAction.cs:327
-msgid "Adjust the angle of the image to straighten the horizon"
-msgstr ""
-
-#: ../src/ItemAction.cs:343
-msgid "Create a soft focus visual effect"
-msgstr "建立柔焦視覺特效"
-
-#: ../src/Loupe.cs:64
-msgid "Error saving sharpened photo"
-msgstr "儲存銳化相片時發生錯誤"
-
-#: ../src/Loupe.cs:94
-msgid "Sharpen"
-msgstr "銳化"
-
-#: ../src/Loupe.cs:104
-msgid "Amount:"
-msgstr "數量："
-
-#: ../src/Loupe.cs:105
-msgid "Radius:"
-msgstr "半徑："
-
-#: ../src/Loupe.cs:106
-msgid "Threshold:"
-msgstr "門檻值："
-
-#: ../src/MainWindow.cs:254
-#: ../src/f-spot.glade.h:123
-msgid "Import"
-msgstr "匯入"
-
-#: ../src/MainWindow.cs:256
+#: ../src/MainWindow.cs:303
msgid "Import new images"
msgstr "匯入新影像"
-#: ../src/MainWindow.cs:272
-#: ../src/f-spot.glade.h:77
+#: ../src/MainWindow.cs:319 ../src/ui/main_window.ui.h:3
msgid "Browse"
msgstr "瀏覽"
-#: ../src/MainWindow.cs:276
+#: ../src/MainWindow.cs:323
msgid "Browse many photos simultaneously"
msgstr "同時瀏覽多個相片"
-#: ../src/MainWindow.cs:280
+#: ../src/MainWindow.cs:327
msgid "Edit Image"
msgstr "編輯影像"
-#: ../src/MainWindow.cs:284
+#: ../src/MainWindow.cs:331
msgid "View and edit a photo"
msgstr "檢視及編輯相片"
-#: ../src/MainWindow.cs:289
-#: ../src/SingleView.cs:87
+#: ../src/MainWindow.cs:336 ../src/SingleView.cs:83
msgid "Fullscreen"
msgstr "全螢幕"
-#: ../src/MainWindow.cs:291
-#: ../src/SingleView.cs:89
+#: ../src/MainWindow.cs:338 ../src/SingleView.cs:85
msgid "View photos fullscreen"
msgstr "全螢幕檢視相片"
-#: ../src/MainWindow.cs:296
-#: ../src/SingleView.cs:94
+#: ../src/MainWindow.cs:343 ../src/SingleView.cs:90
msgid "View photos in a slideshow"
msgstr "於幻燈片中檢視相片"
-#: ../src/MainWindow.cs:876
-msgid "Error loading database."
-msgstr "載入資料庫時發生錯誤。"
+#: ../src/MainWindow.cs:358
+msgid "Previous photo"
+msgstr "上一張相片"
-#: ../src/MainWindow.cs:877
-#, csharp-format
-msgid "F-Spot encountered an error while loading the photo database. The old database has be moved to {0} and a new database has been created."
-msgstr ""
+#: ../src/MainWindow.cs:363
+msgid "Next photo"
+msgstr "下一張相片"
-#: ../src/MainWindow.cs:1492
+#: ../src/MainWindow.cs:1518
msgid "No cameras detected."
msgstr "偵測不到數位相機。"
-#: ../src/MainWindow.cs:1493
-msgid "F-Spot was unable to find any cameras attached to this system. Double check that the camera is connected and has power"
-msgstr "F-Spot 無法找到任何連接到系統的數位相機。請再次確定它已連接並且電源已開啟。"
+#: ../src/MainWindow.cs:1519
+msgid ""
+"F-Spot was unable to find any cameras attached to this system. Double check "
+"that the camera is connected and has power"
+msgstr ""
+"F-Spot 無法找到任何連接到系統的數位相機。請再次確定它已連接並且電源已開啟。"
-#: ../src/MainWindow.cs:1533
+#: ../src/MainWindow.cs:1558
msgid "Error connecting to camera"
msgstr "連接數位相機時發生錯誤"
-#: ../src/MainWindow.cs:1534
+#: ../src/MainWindow.cs:1559
#, csharp-format
msgid "Received error \"{0}\" while connecting to camera"
msgstr "連接數位相機時收到錯誤 \"{0}\""
#. Translators, The singular case will never happen here.
-#: ../src/MainWindow.cs:1901
+#: ../src/MainWindow.cs:1846
#, csharp-format
msgid "Merge the selected tag"
msgid_plural "Merge the {0} selected tags?"
-msgstr[0] "合併選定的標籤?"
-msgstr[1] "合併選定的 {0} 個標籤?"
+msgstr[0] "合併選定的 {0} 個標籤？"
-#: ../src/MainWindow.cs:1928
-msgid "This operation will merge the selected tags and any sub-tags into a single tag."
-msgstr ""
+#: ../src/MainWindow.cs:1873
+msgid ""
+"This operation will merge the selected tags and any sub-tags into a single "
+"tag."
+msgstr "此操作將合併所選的標籤與任何子標籤為單一標籤。"
-#: ../src/MainWindow.cs:1930
+#: ../src/MainWindow.cs:1875
msgid "_Merge Tags"
msgstr "合併標籤(_M)"
-#: ../src/MainWindow.cs:2130
-#: ../src/SingleView.cs:469
+#: ../src/MainWindow.cs:2080
+#, csharp-format
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] "{1} 張相片中的第 {0} 張"
+
+#: ../src/MainWindow.cs:2082 ../src/SingleView.cs:467
#, csharp-format
msgid "{0} Photo"
msgid_plural "{0} Photos"
msgstr[0] "{0} 張相片"
-msgstr[1] "{0} 張相片"
-
-#: ../src/MainWindow.cs:2137
-#, csharp-format
-msgid " out of {0}"
-msgstr "，共有 {0} 張"
-#: ../src/MainWindow.cs:2140
+#: ../src/MainWindow.cs:2085
#, csharp-format
msgid " ({0} selected)"
msgid_plural " ({0} selected)"
msgstr[0] " (已選 {0} 張)"
-msgstr[1] " (已選 {0} 張)"
-#: ../src/MainWindow.cs:2227
+#: ../src/MainWindow.cs:2166
msgid "_Ok"
msgstr "確定(_O)"
-#: ../src/MainWindow.cs:2228
+#: ../src/MainWindow.cs:2167
msgid "Error Deleting Picture"
msgstr "刪除圖片時發生錯誤"
-#: ../src/MainWindow.cs:2233
+#: ../src/MainWindow.cs:2172
#, csharp-format
msgid "No permission to delete the file:{1}{0}"
msgstr "沒有刪除檔案的權限：{1}{0}"
-#: ../src/MainWindow.cs:2237
+#: ../src/MainWindow.cs:2176
#, csharp-format
msgid "An error of type {0} occurred while deleting the file:{2}{1}"
-msgstr ""
+msgstr "刪除檔案時發生類型 {0} 的錯誤：{2}{1}"
-#: ../src/MainWindow.cs:2263
+#: ../src/MainWindow.cs:2208
#, csharp-format
msgid "Delete the selected photo permanently?"
msgid_plural "Delete the {0} selected photos permanently?"
-msgstr[0] "要永久刪除選擇的相片嗎?"
-msgstr[1] "要永久刪除選擇的 {0} 張相片嗎?"
+msgstr[0] ""
+"要永久刪除選擇的相片嗎？\n"
+"要永久刪除選擇的 {0} 張相片嗎？"
-#: ../src/MainWindow.cs:2267
+#: ../src/MainWindow.cs:2212
msgid "This deletes all versions of the selected photo from your drive."
-msgid_plural "This deletes all versions of the selected photos from your drive."
-msgstr[0] "這樣會從磁碟中刪除已選相片的所有版本。"
-msgstr[1] "這樣會從磁碟中刪除已選相片的所有版本。"
+msgid_plural ""
+"This deletes all versions of the selected photos from your drive."
+msgstr[0] "這樣會從磁碟機中刪除這張相片的所有版本。"
-#: ../src/MainWindow.cs:2270
+#: ../src/MainWindow.cs:2215
msgid "_Delete photo"
msgid_plural "_Delete photos"
msgstr[0] "刪除相片(_D)"
-msgstr[1] "刪除相片(_D)"
-#: ../src/MainWindow.cs:2301
+#: ../src/MainWindow.cs:2251
#, csharp-format
msgid "Remove the selected photo from F-Spot?"
msgid_plural "Remove the {0} selected photos from F-Spot?"
-msgstr[0] "要從 F-Spot 移除已選的相片嗎?"
-msgstr[1] "要從 F-Spot 移除已選的 {0} 張相片嗎?"
+msgstr[0] ""
+"要從 F-Spot 移除已選的相片嗎？\n"
+"要從 F-Spot 移除已選的 {0} 張相片嗎？"
-#: ../src/MainWindow.cs:2306
-msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
-msgstr "如果您要從 F-Spot 型錄中移除相片，那麼所有標籤資訊都會一併消失。不過，您仍然可以再次把相片匯入至 F-Spot 中。"
+#: ../src/MainWindow.cs:2256
+msgid ""
+"If you remove photos from the F-Spot catalog all tag information will be "
+"lost. The photos remain on your computer and can be imported into F-Spot "
+"again."
+msgstr ""
+"如果您要從 F-Spot 編目中移除相片，那麼所有標籤資訊都會一併消失。不過，您仍然"
+"可以再次把相片匯入至 F-Spot 中。"
-#: ../src/MainWindow.cs:2307
+#: ../src/MainWindow.cs:2257
msgid "_Remove from Catalog"
-msgstr "從型錄中移除(_R)"
+msgstr "從編目中移除(_R)"
-#: ../src/MainWindow.cs:2370
+#: ../src/MainWindow.cs:2320
#, csharp-format
msgid "Delete tag \"{0}\"?"
msgstr "刪除標籤\"{0}\"?"
-#: ../src/MainWindow.cs:2372
+#: ../src/MainWindow.cs:2322
#, csharp-format
msgid "Delete the {0} selected tags?"
msgstr "刪除選定的標籤 {0} ?"
-#: ../src/MainWindow.cs:2377
+#: ../src/MainWindow.cs:2327
msgid "photo"
msgid_plural "photos"
msgstr[0] "相片"
-msgstr[1] "相片"
-#: ../src/MainWindow.cs:2379
-#, fuzzy, csharp-format
+#: ../src/MainWindow.cs:2329
+#, csharp-format
msgid "If you delete this tag, the association with {0} {1} will be lost."
-msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
-msgstr[0] "如果您刪除一個標籤，那麼相片的所有關聯都會消失。"
+msgid_plural ""
+"If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] "如果您刪除此標籤，那麼與 {0} {1} 的關聯都會消失。"
-#: ../src/MainWindow.cs:2384
+#: ../src/MainWindow.cs:2334
msgid "_Delete tag"
msgid_plural "_Delete tags"
msgstr[0] "刪除標籤(_D)"
-msgstr[1] "刪除標籤(_D)"
#. A Category is not empty. Can not delete it.
-#: ../src/MainWindow.cs:2398
+#: ../src/MainWindow.cs:2348
msgid "Tag is not empty"
msgstr "標籤不是空的"
-#: ../src/MainWindow.cs:2399
+#: ../src/MainWindow.cs:2349
#, csharp-format
-msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
-msgstr ""
+msgid ""
+"Can not delete tags that have tags within them. Please delete tags under "
+"\"{0}\" first"
+msgstr "無法刪除內含標籤的標籤。請先刪除「{0}」下的標籤"
-#: ../src/MainWindow.cs:2851
+#: ../src/MainWindow.cs:2789
msgid "Rotate selected photo left"
msgid_plural "Rotate selected photos left"
msgstr[0] "將已選的相片向左旋轉"
-msgstr[1] "將已選的相片向左旋轉"
-#: ../src/MainWindow.cs:2864
+#: ../src/MainWindow.cs:2802
msgid "Rotate selected photo right"
msgid_plural "Rotate selected photos right"
msgstr[0] "將已選的相片向右旋轉"
-msgstr[1] "將已選的相片向右旋轉"
-#: ../src/MainWindow.cs:2872
+#: ../src/MainWindow.cs:2813
#, csharp-format
msgid "Find _Selected Tag"
msgid_plural "Find _Selected Tags"
msgstr[0] "尋找選定的標籤(_S)"
-msgstr[1] "尋找選定的標籤(_S)"
-#: ../src/MainWindow.cs:2876
+#: ../src/MainWindow.cs:2817
#, csharp-format
msgid "Find Selected Tag _With"
msgid_plural "Find Selected Tags _With"
-msgstr[0] "尋找選定的標籤以"
-msgstr[1] "尋找選定的標籤以"
+msgstr[0] "尋找選定的標籤以(_W)"
-#: ../src/MainWindow.cs:2914
+#: ../src/MainWindow.cs:2858
msgid "Create New Version?"
msgid_plural "Create New Versions?"
msgstr[0] "建立新版本？"
-msgstr[1] "建立新版本？"
-#: ../src/MainWindow.cs:2916
+#: ../src/MainWindow.cs:2860
#, csharp-format
-msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
-msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
+msgid ""
+"Before launching {1}, should F-Spot create a new version of the selected "
+"photo to preserve the original?"
+msgid_plural ""
+"Before launching {1}, should F-Spot create new versions of the selected "
+"photos to preserve the originals?"
msgstr[0] ""
-msgstr[1] ""
+"在啟動 {1} 之前，F-Spot 應該為所選相片建立新的版本以保留原始版本嗎？"
-#: ../src/MetadataStore.cs:18
+#: ../src/MainWindow.cs:2882
+msgid "XCF version"
+msgstr "XCF 版本"
+
+#: ../src/MetadataStore.cs:19
msgid "Creator"
msgstr "建立者"
-#: ../src/MetadataStore.cs:19
+#: ../src/MetadataStore.cs:20
msgid "Title"
msgstr "標題"
-#: ../src/MetadataStore.cs:20
+#: ../src/MetadataStore.cs:21
msgid "Copyright"
msgstr "版權"
-#: ../src/MetadataStore.cs:21
+#: ../src/MetadataStore.cs:22
msgid "Subject and Keywords"
msgstr "主題與關鍵字"
-#: ../src/MetadataStore.cs:22
+#: ../src/MetadataStore.cs:23
msgid "Compression"
msgstr "壓縮"
-#: ../src/MetadataStore.cs:24
+#. Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+#. "when Planar Configuration=1, this implies that all components must have
+#. the same BitsPerSample value; when Planar Configuration=2, different
+#. components could have different bit depths."
+#: ../src/MetadataStore.cs:29
msgid "Planar Configuration"
-msgstr ""
+msgstr "平面設定"
-#: ../src/MetadataStore.cs:26
+#: ../src/MetadataStore.cs:31
msgid "Orientation"
msgstr "方向"
-#: ../src/MetadataStore.cs:28
+#: ../src/MetadataStore.cs:33
msgid "Photometric Interpretation"
-msgstr ""
+msgstr "光度解譯"
-#: ../src/MetadataStore.cs:30
+#: ../src/MetadataStore.cs:35
msgid "Resolution Unit"
-msgstr ""
+msgstr "解析度單位"
-#: ../src/MetadataStore.cs:32
-#, fuzzy
+#: ../src/MetadataStore.cs:37
msgid "Exposure Program"
-msgstr "曝光率："
+msgstr "曝光模式"
-#: ../src/MetadataStore.cs:34
+#: ../src/MetadataStore.cs:39
msgid "Metering Mode"
-msgstr ""
+msgstr "測量模式"
-#: ../src/MetadataStore.cs:36
+#: ../src/MetadataStore.cs:41
msgid "Exposure Mode"
msgstr "曝光模式"
-#: ../src/MetadataStore.cs:38
+#: ../src/MetadataStore.cs:43
msgid "Custom Rendered"
-msgstr ""
+msgstr "自訂繪製"
-#: ../src/MetadataStore.cs:40
+#: ../src/MetadataStore.cs:45
msgid "Components Configuration"
msgstr "元件設定"
-#: ../src/MetadataStore.cs:42
+#: ../src/MetadataStore.cs:47
msgid "Light Source"
msgstr "光源"
-#: ../src/MetadataStore.cs:44
+#: ../src/MetadataStore.cs:49
msgid "Sensing Method"
-msgstr ""
+msgstr "感測方法"
-#: ../src/MetadataStore.cs:46
+#: ../src/MetadataStore.cs:51
msgid "Color Space"
msgstr "色彩空間"
-#: ../src/MetadataStore.cs:48
+#: ../src/MetadataStore.cs:53
msgid "White Balance"
msgstr "白平衡"
-#: ../src/MetadataStore.cs:50
+#: ../src/MetadataStore.cs:55
msgid "Focal Plane Resolution Unit"
-msgstr ""
+msgstr "對焦平面解析度單位"
-#: ../src/MetadataStore.cs:52
+#: ../src/MetadataStore.cs:57
msgid "File Source Type"
msgstr "來源檔案類型"
-#: ../src/MetadataStore.cs:54
+#: ../src/MetadataStore.cs:59
msgid "Scene Capture Type"
-msgstr ""
+msgstr "情境捕捉類型"
-#: ../src/MetadataStore.cs:56
+#. Translators: Gain Control is the label for the exif:GainControl tag
+#. "This tag indicates the degree of overall image gain adjustment."
+#: ../src/MetadataStore.cs:63
msgid "Gain Control"
msgstr "取得控制"
-#: ../src/MetadataStore.cs:58
+#: ../src/MetadataStore.cs:65
msgid "Contrast"
msgstr "對比度"
-#: ../src/MetadataStore.cs:60
+#: ../src/MetadataStore.cs:67
msgid "Saturation"
msgstr "飽和度"
-#: ../src/MetadataStore.cs:62
+#: ../src/MetadataStore.cs:69
msgid "Sharpness"
-msgstr ""
+msgstr "銳利"
-#: ../src/MetadataStore.cs:64
+#: ../src/MetadataStore.cs:71
msgid "Scene Type"
-msgstr ""
+msgstr "情境類型"
#. Fixme this should really set parent menu
#. items insensitve
@@ -1439,512 +2702,498 @@ msgstr ""
msgid "(No Tags)"
msgstr "(無標籤)"
-#: ../src/PhotoVersionCommands.cs:57
+#: ../src/PhotoVersionCommands.cs:58
msgid "Create New Version"
msgstr "建立新的版本"
-#: ../src/PhotoVersionCommands.cs:58
+#: ../src/PhotoVersionCommands.cs:59
msgid "Name:"
msgstr "名稱："
-#: ../src/PhotoVersionCommands.cs:62
+#: ../src/PhotoVersionCommands.cs:63
msgid "Rename Version"
msgstr "重新命名版本"
-#: ../src/PhotoVersionCommands.cs:63
+#: ../src/PhotoVersionCommands.cs:64
msgid "New name:"
msgstr "新的名稱："
-#: ../src/PhotoVersionCommands.cs:109
+#: ../src/PhotoVersionCommands.cs:110
msgid "Could not create a new version"
msgstr "無法建立新版本"
-#: ../src/PhotoVersionCommands.cs:110
+#: ../src/PhotoVersionCommands.cs:111
#, csharp-format
msgid "Received exception \"{0}\". Unable to create version \"{1}\""
msgstr "收到異常 \"{0}\"。無法建立版本 \"{1}\""
-#: ../src/PhotoVersionCommands.cs:137
+#: ../src/PhotoVersionCommands.cs:138
msgid "Really Delete?"
msgstr "真的要刪除?"
#: ../src/PhotoVersionCommands.cs:139
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/PhotoVersionCommands.cs:140
msgid "Delete"
msgstr "刪除"
-#: ../src/PhotoVersionCommands.cs:143
+#: ../src/PhotoVersionCommands.cs:144
#, csharp-format
msgid "Really delete version \"{0}\"?"
msgstr "真的要刪除版本 \"{0}\" ?"
-#. FIXME show error dialog.
-#: ../src/PhotoVersionCommands.cs:153
+#: ../src/PhotoVersionCommands.cs:154
msgid "Could not delete a version"
msgstr "無法刪除版本"
-#: ../src/PhotoVersionCommands.cs:154
+#: ../src/PhotoVersionCommands.cs:155
#, csharp-format
msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
msgstr "收到異常 \"{0}\"。無法刪除版本 \"{1}\""
-#: ../src/PhotoVersionCommands.cs:195
+#: ../src/PhotoVersionCommands.cs:196
msgid "Could not rename a version"
msgstr "無法將版本重新命名"
-#: ../src/PhotoVersionCommands.cs:196
+#: ../src/PhotoVersionCommands.cs:197
#, csharp-format
msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
msgstr "收到異常 \"{0}\"。無法重新命名版本 \"{1}\""
-#: ../src/PhotoVersionMenu.cs:67
+#: ../src/PhotoVersionMenu.cs:66 ../src/Widgets/InfoBox.cs:563
+#: ../src/Widgets/InfoBox.cs:565
msgid "(No Edits)"
msgstr "(無修改)"
-#: ../src/PhotoView.cs:75
-msgid "4 x 3 (Book)"
-msgstr "4 x 3 (書本)"
-
-#: ../src/PhotoView.cs:76
-msgid "4 x 6 (Postcard)"
-msgstr "4 x 6 (明信片)"
-
-#: ../src/PhotoView.cs:77
-msgid "5 x 7 (L, 2L)"
-msgstr "5 x 7 (L, 2L)"
-
-#: ../src/PhotoView.cs:78
-msgid "8 x 10"
-msgstr "8 x 10"
-
-#: ../src/PhotoView.cs:79
-msgid "Square"
-msgstr "正方形"
-
-#: ../src/PhotoView.cs:126
-msgid "Crop photo to selected area"
-msgstr "剪裁相片中所選區域"
-
-#: ../src/PhotoView.cs:127
-msgid "Remove redeye from selected area"
-msgstr "從選擇區域中移除紅眼"
-
-#: ../src/PhotoView.cs:129
-msgid "Select an area to crop"
-msgstr "選擇區域以剪裁"
-
-#: ../src/PhotoView.cs:130
-msgid "Select an area to remove redeye"
-msgstr "選擇區域以移除紅眼"
-
-#: ../src/PhotoView.cs:255
-#: ../src/UI.Dialog/EditExceptionDialog.cs:38
+#: ../src/PhotoView.cs:167 ../src/UI.Dialog/EditExceptionDialog.cs:38
msgid "Error editing photo"
msgstr "編輯相片時發生錯誤"
-#: ../src/PhotoView.cs:307
-msgid "No selection available"
-msgstr "無可用的選取區域"
-
-#: ../src/PhotoView.cs:308
-msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
-msgstr ""
+#: ../src/PhotoView.cs:168 ../src/Sharpener.cs:73
+#: ../src/UI.Dialog/EditExceptionDialog.cs:25
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "收到異常 \"{0}\"。無法儲存相片 {1}"
-#: ../src/PhotoView.cs:496
+#: ../src/PhotoView.cs:357
msgid "Comment:"
msgstr "註解："
-#: ../src/PhotoView.cs:528
-msgid "Constrain the aspect ratio of the selection"
-msgstr ""
-
-#: ../src/PhotoView.cs:530
-msgid "Crop"
-msgstr "裁剪"
-
-#: ../src/PhotoView.cs:534
-msgid "Reduce Red-Eye"
-msgstr "減少紅眼"
-
-#: ../src/PhotoView.cs:538
-msgid "Adjust Colors"
-msgstr "調節色彩"
-
-#: ../src/PhotoView.cs:540
-msgid "Adjust the photo colors"
-msgstr "調整相片色彩"
-
-#: ../src/PhotoView.cs:543
-msgid "Desaturate"
-msgstr ""
-
-#: ../src/PhotoView.cs:545
-msgid "Convert the photo to black and white"
-msgstr "轉換為黑白相片"
-
-#: ../src/PhotoView.cs:548
-msgid "Sepia Tone"
-msgstr "棕褐色調"
-
-#: ../src/PhotoView.cs:550
-msgid "Convert the photo to sepia tones"
-msgstr "轉換相片為棕褐色調"
-
-#: ../src/PhotoView.cs:580
-msgid "Previous photo"
-msgstr "上一張相片"
-
-#: ../src/PhotoView.cs:585
-msgid "Next photo"
-msgstr "下一張相片"
-
-#: ../src/PhotoView.cs:622
-msgid "No Constraint"
-msgstr "無限制"
-
-#: ../src/PhotoView.cs:623
-#, fuzzy
-msgid "Same as photo"
-msgstr "已評分的相片"
-
-#: ../src/PhotoView.cs:628
-msgid "Custom Ratios..."
-msgstr "自訂比例..."
-
-#: ../src/Preferences.cs:157
+#: ../src/Preferences.cs:152
msgid "Photos"
msgstr "相片"
-#. This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/ProgressDialog.cs:82
-#: ../src/TimeDialog.cs:141
-#: ../extensions/CDExport/CDExport.cs:130
-#: ../extensions/FlickrExport/FlickrExport.cs:338
-#: ../extensions/FolderExport/FolderExport.cs:218
-#: ../extensions/GalleryExport/GalleryExport.cs:744
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{1} 之 {0}"
+#: ../src/PrintOperation.cs:32
+msgid "Image Settings"
+msgstr "影像設定"
-#: ../src/QueryWidget.cs:40
+#: ../src/QueryWidget.cs:58
msgid "Find: "
-msgstr "尋找："
+msgstr "尋找： "
-#: ../src/QueryWidget.cs:45
+#: ../src/QueryWidget.cs:63
msgid "Untagged photos"
msgstr "未標籤的相片"
-#: ../src/QueryWidget.cs:53
+#: ../src/QueryWidget.cs:71
msgid "Rated photos"
msgstr "已評分的相片"
-#: ../src/QueryWidget.cs:61
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/QueryWidget.cs:80
msgid "Import roll"
-msgstr "匯入清單"
+msgstr "匯入膠卷"
-#: ../src/QueryWidget.cs:81
+#: ../src/QueryWidget.cs:104
msgid "Clear search"
msgstr "清除搜尋"
-#: ../src/QueryWidget.cs:88
+#: ../src/QueryWidget.cs:111
msgid "Refresh search"
msgstr "更新搜尋"
-#: ../src/QueryWidget.cs:90
+#: ../src/QueryWidget.cs:113
msgid "No matching photos found"
msgstr "找不到符合的相片"
-#: ../src/QueryWidget.cs:127
+#: ../src/QueryWidget.cs:155
msgid "Hide _Find Bar"
msgstr "隱藏搜尋列(_F)"
-#: ../src/QueryWidget.cs:133
+#: ../src/QueryWidget.cs:161
msgid "Show _Find Bar"
msgstr "顯示搜尋列(_F)"
-#: ../src/RotateCommand.cs:94
-#: ../src/RotateCommand.cs:109
+#: ../src/RotateCommand.cs:96 ../src/RotateCommand.cs:111
msgid "Unable to rotate this type of photo"
msgstr "無法旋轉這種相片"
-#: ../src/RotateCommand.cs:129
+#: ../src/RotateCommand.cs:131
msgid "Unable to rotate readonly file"
msgstr "無法旋轉唯讀檔"
-#: ../src/RotateCommand.cs:196
+#: ../src/RotateCommand.cs:198
msgid "Rotating photos"
msgstr "正在旋轉相片"
-#: ../src/RotateCommand.cs:207
+#: ../src/RotateCommand.cs:209
#, csharp-format
msgid "Rotating photo \"{0}\""
msgstr "正在旋轉圖片\"{0}\""
-#: ../src/RotateCommand.cs:220
+#: ../src/RotateCommand.cs:222
msgid "Directory not found"
msgstr "找不到目錄"
-#: ../src/RotateCommand.cs:240
+#: ../src/RotateCommand.cs:242
#, csharp-format
msgid "Unable to rotate photo"
msgid_plural "Unable to rotate {0} photos"
-msgstr[0] "無法旋轉這張相片"
-msgstr[1] "無法旋轉這 {0} 張相片"
+msgstr[0] ""
+"無法旋轉這張相片\n"
+"無法旋轉這 {0} 張相片"
-#: ../src/RotateCommand.cs:242
+#: ../src/RotateCommand.cs:244
#, csharp-format
-msgid "The photo could not be rotated because it is on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgid_plural "{0} photos could not be rotated because they are on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgstr[0] "無法旋轉這張相片，因為它位於一個唯讀的檔案系統例如 CDROM 。請檢查權限，然後再試一次。"
-msgstr[1] "無法旋轉 {0} 相片，因為它們位於一個唯讀的檔案系統或媒體例如 CDROM。請檢查權限，然後再試一次。"
+msgid ""
+"The photo could not be rotated because it is on a read only file system or "
+"media such as a CDROM. Please check the permissions and try again."
+msgid_plural ""
+"{0} photos could not be rotated because they are on a read only file system "
+"or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] ""
+"無法旋轉這張相片，因為它位於一個唯讀的檔案系統，例如光碟片。請檢查權限，然後"
+"再試一次。\n"
+"無法旋轉這 {0} 張相片，因為它位於一個唯讀的檔案系統，例如光碟片。請檢查權限，"
+"然後再試一次。"
-#: ../src/RotateCommand.cs:269
-#, fuzzy, csharp-format
+#: ../src/RotateCommand.cs:271
+#, csharp-format
msgid "Received error \"{0}\" while attempting to rotate {1}"
-msgstr "連接數位相機時收到錯誤 \"{0}\""
+msgstr "試圖旋轉 {1} 時接收到錯誤 \"{0}\""
-#: ../src/RotateCommand.cs:274
+#: ../src/RotateCommand.cs:276
msgid "Error while rotating photo."
msgstr "旋轉相片時發生錯誤。"
-#: ../src/SendEmail.cs:237
+#: ../src/SendEmail.cs:240
msgid "Preparing email"
msgstr "正在準備電子郵件"
-#: ../src/SendEmail.cs:289
+#: ../src/SendEmail.cs:292
#, csharp-format
msgid "Exporting picture \"{0}\""
msgstr "正在匯出圖片\"{0}\""
-#: ../src/SendEmail.cs:311
+#: ../src/SendEmail.cs:314
msgid "Error processing image"
msgstr "處理影像時錯誤"
-#: ../src/SendEmail.cs:312
+#: ../src/SendEmail.cs:315
#, csharp-format
msgid "An error occured while processing \"{0}\": {1}"
msgstr "當處理「{0}」時發生錯誤：{1}"
#. Send the mail :)
-#: ../src/SendEmail.cs:327
-msgid "my photos"
+#: ../src/SendEmail.cs:330
+msgid "My Photos"
msgstr "我的相片"
-#: ../src/SingleView.cs:77
+#: ../src/Sharpener.cs:72
+msgid "Error saving sharpened photo"
+msgstr "儲存銳化相片時發生錯誤"
+
+#: ../src/Sharpener.cs:102
+msgid "Sharpen"
+msgstr "銳化"
+
+#: ../src/Sharpener.cs:112
+msgid "Amount:"
+msgstr "數量："
+
+#: ../src/Sharpener.cs:113
+msgid "Radius:"
+msgstr "半徑："
+
+#: ../src/Sharpener.cs:114
+msgid "Threshold:"
+msgstr "門檻值："
+
+#: ../src/SingleView.cs:73
msgid "Rotate photo left"
msgstr "往左旋轉相片"
-#: ../src/SingleView.cs:82
+#: ../src/SingleView.cs:78
msgid "Rotate photo right"
msgstr "往右旋轉相片"
-#: ../src/SingleView.cs:324
+#: ../src/SingleView.cs:115
+msgid "Folder"
+msgstr "資料夾"
+
+#: ../src/SingleView.cs:341
msgid "Open"
msgstr "開啟"
-#: ../src/SingleView.cs:429
+#: ../src/SingleView.cs:428
msgid "Set as Background"
msgstr "設為背景"
-#: ../src/TagCommands.cs:92
-#: ../src/TagCommands.cs:220
-#: ../src/TagSelectionWidget.cs:508
+#: ../src/TagCommands.cs:96 ../src/TagSelectionWidget.cs:498
+#: ../src/UI.Dialog/EditTagDialog.cs:78
msgid "This name is already in use"
msgstr "這個名稱已被使用"
-#: ../src/TagCommands.cs:139
+#: ../src/TagCommands.cs:144
msgid "Create New Tag"
msgstr "建立新標籤"
-#: ../src/TagCommands.cs:140
+#: ../src/TagCommands.cs:145
msgid "Name of New Tag:"
msgstr "新標籤名稱："
-#: ../src/TagCommands.cs:279
-msgid "Edit Tag"
-msgstr "編輯標籤"
-
-#: ../src/TagCommands.cs:280
-msgid "Tag Name:"
-msgstr "標籤名稱："
-
-#: ../src/TagCommands.cs:388
-msgid "Unable to load image"
-msgstr "無法載入影像"
-
-#: ../src/TagCommands.cs:389
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "無法讀取「{0}」作為標籤圖示"
-
-#: ../src/TagCommands.cs:427
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "{1}張相片中的第{0}張"
-
-#: ../src/TagCommands.cs:457
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "修改標籤 {0} 的圖示"
-
-#: ../src/TagCommands.cs:473
-msgid "Select Photo from file"
-msgstr "從檔案選擇相片"
-
-#: ../src/TagCommands.cs:496
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-
-#: ../src/TagMenu.cs:91
-#: ../src/TagPopup.cs:36
-msgid "Create New Tag..."
-msgstr "建立新標籤..."
-
#: ../src/TagPopup.cs:26
#, csharp-format
msgid "Find"
msgid_plural "Find"
msgstr[0] "尋找"
-msgstr[1] "尋找"
+
+#: ../src/TagPopup.cs:36 ../src/Widgets/TagMenu.cs:91
+msgid "Create New Tag..."
+msgstr "建立新標籤..."
#: ../src/TagPopup.cs:42
-msgid "Edit Selected Tag..."
-msgstr "編輯選定的標籤..."
+msgid "Edit Tag..."
+msgstr "編輯標籤..."
#: ../src/TagPopup.cs:46
msgid "Delete Tag"
msgid_plural "Delete Tags"
msgstr[0] "刪除標籤"
-msgstr[1] "刪除標籤"
#: ../src/TagPopup.cs:52
msgid "Attach Tag to Selection"
msgid_plural "Attach Tags to Selection"
-msgstr[0] "附加標籤到選擇的項目"
-msgstr[1] "附加標籤到選擇的項目"
+msgstr[0] "附加標籤到選取的項目"
#: ../src/TagPopup.cs:56
msgid "Remove Tag From Selection"
msgid_plural "Remove Tags From Selection"
-msgstr[0] "從選擇項目移除標籤"
-msgstr[1] "從選擇項目移除標籤"
+msgstr[0] "從選取項目移除標籤"
#: ../src/TagPopup.cs:62
msgid "Merge Tags"
msgstr "合併標籤"
-#: ../src/TagQueryWidget.cs:32
+#: ../src/TagQueryWidget.cs:34
#, csharp-format
msgid "Include Photos Tagged \"{0}\""
msgstr "包含被標為 \"{0}\" 的相片"
-#: ../src/TagQueryWidget.cs:37
+#: ../src/TagQueryWidget.cs:39
#, csharp-format
msgid "Exclude Photos Tagged \"{0}\""
msgstr "不包含被標為 \"{0}\" 的相片"
-#: ../src/TagQueryWidget.cs:42
+#: ../src/TagQueryWidget.cs:44
msgid "Remove From Search"
msgstr "從搜尋中移除"
-#: ../src/TagQueryWidget.cs:86
+#: ../src/TagQueryWidget.cs:88
#, csharp-format
msgid "Find _With"
msgid_plural "Find _With"
msgstr[0] "尋找以(_W)"
-msgstr[1] "尋找以(_W)"
-#: ../src/TagQueryWidget.cs:112
+#: ../src/TagQueryWidget.cs:114
msgid "All"
msgstr "全部"
-#: ../src/TagQueryWidget.cs:147
-#: ../src/Term.cs:591
+#: ../src/TagQueryWidget.cs:149 ../src/Term.cs:592
#, csharp-format
msgid "Not {0}"
msgstr "非 {0}"
-#: ../src/TagQueryWidget.cs:277
+#: ../src/TagQueryWidget.cs:278
msgid "Drag tags here to search for them"
msgstr "拖曳標籤至此來為他們搜尋"
-#: ../src/TagSelectionWidget.cs:507
+#: ../src/TagSelectionWidget.cs:497
msgid "Error renaming tag"
msgstr "重新命名標籤時發生錯誤"
-#: ../src/TagStore.cs:222
+#: ../src/TagStore.cs:203
msgid "Favorites"
msgstr "最愛"
-#: ../src/TagStore.cs:227
+#: ../src/TagStore.cs:208
msgid "Hidden"
msgstr "隱藏"
-#: ../src/TagStore.cs:235
+#: ../src/TagStore.cs:216
msgid "People"
msgstr "人物"
-#: ../src/TagStore.cs:240
+#: ../src/TagStore.cs:221
msgid "Places"
msgstr "地方"
-#: ../src/TagStore.cs:245
+#: ../src/TagStore.cs:226
msgid "Events"
msgstr "事件"
-#: ../src/Term.cs:297
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/TagStore.cs:239 ../src/Widgets/InfoBox.cs:409
+msgid "(None)"
+msgstr "(無)"
+
+#: ../src/Term.cs:298
msgid " and "
msgstr " 及 "
#. operators.Add (Catalog.GetString (" && "));
-#: ../src/Term.cs:299
+#: ../src/Term.cs:300
msgid ", "
msgstr "， "
-#: ../src/Term.cs:355
+#: ../src/Term.cs:356
msgid " or "
msgstr " 或 "
-#: ../src/Term.cs:379
-#: ../src/f-spot.glade.h:282
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Term.cs:380 ../src/UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Widgets/FindBar.cs:177
msgid "or"
msgstr "或"
-#: ../src/ThreadProgressDialog.cs:66
-msgid "Retry"
-msgstr "重試"
+#: ../src/ThumbnailCommand.cs:20
+msgid "Updating Thumbnails"
+msgstr "正在更新縮圖"
-#: ../src/TimeDialog.cs:124
-#: ../src/f-spot.glade.h:176
+#: ../src/ThumbnailCommand.cs:28
#, csharp-format
-msgid "Shift all photos by {0}"
-msgstr ""
+msgid "Updating picture \"{0}\""
+msgstr "正在上傳圖片 \"{0}\""
-#: ../src/UI.Dialog/AboutDialog.cs:68
-msgid "Copyright © 2003-2008 Novell Inc."
-msgstr "Copyright © 2003-2008 Novell Inc."
+#: ../src/UI.Dialog/AboutDialog.cs:76
+msgid "Photo management for GNOME"
+msgstr "GNOME 的相片管理"
-#: ../src/UI.Dialog/AboutDialog.cs:93
+#: ../src/UI.Dialog/AboutDialog.cs:77
+msgid "Copyright © 2003-2009 Novell Inc."
+msgstr "Copyright © 2003-2009 Novell Inc."
+
+#: ../src/UI.Dialog/AboutDialog.cs:100
msgid "translator-credits"
msgstr ""
"GNOME 程式中文化郵件論壇\n"
"community at linuxhall.org\n"
"\n"
-"Hialan Liu <hialan.liu at gmail.com>, 2007Stanley Wong <stanley18fan0k at yahoo.com.hk>, 2005"
-
-#: ../src/UI.Dialog/AboutDialog.cs:98
+"Hialan Liu <hialan.liu at gmail.com>, 2007Stanley Wong <stanley18fan0k at yahoo."
+"com.hk>, 2005\n"
+"\n"
+"Launchpad Contributions:\n"
+" Accord Tsai https://launchpad.net/~accordtsai\n"
+" Cheng-Chia Tseng https://launchpad.net/~zerng07\n"
+" Elmaz Yu https://launchpad.net/~elmazyu\n"
+" Jackden https://launchpad.net/~jackden\n"
+" Janelin https://launchpad.net/~wgl1242254\n"
+" Kevin-Wei-2 https://launchpad.net/~kevin-wei3\n"
+" Tenki https://launchpad.net/~tenki-jih\n"
+" nckuhuahua https://launchpad.net/~nckuhuahua"
+
+#: ../src/UI.Dialog/AboutDialog.cs:105
msgid "F-Spot Website"
msgstr "F-Spot 網站"
+#: ../src/UI.Dialog/AdjustTimeDialog.cs:112
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:10
+#, csharp-format
+msgid "Shift all photos by {0}"
+msgstr "依 {0} 轉換所有相片"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:99
+msgid "Today"
+msgstr "今天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:101
+msgid "Yesterday"
+msgstr "昨天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:103
+msgid "Last 7 days"
+msgstr "最近 7 天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:105
+msgid "Last 30 days"
+msgstr "最近 30 天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:107
+msgid "Last 90 days"
+msgstr "最近 90 天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:109
+msgid "Last 360 days"
+msgstr "最近 360 天"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:111
+msgid "Current Week (Mon-Sun)"
+msgstr "本週 (星期一～星期日)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:113
+msgid "Previous Week (Mon-Sun)"
+msgstr "前一週 (星期一～星期日)"
+
+#: ../src/UI.Dialog/DateRangeDialog.cs:131
+msgid "Customized Range"
+msgstr "自訂範圍"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:46
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "修改標籤 {0} 的圖示"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:68
+msgid "Select Photo from file"
+msgstr "從檔案選擇相片"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:90
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>從相片</b>\n"
+" 您可以使用您相片庫中的一張相片作為此標籤的圖示。\n"
+" 然而，首先您必須有至少一張相片和此標籤相關聯。\n"
+" 請將某相片加上「{0}」標籤，並返回這裡\n"
+" 以將它作為圖示使用。"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:168
+msgid "Unable to load image"
+msgstr "無法載入影像"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:169
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "無法讀取「{0}」作為標籤圖示"
+
+#: ../src/UI.Dialog/EditTagIconDialog.cs:207
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "{1}張相片中的第{0}張"
+
#: ../src/UI.Dialog/ExceptionDialog.cs:24
msgid "F-Spot Encountered a Fatal Error"
-msgstr ""
+msgstr "F-Spot 遭遇到嚴重錯誤"
#: ../src/UI.Dialog/ExceptionDialog.cs:60
msgid "Error Details"
@@ -1952,7 +3201,33 @@ msgstr "錯誤細節"
#: ../src/UI.Dialog/ExceptionDialog.cs:104
msgid "An unhandled exception was thrown: "
-msgstr "發生未處理的異常："
+msgstr "出現了預期外的錯誤： "
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:54
+#: ../src/UI.Dialog/PreferenceDialog.cs:77
+msgid "None"
+msgstr "無"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:56
+msgid "System profile"
+msgstr "系統個人設定檔"
+
+#: ../src/UI.Dialog/PreferenceDialog.cs:94
+msgid "Standard theme"
+msgstr "標準主題"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:20
+msgid "Error loading database."
+msgstr "載入資料庫時發生錯誤。"
+
+#: ../src/UI.Dialog/RepairDbDialog.cs:21
+#, csharp-format
+msgid ""
+"F-Spot encountered an error while loading the photo database. The old "
+"database has be moved to {0} and a new database has been created."
+msgstr ""
+"當 F-Spot 載入相片資料庫時遭遇到錯誤。舊的資料庫已經被移至 {0}，新的資料庫已"
+"經建立。"
#: ../src/UI.Dialog/SelectionRatioDialog.cs:60
msgid "Label"
@@ -1962,1826 +3237,924 @@ msgstr "標籤"
msgid "Ratio"
msgstr "比例"
-#: ../src/Updater.cs:284
-msgid "Updating F-Spot Database"
-msgstr "正在更新 F-Spot 資料庫"
-
-#: ../src/Updater.cs:285
-msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
-msgstr "您的 F-Spot 圖庫資料庫正在更新，請稍後。這或許會需要一些時間。"
-
-#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
-#: ../src/Utils/Unix.cs:25
-msgid "Unable to create temporary file"
-msgstr "無法建立暫存檔"
-
-#: ../src/Utils/GnomeUtil.cs:49
-msgid "The \"F-Spot Manual\" could not be found. Please verify that your installation has been completed successfully."
-msgstr "找不到「F-Spot 手冊」。請確認您的安裝過程完整成功。"
-
-#: ../src/Widgets/RatingMenuItem.cs:48
-msgid "Rating:"
-msgstr "評分："
-
-#: ../src/Widgets/FindBar.cs:83
-msgid "Find:"
-msgstr "尋找："
-
-#: ../src/XmpTagsImporter.cs:89
-msgid "Location"
-msgstr "位置"
-
-#: ../src/XmpTagsImporter.cs:90
-msgid "Country"
-msgstr "國家"
-
-#: ../src/XmpTagsImporter.cs:91
-msgid "City"
-msgstr "城市"
-
-#: ../src/XmpTagsImporter.cs:92
-msgid "State"
-msgstr "州"
-
-#. namespace
-#: ../src/f-spot.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/UI.Dialog/ThreadProgressDialog.cs:56
+msgid "Retry"
+msgstr "重試"
-#: ../src/f-spot.glade.h:2
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:1
msgid "0000:00:00 00:00:00"
msgstr "0000:00:00 00:00:00"
-#: ../src/f-spot.glade.h:3
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:2
msgid "00:00:00"
msgstr "00:00:00"
-#: ../src/f-spot.glade.h:4
-msgid "1 of 1"
-msgstr "1 之中的第 1"
-
-#: ../src/f-spot.glade.h:5
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/f-spot.glade.h:6
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/f-spot.glade.h:7
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/f-spot.glade.h:8
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:3
msgid "5"
msgstr "5"
-#: ../src/f-spot.glade.h:9
-msgid "640 px"
-msgstr "640 px"
-
-#: ../src/f-spot.glade.h:10
-msgid "800 px"
-msgstr "800 px"
-
-#: ../src/f-spot.glade.h:11
-msgid "<b></b>"
-msgstr "<b></b>"
-
-#: ../src/f-spot.glade.h:12
-#: ../extensions/FlickrExport/FlickrExport.glade.h:1
-msgid "<b>Account</b>"
-msgstr "<b>帳號</b>"
-
-#: ../src/f-spot.glade.h:13
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:4
msgid "<b>Action</b>"
msgstr "<b>行為</b>"
-#: ../src/f-spot.glade.h:14
-#: ../extensions/GalleryExport/GalleryExport.glade.h:1
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:1
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:1
-msgid "<b>Album</b>"
-msgstr "<b>相簿</b>"
-
-#: ../src/f-spot.glade.h:15
-#, fuzzy
-msgid "<b>Co_rrections</b>"
-msgstr "<b>相片</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>參考相片</b>"
-#: ../src/f-spot.glade.h:16
-msgid "<b>Color Management</b>"
-msgstr "<b>色彩管理</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "調整時間"
-#: ../src/f-spot.glade.h:17
-msgid "<b>Color Temperature</b>"
-msgstr "<b>色溫</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "調整後的日期： "
-#: ../src/f-spot.glade.h:18
-#: ../extensions/FolderExport/FolderExport.glade.h:3
-msgid "<b>Destination</b>"
-msgstr "<b>目的地</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "目前日期："
-#: ../src/f-spot.glade.h:19
-msgid "<b>End Date</b>"
-msgstr "<b>結束日期</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "將所有相片的間隔設為"
-#: ../src/f-spot.glade.h:20
-msgid "<b>Exposure</b>"
-msgstr "<b>曝光率</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "差異："
-#: ../src/f-spot.glade.h:21
-msgid "<b>From External Photo</b>"
-msgstr "<b>從外部相片</b>"
+#: ../src/UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "分。開始於 {0}"
-#: ../src/f-spot.glade.h:22
-#, fuzzy
-msgid "<b>From Photo</b>"
-msgstr "<b>相片</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>結束日期</b>"
-#: ../src/f-spot.glade.h:23
-#: ../extensions/GalleryExport/GalleryExport.glade.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>圖庫</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>選擇期間</b>"
-#: ../src/f-spot.glade.h:24
-msgid "<b>Histo_gram</b>"
-msgstr "<b>長條圖(_G)</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>開始日期</b>"
-#: ../src/f-spot.glade.h:25
-msgid "<b>Histogram</b>"
-msgstr "<b>長條圖</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "取消，不改變目前的時間軸。"
-#: ../src/f-spot.glade.h:26
-#, fuzzy
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>目的地</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "只顯示在這些日期中的相片。"
-#: ../src/f-spot.glade.h:27
-msgid "<b>Import Settings</b>"
-msgstr "<b>匯入設定</b>"
+#: ../src/UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "設定日期範圍"
-#: ../src/f-spot.glade.h:28
-#, fuzzy
-msgid "<b>Interoperability</b>"
-msgstr "<b>印表機細節</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "<small></small>"
+msgstr "<small></small>"
-#: ../src/f-spot.glade.h:29
-msgid "<b>Max Rating</b>"
-msgstr "<b>最高評分</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit Tag"
+msgstr "編輯標籤"
-#: ../src/f-spot.glade.h:30
-msgid "<b>Metadata</b>"
-msgstr "<b>Metadata</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "Edit icon"
+msgstr "編輯圖示"
-#: ../src/f-spot.glade.h:31
-msgid "<b>Min Rating</b>"
-msgstr "<b>最低評分</b>"
+#: ../src/UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Icon:"
+msgstr "圖示(_I)："
-#: ../src/f-spot.glade.h:32
-msgid "<b>Photograph Layout</b>"
-msgstr "<b>相片布局</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>從外部相片</b>"
-#: ../src/f-spot.glade.h:33
-#: ../extensions/FlickrExport/FlickrExport.glade.h:2
-#: ../extensions/FolderExport/FolderExport.glade.h:5
-#: ../extensions/GalleryExport/GalleryExport.glade.h:3
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:2
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:2
-msgid "<b>Photos</b>"
-msgstr "<b>相片</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>從相片</b>"
-#: ../src/f-spot.glade.h:34
-msgid "<b>Predefined</b>"
-msgstr "<b>預先定義</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>預先定義的圖示</b>"
-#: ../src/f-spot.glade.h:35
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:4
msgid "<b>Preview</b>"
msgstr "<b>預覽</b>"
-#: ../src/f-spot.glade.h:36
-msgid "<b>Printer Details</b>"
-msgstr "<b>印表機細節</b>"
-
-#: ../src/f-spot.glade.h:37
-msgid "<b>Reference Photo</b>"
-msgstr "<b>參考相片</b>"
-
-#: ../src/f-spot.glade.h:38
-msgid "<b>Screensaver</b>"
-msgstr "<b>螢幕保護程式</b>"
-
-#: ../src/f-spot.glade.h:39
-msgid "<b>Select period</b>"
-msgstr "<b>選擇期間</b>"
-
-#: ../src/f-spot.glade.h:40
-msgid "<b>Size</b>"
-msgstr "<b>大小</b>"
-
-#: ../src/f-spot.glade.h:41
-msgid "<b>Start Date</b>"
-msgstr "<b>開始日期</b>"
-
-#: ../src/f-spot.glade.h:42
-#: ../extensions/FlickrExport/FlickrExport.glade.h:3
-#: ../extensions/FolderExport/FolderExport.glade.h:6
-#: ../extensions/GalleryExport/GalleryExport.glade.h:4
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:4
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:4
-msgid "<b>Style</b>"
-msgstr "<b>風格</b>"
-
-#: ../src/f-spot.glade.h:43
-msgid "<b>Summary</b>"
-msgstr "<b>摘要</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "設計圖示從"
-#: ../src/f-spot.glade.h:44
-#, fuzzy
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>開始日期</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "編輯標籤圖示"
-#: ../src/f-spot.glade.h:45
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>檢視匯入的所有圖片</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "沒有影像(_I)"
-#: ../src/f-spot.glade.h:46
-msgid "<b>_White Balance</b>"
-msgstr "<b>白平衡(_W)</b>"
+#: ../src/UI.Dialog/ui/EditTagIconDialog.ui.h:8
+msgid "Photo 0 of 0"
+msgstr "0 張中的第 0 張相片"
-#: ../src/f-spot.glade.h:47
-msgid "<small> </small>"
-msgstr "<small> </small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "供顯示用的色彩個人設定檔："
-#: ../src/f-spot.glade.h:48
-msgid "<small></small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "供列印用的色彩個人設定檔："
-#: ../src/f-spot.glade.h:49
-msgid "<small><i>Choose the folder where F-Spot should store newly imported photos</i></small>"
-msgstr "<small><i>選擇 F-Spot 匯入新相片時儲存的資料夾</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "F-Spot 偏好設定"
-#: ../src/f-spot.glade.h:50
-#, fuzzy
-msgid "<small><i>Enable this option if you want to allow other programs to import or delete photos and tags over DBus.</i></small>"
-msgstr "<small><i>啟用這個選項以儲存標籤及描述資訊於支援的影像格式中。</i></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "F-Spot 外觀："
-#: ../src/f-spot.glade.h:51
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:5
msgid ""
-"<small><i>Enable this option to store tags and descriptions inside \n"
-"supported image formats.</i></small>"
-msgstr "<small><i>啟用這個選項以儲存標籤及描述資訊於支援的影像格式中。</i></small>"
-
-#: ../src/f-spot.glade.h:53
-msgid "<small><i>Enable this to allow interpolation on zoomed images. You shouldn't disable this for viewing photos, but disabling the interpolation could be usefull in icon design.</i></small>"
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
msgstr ""
+"如果可以的話放在影像檔內\n"
+"<small>讓其他影像編輯程式可以存取。</small>"
-#: ../src/f-spot.glade.h:54
-msgid "<small><i>While acting as a screensaver, F-Spot can display all of your images, or a small subset based on tags.</i></small>"
-msgstr "<small><i>當作為螢幕保護程式時，F-Spot 可以顯示您所有的圖片，或是依據標籤顯示一小部份。</i></small>"
-
-#: ../src/f-spot.glade.h:55
-msgid "<small><i>You can choose how to display transparent parts in images. This option has no effect on photos, but setting this as check pattern or custom color could be usefull when viewing icons or other artworks with transparent parts.</i></small>"
-msgstr ""
-
-#: ../src/f-spot.glade.h:56
-msgid "<small>C_ontrast:</small>"
-msgstr "<small>對比(_O)：</small>"
-
-#: ../src/f-spot.glade.h:57
-msgid "<small>Te_mp:</small>"
-msgstr "<small>色溫(M)：</small>"
-
-#: ../src/f-spot.glade.h:58
-msgid "<small>_Brightness:</small>"
-msgstr "<small>_亮度：</small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid "Select A Folder"
+msgstr "選擇資料夾"
-#: ../src/f-spot.glade.h:59
-msgid "<small>_Exposure:</small>"
-msgstr "<small>曝光(_E)：</small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:8
+msgid "Separately from the image files"
+msgstr "從影像檔分離"
-#: ../src/f-spot.glade.h:60
-msgid "<small>_Hue:</small>"
-msgstr "<small>色調(_H)：</small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Store tags and descriptions for photos:"
+msgstr "為這些相片儲存標籤與描述："
-#: ../src/f-spot.glade.h:61
-msgid "<small>_Saturation:</small>"
-msgstr "<small>色彩飽和(_S)</small>"
-
-#: ../src/f-spot.glade.h:62
-#, fuzzy
-msgid "<small>_Tint:</small>"
-msgstr "<small></small>"
+#: ../src/UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "When importing photos, copy them to:"
+msgstr "當匯入相片時，將它們複製到："
-#: ../src/f-spot.glade.h:63
-msgid "Ad_just Color..."
-msgstr "調節色彩(_J)..."
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>最高評分</b>"
-#: ../src/f-spot.glade.h:64
-msgid "Adjust Color"
-msgstr "調節色彩"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>最低評分</b>"
-#: ../src/f-spot.glade.h:65
-msgid "Adjust Time"
-msgstr "調整時間"
+#: ../src/UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "設定評分過濾器"
-#: ../src/f-spot.glade.h:66
+#: ../src/ui/main_window.ui.h:1
msgid "Adjust _Time..."
msgstr "調整時間(_T)..."
-#: ../src/f-spot.glade.h:67
-msgid "Adjusted date: "
-msgstr "調整後的日期："
-
-#: ../src/f-spot.glade.h:69
-msgid "Allow other programs to manipulate F-Spot"
-msgstr ""
-
-#: ../src/f-spot.glade.h:70
+#: ../src/ui/main_window.ui.h:2
msgid "Arrange _by"
msgstr "排列依(_B)"
-#: ../src/f-spot.glade.h:71
-#, fuzzy
-msgid "As _background"
-msgstr "設定為背景(_B)"
-
-#: ../src/f-spot.glade.h:72
-#, fuzzy
-msgid "As _custom color: "
-msgstr "調節色彩"
-
-#: ../src/f-spot.glade.h:73
-#, fuzzy
-msgid "As check _pattern"
-msgstr "檢查類型"
-
-#: ../src/f-spot.glade.h:74
-msgid "Attach Tags:"
-msgstr "附加標籤："
-
-#: ../src/f-spot.glade.h:75
-msgid "Attach tag:"
-msgstr "附加標籤："
-
-#: ../src/f-spot.glade.h:76
-#: ../extensions/CDExport/CDExport.glade.h:2
-#: ../extensions/FolderExport/FolderExport.glade.h:7
-#: ../extensions/GalleryExport/GalleryExport.glade.h:9
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:5
-msgid "Autorotate"
-msgstr "自動旋轉"
-
-#: ../src/f-spot.glade.h:78
+#: ../src/ui/main_window.ui.h:4
msgid "By _Date"
msgstr "依日期(_D)"
-#: ../src/f-spot.glade.h:79
+#: ../src/ui/main_window.ui.h:5
msgid "By _Import Roll"
-msgstr "依匯入清單(_I)"
+msgstr "依匯入膠卷(_I)"
-#: ../src/f-spot.glade.h:80
+#: ../src/ui/main_window.ui.h:6
msgid "By _Rating"
msgstr "依評分(_R)"
-#: ../src/f-spot.glade.h:81
-msgid "CD"
-msgstr "CD"
-
-#: ../src/f-spot.glade.h:82
-msgid "C_aption:"
-msgstr "標題(_A)："
-
-#: ../src/f-spot.glade.h:83
-msgid "C_ontrast:"
-msgstr "對比(_O)："
-
-#: ../src/f-spot.glade.h:84
-msgid "Camera Selection"
-msgstr "選擇的數位相機"
-
-#: ../src/f-spot.glade.h:85
-msgid "Cancel, do not change the current timeline. "
-msgstr "取消，不改變目前的時間線。"
-
-#: ../src/f-spot.glade.h:86
-msgid "Co_nfigure"
-msgstr "組態(_N)"
-
-#: ../src/f-spot.glade.h:87
-msgid "Copy Locat_ion"
-msgstr "複製影像位置(_I)"
-
-#: ../src/f-spot.glade.h:88
-msgid "Copy files to the Photos folder"
-msgstr "複製檔案至相片資料夾"
-
-#: ../src/f-spot.glade.h:89
-msgid "Create Mail"
-msgstr "建立郵件"
+#: ../src/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "複製"
-#: ../src/f-spot.glade.h:90
+#: ../src/ui/main_window.ui.h:8
msgid "Create New _Tag..."
msgstr "建立新標籤(_T)..."
-#: ../src/f-spot.glade.h:91
+#: ../src/ui/main_window.ui.h:9
msgid "Create _New Version..."
msgstr "建立新版本(_N)..."
-#: ../src/f-spot.glade.h:92
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr "建立郵件並將所選相片（可能會被縮放）作為附件"
-
-#: ../src/f-spot.glade.h:93
-msgid "Crop photo to _fit"
-msgstr "剪裁相片以符合(_F)"
-
-#: ../src/f-spot.glade.h:94
-msgid "Current date:"
-msgstr "目前日期："
-
-#: ../src/f-spot.glade.h:95
-msgid "Display File _Names"
-msgstr "顯示檔案名稱(_N)"
-
-#: ../src/f-spot.glade.h:96
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "只顯示那些匯入指定清單的相片。"
-
-#: ../src/f-spot.glade.h:97
-msgid "Do not send a mail"
-msgstr "不要寄出郵件"
-
-#: ../src/f-spot.glade.h:98
-msgid "E-_Mail:"
-msgstr "電子郵件(_M)："
-
-#: ../src/f-spot.glade.h:99
-msgid "E_xport titles and comments"
-msgstr "匯出標題和註解(_X)"
-
-#: ../src/f-spot.glade.h:100
-msgid "Edit Tag Icon"
-msgstr "編輯標籤圖示"
-
-#: ../src/f-spot.glade.h:101
-msgid "Edit icon"
-msgstr "編輯圖示"
-
-#: ../src/f-spot.glade.h:102
-msgid "Estimated new size"
-msgstr "估計新大小"
-
-#: ../src/f-spot.glade.h:103
-#: ../extensions/FlickrExport/FlickrExport.glade.h:6
-#: ../extensions/GalleryExport/GalleryExport.glade.h:10
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:9
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:6
-msgid "Export"
-msgstr "匯出"
-
-#: ../src/f-spot.glade.h:104
-msgid "Extra large"
-msgstr "非常大"
-
-#: ../src/f-spot.glade.h:105
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../src/f-spot.glade.h:106
-msgid "F-Spot View"
-msgstr "F-Spot 檢視"
-
-#: ../src/f-spot.glade.h:108
-msgid "Filter on selected rolls"
-msgstr "過濾所選清單"
-
-#: ../src/f-spot.glade.h:109
+#: ../src/ui/main_window.ui.h:11
msgid "Fin_d"
msgstr "尋找(_D)"
-#: ../src/f-spot.glade.h:111
-msgid ""
-"From Screen\n"
-"Standard RGB"
-msgstr ""
-"從螢幕\n"
-"標準 RGB"
-
-#: ../src/f-spot.glade.h:113
-msgid ""
-"Full Page\n"
-"Standard - 4x6"
-msgstr ""
-"全頁\n"
-"標準 - 4x6"
-
-#: ../src/f-spot.glade.h:115
-msgid "G_allery:"
-msgstr "G_allery:"
-
-#: ../src/f-spot.glade.h:116
-msgid "Gallery"
-msgstr "圖庫"
-
-#: ../src/f-spot.glade.h:117
-msgid ""
-"Hairline\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-msgstr ""
-"十字線\n"
-"0.25\"\n"
-"0.5\"\n"
-"1\"\n"
-
-#: ../src/f-spot.glade.h:122
-msgid "Images tagged with:"
-msgstr "含有標籤的影像："
-
-#: ../src/f-spot.glade.h:124
-msgid "Import Source:"
-msgstr "匯入來源："
-
-#: ../src/f-spot.glade.h:125
-msgid "Include subfolders"
-msgstr "包括子目錄(_C)"
-
-#: ../src/f-spot.glade.h:126
-msgid "Large"
-msgstr "大"
-
-#: ../src/f-spot.glade.h:127
-msgid "Make F-Spot your screensaver"
-msgstr "使 F-Spot 做為您的螢幕保護程式"
-
-#: ../src/f-spot.glade.h:128
+#: ../src/ui/main_window.ui.h:12
msgid "Manage _Extensions"
-msgstr "管理延伸套件(_E)"
-
-#: ../src/f-spot.glade.h:129
-msgid "Manage your custom selection ratios"
-msgstr ""
-
-#: ../src/f-spot.glade.h:130
-msgid "Medium"
-msgstr "中"
-
-#: ../src/f-spot.glade.h:131
-msgid "N_umber of Copies:"
-msgstr "副本數目(_U)："
-
-#: ../src/f-spot.glade.h:133
-msgid "No _image"
-msgstr "沒有影像(_I)"
-
-#: ../src/f-spot.glade.h:134
-msgid ""
-"None\n"
-"Title\n"
-"Filename\n"
-"Date\n"
-"Photo Details"
-msgstr ""
-"無\n"
-"標題\n"
-"檔案名稱\n"
-"日期\n"
-"相片細節"
-
-#: ../src/f-spot.glade.h:139
-msgid "Number of photos in selected rolls :"
-msgstr "所選清單的相片張數："
-
-#: ../src/f-spot.glade.h:140
-msgid "Number of pictures"
-msgstr "圖片數目："
-
-#: ../src/f-spot.glade.h:141
-msgid "Only photos taken within these dates will be displayed."
-msgstr "只顯示在這些日期中的相片。"
-
-#: ../src/f-spot.glade.h:142
-msgid "Open _Folder..."
-msgstr "開啟資料夾(_F)..."
-
-#: ../src/f-spot.glade.h:144
-msgid "Original size (possible very large file size)"
-msgstr "原始大小(檔案可能非常大)"
-
-#: ../src/f-spot.glade.h:145
-msgid "P_arent Tag:"
-msgstr "父標籤(_A)："
-
-#: ../src/f-spot.glade.h:146
-msgid "P_hoto Source:"
-msgstr "相片來源(_H)："
-
-#: ../src/f-spot.glade.h:147
-msgid "Page 1 of 3"
-msgstr "3 頁中的第 1 頁"
-
-#: ../src/f-spot.glade.h:148
-msgid "Pause"
-msgstr "暫停"
-
-#: ../src/f-spot.glade.h:149
-msgid "Photo 0 of 0"
-msgstr "0 張中的第 0 張相片"
+msgstr "管理擴充套件(_E)"
-#: ../src/f-spot.glade.h:150
-msgid "Photo _Size:"
-msgstr "相片大小(_S)："
+#: ../src/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "頁面設定(_U)..."
-#: ../src/f-spot.glade.h:151
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../src/f-spot.glade.h:153
-msgid "Print"
-msgstr "列印"
-
-#: ../src/f-spot.glade.h:154
-msgid "Print crop _marks"
-msgstr "列印裁剪標記(_M)"
-
-#: ../src/f-spot.glade.h:155
+#: ../src/ui/main_window.ui.h:14
msgid "Re_fresh Thumbnail"
msgstr "更新縮圖(_F)"
-#: ../src/f-spot.glade.h:157
-msgid "Repair"
-msgstr ""
-
-#: ../src/f-spot.glade.h:158
-msgid "Reset"
-msgstr "重新設定"
-
-#: ../src/f-spot.glade.h:161
-msgid "Select A Folder"
-msgstr "選擇資料夾"
-
-#: ../src/f-spot.glade.h:162
-msgid "Select Photos to Copy From Camera..."
-msgstr "選擇要從數位相機複製的相片..."
+#: ../src/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "選擇全部(_A)"
-#: ../src/f-spot.glade.h:164
+#: ../src/ui/main_window.ui.h:19
msgid "Select _None"
msgstr "取消選擇(_N)"
-#: ../src/f-spot.glade.h:165
-msgid "Select a Tag..."
-msgstr "選擇標籤..."
-
-#: ../src/f-spot.glade.h:166
-msgid "Select the camera from which you want to transfer files"
-msgstr "請選擇您要傳輸檔案的數位相機"
-
-#: ../src/f-spot.glade.h:167
-msgid "Selected Camera: "
-msgstr "選擇的相機："
-
-#: ../src/f-spot.glade.h:168
-msgid ""
-"Selection\n"
-"Gallery\n"
-"Viewport"
-msgstr ""
-"選擇\n"
-"圖庫\n"
-"Viewport"
-
-#: ../src/f-spot.glade.h:171
-msgid "Selection Constraints"
-msgstr "選擇限制"
-
-#: ../src/f-spot.glade.h:172
+#: ../src/ui/main_window.ui.h:20
msgid "Send by _Mail..."
msgstr "以郵件傳送(_M)..."
-#: ../src/f-spot.glade.h:173
-msgid "Set Rating Filter"
-msgstr "設定評分過濾器"
-
-#: ../src/f-spot.glade.h:174
-msgid "Set as _Background"
-msgstr "設定為背景(_B)"
-
-#: ../src/f-spot.glade.h:175
-msgid "Set date range"
-msgstr "設定日期範圍"
-
-#: ../src/f-spot.glade.h:177
-msgid "Show all photos."
-msgstr "顯示所有相片。"
-
-#: ../src/f-spot.glade.h:178
-msgid "Show or hide the side pane"
-msgstr "顯示或隱藏側面的長方格"
-
-#: ../src/f-spot.glade.h:179
-msgid "Show or hide the toolbar"
-msgstr "顯示或隱藏工具列"
-
-#: ../src/f-spot.glade.h:180
-msgid "Side _pane"
-msgstr "側面的長方格(_P)"
-
-#: ../src/f-spot.glade.h:181
+#: ../src/ui/main_window.ui.h:22
msgid "Side_bar"
msgstr "側邊列(_B)"
-#: ../src/f-spot.glade.h:182
-msgid "Small"
-msgstr "小"
-
-#: ../src/f-spot.glade.h:183
-msgid "So_urce Temp"
-msgstr "來源色溫(_U)"
-
-#: ../src/f-spot.glade.h:184
-msgid "Space all photos by"
-msgstr ""
-
-#: ../src/f-spot.glade.h:185
-msgid "Specify if an original size picture should be rotated or not. Smaller sizes are automatically rotated."
-msgstr ""
-
-#: ../src/f-spot.glade.h:186
-msgid ""
-"Standard RGB\n"
-"Image Profile\n"
-"Custom\n"
-msgstr ""
-
-#: ../src/f-spot.glade.h:190
-msgid "Strip image _metadata"
-msgstr "除去影像的 Metadata(_M)"
-
-#: ../src/f-spot.glade.h:191
+#: ../src/ui/main_window.ui.h:23
msgid "T_ags"
msgstr "標籤(_A)"
-#: ../src/f-spot.glade.h:192
-msgid "Tags: "
-msgstr "標籤："
-
-#: ../src/f-spot.glade.h:193
-#, fuzzy
+#: ../src/ui/main_window.ui.h:25
msgid "Thumbnail _elements"
-msgstr "縮圖目錄"
-
-#: ../src/f-spot.glade.h:194
-msgid "Tiny"
-msgstr "極小"
+msgstr "縮圖元素(_E)"
-#: ../src/f-spot.glade.h:195
+#: ../src/ui/main_window.ui.h:26
msgid "Too_lbar"
msgstr "工具列(_L)"
-#: ../src/f-spot.glade.h:196
-msgid "Total original size"
-msgstr "總計原始大小"
-
-#: ../src/f-spot.glade.h:197
+#: ../src/ui/main_window.ui.h:27
msgid "View"
msgstr "檢視"
-#: ../src/f-spot.glade.h:198
-#, fuzzy
-msgid "Will print using: US Letter size on Generic Postscript"
-msgstr "將會在通用 Postscript 使用 US 字母大小"
-
-#: ../src/f-spot.glade.h:199
-msgid "Write _metadata to file"
-msgstr "將 _Metadata 寫入檔案"
-
-#: ../src/f-spot.glade.h:200
-msgid "Zoom _in"
-msgstr "放大(_I)"
-
-#: ../src/f-spot.glade.h:201
-msgid "Zoom _out"
-msgstr "縮小(_O)"
-
-#: ../src/f-spot.glade.h:202
-msgid "Zoom in"
-msgstr "放大"
-
-#: ../src/f-spot.glade.h:203
-msgid "Zoom out"
-msgstr "縮小"
-
-#: ../src/f-spot.glade.h:205
+#: ../src/ui/main_window.ui.h:33
msgid "_Attach Tag to Selection"
-msgstr "將選擇項目附上標籤(_A)"
-
-#: ../src/f-spot.glade.h:206
-msgid "_Border:"
-msgstr "邊框(_B)："
-
-#: ../src/f-spot.glade.h:207
-msgid "_Brightness:"
-msgstr "亮度(_B)："
+msgstr "將選取項目附上標籤(_A)"
-#: ../src/f-spot.glade.h:209
+#: ../src/ui/main_window.ui.h:35
msgid "_Clear Rating Filter"
msgstr "清除評分過濾器(_C)"
-#: ../src/f-spot.glade.h:210
+#: ../src/ui/main_window.ui.h:36
msgid "_Clear Roll Filter"
-msgstr "清除清單過濾器(_C)"
+msgstr "清除膠卷過濾條件(_C)"
-#: ../src/f-spot.glade.h:211
+#: ../src/ui/main_window.ui.h:38
msgid "_Components"
msgstr "元件(_C)"
-#: ../src/f-spot.glade.h:212
+#: ../src/ui/main_window.ui.h:39
msgid "_Contents"
msgstr "內容(_C)"
-#: ../src/f-spot.glade.h:213
-msgid "_Create Mail"
-msgstr "建立郵件(_C)"
-
-#: ../src/f-spot.glade.h:214
+#: ../src/ui/main_window.ui.h:40
msgid "_Dates"
msgstr "日期(_D)"
-#: ../src/f-spot.glade.h:216
+#: ../src/ui/main_window.ui.h:42
msgid "_Delete Selected Tag"
msgstr "刪除選定的標籤(_D)"
-#: ../src/f-spot.glade.h:217
+#: ../src/ui/main_window.ui.h:43
msgid "_Delete Version"
msgstr "刪除版本(_D)"
-#: ../src/f-spot.glade.h:218
-msgid "_Destination Temp"
-msgstr "目標色溫(_D)"
-
-#: ../src/f-spot.glade.h:219
-msgid "_Display:"
-msgstr "顯示(_D)："
-
-#: ../src/f-spot.glade.h:220
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../src/f-spot.glade.h:221
-msgid "_Edit Selected Tag..."
-msgstr "編輯選定的標籤(_E)..."
-
-#: ../src/f-spot.glade.h:222
-msgid "_Export"
-msgstr "匯出(_E)"
-
-#: ../src/f-spot.glade.h:223
-#: ../extensions/FlickrExport/FlickrExport.glade.h:15
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:20
-msgid "_Export tags"
-msgstr "匯出標籤(_E)"
+#: ../src/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "編輯標籤(_E)..."
-#: ../src/f-spot.glade.h:224
+#: ../src/ui/main_window.ui.h:46
msgid "_Export to"
msgstr "匯出至(_E)"
-#: ../src/f-spot.glade.h:225
-#: ../extensions/GalleryExport/GalleryExport.glade.h:23
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:21
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:12
-msgid "_Export to Album:"
-msgstr "匯出到相簿(_E)："
-
-#: ../src/f-spot.glade.h:226
+#: ../src/ui/main_window.ui.h:47
msgid "_Filmstrip"
-msgstr ""
+msgstr "幻燈片帶(_F)"
-#: ../src/f-spot.glade.h:227
-msgid "_Flickr"
-msgstr "_Flickr"
-
-#: ../src/f-spot.glade.h:228
-msgid "_Folder"
-msgstr "資料夾(_F)"
-
-#: ../src/f-spot.glade.h:229
-msgid "_Fullscreen"
-msgstr "全螢幕(_F)"
-
-#: ../src/f-spot.glade.h:230
-msgid "_Gallery"
-msgstr "_Gallery"
-
-#: ../src/f-spot.glade.h:231
-msgid "_Help"
-msgstr "說明(_H)"
-
-#: ../src/f-spot.glade.h:232
+#: ../src/ui/main_window.ui.h:50
msgid "_Hidden"
msgstr "隱藏(_H)"
-#: ../src/f-spot.glade.h:233
-msgid "_Hue:"
-msgstr "色調(_H)："
-
-#: ../src/f-spot.glade.h:234
-msgid "_Icon:"
-msgstr "圖示(_I)："
-
-#: ../src/f-spot.glade.h:235
+#: ../src/ui/main_window.ui.h:51
msgid "_Import..."
msgstr "匯入(_I)..."
-#: ../src/f-spot.glade.h:236
-#, fuzzy
-msgid "_Interpolate image on zoom"
-msgstr "補點類型(Interpolation)："
-
-#: ../src/f-spot.glade.h:237
+#: ../src/ui/main_window.ui.h:52
msgid "_Large"
msgstr "大(_L)"
-#: ../src/f-spot.glade.h:238
+#: ../src/ui/main_window.ui.h:53
msgid "_Last Import Roll"
-msgstr "最後匯入清單(_L)"
+msgstr "最近匯入膠卷(_L)"
-#: ../src/f-spot.glade.h:239
+#: ../src/ui/main_window.ui.h:54
+msgid "_Loupe"
+msgstr "放大鏡(_L)"
+
+#: ../src/ui/main_window.ui.h:55
msgid "_Medium"
msgstr "中(_M)"
-#: ../src/f-spot.glade.h:240
-msgid "_Metadata Browser"
-msgstr "_Metadata 瀏覽器"
-
-#: ../src/f-spot.glade.h:241
-msgid "_Month"
-msgstr "月份(_M)"
-
-#: ../src/f-spot.glade.h:242
-msgid "_New Window"
-msgstr "新視窗(_N)"
-
-#: ../src/f-spot.glade.h:243
-msgid "_Open album in browser when done uploading"
-msgstr "完成上傳後在瀏覽器中開啟圖庫(_O)"
-
-#: ../src/f-spot.glade.h:244
-msgid "_Open destination when done exporting"
-msgstr "完成匯出後開啟目的地(_O)"
-
-#: ../src/f-spot.glade.h:245
-msgid "_Output:"
-msgstr "輸出(_O)："
-
-#: ../src/f-spot.glade.h:246
-msgid "_Photo"
-msgstr "相片(_P)"
-
-#: ../src/f-spot.glade.h:247
+#: ../src/ui/main_window.ui.h:57
msgid "_Quit"
msgstr "離開(_Q)"
-#: ../src/f-spot.glade.h:248
+#: ../src/ui/main_window.ui.h:58
msgid "_Ratings"
msgstr "評分(_R)"
-#: ../src/f-spot.glade.h:250
+#: ../src/ui/main_window.ui.h:60
msgid "_Remove Tag From Selection"
-msgstr "從選擇項目中移附標籤(_R)"
+msgstr "從選取項目中移附標籤(_R)"
-#: ../src/f-spot.glade.h:251
+#: ../src/ui/main_window.ui.h:61
msgid "_Rename Version"
msgstr "重新命名版本(_R)"
-#: ../src/f-spot.glade.h:252
-#: ../extensions/FlickrExport/FlickrExport.glade.h:16
-#: ../extensions/FolderExport/FolderExport.glade.h:15
-#: ../extensions/GalleryExport/GalleryExport.glade.h:28
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:24
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:14
-msgid "_Resize to: "
-msgstr "重新調整大小為(_R)："
-
-#: ../src/f-spot.glade.h:254
-msgid "_Saturation:"
-msgstr "飽和度(_S)："
-
-#: ../src/f-spot.glade.h:255
-msgid "_Scale photos to no larger than: "
-msgstr "相片縮放不能超過(_S)："
+#: ../src/ui/main_window.ui.h:62
+msgid "_Reverse Order"
+msgstr "順序反轉(_R)"
-#: ../src/f-spot.glade.h:256
+#: ../src/ui/main_window.ui.h:63
msgid "_Select Import Rolls..."
-msgstr "選擇匯入清單(_S)..."
+msgstr "選擇匯入膠卷(_S)..."
-#: ../src/f-spot.glade.h:257
+#: ../src/ui/main_window.ui.h:64
msgid "_Set Date Range..."
msgstr "設定日期範圍(_S)..."
-#: ../src/f-spot.glade.h:258
+#: ../src/ui/main_window.ui.h:65
msgid "_Set Rating filter..."
msgstr "設定評分過濾器(_S)..."
-#: ../src/f-spot.glade.h:259
+#: ../src/ui/main_window.ui.h:66
msgid "_Sharpen..."
msgstr "銳化(_S)..."
-#: ../src/f-spot.glade.h:260
-msgid "_Slideshow"
-msgstr "幻燈片(_8)"
-
-#: ../src/f-spot.glade.h:261
+#: ../src/ui/main_window.ui.h:68
msgid "_Small"
msgstr "小(_S)"
-#: ../src/f-spot.glade.h:262
-msgid "_Strip metadata"
-msgstr "除去 Metadata(_S)"
-
-#: ../src/f-spot.glade.h:263
+#: ../src/ui/main_window.ui.h:69
msgid "_Tag Icons"
msgstr "標籤圖示(_T)"
-#: ../src/f-spot.glade.h:264
-msgid "_Tag Name:"
-msgstr "標籤名稱(_T)："
-
-#: ../src/f-spot.glade.h:265
+#: ../src/ui/main_window.ui.h:70
msgid "_Tags"
msgstr "標籤(_T)"
-#: ../src/f-spot.glade.h:266
+#: ../src/ui/main_window.ui.h:71
msgid "_Timeline"
-msgstr "時間線(_T)"
+msgstr "時間軸(_T)"
-#: ../src/f-spot.glade.h:267
-msgid "_Toolbar"
-msgstr "工具列(_T)"
-
-#: ../src/f-spot.glade.h:268
+#: ../src/ui/main_window.ui.h:72
msgid "_Tools"
msgstr "工具(_T)"
-#: ../src/f-spot.glade.h:269
-msgid "_URI:"
-msgstr "_URI："
-
-#: ../src/f-spot.glade.h:270
+#: ../src/ui/main_window.ui.h:73
msgid "_Untagged Photos"
msgstr "未標籤的相片(_U)"
-#: ../src/f-spot.glade.h:271
+#: ../src/ui/main_window.ui.h:74
msgid "_Version"
msgstr "版本(_V)"
-#: ../src/f-spot.glade.h:272
-msgid "_View"
-msgstr "檢視(_V)"
+#: ../src/Updater.cs:622
+msgid "Updating F-Spot Database"
+msgstr "正在更新 F-Spot 資料庫"
-#: ../src/f-spot.glade.h:273
-msgid "_Virtual Filesystem"
-msgstr "虛擬檔案系統(_V)"
+#: ../src/Updater.cs:623
+msgid ""
+"Please wait while your F-Spot gallery's database is updated. This may take "
+"some time."
+msgstr "您的 F-Spot 圖庫資料庫正在更新，請稍後。這或許會需要一些時間。"
-#: ../src/f-spot.glade.h:274
-msgid "and"
-msgstr "及"
+#. Mono.Unix.Error error = Mono.Unix.Stdlib.GetLastError ();
+#: ../src/Utils/Unix.cs:35
+msgid "Unable to create temporary file"
+msgstr "無法建立暫存檔"
-#. at, or after a date, or between dates
-#: ../src/f-spot.glade.h:276
-msgid ""
-"at\n"
-"after\n"
-"between"
-msgstr ""
-"於\n"
-"之後\n"
-"之間"
+#: ../src/Widgets/CustomPrintWidget.cs:119
+msgid "Page Setup"
+msgstr "頁面設定"
-#: ../src/f-spot.glade.h:279
-msgid "difference:"
-msgstr "差異："
+#: ../src/Widgets/CustomPrintWidget.cs:123
+#: ../src/Widgets/CustomPrintWidget.cs:127
+#: ../src/Widgets/CustomPrintWidget.cs:133
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "紙張大小：{0} x {1} mm"
-#: ../src/f-spot.glade.h:280
-msgid "img_000.jpg"
-msgstr "img_000.jpg"
+#: ../src/Widgets/CustomPrintWidget.cs:130
+msgid "Set Page Size and Orientation"
+msgstr "設定頁面大小與方向"
-#: ../src/f-spot.glade.h:281
-msgid "min. Starting at {0}"
-msgstr "分。開始於 {0}"
+#: ../src/Widgets/CustomPrintWidget.cs:141
+msgid "Photos per page"
+msgstr "每頁照片張數"
-#: ../src/f-spot.glade.h:283
-#: ../extensions/FlickrExport/FlickrExport.glade.h:18
-#: ../extensions/FolderExport/FolderExport.glade.h:17
-#: ../extensions/GalleryExport/GalleryExport.glade.h:31
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:26
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:16
-msgid "pixels"
-msgstr "像素"
+#: ../src/Widgets/CustomPrintWidget.cs:151
+msgid "Repeat"
+msgstr "重複"
-#: ../src/f-spot.glade.h:284
-msgid "x"
-msgstr "x"
+#: ../src/Widgets/CustomPrintWidget.cs:152
+msgid "Print cut marks"
+msgstr "列印裁剪標記"
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "從 F-Spot 播放幻燈片"
+#: ../src/Widgets/CustomPrintWidget.cs:158
+msgid "Photos layout"
+msgstr "相片配置"
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "F-Spot 相片"
+#: ../src/Widgets/CustomPrintWidget.cs:160
+msgid "Full Page (no margin)"
+msgstr "全頁(無邊緣)"
-#: ../extensions/CDExport/CDExport.addin.xml.h:1
-msgid "_CD..."
-msgstr "_CD..."
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Widgets/CustomPrintWidget.cs:163
+msgid "Zoom"
+msgstr "拉近拉遠"
-#: ../extensions/CDExport/CDExport.cs:128
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "傳送圖片 \"{0}\" 到 CD"
+#: ../src/Widgets/CustomPrintWidget.cs:164
+msgid "Fill"
+msgstr "填滿"
-#: ../extensions/CDExport/CDExport.cs:143
-#: ../extensions/FlickrExport/FlickrExport.cs:368
-#: ../extensions/FolderExport/FolderExport.cs:249
-#: ../extensions/GalleryExport/GalleryExport.cs:769
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:702
-#: ../extensions/SmugMugExport/SmugMugExport.cs:605
-msgid "Done Sending Photos"
-msgstr "傳送相片完成"
+#: ../src/Widgets/CustomPrintWidget.cs:165
+msgid "Scaled"
+msgstr "已縮放"
-#: ../extensions/CDExport/CDExport.cs:145
-#: ../extensions/FolderExport/FolderExport.cs:251
-msgid "Transfer Complete"
-msgstr "傳輸完畢"
+#: ../src/Widgets/CustomPrintWidget.cs:170
+msgid "White borders"
+msgstr "白色邊緣"
-#: ../extensions/CDExport/CDExport.cs:152
-#: ../extensions/FolderExport/FolderExport.cs:256
-msgid "Error While Transferring"
-msgstr "傳輸時發生錯誤"
+#: ../src/Widgets/CustomPrintWidget.cs:176
+msgid "Custom Text"
+msgstr "自訂文字"
-#: ../extensions/CDExport/CDExport.cs:159
-#: ../extensions/FolderExport/FolderExport.cs:273
-msgid "Error Transferring"
-msgstr "傳輸發生錯誤"
+#: ../src/Widgets/CustomPrintWidget.cs:180
+msgid "Photos infos"
+msgstr "相片資訊"
-#: ../extensions/CDExport/CDExport.cs:180
-#: ../extensions/FolderExport/FolderExport.cs:295
-msgid "Error: Error while transferring; Aborting"
-msgstr "錯誤：傳輸時發生錯誤；正在中止"
+#: ../src/Widgets/CustomPrintWidget.cs:182
+msgid "Print file name"
+msgstr "列印檔案名稱"
-#: ../extensions/CDExport/CDExport.cs:183
-#: ../extensions/FolderExport/FolderExport.cs:298
-msgid "Error: File Already Exists; Aborting"
-msgstr "錯誤：檔案已存在；正在中止"
+#: ../src/Widgets/CustomPrintWidget.cs:183
+msgid "Print photo date"
+msgstr "列印相片日期"
-#: ../extensions/CDExport/CDExport.glade.h:1
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>要燒錄的圖片</b>"
+#: ../src/Widgets/CustomPrintWidget.cs:184
+msgid "Print photo time"
+msgstr "列印相片時間"
-#: ../extensions/CDExport/CDExport.glade.h:3
-msgid "Create CD"
-msgstr "建立 CD"
+#: ../src/Widgets/CustomPrintWidget.cs:185
+msgid "Print photo tags"
+msgstr "列印相片標籤"
-#: ../extensions/CDExport/CDExport.glade.h:4
-msgid "Size"
-msgstr "大小"
+#: ../src/Widgets/CustomPrintWidget.cs:186
+msgid "Print photo comment"
+msgstr "列印相片註解"
-#: ../extensions/CDExport/CDExport.glade.h:5
-msgid "Size of the exported selection :"
-msgstr "選擇相片中已匯出的大小："
+#: ../src/Widgets/EditorPage.cs:30 ../src/Widgets/Sidebar.cs:54
+msgid "Edit"
+msgstr "編輯"
-#: ../extensions/CDExport/CDExport.glade.h:6
-msgid "_Browse Previously Scheduled Files"
-msgstr "瀏覽以往排程的檔案(_B)"
+#: ../src/Widgets/EditorPage.cs:198
+msgid ""
+"This tool requires an active selection. Please select a region of the photo "
+"and try the operation again"
+msgstr "此工具需要作用中的選取項目。請選取一個圖片的區域，或是重試操作"
-#: ../extensions/CDExport/CDExport.glade.h:7
-msgid "_Write only these photos to CD"
-msgstr "僅把這些相片寫入到 CD 中(_W)"
+#: ../src/Widgets/EditorPage.cs:216
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "儲存調整過的相片時發生錯誤"
-#: ../extensions/FlickrExport/FlickrExport.addin.xml.h:1
-msgid "_23hq..."
-msgstr "_23hq..."
+#: ../src/Widgets/EditorPage.cs:218
+#, csharp-format
+msgid ""
+"Received exception \"{0}\". Note that you have to develop RAW files into "
+"JPEG before you can edit them."
+msgstr "接收到例外「{0}」。請注意您在編輯它們之前必須先將 RAW 檔轉換為 JPEG。"
-#: ../extensions/FlickrExport/FlickrExport.addin.xml.h:2
-msgid "_Flickr..."
-msgstr "_Flickr..."
+#: ../src/Widgets/Filmstrip.cs:572
+msgid "_Horizontal"
+msgstr "水平(_H)"
-#: ../extensions/FlickrExport/FlickrExport.cs:97
-#: ../extensions/FlickrExport/FlickrExport.glade.h:5
-msgid "Authorize"
-msgstr "授權"
+#: ../src/Widgets/Filmstrip.cs:576
+msgid "_Vertical"
+msgstr "垂直(_V)"
-#: ../extensions/FlickrExport/FlickrExport.cs:103
-#, csharp-format
-msgid "Return to this window after you have finished the authorization process on {0} and click the \"Complete Authorization\" button below"
-msgstr ""
+#: ../src/Widgets/FindBar.cs:58
+msgid "Find:"
+msgstr "尋找："
-#: ../extensions/FlickrExport/FlickrExport.cs:104
-msgid "Complete Authorization"
-msgstr "完成授權"
+#: ../src/Widgets/FolderTreePage.cs:22
+msgid "Folders"
+msgstr "資料夾"
-#: ../extensions/FlickrExport/FlickrExport.cs:109
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "正在登入 {0}"
+#: ../src/Widgets/FolderTreeView.cs:123
+msgid "Filesystem"
+msgstr "檔案系統"
-#: ../extensions/FlickrExport/FlickrExport.cs:110
-msgid "Checking credentials..."
-msgstr "正在檢查憑證..."
+#: ../src/Widgets/InfoBox.cs:182
+msgid "Histogram"
+msgstr "長條圖"
-#: ../extensions/FlickrExport/FlickrExport.cs:117
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "歡迎 {0} 您已連線至 {1}"
+#: ../src/Widgets/InfoBox.cs:215
+msgid "Version"
+msgstr "版本"
-#: ../extensions/FlickrExport/FlickrExport.cs:120
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "以不同使用者登入"
+#: ../src/Widgets/InfoBox.cs:218
+msgid "Date"
+msgstr "日期"
+
+#: ../src/Widgets/InfoBox.cs:224
+msgid "Exposure"
+msgstr "曝光"
+
+#: ../src/Widgets/InfoBox.cs:228
+msgid "Focal Length"
+msgstr "焦距"
+
+#: ../src/Widgets/InfoBox.cs:234
+msgid "File Size"
+msgstr "檔案大小"
+
+#: ../src/Widgets/InfoBox.cs:237
+msgid "Rating"
+msgstr "評等"
+
+#: ../src/Widgets/InfoBox.cs:390 ../src/Widgets/InfoBox.cs:398
+#: ../src/Widgets/InfoBox.cs:428
+msgid "(wrong format)"
+msgstr "(錯誤的格式)"
-#: ../extensions/FlickrExport/FlickrExport.cs:123
+#: ../src/Widgets/InfoBox.cs:418 ../src/Widgets/InfoBox.cs:441
+#: ../src/Widgets/InfoBox.cs:451 ../src/Widgets/InfoBox.cs:460
+msgid "(Unknown)"
+msgstr "(未知)"
+
+#: ../src/Widgets/InfoBox.cs:561
#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr ""
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "(編輯 {0} 次)"
-#: ../extensions/FlickrExport/FlickrExport.cs:286
-msgid "Unable to log on"
-msgstr "無法登入"
+#: ../src/Widgets/InfoBox.cs:575
+msgid "(File read error)"
+msgstr "(檔案讀取錯誤)"
-#: ../extensions/FlickrExport/FlickrExport.cs:306
+#: ../src/Widgets/InfoBox.cs:620
#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "正在等待回應 {1} 個中的第 {0} 個"
+msgid "{0} Photos"
+msgstr "{0} 張相片"
-#: ../extensions/FlickrExport/FlickrExport.cs:333
-#: ../extensions/FolderExport/FolderExport.cs:215
-#: ../extensions/GalleryExport/GalleryExport.cs:740
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Widgets/InfoBox.cs:640
#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "正在上載圖片 \"{0}\""
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"於 {0} 介於 \n"
+"{1} 與 {2}"
-#: ../extensions/FlickrExport/FlickrExport.cs:356
+#: ../src/Widgets/InfoBox.cs:645
#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "上傳至 {0} 錯誤: {1}"
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"介於 {0} \n"
+"以及 {1}"
-#: ../extensions/FlickrExport/FlickrExport.cs:370
-#: ../extensions/GalleryExport/GalleryExport.cs:771
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:704
-#: ../extensions/SmugMugExport/SmugMugExport.cs:607
-msgid "Upload Complete"
-msgstr "上載完畢"
+#: ../src/Widgets/InfoBox.cs:672
+msgid "(At least one File not found)"
+msgstr "(至少有一個檔案找不到)"
-#: ../extensions/FlickrExport/FlickrExport.cs:438
-msgid "Unable to log on."
-msgstr "無法登入。"
+#: ../src/Widgets/InfoBox.cs:789
+msgid "Show Photo Name"
+msgstr "顯示相片名稱"
-#: ../extensions/FlickrExport/FlickrExport.cs:439
-#, csharp-format
-msgid "F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."
-msgstr "F-Spot 無法登入至 {0}。請確定您已使用 {0} 的網頁瀏覽介面進行驗證。"
+#: ../src/Widgets/InfoBox.cs:798
+msgid "Show Date"
+msgstr "顯示日期"
-#: ../extensions/FlickrExport/FlickrExport.cs:459
-#: ../extensions/GalleryExport/GalleryExport.cs:693
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:598
-#: ../extensions/SmugMugExport/SmugMugExport.cs:523
-msgid "Uploading Pictures"
-msgstr "正在上載圖片"
+#: ../src/Widgets/InfoBox.cs:807
+msgid "Show Size"
+msgstr "顯示大小"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>檢視權限</b>"
+#: ../src/Widgets/InfoBox.cs:816
+msgid "Show Exposure"
+msgstr "顯示曝光"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:7
-msgid "Export tag _hierarchy"
-msgstr "匯出標籤層級(_H)"
+#: ../src/Widgets/InfoBox.cs:825
+msgid "Show Focal Length"
+msgstr "顯示焦距"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:8
-msgid "F-Spot needs your authorization in order to upload photos to your {0} account. Press the \"Authorize\" button to open a web browser and give F-Spot the authorization. "
-msgstr ""
+#: ../src/Widgets/InfoBox.cs:834
+msgid "Show Camera"
+msgstr "顯示相機"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:9
-msgid "Ignore _top level tags"
-msgstr "忽略頂層標籤(_T)"
+#: ../src/Widgets/InfoBox.cs:843
+msgid "Show File Size"
+msgstr "顯示檔案大小"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:10
-msgid "Private"
-msgstr "私人"
+#: ../src/Widgets/MetadataDisplay.cs:25
+msgid "Metadata"
+msgstr "中介資料"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:11
-msgid "Public"
-msgstr "公開"
+#: ../src/Widgets/MetadataDisplay.cs:106
+msgid "Extended Metadata"
+msgstr "擴展的中介資料"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:12
-msgid "Strip _metadata"
-msgstr "除去 Metadata(_M)"
+#. clear Extended Metadata
+#: ../src/Widgets/MetadataDisplay.cs:394
+msgid "No Extended Metadata Available"
+msgstr "無可用的擴展式中介資料"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:13
-msgid "Visible to Family"
-msgstr ""
+#: ../src/Widgets/MetadataDisplay.cs:412
+msgid "No active photo"
+msgstr "沒有活動中的相片"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:14
-msgid "Visible to Friends"
-msgstr ""
+#: ../src/Widgets/MetadataDisplay.cs:414
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "相片 \"{0}\" 並不存在"
-#: ../extensions/FlickrExport/FlickrExport.glade.h:17
-msgid "_View photos in browser when done uploading"
-msgstr "完成上傳後用瀏覽器檢視相片(_V)"
+#: ../src/Widgets/MetadataDisplay.cs:417
+msgid "No metadata available"
+msgstr "無可用的中介資料"
-#: ../extensions/FolderExport/FolderExport.addin.xml.h:1
-msgid "F_older..."
-msgstr "資料夾(_O)..."
+#: ../src/Widgets/OpenWithMenu.cs:71
+msgid "No applications available"
+msgstr "無可用的應用程式"
-#: ../extensions/FolderExport/FolderExport.cs:132
-msgid "Select Export Folder"
-msgstr "選擇匯出資料夾"
+#: ../src/Widgets/RatingMenuItem.cs:56
+msgid "Rating:"
+msgstr "評分："
-#: ../extensions/FolderExport/FolderExport.cs:177
-msgid "Building Gallery"
-msgstr "正在建立圖庫"
+#: ../src/XmpTagsImporter.cs:91
+msgid "Country"
+msgstr "國家"
-#: ../extensions/FolderExport/FolderExport.cs:221
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery:{2}{1}"
-msgstr "上傳圖片「{0}」至圖庫錯誤：{2}{1}"
+#: ../src/XmpTagsImporter.cs:92
+msgid "City"
+msgstr "城市"
-#: ../extensions/FolderExport/FolderExport.cs:739
-msgid "Light"
-msgstr "亮"
+#: ../src/XmpTagsImporter.cs:93
+msgid "State"
+msgstr "州"
-#: ../extensions/FolderExport/FolderExport.cs:740
-msgid "Dark"
-msgstr "暗"
+#. namespace
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "從 F-Spot 播放幻燈片"
-#. Abbreviation of previous
-#: ../extensions/FolderExport/FolderExport.cs:883
-msgid "Prev"
-msgstr "上一步"
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot 相片"
-#: ../extensions/FolderExport/FolderExport.cs:941
-#: ../extensions/FolderExport/FolderExport.cs:1114
-msgid "Show Styles"
-msgstr "顯示風格"
+#~ msgid "Package"
+#~ msgstr "套件"
-#: ../extensions/FolderExport/FolderExport.cs:942
-#: ../extensions/FolderExport/FolderExport.cs:1115
-msgid "Hide Styles"
-msgstr "隱藏風格"
+#~ msgid "Extension Installation"
+#~ msgstr "擴充套件安裝程序"
-#: ../extensions/FolderExport/FolderExport.cs:999
-msgid "Gallery generated by"
-msgstr "產生圖庫由"
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>選擇要安裝的擴充套件並點擊「下一步」</b>"
-#: ../extensions/FolderExport/FolderExport.cs:1044
-msgid "Page:"
-msgstr "頁："
+#~ msgid "Install from:"
+#~ msgstr "安裝來源："
-#: ../extensions/FolderExport/FolderExport.glade.h:1
-msgid "\n"
-msgstr "\n"
+#~ msgid "_Repositories..."
+#~ msgstr "套件庫(_R)..."
-#: ../extensions/FolderExport/FolderExport.glade.h:4
-msgid "<b>Export Method</b>"
-msgstr "<b>匯出方式</b>"
+#~ msgid "Show all packages"
+#~ msgstr "顯示所有套件"
-#: ../extensions/FolderExport/FolderExport.glade.h:8
-msgid "Create _gallery using \"Original\""
-msgstr "使用「原始版本」建立圖庫(_G)"
+#~ msgid "Show new versions only"
+#~ msgstr "只顯示新版本"
-#: ../extensions/FolderExport/FolderExport.glade.h:9
-msgid "Create standalone _web gallery"
-msgstr ""
+#~ msgid "Show updates only"
+#~ msgstr "只顯示更新"
-#: ../extensions/FolderExport/FolderExport.glade.h:10
-msgid "D_escription:"
-msgstr "描述(_D)："
+#~ msgid "_Unselect All"
+#~ msgstr "全部不選(_U)"
-#: ../extensions/FolderExport/FolderExport.glade.h:11
-msgid "Folder Export"
-msgstr "匯出資料夾"
+#~ msgid "label124"
+#~ msgstr "label124"
-#: ../extensions/FolderExport/FolderExport.glade.h:12
-msgid "G_allery Name:"
-msgstr "圖庫名稱(_A)："
+#~ msgid "Overall Progress:"
+#~ msgstr "整體進度："
-#: ../extensions/FolderExport/FolderExport.glade.h:13
-msgid "Open _destination when done exporting"
-msgstr "完成匯出後開啟目的地(_D)"
+#~ msgid "Downloading extensions..."
+#~ msgstr "正在下載擴充套件..."
-#: ../extensions/FolderExport/FolderExport.glade.h:14
-msgid "_Folder:"
-msgstr "資料夾(_F)："
+#~ msgid "Extension Manager"
+#~ msgstr "擴充套件管理員"
-#: ../extensions/FolderExport/FolderExport.glade.h:16
-msgid "_Save the files only"
-msgstr "只儲存檔案(_S)"
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "需要額外的擴充套件來完成此操作。"
-#: ../extensions/GalleryExport/GalleryExport.addin.xml.h:1
-#, fuzzy
-msgid "Web _Gallery..."
-msgstr "網上圖庫(_W)..."
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "將安裝下列擴充套件："
-#: ../extensions/GalleryExport/GalleryExport.cs:384
-msgid "Invalid URL"
-msgstr "無效的 URL"
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>擴充套件管理員</b></big>"
-#: ../extensions/GalleryExport/GalleryExport.cs:385
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr ""
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "目前已安裝下列擴充套件："
-#: ../extensions/GalleryExport/GalleryExport.cs:395
-#: ../extensions/GalleryExport/GalleryExport.cs:410
-msgid "Error while connecting to Gallery"
-msgstr "連接 Gallery 時發生錯誤"
+#~ msgid "_Install Extensions..."
+#~ msgstr "安裝擴充套件(_I)..."
-#: ../extensions/GalleryExport/GalleryExport.cs:396
-#: ../extensions/GalleryExport/GalleryExport.cs:411
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr ""
+#~ msgid "_Uninstall..."
+#~ msgstr "解除安裝(_U)..."
-#: ../extensions/GalleryExport/GalleryExport.cs:497
-msgid "(TopLevel)"
-msgstr "(最頂層)"
+#~ msgid "Enable"
+#~ msgstr "啟用"
-#: ../extensions/GalleryExport/GalleryExport.cs:559
-msgid "Invalid Gallery name"
-msgstr "無效的 Gallery 名稱"
+#~ msgid "Disable"
+#~ msgstr "停用"
-#: ../extensions/GalleryExport/GalleryExport.cs:560
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
+#~ msgid "Details"
+#~ msgstr "細節"
-#: ../extensions/GalleryExport/GalleryExport.cs:759
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "上傳圖片「{0}」至圖庫錯誤：{1}"
+#~ msgid "Extension Repository Management"
+#~ msgstr "擴充套件庫管理"
-#: ../extensions/GalleryExport/GalleryExport.cs:787
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:725
-#: ../extensions/SmugMugExport/SmugMugExport.cs:628
-msgid "(No Gallery)"
-msgstr "(無圖庫)"
+#~ msgid "Add New Repository"
+#~ msgstr "新增新的套件庫"
-#: ../extensions/GalleryExport/GalleryExport.cs:874
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:852
-#: ../extensions/SmugMugExport/SmugMugExport.cs:725
-msgid "(Not Connected)"
-msgstr "(沒有連接)"
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "選擇您想註冊的套件庫的位置："
-#: ../extensions/GalleryExport/GalleryExport.cs:875
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:853
-#: ../extensions/SmugMugExport/SmugMugExport.cs:726
-msgid "(No Albums)"
-msgstr "(無相簿)"
+#~ msgid "Register an on-line repository"
+#~ msgstr "註冊一個線上套件庫"
-#: ../extensions/GalleryExport/GalleryExport.cs:927
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:912
-#: ../extensions/SmugMugExport/SmugMugExport.cs:767
-msgid "No account selected"
-msgstr "未選取任何帳號"
+#~ msgid "Url:"
+#~ msgstr "Url："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:5
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:5
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr "<span weight='bold' size='larger'>連接到圖庫時發生錯誤</span>\n"
+#~ msgid "Register a local repository"
+#~ msgstr "註冊本地套件庫"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:7
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:7
-msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr "<span weight='bold' size='larger'>您的 Google 帳號已被鎖定</span>\n"
+#~ msgid "Path:"
+#~ msgstr "路徑："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:11
-msgid "Export _titles and comments"
-msgstr "匯出標題和註解(_T)"
+#~ msgid "Browse..."
+#~ msgstr "瀏覽..."
-#: ../extensions/GalleryExport/GalleryExport.glade.h:12
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:10
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:7
-msgid "Open _album in browser when done uploading"
-msgstr "完成上傳後在瀏覽器中開啟圖庫(_A)"
+#~ msgid "Version:"
+#~ msgstr "版本："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:13
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:11
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "請確定這個圖庫的設定是正確的。"
+#~ msgid "Author:"
+#~ msgstr "作者："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:14
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:12
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
+#~ msgid "Copyright:"
+#~ msgstr "版權:"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:17
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:15
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:8
-msgid "Public Album"
-msgstr "公開相簿"
+#~ msgid "Extension Dependencies:"
+#~ msgstr "擴充套件相依性："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:18
-msgid "U_RL:"
-msgstr "U_RL："
+#~ msgid "All registered repositories"
+#~ msgstr "所有已註冊的套件庫"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:19
-msgid "_Album Name:"
-msgstr "相簿名稱(_A)："
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "您確定您想取消安裝？"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:20
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:16
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:10
-msgid "_Album Title:"
-msgstr "相簿標題(_A)："
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "下列套件將被解除安裝："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:21
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:18
-msgid "_Captcha:"
-msgstr ""
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr "其他依賴於前幾項擴充套件的項目也將一併解除安裝："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:22
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:19
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:11
-msgid "_Description:"
-msgstr "描述(_D)："
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr "因為相依性衝突，無法安裝選擇的擴充套件。"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:24
-msgid "_Gallery Name:"
-msgstr "圖庫名稱(_G)："
+#~ msgid "The following packages will be installed:"
+#~ msgstr "下列套件將被安裝："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:25
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:22
-msgid "_Gallery:"
-msgstr "圖庫(_G)："
+#~ msgid " (in user directory)"
+#~ msgstr " (在使用者目錄中)"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:26
-msgid "_Parent Album:"
-msgstr "父相簿(_P)："
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "下列套件需要被解除安裝："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:27
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:23
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:13
-msgid "_Password:"
-msgstr "密碼(_P)："
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "以下的相依性需求無法解決："
-#: ../extensions/GalleryExport/GalleryExport.glade.h:29
-msgid "_Title:"
-msgstr "標題(_T)："
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "安裝已成功完成。"
-#: ../extensions/GalleryExport/GalleryExport.glade.h:30
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:25
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:15
-msgid "_Username:"
-msgstr "用戶名稱(_U)："
+#~ msgid "The installation failed!"
+#~ msgstr "安裝失敗！"
-#: ../extensions/GalleryExport/GalleryRemote.cs:357
-msgid "Error reading server response"
-msgstr "Error reading server response"
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "安裝程序帶著警告訊息完成。"
-#. failed to find the response
-#: ../extensions/GalleryExport/GalleryRemote.cs:369
-msgid "Server returned response without Gallery content"
-msgstr ""
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "解除安裝已成功完成。"
-#: ../extensions/PicasaWebExport/PicasaWebExport.addin.xml.h:1
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb..."
+#~ msgid "The uninstallation failed!"
+#~ msgstr "解除安裝失敗！"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:441
-msgid "Error while creating Album"
-msgstr "建立相簿時發生錯誤"
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "解除安裝程序帶著警告訊息完成。"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:442
-#, csharp-format
-msgid "The following error was encountered while attempting to create an album: {0}"
-msgstr ""
+#~ msgid "Repository"
+#~ msgstr "套件庫"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:621
-#, csharp-format
-msgid "{0} Sent"
-msgstr "已送出{0}"
+#~ msgid "Installation cancelled"
+#~ msgstr "安裝已取消"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:623
-#, fuzzy, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{1} 之中的第 {0}"
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "找不到某些需要的擴充套件"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:661
-#: ../extensions/SmugMugExport/SmugMugExport.cs:566
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "正在上傳圖片 \"{0}\" ({2} 之 {1})"
+#~ msgid "Installation failed"
+#~ msgstr "安裝失敗"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:692
-#: ../extensions/SmugMugExport/SmugMugExport.cs:595
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "上傳到圖庫時發生錯誤：{0}"
+#~ msgid "Extension"
+#~ msgstr "擴充套件"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:776
-msgid "Available space :"
-msgstr "可用空間："
+#~ msgid "Other"
+#~ msgstr "其它"
-#: ../extensions/PicasaWebExport/PicasaWebExport.cs:890
-#, csharp-format
-msgid ""
-"<small>The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images</small>"
-msgstr ""
+#~ msgid "Url"
+#~ msgstr "網址"
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>PicasaWeb 匯出</b>"
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "發生異常: {0}"
-#: ../extensions/PicasaWebExport/PicasaWebExport.glade.h:17
-msgid "_Autorotate"
-msgstr "自動旋轉(_A)"
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "無法載入已停用的擴充套件。"
-#: ../extensions/PicasaWebExport/google-sharp/CaptchaException.cs:58
-msgid "url"
-msgstr "網址"
+#~ msgid "Loading {0} extension"
+#~ msgstr "正在載入 {0} 擴充套件"
-#: ../extensions/PicasaWebExport/google-sharp/CaptchaException.cs:59
-msgid "token"
-msgstr ""
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "需要的擴充套件 '{0}' 已停用。"
-#: ../extensions/PicasaWebExport/google-sharp/CaptchaException.cs:60
-msgid "captcha_url"
-msgstr ""
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "需要的擴充套件 '{0}' 尚未安裝。"
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>SmugMug 匯出</b>"
+#~ msgid "(provided by {0})"
+#~ msgstr "(由 {0} 提供)"
-#: ../extensions/SmugMugExport/SmugMugExport.glade.h:9
-msgid "_Account:"
-msgstr "帳號(_A)："
+#~ msgid "Copy Photo Locat_ion"
+#~ msgstr "複製相片位置(_I)"
-#: ../extensions/SmugMugExport/SmugMugExport.addin.xml.h:1
-msgid "_SmugMug..."
-msgstr "_SmugMug..."
+#~ msgid "Choose destination directory"
+#~ msgstr "選擇目的端目錄"
+
+#~ msgid "Target location:\t"
+#~ msgstr "目標位置：\t"
+
+#~ msgid "Save As..."
+#~ msgstr "另存新檔..."
+
+#~ msgid "Save changes to image: {0} before closing?"
+#~ msgid_plural ""
+#~ "Save changes to images:\n"
+#~ "{0}\n"
+#~ "before closing?"
+#~ msgstr[0] ""
+#~ "在關閉之前要儲存變更到影像：\n"
+#~ "{0}\n"
+#~ "嗎？"
-#~ msgid "By Extension"
-#~ msgstr "以副檔案名"
-#~ msgid "BMP"
-#~ msgstr "BMP"
-#~ msgid "GIF"
-#~ msgstr "GIF"
-#~ msgid "ICO"
-#~ msgstr "ICO"
-#~ msgid "JPEG"
-#~ msgstr "JPEG"
-#~ msgid "PNG"
-#~ msgstr "PNG"
-#~ msgid "PNM"
-#~ msgstr "PNM"
-#~ msgid "RAS"
-#~ msgstr "RAS"
-#~ msgid "SVG"
-#~ msgstr "SVG"
-#~ msgid "TGA"
-#~ msgstr "TGA"
-#~ msgid "TIFF"
-#~ msgstr "TIFF"
-#~ msgid "XBM"
-#~ msgstr "XBM"
-#~ msgid "XPM"
-#~ msgstr "XPM"
-#~ msgid "Unsupported file format."
-#~ msgstr "未支援的檔案格式。"
-#~ msgid "Determine File Type:"
-#~ msgstr "判斷檔案類型："
-#~ msgid "Load Image"
-#~ msgstr "載入影像"
-#~ msgid "Save Image"
-#~ msgstr "儲存影像"
-#~ msgid "Unsharp Mask"
-#~ msgstr "銳化濾鏡"
-#~ msgid "Unrated photos"
-#~ msgstr "未評分的相片"
-#~ msgid "Edit"
-#~ msgstr "編輯"
-#~ msgid "_File"
-#~ msgstr "檔案(_F)"
-#~ msgid "_Unrated Photos"
-#~ msgstr "未評分的相片(_U)"
-#~ msgid "Add-in"
-#~ msgstr "附加套件"
-#~ msgid "Add-in Manager"
-#~ msgstr "附加套件管理員"
-#~ msgid "F-Spot Add-in Manager"
-#~ msgstr "F-Spot 附加套件管理員"
-#~ msgid "Attach Tag"
-#~ msgstr "附加標籤"
-#~ msgid "Delete From Drive"
-#~ msgstr "從磁碟中刪除"
-#~ msgid "Remove From Catalog"
-#~ msgstr "從型錄中移除"
-#~ msgid "Remove Tag"
-#~ msgstr "移除標籤"
-#~ msgid "There was an error invoking the external handler"
-#~ msgstr "發生外部錯誤"
-#~ msgid "Received error:{1}\"{0}\"{1}"
-#~ msgstr "收到錯誤：{1}\"{0}\"{1}"
-#~ msgid "Help not found"
-#~ msgstr "找不到說明"
-#~ msgid "Clea_r Date Range"
-#~ msgstr "清除日期範圍(_R)"
-#~ msgid "Unknown destination."
-#~ msgstr "未知的目的端."
-#~ msgid ""
-#~ "When copying files from a camera you must select a valid destination on "
-#~ "the local filesystem"
-#~ msgstr "從數位相機複製檔案時您需要選擇一個有效的本地目的地。"
#~ msgid ""
-#~ "Error \"{0}\" while creating directory \"{1}\". Check that the path and "
-#~ "permissions are correct and try again"
-#~ msgstr ""
-#~ "建立目錄 \"{1}\" 時發生錯誤 \"{0}\"。請確定路徑和權限是否正確，然後再試一"
-#~ "次。"
-#~ msgid "Select Destination"
-#~ msgstr "選擇目的地"
-#~ msgid "Enter Password"
-#~ msgstr "輸入密碼"
-#~ msgid "Enter Password for "
-#~ msgstr "輸入密碼給"
-#~ msgid "Transfering Pictures"
-#~ msgstr "正在傳輸圖片"
-#~ msgid "<b>From Image</b>"
-#~ msgstr "<b>從圖片</b>"
-#~ msgid "Copy Files To: "
-#~ msgstr "複製檔案到："
-#~ msgid "Create New _Category..."
-#~ msgstr "建立新的分類(_C)..."
-#~ msgid "Directory"
-#~ msgstr "目錄"
-#~ msgid "E_xport To CD..."
-#~ msgstr "匯出到 CD(_X)..."
-#~ msgid "Export Tags and Categories"
-#~ msgstr "匯出標籤和分類"
-#~ msgid "Export tags and categories"
-#~ msgstr "匯出標籤和分類"
-#~ msgid "Export to _Flickr..."
-#~ msgstr "匯出到 _Flickr..."
-#~ msgid "Find by _Tag"
-#~ msgstr "依標籤尋找(_T)"
-#~ msgid "Import files after copy."
-#~ msgstr "複製之後匯入檔案。"
-#~ msgid "Import from C_amera..."
-#~ msgstr "從數位相機匯入(_C)..."
-#~ msgid "Plain Files."
-#~ msgstr "一般檔案。"
-#~ msgid "Prefix: "
-#~ msgstr "前綴："
-#~ msgid "Use Original."
-#~ msgstr "以原樣匯出。"
-#~ msgid "Use static HTML."
-#~ msgstr "以 HTML 匯出。"
-#~ msgid "_Close"
-#~ msgstr "關閉(_C)"
-#~ msgid "_Delete from Drive"
-#~ msgstr "從磁碟機刪除(_D)"
-#~ msgid "_Directory"
-#~ msgstr "依目錄(_D)"
-#~ msgid "_EXIF Data"
-#~ msgstr "_EXIF 資料"
-#~ msgid "dialog1"
-#~ msgstr "dialog1"
-#~ msgid "Size:"
-#~ msgstr "大小："
-#~ msgid "4 x 3 Portrait (Book)"
-#~ msgstr "4 x 3 寫照(書本)"
-#~ msgid "4 x 6 Portrait (Postcard)"
-#~ msgstr "4 x 6 寫照(明信片)"
-#~ msgid "5 x 7 Portrait (L, 2L)"
-#~ msgstr "5 x 7 寫照(L, 2L)"
-#~ msgid "8 x 10 Portrait"
-#~ msgstr "8 x 10 寫照"
-#~ msgid "Received exception \"{0}\" while rotating image {1}"
-#~ msgstr "旋轉影像{1}時接收到異常\"{0}\""
-#~ msgid "Unknown Error while Rotating Image."
-#~ msgstr "旋轉影像時發生未知的錯誤。"
-#~ msgid "Logo"
-#~ msgstr "圖標"
-#~ msgid "Question"
-#~ msgstr "問題"
-#~ msgid "(No categories)"
-#~ msgstr "(沒有分類)"
-#~ msgid "Create New Category"
-#~ msgstr "建立新的分類"
-#~ msgid "Name of new category:"
-#~ msgstr "新分類的名稱："
-#~ msgid "Edit Category"
-#~ msgstr "編輯分類"
-#~ msgid "Category name:"
-#~ msgstr "分類名稱："
-#~ msgid "Edit icon For category {0}"
-#~ msgstr "修改分類{0}的圖示"
-#~ msgid "Scaling picture \"{0}\""
-#~ msgstr "正在縮放圖片\"{0}\""
-#~ msgid "Transferring picture \"{0}\""
-#~ msgstr "正在傳輸圖片\"{0}\""
+#~ "If you don't save, the changes you have made to this image will be "
+#~ "permanently lost"
+#~ msgid_plural ""
+#~ "If you don't save, the changes you have made to these images will be "
+#~ "permanently lost"
+#~ msgstr[0] "如果您不儲存，您對這些影像所做出的變更將會永久喪失"
+
+#~ msgid "Discard changes"
+#~ msgstr "捨棄變更"
+
+#~ msgid "Continue editing"
+#~ msgstr "繼續編輯"
+
+#~ msgid "Save"
+#~ msgid_plural "Save all"
+#~ msgstr[0] "儲存所有"
+
+#~ msgid "Copy Locat_ion"
+#~ msgstr "複製影像位置(_I)"
+
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "編輯選定的標籤(_E)..."
+
+#~ msgid "my photos"
+#~ msgstr "我的相片"
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "編輯選定的標籤..."
diff --git a/src/Bling/Animation.cs b/src/Bling/Animation.cs
index 7eca223..bbdc2e9 100644
--- a/src/Bling/Animation.cs
+++ b/src/Bling/Animation.cs
@@ -75,7 +75,7 @@ namespace FSpot.Bling
throw new InvalidOperationException ("Can't Resume () a non running animation.");
starttime = DateTimeOffset.Now - pausedafter;
state = AnimationState.Running;
- Sources.SetPriority (GLib.Timeout.Add (40, Handler), GLib.Priority.DefaultIdle);
+ Sources.SetPriority (GLib.Timeout.Add (40, Handler), priority);
}
public void Start ()
@@ -84,7 +84,7 @@ namespace FSpot.Bling
throw new InvalidOperationException ("Can't Start () a running or paused animation.");
starttime = DateTimeOffset.Now;
state = AnimationState.Running;
- Sources.SetPriority (GLib.Timeout.Add (40, Handler), GLib.Priority.DefaultIdle);
+ Sources.SetPriority (GLib.Timeout.Add (40, Handler), priority);
}
public void Stop ()
diff --git a/src/CameraFileSelectionDialog.cs b/src/CameraFileSelectionDialog.cs
index b60fe55..491f0cc 100644
--- a/src/CameraFileSelectionDialog.cs
+++ b/src/CameraFileSelectionDialog.cs
@@ -13,7 +13,7 @@ using System.IO;
using Gdk;
using Gtk;
using Glade;
-using LibGPhoto2;
+using GPhoto2;
using Mono.Unix;
using FSpot.Utils;
using FSpot.UI.Dialog;
diff --git a/src/CameraSelectionDialog.cs b/src/CameraSelectionDialog.cs
index ed727c5..d8f2ec1 100644
--- a/src/CameraSelectionDialog.cs
+++ b/src/CameraSelectionDialog.cs
@@ -1,7 +1,7 @@
using System;
using Gtk;
using Glade;
-using LibGPhoto2;
+using GPhoto2;
using Mono.Unix;
using FSpot.UI.Dialog;
@@ -30,7 +30,7 @@ namespace FSpot {
cameraList.AppendColumn (Catalog.GetString ("Port"), new CellRendererText (), "text", 1);
ListStore tstore = new ListStore (typeof (string), typeof (string));
- for (int i = 0; i < camlist.Count (); i++) {
+ for (int i = 0; i < camlist.Count; i++) {
tstore.AppendValues (camlist.GetName (i), camlist.GetValue (i));
}
@@ -50,5 +50,21 @@ namespace FSpot {
return return_value;
}
+
+ }
+
+ internal static class CameraListExtensions
+ {
+ public static int GetPosition(this CameraList list, string name, string value)
+ {
+ for (int index = 0; index < list.Count; index++)
+ {
+ if (list.GetName(index) == name && list.GetValue(index) == value)
+ return index;
+ }
+
+ return -1;
+ }
+
}
}
diff --git a/src/Cms/IccProfileClass.cs b/src/Cms/IccProfileClass.cs
new file mode 100644
index 0000000..9f92988
--- /dev/null
+++ b/src/Cms/IccProfileClass.cs
@@ -0,0 +1,21 @@
+/*
+ * Cms.IccProfileClass.cs A very incomplete wrapper for lcms
+ *
+ * Author(s):
+ * Pascal de Bruijn <pmjdebruijn at pcode.nl>
+ *
+ * This is free software. See COPYING for details.
+ */
+
+namespace Cms {
+ public enum IccProfileClass : uint {
+ Input = 0x73636e72, /* 'scnr' */
+ Display = 0x6D6e7472, /* 'mntr' */
+ Output = 0x70727472, /* 'prtr' */
+ Link = 0x6c696e6b, /* 'link' */
+ Abstract = 0x61627374, /* 'abst' */
+ ColorSpace = 0x73706163, /* 'spac' */
+ NamedColor = 0x6e6d636c, /* 'nmcl' */
+ Max = 0xffffffff,
+ }
+}
diff --git a/src/Cms/NativeMethods.cs b/src/Cms/NativeMethods.cs
index 71800b7..acf11a7 100644
--- a/src/Cms/NativeMethods.cs
+++ b/src/Cms/NativeMethods.cs
@@ -95,7 +95,10 @@ namespace Cms
public static extern void CmsErrorAction (int action);
[DllImport ("liblcms-1.0.0.dll", EntryPoint = "cmsGetColorSpace")]
- public static extern uint cmsGetColorSpace (HandleRef hprofile);
+ public static extern uint CmsGetColorSpace (HandleRef hprofile);
+
+ [DllImport ("liblcms-1.0.0.dll", EntryPoint = "cmsGetDeviceClass")]
+ public static extern uint CmsGetDeviceClass (HandleRef hprofile);
[DllImport("liblcms-1.0.0.dll", EntryPoint = "cmsTakeProductDesc")]
public extern static IntPtr CmsTakeProductDesc (HandleRef handle);
diff --git a/src/Cms/Profile.cs b/src/Cms/Profile.cs
index 56c9201..d86ae56 100644
--- a/src/Cms/Profile.cs
+++ b/src/Cms/Profile.cs
@@ -3,6 +3,10 @@
*
* Author(s):
* Larry Ewing <lewing at novell.com>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2005-2008 Novell, Inc.
+ * Copyright (c) 2010 Stephane Delcroix
*
* This is free software. See COPYING for details.
*/
@@ -25,14 +29,11 @@ namespace Cms {
private HandleRef handle;
public HandleRef Handle {
- get {
- return handle;
- }
+ get { return handle; }
}
private Profile () : this (NativeMethods.CmsCreateProfilePlaceholder ())
{
-
}
public static Profile CreateSRgb ()
@@ -261,10 +262,12 @@ namespace Cms {
}
}
- public uint ColorSpace {
- get {
- return NativeMethods.cmsGetColorSpace (this.handle);
- }
+ public IccColorSpace ColorSpace {
+ get { return (IccColorSpace) NativeMethods.CmsGetColorSpace (this.handle); }
+ }
+
+ public IccProfileClass DeviceClass {
+ get { return (IccProfileClass) NativeMethods.CmsGetDeviceClass (this.handle); }
}
public string Model {
diff --git a/src/Core.cs b/src/Core.cs
deleted file mode 100644
index 28c4555..0000000
--- a/src/Core.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-using Gtk;
-using System;
-using System.IO;
-using System.Collections.Generic;
-using Mono.Unix;
-using NDesk.DBus;
-using org.freedesktop.DBus;
-
-using FSpot.UI.Dialog;
-using FSpot.Utils;
-
-namespace FSpot {
- [Interface ("org.gnome.FSpot.Core")]
- public interface ICore {
- void Import (string path);
-
- void Organize ();
-
- void View (string list);
-
- void Shutdown ();
-
- string Version ();
- }
-
- public class Core : ICore
- {
- MainWindow organizer;
- private static Db db;
- List<Window> toplevels;
- const string ServicePath = "org.gnome.FSpot";
- static ObjectPath CorePath = new ObjectPath ("/org/gnome/FSpot/Core");
-
- public Core ()
- {
- toplevels = new List<Window> ();
- }
-
- public static Db Database {
- get {
- if (db == null) {
- // Load the database, upgrading/creating it as needed
- string base_directory = FSpot.Global.BaseDirectory;
- if (! File.Exists (base_directory))
- Directory.CreateDirectory (base_directory);
-
- db = new Db ();
- try {
- db.Init (Path.Combine (base_directory, "photos.db"), true);
- } catch (System.Exception e) {
- new RepairDbDialog (e, db.Repair (), null);
- db.Init (Path.Combine (base_directory, "photos.db"), true);
- }
- }
- return db;
- }
- }
-
- public static ICore FindInstance ()
- {
- if (Bus.Session.NameHasOwner (ServicePath)) {
- return Bus.Session.GetObject<ICore> (ServicePath, CorePath);
- } else {
- throw new Exception("No Instance Found");
- }
- }
-
- public void UnregisterServer ()
- {
- Bus.Session.ReleaseName(ServicePath);
- }
-
- public void RegisterServer ()
- {
-#if DEBUG_DBUS
- RequestNameReply nameReply = Bus.Session.RequestName (ServicePath, NameFlag.DoNotQueue);
- Console.WriteLine("RequestNameReply {0}", nameReply);
-#else
- Bus.Session.RequestName (ServicePath, NameFlag.DoNotQueue);
-#endif
- Bus.Session.Register (ServicePath, CorePath, this);
- }
-
- private class ImportCommand
- {
- string path;
- MainWindow main;
-
- public ImportCommand (MainWindow main, string path)
- {
- this.main = main;
- this.path = path;
- }
-
- public bool Execute ()
- {
- if (path != null && path.StartsWith ("gphoto2:"))
- main.ImportCamera (path);
- else if (path != null && path.StartsWith ("file:")) {
- Uri uri = new Uri (path);
- main.ImportFile (Uri.UnescapeDataString (uri.AbsolutePath));
- } else
- main.ImportFile (path);
-
- return false;
- }
- }
-
- public void Import (string path)
- {
- ImportCommand cmd = new ImportCommand (MainWindow, path);
- cmd.Execute ();
- }
-
- public MainWindow MainWindow {
- get {
- if (organizer == null) {
- organizer = new MainWindow (Database);
- Register (organizer.Window);
- }
-
- return organizer;
- }
- }
-
- public void Organize ()
- {
- MainWindow.Window.Present ();
- }
-
- public void View (string list)
- {
- Viewbla (new UriList (list));
- }
-
- public void Viewbla (UriList list)
- {
- try {
- Register (new FSpot.SingleView (list).Window);
- } catch (System.Exception e) {
- System.Console.WriteLine (e.ToString ());
- System.Console.WriteLine ("no real valid path to view from {0}", list);
- }
- }
-
- private class SlideShow
- {
- SlideView slideview;
- Gtk.Window window;
-
- public Gtk.Window Window {
- get { return window; }
- }
-
- public SlideShow (string name)
- {
- Tag tag;
-
- if (name != null)
- tag = Database.Tags.GetTagByName (name);
- else {
- int id = Preferences.Get<int> (Preferences.SCREENSAVER_TAG);
- tag = Database.Tags.GetTagById (id);
- }
-
- Photo [] photos;
- if (tag != null)
- photos = Database.Photos.Query (new Tag [] { tag } );
- else if (Preferences.Get<int> (Preferences.SCREENSAVER_TAG) == 0)
- photos = db.Photos.Query (new Tag [] {});
- else
- photos = new Photo [0];
-
- double delay = Preferences.Get<double> (Preferences.APP_FSPOT + "screensaver/delay");
- delay = Math.Max (1.0, delay);
-
- window = new XScreenSaverSlide ();
- SetStyle (window);
- if (photos.Length > 0) {
- Array.Sort (photos, new Photo.RandomSort ());
-
- Gdk.Pixbuf black = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, false, 8, 1, 1);
- black.Fill (0x00000000);
- slideview = new SlideView (black, photos, delay);
- window.Add (slideview);
- } else {
- Gtk.HBox outer = new Gtk.HBox ();
- Gtk.HBox hbox = new Gtk.HBox ();
- Gtk.VBox vbox = new Gtk.VBox ();
-
- outer.PackStart (new Gtk.Label (String.Empty));
- outer.PackStart (vbox, false, false, 0);
- vbox.PackStart (new Gtk.Label (String.Empty));
- vbox.PackStart (hbox, false, false, 0);
- hbox.PackStart (new Gtk.Image (Gtk.Stock.DialogWarning, Gtk.IconSize.Dialog),
- false, false, 0);
- outer.PackStart (new Gtk.Label (String.Empty));
-
- string msg;
- string long_msg;
-
- if (tag != null) {
- msg = String.Format (Catalog.GetString ("No photos matching {0} found"), tag.Name);
- long_msg = String.Format (Catalog.GetString ("The tag \"{0}\" is not applied to any photos. Try adding\n" +
- "the tag to some photos or selecting a different tag in the\n" +
- "F-Spot preference dialog."), tag.Name);
- } else {
- msg = Catalog.GetString ("Search returned no results");
- long_msg = Catalog.GetString ("The tag F-Spot is looking for does not exist. Try\n" +
- "selecting a different tag in the F-Spot preference\n" +
- "dialog.");
- }
-
- Gtk.Label label = new Gtk.Label (msg);
- hbox.PackStart (label, false, false, 0);
-
- Gtk.Label long_label = new Gtk.Label (long_msg);
- long_label.Markup = String.Format ("<small>{0}</small>", long_msg);
-
- vbox.PackStart (long_label, false, false, 0);
- vbox.PackStart (new Gtk.Label (String.Empty));
-
- window.Add (outer);
- SetStyle (label);
- SetStyle (long_label);
- //SetStyle (image);
- }
- window.ShowAll ();
- }
-
- private void SetStyle (Gtk.Widget w)
- {
- w.ModifyFg (Gtk.StateType.Normal, new Gdk.Color (127, 127, 127));
- w.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (0, 0, 0));
- }
-
- public bool Execute ()
- {
- if (slideview != null)
- slideview.Play ();
- return false;
- }
- }
-
- public void ShowSlides (string name)
- {
- SlideShow show = new SlideShow (name);
- Register (show.Window);
- GLib.Idle.Add (new GLib.IdleHandler (show.Execute));
- }
-
-
- public void Shutdown ()
- {
- try {
- MainWindow.Toplevel.Close ();
- } catch {
- System.Environment.Exit (0);
- }
- }
-
- public void Register (Window window)
- {
- toplevels.Add (window);
- window.Destroyed += HandleDestroyed;
- }
-
- public string Version () {
- return FSpot.Defines.VERSION;
- }
-
- public void HandleDestroyed (object sender, System.EventArgs args)
- {
- Log.Information ("Exiting");
- toplevels.Remove (sender as Window);
- if (toplevels.Count == 0) {
- Banshee.Kernel.Scheduler.Dispose ();
- Core.Database.Dispose ();
- ImageLoaderThread.Cleanup ();
- Gtk.Application.Quit ();
- System.Environment.Exit (0);
- }
- if (organizer != null && organizer.Window == sender)
- organizer = null;
- }
- }
-}
diff --git a/src/Core/App.cs b/src/Core/App.cs
new file mode 100644
index 0000000..c2207df
--- /dev/null
+++ b/src/Core/App.cs
@@ -0,0 +1,352 @@
+/*
+ * FSpot.Application.cs
+ *
+ * Author(s):
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2009 Stephane Delcroix.
+ *
+ * This is open source software. See COPYING fro details.
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Linq;
+
+using Unique;
+
+using Mono.Unix;
+
+using FSpot.Utils;
+
+namespace FSpot
+{
+ public class App : Unique.App
+ {
+#region public API
+ static App app;
+ public static App Instance {
+ get {
+ if (app == null)
+ app = new App ();
+ return app;
+ }
+ }
+
+ public MainWindow Organizer {
+ get {
+ if (organizer == null) {
+ organizer = new MainWindow (Database);
+ Register (organizer.Window);
+ }
+ return organizer;
+ }
+ }
+
+ public Db Database {
+ get {
+ if (db == null) {
+ if (!File.Exists (FSpot.Global.BaseDirectory))
+ Directory.CreateDirectory (FSpot.Global.BaseDirectory);
+
+ db = new Db ();
+
+ try {
+ db.Init (Path.Combine (FSpot.Global.BaseDirectory, "photos.db"), true);
+ } catch (Exception e) {
+ new FSpot.UI.Dialog.RepairDbDialog (e, db.Repair (), null);
+ db.Init (Path.Combine (FSpot.Global.BaseDirectory, "photos.db"), true);
+ }
+ }
+ return db;
+ }
+ }
+
+ public void Import (string path)
+ {
+ if (IsRunning) {
+ var md = new MessageData ();
+ md.Text = path;
+ SendMessage (Command.Import, md);
+ return;
+ }
+ HandleImport (path);
+ }
+
+ public void Organize ()
+ {
+ if (IsRunning) {
+ SendMessage (Command.Organize, null);
+ return;
+ }
+ HandleOrganize ();
+ }
+
+ public void Shutdown ()
+ {
+ if (IsRunning) {
+ SendMessage (Command.Shutdown, null);
+ return;
+ }
+ HandleShutdown ();
+ }
+
+ public void Slideshow (string tagname)
+ {
+ if (IsRunning) {
+ var md = new MessageData ();
+ md.Text = tagname ?? String.Empty;
+ SendMessage (Command.Slideshow, md);
+
+ return;
+ }
+ HandleSlideshow (tagname);
+ }
+
+ public void View (Uri uri)
+ {
+ View (new Uri[] {uri});
+ }
+
+ public void View (IEnumerable<Uri> uris)
+ {
+ var uri_s = from uri in uris select uri.ToString ();
+ View (uri_s);
+ }
+
+ public void View (string uri)
+ {
+ View (new string[] {uri});
+ }
+
+ public void View (IEnumerable<string> uris)
+ {
+ if (IsRunning) {
+ var md = new MessageData ();
+ md.Uris = uris.ToArray ();
+ SendMessage (Command.View, md);
+ return;
+ }
+ HandleView (uris.ToArray());
+ }
+#endregion
+
+#region private ctor and stuffs
+ enum Command {
+ Invalid = 0,
+ Import,
+ View,
+ Organize,
+ Shutdown,
+ Version,
+ Slideshow,
+ }
+
+ List<Gtk.Window> toplevels;
+ MainWindow organizer;
+ Db db;
+
+ App (): base ("org.gnome.FSpot.Core", null,
+ "Import", Command.Import,
+ "View", Command.View,
+ "Organize", Command.Organize,
+ "Shutdown", Command.Shutdown,
+ "Slideshow", Command.Slideshow)
+ {
+ toplevels = new List<Gtk.Window> ();
+ if (IsRunning) {
+ Log.Information ("Found active FSpot process");
+ } else {
+ MessageReceived += HandleMessageReceived;
+ }
+ }
+
+ void SendMessage (Command command, MessageData md)
+ {
+ SendMessage ((Unique.Command)command, md);
+ }
+#endregion
+
+#region Command Handlers
+ void HandleMessageReceived (object sender, MessageReceivedArgs e)
+ {
+ switch ((Command)e.Command) {
+ case Command.Import:
+ HandleImport (e.MessageData.Text);
+ e.RetVal = Response.Ok;
+ break;
+ case Command.Organize:
+ HandleOrganize ();
+ e.RetVal = Response.Ok;
+ break;
+ case Command.Shutdown:
+ HandleShutdown ();
+ e.RetVal = Response.Ok;
+ break;
+ case Command.Slideshow:
+ HandleSlideshow (e.MessageData.Text);
+ e.RetVal = Response.Ok;
+ break;
+ case Command.View:
+ HandleView (e.MessageData.Uris);
+ e.RetVal = Response.Ok;
+ break;
+ case Command.Invalid:
+ default:
+ Log.Debug ("Wrong command received");
+ break;
+ }
+ }
+
+ void HandleImport (string path)
+ {
+ Organizer.Window.Present ();
+ if (path != null && path.StartsWith ("gphoto2:"))
+ Organizer.ImportCamera (path);
+ else if (path != null && path.StartsWith ("file:"))
+ Organizer.ImportFile (Uri.UnescapeDataString ((new Uri(path)).AbsolutePath));
+ else
+ Organizer.ImportFile (path);
+ }
+
+ void HandleOrganize ()
+ {
+ if (Database.Empty)
+ HandleImport (null);
+ else
+ Organizer.Window.Present ();
+ }
+
+ void HandleShutdown ()
+ {
+ try {
+ MainWindow.Toplevel.Close ();
+ } catch {
+ System.Environment.Exit (0);
+ }
+ }
+
+ //FIXME move all this in a standalone class
+ void HandleSlideshow (string tagname)
+ {
+ Tag tag;
+ FSpot.Widgets.SlideShow slideshow = null;
+
+ if (!String.IsNullOrEmpty (tagname))
+ tag = Database.Tags.GetTagByName (tagname);
+ else
+ tag = Database.Tags.GetTagById (Preferences.Get<int> (Preferences.SCREENSAVER_TAG));
+
+ Photo[] photos;
+ if (tag != null)
+ photos = Database.Photos.Query (new Tag[] {tag});
+ else if (Preferences.Get<int> (Preferences.SCREENSAVER_TAG) == 0)
+ photos = Database.Photos.Query (new Tag [] {});
+ else
+ photos = new Photo [0];
+
+ // Minimum delay 1 second; default is 4s
+ var delay = Math.Max (1.0, Preferences.Get<double> (Preferences.SCREENSAVER_DELAY));
+
+ var window = new XScreenSaverSlide ();
+ window.ModifyFg (Gtk.StateType.Normal, new Gdk.Color (127, 127, 127));
+ window.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (0, 0, 0));
+
+ if (photos.Length > 0) {
+ Array.Sort (photos, new Photo.RandomSort ());
+ slideshow = new FSpot.Widgets.SlideShow (new BrowsablePointer (new PhotoList (photos), 0), (uint)(delay * 1000), true);
+ slideshow.Transition = new FSpot.Widgets.DissolveTransition ();
+ window.Add (slideshow);
+ } else {
+ Gtk.HBox outer = new Gtk.HBox ();
+ Gtk.HBox hbox = new Gtk.HBox ();
+ Gtk.VBox vbox = new Gtk.VBox ();
+
+ outer.PackStart (new Gtk.Label (String.Empty));
+ outer.PackStart (vbox, false, false, 0);
+ vbox.PackStart (new Gtk.Label (String.Empty));
+ vbox.PackStart (hbox, false, false, 0);
+ hbox.PackStart (new Gtk.Image (Gtk.Stock.DialogWarning, Gtk.IconSize.Dialog),
+ false, false, 0);
+ outer.PackStart (new Gtk.Label (String.Empty));
+
+ string msg;
+ string long_msg;
+
+ if (tag != null) {
+ msg = String.Format (Catalog.GetString ("No photos matching {0} found"), tag.Name);
+ long_msg = String.Format (Catalog.GetString ("The tag \"{0}\" is not applied to any photos. Try adding\n" +
+ "the tag to some photos or selecting a different tag in the\n" +
+ "F-Spot preference dialog."), tag.Name);
+ } else {
+ msg = Catalog.GetString ("Search returned no results");
+ long_msg = Catalog.GetString ("The tag F-Spot is looking for does not exist. Try\n" +
+ "selecting a different tag in the F-Spot preference\n" +
+ "dialog.");
+ }
+
+ Gtk.Label label = new Gtk.Label (msg);
+ hbox.PackStart (label, false, false, 0);
+
+ Gtk.Label long_label = new Gtk.Label (long_msg);
+ long_label.Markup = String.Format ("<small>{0}</small>", long_msg);
+
+ vbox.PackStart (long_label, false, false, 0);
+ vbox.PackStart (new Gtk.Label (String.Empty));
+
+ window.Add (outer);
+ label.ModifyFg (Gtk.StateType.Normal, new Gdk.Color (127, 127, 127));
+ label.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (0, 0, 0));
+ long_label.ModifyFg (Gtk.StateType.Normal, new Gdk.Color (127, 127, 127));
+ long_label.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (0, 0, 0));
+ }
+ window.ShowAll ();
+
+ Register (window);
+ GLib.Idle.Add (delegate {
+ if (slideshow != null)
+ slideshow.Start ();
+ return false;
+ });
+ }
+
+ void HandleView (string[] uris)
+ {
+ List<Uri> ul = new List<Uri> ();
+ foreach (var u in uris)
+ ul.Add (new Uri (u));
+ try {
+ Register (new FSpot.SingleView (ul.ToArray ()).Window);
+ } catch (System.Exception e) {
+ System.Console.WriteLine (e.ToString ());
+ System.Console.WriteLine ("no real valid path to view from");
+ }
+ }
+
+#endregion
+
+#region Track toplevel windows
+ void Register (Gtk.Window window)
+ {
+ toplevels.Add (window);
+ window.Destroyed += HandleDestroyed;
+ }
+
+ void HandleDestroyed (object sender, EventArgs e)
+ {
+ toplevels.Remove (sender as Gtk.Window);
+ if (toplevels.Count == 0) {
+ Log.Information ("Exiting...");
+ Banshee.Kernel.Scheduler.Dispose ();
+ Database.Dispose ();
+ ImageLoaderThread.Cleanup ();
+ Gtk.Application.Quit ();
+ System.Environment.Exit (0);
+ }
+ if (organizer != null && organizer.Window == sender)
+ organizer = null;
+ }
+#endregion
+ }
+}
diff --git a/src/Core/ColorManagement.cs b/src/Core/ColorManagement.cs
index 2bbcfd1..083268e 100644
--- a/src/Core/ColorManagement.cs
+++ b/src/Core/ColorManagement.cs
@@ -17,7 +17,7 @@ using System.Collections.Generic;
namespace FSpot {
public static class ColorManagement {
- static string [] search_dir = { "/usr/share/color/icc", "~/.color/icc", "/usr/local/share/color/icc " };
+ static string [] search_dir = { "/usr/share/color/icc", Path.Combine (Global.HomeDirectory, ".color/icc"), "/usr/local/share/color/icc " };
static Dictionary<string, Cms.Profile> profiles;
public static IDictionary<string, Cms.Profile> Profiles {
@@ -25,12 +25,12 @@ namespace FSpot {
if (profiles == null) {
profiles = new Dictionary<string, Cms.Profile> ();
Cms.Profile p = Cms.Profile.CreateStandardRgb ();
- if (!profiles.ContainsKey (p.ProductName))
- profiles.Add (p.ProductName, p);
+ if (!profiles.ContainsKey (p.ProductDescription))
+ profiles.Add (p.ProductDescription, p);
p = Cms.Profile.CreateAlternateRgb ();
- if (!profiles.ContainsKey (p.ProductName))
- profiles.Add (p.ProductName, p);
+ if (!profiles.ContainsKey (p.ProductDescription))
+ profiles.Add (p.ProductDescription, p);
foreach (var path in search_dir)
if (!profiles.ContainsKey (path))
@@ -60,14 +60,14 @@ namespace FSpot {
string[] IccColorProfilList = System.IO.Directory.GetFiles (path, "*.icc");
foreach (string ColorProfilePath in IccColorProfilList) {
Cms.Profile profile = new Cms.Profile (ColorProfilePath);
- if ((Cms.IccColorSpace)profile.ColorSpace == Cms.IccColorSpace.Rgb && profile.ProductName != null && !profs.ContainsKey (profile.ProductName))
- profs.Add(profile.ProductName, profile);
+ if ((Cms.IccColorSpace)profile.ColorSpace == Cms.IccColorSpace.Rgb && profile.ProductDescription != null && !profs.ContainsKey (profile.ProductDescription))
+ profs.Add(profile.ProductDescription, profile);
}
string[] IcmColorProfilList = System.IO.Directory.GetFiles (path, "*.icm");
foreach (string ColorProfilePath in IcmColorProfilList) {
Cms.Profile profile = new Cms.Profile (ColorProfilePath);
- if ((Cms.IccColorSpace)profile.ColorSpace == Cms.IccColorSpace.Rgb && !profs.ContainsKey (profile.ProductName))
- profs.Add(profile.ProductName, profile);
+ if ((Cms.IccColorSpace)profile.ColorSpace == Cms.IccColorSpace.Rgb && !profs.ContainsKey (profile.ProductDescription))
+ profs.Add(profile.ProductDescription, profile);
}
string[] DirList = System.IO.Directory.GetDirectories (path);
foreach (string dir in DirList)
@@ -85,6 +85,8 @@ namespace FSpot {
if (pixbuf == null || pixbuf.HasAlpha)
return;
+ image_profile = image_profile ?? Cms.Profile.CreateStandardRgb ();
+
Cms.Profile [] list = new Cms.Profile [] { image_profile, destination_profile };
Cms.Transform transform = new Cms.Transform (list,
PixbufUtils.PixbufCmsFormat (pixbuf),
diff --git a/src/Core/Photo.cs b/src/Core/Photo.cs
index fa38bd6..3f595cd 100644
--- a/src/Core/Photo.cs
+++ b/src/Core/Photo.cs
@@ -503,11 +503,6 @@ namespace FSpot
}
}
- public uint CreateNamedVersion (string name, uint baseVersionId, bool createFile)
- {
- return CreateNamedVersion (name, baseVersionId, createFile);
- }
-
public uint CreateNamedVersion (string name, string extension, uint base_version_id, bool create_file)
{
int num = 1;
diff --git a/src/DragDropTargets.cs b/src/DragDropTargets.cs
index f893e0a..433f099 100644
--- a/src/DragDropTargets.cs
+++ b/src/DragDropTargets.cs
@@ -14,36 +14,42 @@ namespace FSpot
{
public static class DragDropTargets
{
- enum TargetType {
+ enum TargetType : uint {
PlainText = 0,
UriList,
TagList,
TagQueryItem,
UriQueryItem,
PhotoList,
- RootWindow
+ RootWindow,
+ CopyFiles,
};
+ [Obsolete ("better use gtk_target_list_add_text_targets")]
public static readonly TargetEntry PlainTextEntry =
- new TargetEntry ("text/plain", 0, (uint) TargetType.PhotoList);
+ new TargetEntry ("text/plain", 0, (uint)TargetType.PhotoList);
public static readonly TargetEntry PhotoListEntry =
- new TargetEntry ("application/x-fspot-photos", 0, (uint) TargetType.PhotoList);
+ new TargetEntry ("application/x-fspot-photos", 0, (uint)TargetType.PhotoList);
+ [Obsolete ("Use gtk_target_list_add_uri_target")]
public static readonly TargetEntry UriListEntry =
- new TargetEntry ("text/uri-list", 0, (uint) TargetType.UriList);
+ new TargetEntry ("text/uri-list", 0, (uint)TargetType.UriList);
public static readonly TargetEntry TagListEntry =
- new TargetEntry ("application/x-fspot-tags", 0, (uint) TargetType.TagList);
+ new TargetEntry ("application/x-fspot-tags", 0, (uint)TargetType.TagList);
/* FIXME: maybe we need just one fspot-query-item */
public static readonly TargetEntry UriQueryEntry =
- new TargetEntry ("application/x-fspot-uri-query-item", 0, (uint) TargetType.UriQueryItem);
+ new TargetEntry ("application/x-fspot-uri-query-item", 0, (uint)TargetType.UriQueryItem);
public static readonly TargetEntry TagQueryEntry =
- new TargetEntry ("application/x-fspot-tag-query-item", 0, (uint) TargetType.TagQueryItem);
+ new TargetEntry ("application/x-fspot-tag-query-item", 0, (uint)TargetType.TagQueryItem);
public static readonly TargetEntry RootWindowEntry =
- new TargetEntry ("application/x-root-window-drop", 0, (uint) TargetType.RootWindow);
+ new TargetEntry ("application/x-root-window-drop", 0, (uint)TargetType.RootWindow);
+
+ public static readonly TargetEntry CopyFilesEntry =
+ new TargetEntry ("x-special/gnome-copied-files", 0, (uint)TargetType.CopyFiles);
}
}
diff --git a/src/Editors/Editor.cs b/src/Editors/Editor.cs
index 9542419..ef5a4db 100644
--- a/src/Editors/Editor.cs
+++ b/src/Editors/Editor.cs
@@ -154,7 +154,7 @@ namespace FSpot.Editors {
bool create_version = photo.DefaultVersion.IsProtected;
photo.SaveVersion (edited, create_version);
photo.Changes.DataChanged = true;
- Core.Database.Photos.Commit (photo);
+ App.Instance.Database.Photos.Commit (photo);
done++;
if (ProcessingStep != null) {
diff --git a/src/Editors/SoftFocusEditor.cs b/src/Editors/SoftFocusEditor.cs
index cd45136..8f63796 100644
--- a/src/Editors/SoftFocusEditor.cs
+++ b/src/Editors/SoftFocusEditor.cs
@@ -3,32 +3,37 @@
*
* Author(s)
* Ruben Vermeersch <ruben at savanne.be>
+ * Stephane Delcroix <stephane at delcroix.org>
*
- * This is free software. See COPYING for details.
+ * Copyright (c) 2009 Stephane Delcroix
+ *
+ * This is open source software. See COPYING for details.
*/
+using System;
+using Mono.Unix;
using Cairo;
+using Gdk;
+using Gtk;
using FSpot.Widgets;
-using Gdk;
-using Gtk;
-using Mono.Unix;
-using System;
-namespace FSpot.Editors {
+namespace FSpot.Editors
+{
// TODO: This had a keybinding e. Maybe we should add it back, but did people even knew it?
class SoftFocusEditor : Editor
{
double radius;
Scale scale;
- public SoftFocusEditor () : base (Catalog.GetString ("Soft Focus"), "filter-soft-focus") {
+ public SoftFocusEditor () : base (Catalog.GetString ("Soft Focus"), "filter-soft-focus")
+ {
// FIXME: need tooltip Catalog.GetString ("Create a soft focus visual effect")
HasSettings = true;
- }
+ }
public override Widget ConfigurationWidget ()
{
@@ -52,19 +57,21 @@ namespace FSpot.Editors {
private Pixbuf ProcessImpl (Pixbuf input, Cms.Profile input_profile, bool fast) {
Pixbuf result;
using (ImageInfo info = new ImageInfo (input)) {
- Widgets.SoftFocus soft = new Widgets.SoftFocus (info);
- soft.Radius = radius;
-
- MemorySurface surface = new MemorySurface (Format.Argb32,
- input.Width,
- input.Height);
-
- Context ctx = new Context (surface);
- soft.Apply (ctx, info.Bounds);
- ((IDisposable)ctx).Dispose ();
-
- result = MemorySurface.CreatePixbuf (surface);
- surface.Flush ();
+ using (Widgets.SoftFocus soft = new Widgets.SoftFocus (info)) {
+ soft.Radius = radius;
+
+ using (MemorySurface surface = new MemorySurface (Format.Argb32,
+ input.Width,
+ input.Height)) {
+
+ using (Context ctx = new Context (surface)) {
+ soft.Apply (ctx, info.Bounds);
+ }
+
+ result = MemorySurface.CreatePixbuf (surface);
+ surface.Flush ();
+ }
+ }
}
return result;
}
diff --git a/src/Editors/TiltEditor.cs b/src/Editors/TiltEditor.cs
index bda5826..f14d817 100644
--- a/src/Editors/TiltEditor.cs
+++ b/src/Editors/TiltEditor.cs
@@ -1,24 +1,26 @@
/*
- * TiltEditor.cs
+ * FSpot.Editors.TiltEditor.cs
*
* Author(s)
* Ruben Vermeersch <ruben at savanne.be>
+ * Stephane Delcroix <stephane at delcroix.org>
*
+ * Copyright (c) 2009 Stephane Delcroix
+ *
* This is free software. See COPYING for details.
*/
-using Cairo;
-
-using FSpot.Widgets;
+using System;
+using Mono.Unix;
using Gdk;
using Gtk;
+using Cairo;
-using Mono.Unix;
-
-using System;
+using FSpot.Widgets;
-namespace FSpot.Editors {
+namespace FSpot.Editors
+{
// TODO: there were keybindings (left/right) to adjust tilt, maybe they should be added back.
class TiltEditor : Editor
{
@@ -52,22 +54,21 @@ namespace FSpot.Editors {
private Pixbuf ProcessImpl (Pixbuf input, Cms.Profile input_profile, bool fast) {
Pixbuf result;
using (ImageInfo info = new ImageInfo (input)) {
- MemorySurface surface = new MemorySurface (Format.Argb32,
+ using (MemorySurface surface = new MemorySurface (Format.Argb32,
input.Width,
- input.Height);
-
- Context ctx = new Context (surface);
- ctx.Matrix = info.Fill (info.Bounds, angle);
- SurfacePattern p = new SurfacePattern (info.Surface);
- if (fast) {
- p.Filter = Filter.Fast;
+ input.Height)) {
+ using (Context ctx = new Context (surface)) {
+ ctx.Matrix = info.Fill (info.Bounds, angle);
+ using (SurfacePattern p = new SurfacePattern (info.Surface)) {
+ if (fast)
+ p.Filter = Filter.Fast;
+ ctx.Source = p;
+ ctx.Paint ();
+ }
+ result = MemorySurface.CreatePixbuf (surface);
+ surface.Flush ();
+ }
}
- ctx.Source = p;
- ctx.Paint ();
- ((IDisposable)ctx).Dispose ();
- p.Destroy ();
- result = MemorySurface.CreatePixbuf (surface);
- surface.Flush ();
}
return result;
}
diff --git a/src/Extensions/PopupCommands.cs b/src/Extensions/PopupCommands.cs
index a0ae7b5..787533b 100644
--- a/src/Extensions/PopupCommands.cs
+++ b/src/Extensions/PopupCommands.cs
@@ -14,11 +14,11 @@ using FSpot.Widgets;
namespace FSpot.Extensions
{
- public class CopyLocation : ICommand
+ public class Copy : ICommand
{
public void Run (object o, EventArgs e)
{
- MainWindow.Toplevel.HandleCopyLocation (o, e);
+ MainWindow.Toplevel.HandleCopy (o, e);
}
}
diff --git a/src/Extensions/ServiceNode.cs b/src/Extensions/ServiceNode.cs
index ab79432..32e8952 100644
--- a/src/Extensions/ServiceNode.cs
+++ b/src/Extensions/ServiceNode.cs
@@ -1,5 +1,5 @@
/*
- * FSpot.Extensions.ServiceNodea.cs
+ * FSpot.Extensions.ServiceNode.cs
*
* Author(s):
* Stephane Delcroix <stephane at delcroix.org>
diff --git a/src/Extensions/SidebarPage.cs b/src/Extensions/SidebarPage.cs
new file mode 100644
index 0000000..a8eecdb
--- /dev/null
+++ b/src/Extensions/SidebarPage.cs
@@ -0,0 +1,78 @@
+/*
+ * Widgets.SidebarPage.cs
+ *
+ * Author(s)
+ * Mike Gemuende <mike at gemuende.de>
+ * Stephane Delcroix <stephane at delcroix.org>
+ * Ruben Vermeersch <ruben at savanne.be>
+ *
+ * This is free software. See COPYING for details.
+ */
+
+using FSpot.Extensions;
+using FSpot.Utils;
+using Gtk;
+using Mono.Addins;
+using Mono.Unix;
+using System;
+using System.Collections.Generic;
+
+namespace FSpot.Extensions
+{
+ public class SidebarPage {
+ // The widget shown on the sidebar page.
+ private readonly Widget widget;
+ public Widget SidebarWidget {
+ get { return widget; }
+ }
+
+ // Whether this page can be selected
+ private bool can_select;
+ public bool CanSelect {
+ protected set {
+ can_select = value;
+ if (CanSelectChanged != null)
+ CanSelectChanged (this, null);
+ }
+ get { return can_select; }
+ }
+
+ public event EventHandler CanSelectChanged;
+
+ // The label of the sidebar page.
+ private readonly string label;
+ public string Label {
+ get { return label; }
+ }
+
+ // The icon name, used for the selector
+ private readonly string icon_name;
+ public string IconName {
+ get { return icon_name; }
+ }
+
+ // The sidebar onto which this page is attached
+ private Gtk.Widget sidebar;
+ public Gtk.Widget Sidebar {
+ get { return sidebar; }
+ set {
+ sidebar = value;
+ AddedToSidebar ();
+ }
+ }
+
+ // Can be overriden to get notified as soon as we're added to a sidebar.
+ protected virtual void AddedToSidebar () { }
+
+// // Whether this page is currently visible
+// public bool IsActive {
+// get { return Sidebar.IsActive (this); }
+// }
+
+ public SidebarPage (Widget widget, string label, string icon_name) {
+ this.widget = widget;
+ this.label = label;
+ this.icon_name = icon_name;
+ }
+ }
+}
diff --git a/src/Extensions/SidebarPageNode.cs b/src/Extensions/SidebarPageNode.cs
new file mode 100644
index 0000000..21f044f
--- /dev/null
+++ b/src/Extensions/SidebarPageNode.cs
@@ -0,0 +1,27 @@
+/*
+ * FSpot.Extensions.ServiceNode.cs
+ *
+ * Author(s):
+ * Ruben Vermeersch <ruben at savanne.be>
+ * Stephane Delcroix <stephane at delcroix.org>
+ *
+ * Copyright (c) 2010 Stephane Delcroix <stephane at delcroix.org>
+ *
+ * This is free software. See COPYING for details.
+ *
+ */
+
+using System;
+using Mono.Addins;
+
+namespace FSpot.Extensions
+{
+ public class SidebarPageNode : ExtensionNode {
+ [NodeAttribute (Required=true)]
+ protected string sidebar_page_type;
+
+ public SidebarPage GetPage () {
+ return (SidebarPage) Addin.CreateInstance (sidebar_page_type);
+ }
+ }
+}
diff --git a/src/FSpot.addin.xml b/src/FSpot.addin.xml
index e75b561..ea7e04d 100644
--- a/src/FSpot.addin.xml
+++ b/src/FSpot.addin.xml
@@ -1,7 +1,7 @@
<Addin namespace = "FSpot"
id = "Core"
- version = "0.6.1.5"
- compatVersion = "0.6"
+ version = "0.7.0.0"
+ compatVersion = "0.7"
isroot="true">
<Runtime>
@@ -18,7 +18,7 @@
</ExtensionPoint>
<ExtensionPoint path = "/FSpot/Sidebar">
- <ExtensionNode type="FSpot.Widgets.SidebarPageNode"/>
+ <ExtensionNode name="SidebarPage" type="FSpot.Extensions.SidebarPageNode"/>
</ExtensionPoint>
<ExtensionPoint path = "/FSpot/Services">
@@ -45,7 +45,7 @@
<ConditionType id="ViewMode" type="FSpot.Extensions.ViewModeCondition" />
<Extension path = "/FSpot/Menus/PhotoPopup">
- <Command id = "CopyLocation" _label = "Copy Photo Locat_ion" command_type = "FSpot.Extensions.CopyLocation" />
+ <Command id = "Copy" _label = "Copy Photo" command_type = "FSpot.Extensions.Copy" />
<MenuSeparator id = "Separator1" />
<Command id = "RLeft" _label = "Rotate _Left" icon = "object-rotate-left" command_type = "FSpot.Extensions.Rotate270" />
<Command id = "RRight" _label = "Rotate _Right" icon = "object-rotate-right" command_type = "FSpot.Extensions.Rotate90" />
diff --git a/src/FileImportBackend.cs b/src/FileImportBackend.cs
index 8588b28..5c3a04e 100644
--- a/src/FileImportBackend.cs
+++ b/src/FileImportBackend.cs
@@ -18,8 +18,8 @@ public class ImportException : System.Exception {
public class FileImportBackend : ImportBackend {
PhotoStore store;
- RollStore rolls = FSpot.Core.Database.Rolls;
- TagStore tag_store = FSpot.Core.Database.Tags;
+ RollStore rolls = FSpot.App.Instance.Database.Rolls;
+ TagStore tag_store = FSpot.App.Instance.Database.Tags;
bool recurse;
bool copy;
bool detect_duplicates;
@@ -227,6 +227,7 @@ public class FileImportBackend : ImportBackend {
is_duplicate = true;
} else {
System.IO.File.Copy (info.OriginalPath, destination);
+ System.IO.File.SetAttributes (destination, System.IO.FileAttributes.Normal);
info.DestinationPath = destination;
if (detect_duplicates)
diff --git a/src/FolderQueryWidget.cs b/src/FolderQueryWidget.cs
index 3ce26c5..5a446d9 100644
--- a/src/FolderQueryWidget.cs
+++ b/src/FolderQueryWidget.cs
@@ -26,10 +26,10 @@ namespace FSpot
PhotoQuery query;
FolderSet folder_set;
- public FolderQueryWidget () : base ()
+ public FolderQueryWidget (PhotoQuery query) : base ()
{
folder_set = new FolderSet ();
- query = MainWindow.Toplevel.Query;
+ this.query = query;
query.SetCondition (folder_set);
diff --git a/src/GPhotoCamera.cs b/src/GPhotoCamera.cs
index 776cc82..07e9a66 100644
--- a/src/GPhotoCamera.cs
+++ b/src/GPhotoCamera.cs
@@ -1,13 +1,12 @@
using System;
using System.IO;
using System.Collections;
-using LibGPhoto2;
+using GPhoto2;
using Gdk;
using FSpot.Utils;
using FSpot;
-#if GPHOTO2_2_4
using Mono.Unix.Native;
-#endif
+
public class GPhotoCamera
{
Context context;
@@ -17,11 +16,9 @@ public class GPhotoCamera
CameraAbilities camera_abilities;
Camera camera;
PortInfo port_info;
- CameraFilesystem camera_fs;
ArrayList files;
int selected_camera__camera_list_index;
- int selected_camera__abilities_list_index;
int selected_camera__port_info_list_index;
public GPhotoCamera()
@@ -34,52 +31,35 @@ public class GPhotoCamera
abilities_list = new CameraAbilitiesList ();
abilities_list.Load (context);
- camera_list = new CameraList();
-
selected_camera__camera_list_index = -1;
camera = null;
- port_info = null;
- camera_fs = null;
}
public int DetectCameras ()
{
- abilities_list.Detect (port_info_list, camera_list, context);
+ camera_list = abilities_list.Detect (port_info_list, context);
return CameraCount;
}
public int CameraCount {
- get {
- return camera_list.Count();
- }
+ get { return camera_list.Count; }
}
public CameraList CameraList {
- get {
- return camera_list;
- }
+ get { return camera_list; }
}
public void SelectCamera (int index)
{
selected_camera__camera_list_index = index;
- selected_camera__abilities_list_index = abilities_list.LookupModel (camera_list.GetName (selected_camera__camera_list_index));
- camera_abilities = abilities_list.GetAbilities (selected_camera__abilities_list_index);
-
- camera = new Camera ();
- camera.SetAbilities (camera_abilities);
+ camera_abilities = abilities_list [camera_list.GetName (selected_camera__camera_list_index)];
+ port_info = port_info_list.LookupPath (camera_list.GetValue (selected_camera__camera_list_index));
-
- string path = camera_list.GetValue (selected_camera__camera_list_index);
- Log.Debug ("Testing gphoto path = {0}", path);
- selected_camera__port_info_list_index = port_info_list.LookupPath (path);
-
- port_info = port_info_list.GetInfo (selected_camera__port_info_list_index);
Log.Debug ("PortInfo {0}, {1}", port_info.Name, port_info.Path);
- camera.SetPortInfo (port_info);
+ camera = new Camera () { Abilities = camera_abilities, PortInfo = port_info };
}
public void InitializeCamera ()
@@ -88,7 +68,6 @@ public class GPhotoCamera
throw new InvalidOperationException();
camera.Init (context);
- camera_fs = camera.GetFS ();
files = new ArrayList ();
GetFileList ();
@@ -101,7 +80,7 @@ public class GPhotoCamera
private void GetFileList (string dir)
{
- if (camera_fs == null)
+ if (camera == null)
throw new InvalidOperationException ();
//workaround for nikon dslr in ptp mode
@@ -109,14 +88,14 @@ public class GPhotoCamera
return;
//files
- CameraList filelist = camera_fs.ListFiles(dir, context);
- for (int i = 0; i < filelist.Count(); i++) {
+ CameraList filelist = camera.ListFiles(dir, context);
+ for (int i = 0; i < filelist.Count; i++) {
files.Add(new GPhotoCameraFile(dir, filelist.GetName(i)));
}
//subdirectories
- CameraList folderlist = camera_fs.ListFolders(dir, context);
- for (int i = 0; i < folderlist.Count(); i++) {
+ CameraList folderlist = camera.ListFolders(dir, context);
+ for (int i = 0; i < folderlist.Count; i++) {
GetFileList(dir + folderlist.GetName(i) + "/");
}
}
@@ -136,16 +115,14 @@ public class GPhotoCamera
public CameraFile GetFile (int index)
{
- if (camera_fs == null || files == null || index < 0 || index >= files.Count)
+ if (camera == null || files == null || index < 0 || index >= files.Count)
return null;
GPhotoCameraFile selected_file = (GPhotoCameraFile)files [index];
if (selected_file.NormalFile == null)
{
- selected_file.NormalFile = camera_fs.GetFile (selected_file.Directory,
- selected_file.FileName,
- CameraFileType.Normal,
- context);
+ selected_file.NormalFile = new CameraFile ();
+ camera.GetFile (selected_file.Directory, selected_file.FileName, CameraFileType.Normal, selected_file.NormalFile, context);
}
return selected_file.NormalFile;
@@ -159,17 +136,15 @@ public class GPhotoCamera
public CameraFile GetPreview (int index)
{
- if (camera_fs == null || files == null || index < 0 || index >= files.Count)
+ if (camera == null || files == null || index < 0 || index >= files.Count)
return null;
GPhotoCameraFile selected_file = (GPhotoCameraFile) files [index];
if (selected_file.PreviewFile == null) {
try {
- selected_file.PreviewFile = camera_fs.GetFile (selected_file.Directory,
- selected_file.FileName,
- CameraFileType.Preview,
- context);
+ selected_file.PreviewFile = new CameraFile ();
+ camera.GetFile (selected_file.Directory, selected_file.FileName, CameraFileType.Preview, selected_file.PreviewFile, context);
} catch (System.Exception e) {
Log.Exception (e);
selected_file.PreviewFile = null;
@@ -212,17 +187,15 @@ public class GPhotoCamera
//check if the directory exists
if (!Directory.Exists (Path.GetDirectoryName (filename)))
throw new Exception (String.Format ("Directory \"{0}\"does not exist", filename)); //FIXME
-#if GPHOTO2_2_4
//gp_file_new_from_fd is broken on the directory driver
//but using gp_file_new_from_fd doesn't move the files to memory
- if (camera_abilities.port != PortType.Disk) {
+ if (camera_abilities.PortType != PortType.Disk) {
GPhotoCameraFile selected_file = (GPhotoCameraFile) files [index];
using (var f = new CameraFile (Syscall.open (filename, OpenFlags.O_CREAT|OpenFlags.O_RDWR, FilePermissions.DEFFILEMODE))) {
camera.GetFile (selected_file.Directory, selected_file.FileName, CameraFileType.Normal, f, context);
}
return;
}
-#endif
using (CameraFile camfile = GetFile (index)) {
if (camfile == null)
@@ -252,8 +225,6 @@ public class GPhotoCamera
foreach (GPhotoCameraFile curcamfile in files)
curcamfile.ReleaseGPhotoResources ();
- if (camera_fs != null)
- camera_fs.Dispose ();
if (camera != null)
camera.Dispose ();
diff --git a/src/GdkGlx.cs b/src/GdkGlx.cs
deleted file mode 100644
index fa6c482..0000000
--- a/src/GdkGlx.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using FSpot.Widgets;
-using FSpot.Utils;
-
-namespace GdkGlx {
- public enum GlxAttribute {
- None = 0,
- UseGL = 1,
- BufferSize = 2,
- Level = 3,
- Rgba = 4,
- DoubleBuffer = 5,
- Stereo = 6,
- AuxBuffers = 7,
- RedSize = 8,
- GreenSize = 9,
- BlueSize = 10,
- AlphaSize = 11,
- DepthSize = 12,
- StencilSize = 13,
- AccumRedSize = 14,
- AccumGreenSize = 15,
- AccumBlueSize = 16,
- AccumAlphaSize = 17
- }
-
- public class GlxException : System.Exception {
- public GlxException (string text) : base (text)
- {
- }
-
- public GlxException (string text, Exception e) : base (text, e)
- {
- }
- }
-
- public class Context {
- private HandleRef handle;
- private Gdk.Visual visual;
-
- [DllImport("X11")]
- static extern void XFree (IntPtr handle);
-
- [DllImport("GL")]
- static extern IntPtr glXCreateContext (IntPtr display,
- IntPtr visual_info,
- HandleRef share_list,
- bool direct);
-
- [DllImport("GL")]
- static extern IntPtr glXChooseVisual (IntPtr display,
- int screen,
- int [] attr);
-
- [DllImport("GL")]
- static extern void glXDestroyContext (IntPtr display,
- HandleRef ctx);
-
- [DllImport("GL")]
- static extern bool glXMakeCurrent (IntPtr display,
- uint xdrawable,
- HandleRef ctx);
-
- [DllImport("GL")]
- static extern void glXSwapBuffers (IntPtr display, uint drawable);
-
-
- public HandleRef Handle {
- get { return handle; }
- }
-
- public Context (Gdk.Screen screen, int [] attr) : this (screen, null, attr)
- {
- }
-
- [StructLayout(LayoutKind.Sequential)]
- private struct XVisualInfo {
- public IntPtr visual;
- public uint visualid;
- public int screen;
- public int depth;
- public int c_class;
- public uint red_mask;
- public uint blue_mask;
- public uint green_mask;
- public int colormap_size;
- public int bits_per_rgb;
- }
-
-#if false
- public Gdk.Colormap GetColormap (Gdk.Screen screen, )
- {
- DrawableFormat template = new DrawableFormat ();
- template.Color = new ColorFormat ();
- FormatMask mask = FormatMask.None;
- int num = screen.Number;
-
- IntPtr dformat = GlitzAPI.glitz_glx_find_window_format (GdkUtils.GetXDisplay (screen.Display),
- num,
- mask,
- ref template,
- 0);
-
- visual_info = GlitzAPI.glitz_glx_get_visual_info_from_format (dpy, scr, dformat);
- Gdk.Visual visual = new Gdk.Visual (gdkx_visual_get (XVisualIDFromVisual (vinfo)));
- new Gdk.Colormap (visual, true);
- */
- }
-#endif
- public Gdk.Colormap GetColormap ()
- {
- return new Gdk.Colormap (visual, false);
- }
-
- public Context (Gdk.Screen screen,
- Context share_list,
- int [] attr)
- {
- IntPtr xdisplay = GdkUtils.GetXDisplay (screen.Display);
- IntPtr visual_info = IntPtr.Zero;
-
-
- // Be careful about the first glx call and handle the exception
- // with more grace.
- try {
- visual_info = glXChooseVisual (xdisplay,
- screen.Number,
- attr);
- } catch (DllNotFoundException e) {
- throw new GlxException ("Unable to find OpenGL libarary", e);
- } catch (EntryPointNotFoundException enf) {
- throw new GlxException ("Unable to find Glx entry point", enf);
- }
-
- if (visual_info == IntPtr.Zero)
- throw new GlxException ("Unable to find matching visual");
-
- XVisualInfo xinfo = (XVisualInfo) Marshal.PtrToStructure (visual_info, typeof (XVisualInfo));
-
-
- HandleRef share = share_list != null ? share_list.Handle : new HandleRef (null, IntPtr.Zero);
- IntPtr tmp = glXCreateContext (xdisplay, visual_info, share, true);
-
- if (tmp == IntPtr.Zero)
- throw new GlxException ("Unable to create context");
-
- handle = new HandleRef (this, tmp);
-
- visual = GdkUtils.LookupVisual (screen, xinfo.visualid);
-
- if (visual_info != IntPtr.Zero)
- XFree (visual_info);
- }
-
- public void Destroy ()
- {
- glXDestroyContext (GdkUtils.GetXDisplay (visual.Screen.Display),
- Handle);
- }
-
- public bool MakeCurrent (Gdk.Drawable drawable)
- {
- return glXMakeCurrent (GdkUtils.GetXDisplay (drawable.Display),
- GdkUtils.GetXid (drawable),
- Handle);
- }
-
- public void SwapBuffers (Gdk.Drawable drawable)
- {
- glXSwapBuffers (GdkUtils.GetXDisplay (drawable.Display),
- GdkUtils.GetXid (drawable));
- }
- }
-}
diff --git a/src/Imaging/Ciff.cs b/src/Imaging/Ciff.cs
index b59605f..34c6071 100644
--- a/src/Imaging/Ciff.cs
+++ b/src/Imaging/Ciff.cs
@@ -441,7 +441,7 @@ namespace FSpot.Ciff {
return base.Date;
}
- return new CaptureTime (date, little).LocalTime.ToUniversalTime ();
+ return new CaptureTime (date, little).LocalTime;
}
}
diff --git a/src/Imaging/ImageFile.cs b/src/Imaging/ImageFile.cs
index 93b855e..5676fba 100644
--- a/src/Imaging/ImageFile.cs
+++ b/src/Imaging/ImageFile.cs
@@ -1,9 +1,14 @@
using System;
using System.IO;
+using System.Collections;
+
using FSpot.Utils;
using Mono.Unix;
+using Mono.Unix.Native;
using Gdk;
+using GFileInfo = GLib.FileInfo;
+
namespace FSpot {
public class ImageFormatException : ApplicationException {
public ImageFormatException (string msg) : base (msg)
@@ -14,7 +19,8 @@ namespace FSpot {
public class ImageFile : IDisposable {
protected Uri uri;
- static System.Collections.Hashtable name_table;
+ static Hashtable name_table;
+ internal static Hashtable NameTable { get { return name_table; } }
public ImageFile (string path)
{
@@ -41,7 +47,7 @@ namespace FSpot {
static ImageFile ()
{
- name_table = new System.Collections.Hashtable ();
+ name_table = new Hashtable ();
name_table [".svg"] = typeof (FSpot.Svg.SvgFile);
name_table [".gif"] = typeof (ImageFile);
name_table [".bmp"] = typeof (ImageFile);
@@ -67,6 +73,22 @@ namespace FSpot {
name_table [".raf"] = typeof (FSpot.Raf.RafFile);
name_table [".x3f"] = typeof (FSpot.X3f.X3fFile);
+ // add mimetypes for fallback
+ name_table ["image/bmp"] = name_table ["image/x-bmp"] = name_table [".bmp"];
+ name_table ["image/gif"] = name_table [".gif"];
+ name_table ["image/pjpeg"] = name_table ["image/jpeg"] = name_table ["image/jpg"] = name_table [".jpg"];
+ name_table ["image/x-png"] = name_table ["image/png"] = name_table [".png"];
+ name_table ["image/svg+xml"] = name_table [".svg"];
+ name_table ["image/tiff"] = name_table [".tiff"];
+ name_table ["image/x-dcraw"] = name_table [".raw"];
+ name_table ["image/x-ciff"] = name_table [".crw"];
+ name_table ["image/x-mrw"] = name_table [".mrw"];
+ name_table ["image/x-x3f"] = name_table [".x3f"];
+ name_table ["image/x-orf"] = name_table [".orf"];
+ name_table ["image/x-nef"] = name_table [".nef"];
+ name_table ["image/x-cr2"] = name_table [".cr2"];
+ name_table ["image/x-raf"] = name_table [".raf"];
+
//as xcf pixbufloader is not part of gdk-pixbuf, check if it's there,
//and enable it if needed.
foreach (Gdk.PixbufFormat format in Gdk.Pixbuf.Formats)
@@ -149,10 +171,9 @@ namespace FSpot {
get {
// FIXME mono uses the file change time (ctime) incorrectly
// as the creation time so we try to work around that slightly
- Gnome.Vfs.FileInfo info = new Gnome.Vfs.FileInfo (uri.ToString ());
-
- DateTime create = info.Ctime;
- DateTime write = info.Mtime;
+ GFileInfo info = GLib.FileFactory.NewForUri (uri).QueryInfo ("time::modified,time::created", GLib.FileQueryInfoFlags.None, null);
+ DateTime write = NativeConvert.ToDateTime ((long)info.GetAttributeULong ("time::modified"));
+ DateTime create = NativeConvert.ToDateTime ((long)info.GetAttributeULong ("time::created"));
if (create < write)
return create;
@@ -169,13 +190,23 @@ namespace FSpot {
public static bool HasLoader (Uri uri)
{
+ return GetLoaderType (uri) != null;
+ }
+
+ static Type GetLoaderType (Uri uri)
+ {
string path = uri.AbsolutePath;
string extension = System.IO.Path.GetExtension (path).ToLower ();
- System.Type t = (System.Type) name_table [extension];
-
- return (t != null);
- }
+ Type t = (Type) name_table [extension];
+
+ if (t == null) {
+ GLib.FileInfo info = GLib.FileFactory.NewForUri (uri).QueryInfo ("standard::type,standard::content-type", GLib.FileQueryInfoFlags.None, null);
+ t = (Type) name_table [info.ContentType];
+ }
+ return t;
+ }
+
[Obsolete ("use Create (System.Uri) instead")]
public static ImageFile Create (string path)
{
@@ -184,9 +215,7 @@ namespace FSpot {
public static ImageFile Create (Uri uri)
{
- string path = uri.AbsolutePath;
- string extension = System.IO.Path.GetExtension (path).ToLower ();
- System.Type t = (System.Type) name_table [extension];
+ System.Type t = GetLoaderType (uri);
ImageFile img;
if (t != null)
diff --git a/src/Imaging/JpegFile.cs b/src/Imaging/JpegFile.cs
index ff17905..c82e6dc 100644
--- a/src/Imaging/JpegFile.cs
+++ b/src/Imaging/JpegFile.cs
@@ -333,13 +333,13 @@ Console.WriteLine ("<<<");
e = sub.Directory [0].Lookup (TagId.DateTimeOriginal);
if (e != null)
- return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime ();
+ return DirectoryEntry.DateTimeFromString (e.StringValue);
}
e = ExifHeader.Directory.Lookup (TagId.DateTime);
if (e != null)
- return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime ();
+ return DirectoryEntry.DateTimeFromString (e.StringValue);
return base.Date;
#else
@@ -349,7 +349,7 @@ Console.WriteLine ("<<<");
if (time_str == null || time_str == "")
time_str = ExifData.LookupFirstValue (Exif.Tag.DateTime);
- time = Exif.ExifUtil.DateTimeFromString (time_str).ToUniversalTime ();
+ time = Exif.ExifUtil.DateTimeFromString (time_str);
#endif
} catch (System.Exception e) {
Console.WriteLine (e);
diff --git a/src/Imaging/MrwFile.cs b/src/Imaging/MrwFile.cs
index 098c72e..b4693df 100644
--- a/src/Imaging/MrwFile.cs
+++ b/src/Imaging/MrwFile.cs
@@ -201,7 +201,7 @@ namespace FSpot.Mrw {
DirectoryEntry e = this.Header.Directory.Lookup (TagId.DateTime);
if (e != null)
- return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime ();
+ return DirectoryEntry.DateTimeFromString (e.StringValue);
else
return base.Date;
}
diff --git a/src/Imaging/PngFile.cs b/src/Imaging/PngFile.cs
index 8601a5a..cccf6e6 100644
--- a/src/Imaging/PngFile.cs
+++ b/src/Imaging/PngFile.cs
@@ -1418,7 +1418,7 @@ namespace FSpot.Png {
foreach (Chunk chunk in Chunks) {
TimeChunk time = chunk as TimeChunk;
if (time != null)
- return time.Time.ToUniversalTime ();
+ return time.Time;
}
return base.Date;
}
diff --git a/src/Imaging/Tiff.cs b/src/Imaging/Tiff.cs
index 4dc86c2..083e13e 100644
--- a/src/Imaging/Tiff.cs
+++ b/src/Imaging/Tiff.cs
@@ -2066,13 +2066,13 @@ namespace FSpot.Tiff {
e = sub.Directory [0].Lookup (TagId.DateTimeOriginal);
if (e != null)
- return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime ();
+ return DirectoryEntry.DateTimeFromString (e.StringValue);
}
e = this.Header.Directory.Lookup (TagId.DateTime);
if (e != null)
- return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime ();
+ return DirectoryEntry.DateTimeFromString (e.StringValue);
else
return base.Date;
}
diff --git a/src/ImportCommand.cs b/src/ImportCommand.cs
index 47f84a6..16e1d27 100644
--- a/src/ImportCommand.cs
+++ b/src/ImportCommand.cs
@@ -235,7 +235,7 @@ public class ImportCommand : GladeDialog
GPhotoCamera cam = new GPhotoCamera ();
cam.DetectCameras ();
- int camera_count = cam.CameraList.Count ();
+ int camera_count = cam.CameraList.Count;
if (camera_count > 0) {
source_count += camera_count;
@@ -735,10 +735,9 @@ public class ImportCommand : GladeDialog
foreach (string tagname in new_tags) {
Tag t = db.Tags.GetTagByName (tagname);
if (t == null) {
- // Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
- Category default_category = db.Tags.GetTagByName (Catalog.GetString ("Import Tags")) as Category;
+ Category default_category = db.Tags.GetTagByName (Catalog.GetString ("Imported Tags")) as Category;
if (default_category == null) {
- default_category = db.Tags.CreateCategory (null, Catalog.GetString ("Import Tags"), false);
+ default_category = db.Tags.CreateCategory (null, Catalog.GetString ("Imported Tags"), false);
default_category.ThemeIconName = "gtk-new";
}
t = db.Tags.CreateCategory (default_category, tagname, false) as Tag;
diff --git a/src/Jobs/CalculateHashJob.cs b/src/Jobs/CalculateHashJob.cs
index 46cbe11..4c93505 100644
--- a/src/Jobs/CalculateHashJob.cs
+++ b/src/Jobs/CalculateHashJob.cs
@@ -38,8 +38,8 @@ namespace FSpot.Jobs {
Log.Debug ("Calculating Hash {0}...", photo_id);
try {
- Photo photo = FSpot.Core.Database.Photos.Get (Convert.ToUInt32 (photo_id)) as Photo;
- FSpot.Core.Database.Photos.UpdateMD5Sum (photo);
+ Photo photo = FSpot.App.Instance.Database.Photos.Get (Convert.ToUInt32 (photo_id)) as Photo;
+ FSpot.App.Instance.Database.Photos.UpdateMD5Sum (photo);
return true;
} catch (System.Exception e) {
Log.Debug ("Error Calculating Hash for photo {0}: {1}", JobOptions, e.Message);
diff --git a/src/Jobs/SyncMetadataJob.cs b/src/Jobs/SyncMetadataJob.cs
index 5edffa5..b0ceadd 100644
--- a/src/Jobs/SyncMetadataJob.cs
+++ b/src/Jobs/SyncMetadataJob.cs
@@ -34,7 +34,7 @@ namespace FSpot.Jobs {
System.Threading.Thread.Sleep (500);
Console.WriteLine ("Syncing metadata to file...");
try {
- Photo photo = FSpot.Core.Database.Photos.Get (Convert.ToUInt32 (JobOptions)) as Photo;
+ Photo photo = FSpot.App.Instance.Database.Photos.Get (Convert.ToUInt32 (JobOptions)) as Photo;
WriteMetadataToImage (photo);
return true;
} catch (System.Exception e) {
@@ -53,7 +53,7 @@ namespace FSpot.Jobs {
FSpot.JpegFile jimg = img as FSpot.JpegFile;
jimg.SetDescription (photo.Description);
- jimg.SetDateTimeOriginal (photo.Time.ToLocalTime ());
+ jimg.SetDateTimeOriginal (photo.Time);
jimg.SetXmp (UpdateXmp (photo, jimg.Header.GetXmp ()));
jimg.SaveMetaData (path);
diff --git a/src/Loaders/ImageLoader.cs b/src/Loaders/ImageLoader.cs
index 59a1d76..94b20fb 100644
--- a/src/Loaders/ImageLoader.cs
+++ b/src/Loaders/ImageLoader.cs
@@ -22,29 +22,10 @@ namespace FSpot.Loaders {
static ImageLoader ()
{
name_table = new Dictionary<string, System.Type> ();
- name_table [".svg"] = typeof (GdkImageLoader);
- name_table [".gif"] = typeof (GdkImageLoader);
- name_table [".bmp"] = typeof (GdkImageLoader);
- name_table [".jpeg"] = typeof (GdkImageLoader);
- name_table [".jpg"] = typeof (GdkImageLoader);
- name_table [".png"] = typeof (GdkImageLoader);
- name_table [".cr2"] = typeof (GdkImageLoader);
- name_table [".nef"] = typeof (GdkImageLoader);
- name_table [".pef"] = typeof (GdkImageLoader);
- name_table [".raw"] = typeof (GdkImageLoader);
- name_table [".kdc"] = typeof (GdkImageLoader);
- name_table [".arw"] = typeof (GdkImageLoader);
- name_table [".tiff"] = typeof (GdkImageLoader);
- name_table [".tif"] = typeof (GdkImageLoader);
- name_table [".orf"] = typeof (GdkImageLoader);
- name_table [".srf"] = typeof (GdkImageLoader);
- name_table [".dng"] = typeof (GdkImageLoader);
- name_table [".crw"] = typeof (GdkImageLoader);
- name_table [".ppm"] = typeof (GdkImageLoader);
- name_table [".mrw"] = typeof (GdkImageLoader);
- name_table [".pcx"] = typeof (GdkImageLoader);
- name_table [".raf"] = typeof (GdkImageLoader);
- name_table [".x3f"] = typeof (GdkImageLoader);
+ System.Type gdk_loader = typeof (GdkImageLoader);
+ foreach (string key in ImageFile.NameTable.Keys) {
+ name_table [key] = gdk_loader;
+ }
//as xcf pixbufloader is not part of gdk-pixbuf, check if it's there,
//and enable it if needed.
@@ -63,8 +44,11 @@ namespace FSpot.Loaders {
System.Type t;
IImageLoader loader;
- if (!name_table.TryGetValue (extension, out t))
- throw new Exception ("Loader requested for unknown file type: "+extension);
+ if (!name_table.TryGetValue (extension, out t)) {
+ GLib.FileInfo info = GLib.FileFactory.NewForUri (uri).QueryInfo ("standard::type,standard::content-type", GLib.FileQueryInfoFlags.None, null);
+ if (!name_table.TryGetValue (info.ContentType, out t))
+ throw new Exception ("Loader requested for unknown file type: "+extension);
+ }
loader = (IImageLoader) System.Activator.CreateInstance (t);
diff --git a/src/MainWindow.cs b/src/MainWindow.cs
index 48b91ec..69cbfae 100644
--- a/src/MainWindow.cs
+++ b/src/MainWindow.cs
@@ -1,18 +1,21 @@
-using Gdk;
-using Gtk;
+/*
+ * FSpot.MainWindow.cs
+ *
+ * Copyright (c) 2003-2009 Novell, Inc.
+ *
+ * This is open source software. See COPYING for details.
+ */
-using Glade;
-using Mono.Addins;
-using Mono.Unix;
using System;
using System.Text;
-
using System.Collections;
using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-using System.Web;
-using System.Web.Mail;
+
+using Gdk;
+using Gtk;
+
+using Mono.Addins;
+using Mono.Unix;
using Banshee.Kernel;
@@ -24,3078 +27,3101 @@ using FSpot.Utils;
using FSpot.UI.Dialog;
using FSpot.Platform;
-using LibGPhoto2;
-
-public class MainWindow {
-
- public static MainWindow Toplevel;
-
- Db db;
-
- public Sidebar Sidebar;
-
- TagSelectionWidget tag_selection_widget;
- [GtkBeans.Builder.Object] Gtk.Window main_window;
+using GPhoto2;
- [GtkBeans.Builder.Object] Gtk.HPaned main_hpaned;
- [GtkBeans.Builder.Object] Gtk.VBox left_vbox;
- [GtkBeans.Builder.Object] Gtk.VBox group_vbox;
- [GtkBeans.Builder.Object] Gtk.VBox view_vbox;
-
- [GtkBeans.Builder.Object] Gtk.VBox toolbar_vbox;
-
- [GtkBeans.Builder.Object] ScrolledWindow icon_view_scrolled;
- [GtkBeans.Builder.Object] Box photo_box;
- [GtkBeans.Builder.Object] Notebook view_notebook;
+namespace FSpot
+{
+ public class MainWindow
+ {
+ public static MainWindow Toplevel;
+ public Sidebar Sidebar { get; private set; }
- ScrolledWindow tag_selection_scrolled;
-
- [GtkBeans.Builder.Object] Label status_label;
-
- [GtkBeans.Builder.Object] Gtk.UIManager uimanager;
- // File
- [GtkBeans.Builder.Object] Gtk.Action create_version_menu_item;
- [GtkBeans.Builder.Object] Gtk.Action delete_version_menu_item;
- [GtkBeans.Builder.Object] Gtk.Action rename_version_menu_item;
-
- [GtkBeans.Builder.Object] Gtk.Action tools;
- [GtkBeans.Builder.Object] Gtk.Action export;
- [GtkBeans.Builder.Object] Gtk.Action pagesetup_menu_item;
- [GtkBeans.Builder.Object] Gtk.Action print;
- [GtkBeans.Builder.Object] Gtk.Action send_mail;
-
- // Edit
- [GtkBeans.Builder.Object] Gtk.Action copy_location;
- [GtkBeans.Builder.Object] Gtk.Action select_none;
- [GtkBeans.Builder.Object] Gtk.Action rotate_left;
- [GtkBeans.Builder.Object] Gtk.Action rotate_right;
-
- [GtkBeans.Builder.Object] Gtk.Action sharpen;
- [GtkBeans.Builder.Object] Gtk.Action adjust_time;
-
- [GtkBeans.Builder.Object] Gtk.Action update_thumbnail;
- [GtkBeans.Builder.Object] Gtk.Action delete_from_drive;
- [GtkBeans.Builder.Object] Gtk.Action remove_from_catalog;
- [GtkBeans.Builder.Object] Gtk.Action set_as_background;
-
- [GtkBeans.Builder.Object] Gtk.Action attach_tag;
- [GtkBeans.Builder.Object] Gtk.Action remove_tag;
-
- // View
- [GtkBeans.Builder.Object] Gtk.ToggleAction display_toolbar;
- [GtkBeans.Builder.Object] Gtk.ToggleAction display_sidebar;
- [GtkBeans.Builder.Object] Gtk.ToggleAction display_timeline;
- [GtkBeans.Builder.Object] Gtk.ToggleAction display_filmstrip;
- [GtkBeans.Builder.Object] Gtk.ToggleAction display_dates_menu_item;
- [GtkBeans.Builder.Object] Gtk.ToggleAction display_tags_menu_item;
- [GtkBeans.Builder.Object] Gtk.ToggleAction display_ratings_menu_item;
-
- [GtkBeans.Builder.Object] Gtk.Action zoom_in;
- [GtkBeans.Builder.Object] Gtk.Action zoom_out;
- [GtkBeans.Builder.Object] Gtk.ToggleAction loupe_menu_item;
-
- [GtkBeans.Builder.Object] Gtk.RadioAction tag_icon_hidden;
- [GtkBeans.Builder.Object] Gtk.RadioAction tag_icon_small;
- [GtkBeans.Builder.Object] Gtk.RadioAction tag_icon_medium;
- [GtkBeans.Builder.Object] Gtk.RadioAction tag_icon_large;
-
- [GtkBeans.Builder.Object] Gtk.ToggleAction reverse_order;
- public Gtk.ToggleAction ReverseOrderAction {
- get { return reverse_order; }
- }
-
- // Find
- [GtkBeans.Builder.Object] Gtk.Action clear_date_range;
- [GtkBeans.Builder.Object] Gtk.Action clear_rating_filter;
-
- [GtkBeans.Builder.Object] Gtk.ToggleAction find_untagged;
+ TagSelectionWidget tag_selection_widget;
+ [GtkBeans.Builder.Object] Gtk.Window main_window;
+ public Gtk.Window Window {
+ get { return main_window; }
+ }
- [GtkBeans.Builder.Object] Gtk.Action clear_roll_filter;
+ [GtkBeans.Builder.Object] Gtk.HPaned main_hpaned;
+ [GtkBeans.Builder.Object] Gtk.VBox left_vbox;
+ [GtkBeans.Builder.Object] Gtk.VBox group_vbox;
+ [GtkBeans.Builder.Object] Gtk.VBox view_vbox;
- // Tags
- [GtkBeans.Builder.Object] Gtk.Action edit_selected_tag;
- [GtkBeans.Builder.Object] Gtk.Action delete_selected_tag;
-
- [GtkBeans.Builder.Object] Gtk.Action attach_tag_to_selection;
- [GtkBeans.Builder.Object] Gtk.Action remove_tag_from_selection;
+ [GtkBeans.Builder.Object] Gtk.VBox toolbar_vbox;
- // Other Widgets
- [GtkBeans.Builder.Object] Scale zoom_scale;
-
- [GtkBeans.Builder.Object] VBox info_vbox;
-
- [GtkBeans.Builder.Object] Gtk.HBox tagbar;
- [GtkBeans.Builder.Object] Gtk.VBox tag_entry_container;
- [GtkBeans.Builder.Object] Gtk.VBox sidebar_vbox;
- TagEntry tag_entry;
-
- Gtk.Toolbar toolbar;
-
- FindBar find_bar;
-
- PhotoVersionMenu versions_submenu;
-
- Gtk.ToggleToolButton browse_button;
- Gtk.ToggleToolButton edit_button;
-
- InfoBox info_box;
- QueryView icon_view;
- PhotoView photo_view;
- FSpot.FullScreenView fsview;
- FSpot.PhotoQuery query;
- FSpot.GroupSelector group_selector;
- FSpot.QueryWidget query_widget;
- MainSelection selection;
-
- ToolButton rl_button;
- ToolButton rr_button;
-
- Label count_label;
-
- Gtk.ToolButton display_next_button;
- Gtk.ToolButton display_previous_button;
+ [GtkBeans.Builder.Object] ScrolledWindow icon_view_scrolled;
+ [GtkBeans.Builder.Object] Box photo_box;
+ [GtkBeans.Builder.Object] Notebook view_notebook;
+
+ ScrolledWindow tag_selection_scrolled;
- ModeType view_mode;
- bool write_metadata = false;
-
- Gdk.Cursor watch = new Gdk.Cursor (Gdk.CursorType.Watch);
-
- // Tag Icon Sizes
- public int TagsIconSize {
- get { return (int) Tag.TagIconSize; }
- set { Tag.TagIconSize = (Tag.IconSize) value; }
- }
-
- public PhotoView PhotoView {
- get { return photo_view; }
- }
-
- private static TargetEntry [] icon_source_target_table =
- new TargetEntry [] {
- DragDropTargets.PhotoListEntry,
- DragDropTargets.TagQueryEntry,
- DragDropTargets.UriListEntry,
- DragDropTargets.RootWindowEntry
- };
-
- private static TargetEntry [] icon_dest_target_table =
- new TargetEntry [] {
-#if ENABLE_REPARENTING
- DragDropTargets.PhotoListEntry,
-#endif
- DragDropTargets.TagListEntry,
- DragDropTargets.UriListEntry
- };
-
- private static TargetEntry [] tag_target_table =
- new TargetEntry [] {
- DragDropTargets.TagListEntry
- };
-
- private static TargetEntry [] tag_dest_target_table =
- new TargetEntry [] {
- DragDropTargets.PhotoListEntry,
- DragDropTargets.UriListEntry,
- DragDropTargets.TagListEntry
- };
-
- const int PHOTO_IDX_NONE = -1;
-
- private static Gtk.Tooltips toolTips;
- public static Gtk.Tooltips ToolTips {
- get {
- if (toolTips == null)
- toolTips = new Gtk.Tooltips ();
- return toolTips;
+ [GtkBeans.Builder.Object] Label status_label;
+
+ [GtkBeans.Builder.Object] Gtk.UIManager uimanager;
+ // File
+ [GtkBeans.Builder.Object] Gtk.Action create_version_menu_item;
+ [GtkBeans.Builder.Object] Gtk.Action delete_version_menu_item;
+ [GtkBeans.Builder.Object] Gtk.Action rename_version_menu_item;
+
+ [GtkBeans.Builder.Object] Gtk.Action tools;
+ [GtkBeans.Builder.Object] Gtk.Action export;
+ [GtkBeans.Builder.Object] Gtk.Action pagesetup_menu_item;
+ [GtkBeans.Builder.Object] Gtk.Action print;
+ [GtkBeans.Builder.Object] Gtk.Action send_mail;
+
+ // Edit
+ [GtkBeans.Builder.Object] Gtk.Action copy;
+ [GtkBeans.Builder.Object] Gtk.Action select_none;
+ [GtkBeans.Builder.Object] Gtk.Action rotate_left;
+ [GtkBeans.Builder.Object] Gtk.Action rotate_right;
+
+ [GtkBeans.Builder.Object] Gtk.Action sharpen;
+ [GtkBeans.Builder.Object] Gtk.Action adjust_time;
+
+ [GtkBeans.Builder.Object] Gtk.Action update_thumbnail;
+ [GtkBeans.Builder.Object] Gtk.Action delete_from_drive;
+ [GtkBeans.Builder.Object] Gtk.Action remove_from_catalog;
+ [GtkBeans.Builder.Object] Gtk.Action set_as_background;
+
+ [GtkBeans.Builder.Object] Gtk.Action attach_tag;
+ [GtkBeans.Builder.Object] Gtk.Action remove_tag;
+
+ // View
+ [GtkBeans.Builder.Object] Gtk.ToggleAction display_toolbar;
+ [GtkBeans.Builder.Object] Gtk.ToggleAction display_sidebar;
+ [GtkBeans.Builder.Object] Gtk.ToggleAction display_timeline;
+ [GtkBeans.Builder.Object] Gtk.ToggleAction display_filmstrip;
+ [GtkBeans.Builder.Object] Gtk.ToggleAction display_dates_menu_item;
+ [GtkBeans.Builder.Object] Gtk.ToggleAction display_tags_menu_item;
+ [GtkBeans.Builder.Object] Gtk.ToggleAction display_ratings_menu_item;
+
+ [GtkBeans.Builder.Object] Gtk.Action zoom_in;
+ [GtkBeans.Builder.Object] Gtk.Action zoom_out;
+ [GtkBeans.Builder.Object] Gtk.ToggleAction loupe_menu_item;
+
+ [GtkBeans.Builder.Object] Gtk.RadioAction tag_icon_hidden;
+ [GtkBeans.Builder.Object] Gtk.RadioAction tag_icon_small;
+ [GtkBeans.Builder.Object] Gtk.RadioAction tag_icon_medium;
+ [GtkBeans.Builder.Object] Gtk.RadioAction tag_icon_large;
+
+ [GtkBeans.Builder.Object] Gtk.ToggleAction reverse_order;
+ public Gtk.ToggleAction ReverseOrderAction {
+ get { return reverse_order; }
}
- }
-
- //
- // Public Properties
- //
-
- public Db Database {
- get { return db; }
- }
-
- public Gtk.Window Window {
- get { return main_window; }
- }
- public ModeType ViewMode {
- get { return view_mode; }
- }
-
- public MainSelection Selection {
- get { return selection; }
- }
-
- public MenuItem FindByTag {
- get { return uimanager.GetWidget ("/ui/menubar1/find/find_by_tag") as MenuItem; }
- }
-
- public InfoBox InfoBox {
- get { return info_box; }
- }
-
- //
- // Constructor
- //
- public MainWindow (Db db)
- {
- this.db = db;
-
- if (Toplevel == null)
- Toplevel = this;
-
- GtkBeans.Builder builder = new GtkBeans.Builder ("main_window.ui");
- builder.Autoconnect (this);
-
- LoadPreference (Preferences.MAIN_WINDOW_WIDTH);
- LoadPreference (Preferences.MAIN_WINDOW_X);
- LoadPreference (Preferences.MAIN_WINDOW_MAXIMIZED);
- main_window.ShowAll ();
-
- LoadPreference (Preferences.SIDEBAR_POSITION);
- LoadPreference (Preferences.METADATA_EMBED_IN_IMAGE);
-
- pagesetup_menu_item.Activated += HandlePageSetupActivated;
-
- toolbar = new Gtk.Toolbar ();
- toolbar_vbox.PackStart (toolbar);
-
- ToolButton import_button = GtkUtil.ToolButtonFromTheme ("gtk-add", Catalog.GetString ("Import"), true);
- import_button.Clicked += HandleImportCommand;
- import_button.SetTooltip (ToolTips, Catalog.GetString ("Import new images"), null);
- toolbar.Insert (import_button, -1);
+ // Find
+ [GtkBeans.Builder.Object] Gtk.Action clear_date_range;
+ [GtkBeans.Builder.Object] Gtk.Action clear_rating_filter;
- toolbar.Insert (new SeparatorToolItem (), -1);
-
- rl_button = GtkUtil.ToolButtonFromTheme ("object-rotate-left", Catalog.GetString ("Rotate Left"), false);
- rl_button.Clicked += HandleRotate270Command;
- toolbar.Insert (rl_button, -1);
-
- rr_button = GtkUtil.ToolButtonFromTheme ("object-rotate-right", Catalog.GetString ("Rotate Right"), false);
- rr_button.Clicked += HandleRotate90Command;
- toolbar.Insert (rr_button, -1);
-
- toolbar.Insert (new SeparatorToolItem (), -1);
-
- browse_button = new ToggleToolButton ();
- browse_button.Label = Catalog.GetString ("Browse");
- browse_button.IconName = "mode-browse";
- browse_button.IsImportant = true;
- browse_button.Toggled += HandleToggleViewBrowse;
- browse_button.SetTooltip (ToolTips, Catalog.GetString ("Browse many photos simultaneously"), null);
- toolbar.Insert (browse_button, -1);
-
- edit_button = new ToggleToolButton ();
- edit_button.Label = Catalog.GetString ("Edit Image");
- edit_button.IconName = "mode-image-edit";
- edit_button.IsImportant = true;
- edit_button.Toggled += HandleToggleViewPhoto;
- edit_button.SetTooltip (ToolTips, Catalog.GetString ("View and edit a photo"), null);
- toolbar.Insert (edit_button, -1);
-
- toolbar.Insert (new SeparatorToolItem (), -1);
-
- ToolButton fs_button = GtkUtil.ToolButtonFromTheme ("view-fullscreen", Catalog.GetString ("Fullscreen"), false);
- fs_button.Clicked += HandleViewFullscreen;
- fs_button.SetTooltip (ToolTips, Catalog.GetString ("View photos fullscreen"), null);
- toolbar.Insert (fs_button, -1);
-
- ToolButton ss_button = GtkUtil.ToolButtonFromTheme ("media-playback-start", Catalog.GetString ("Slideshow"), false);
- ss_button.Clicked += HandleViewSlideShow;
- ss_button.SetTooltip (ToolTips, Catalog.GetString ("View photos in a slideshow"), null);
- toolbar.Insert (ss_button, -1);
-
- SeparatorToolItem white_space = new SeparatorToolItem ();
- white_space.Draw = false;
- white_space.Expand = true;
- toolbar.Insert (white_space, -1);
-
- ToolItem label_item = new ToolItem ();
- count_label = new Label (String.Empty);
- label_item.Child = count_label;
- toolbar.Insert (label_item, -1);
-
- display_previous_button = new ToolButton (Stock.GoBack);
- toolbar.Insert (display_previous_button, -1);
- display_previous_button.SetTooltip (ToolTips, Catalog.GetString ("Previous photo"), String.Empty);
- display_previous_button.Clicked += new EventHandler (HandleDisplayPreviousButtonClicked);
-
- display_next_button = new ToolButton (Stock.GoForward);
- toolbar.Insert (display_next_button, -1);
- display_next_button.SetTooltip (ToolTips, Catalog.GetString ("Next photo"), String.Empty);
- display_next_button.Clicked += new EventHandler (HandleDisplayNextButtonClicked);
-
- Sidebar = new Sidebar ();
- ViewModeChanged += Sidebar.HandleMainWindowViewModeChanged;
- sidebar_vbox.Add (Sidebar);
-
- tag_selection_scrolled = new ScrolledWindow ();
- tag_selection_scrolled.ShadowType = ShadowType.In;
+ [GtkBeans.Builder.Object] Gtk.ToggleAction find_untagged;
- tag_selection_widget = new TagSelectionWidget (db.Tags);
- tag_selection_scrolled.Add (tag_selection_widget);
-
- Sidebar.AppendPage (tag_selection_scrolled, Catalog.GetString ("Tags"), "tag");
-
- AddinManager.AddExtensionNodeHandler ("/FSpot/Sidebar", OnSidebarExtensionChanged);
-
- Sidebar.Context = ViewContext.Library;
-
- Sidebar.CloseRequested += HideSidebar;
- Sidebar.Show ();
-
- info_box = new InfoBox ();
- ViewModeChanged += info_box.HandleMainWindowViewModeChanged;
- info_box.VersionIdChanged += delegate (InfoBox box, uint version_id) { UpdateForVersionIdChange (version_id);};
- sidebar_vbox.PackEnd (info_box, false, false, 0);
-
- info_box.Context = ViewContext.Library;
+ [GtkBeans.Builder.Object] Gtk.Action clear_roll_filter;
- tag_selection_widget.Selection.Changed += HandleTagSelectionChanged;
- tag_selection_widget.KeyPressEvent += HandleTagSelectionKeyPress;
- tag_selection_widget.ButtonPressEvent += HandleTagSelectionButtonPressEvent;
- tag_selection_widget.PopupMenu += HandleTagSelectionPopupMenu;
-
- LoadPreference (Preferences.TAG_ICON_SIZE);
+ // Tags
+ [GtkBeans.Builder.Object] Gtk.Action edit_selected_tag;
+ [GtkBeans.Builder.Object] Gtk.Action delete_selected_tag;
+
+ [GtkBeans.Builder.Object] Gtk.Action attach_tag_to_selection;
+ [GtkBeans.Builder.Object] Gtk.Action remove_tag_from_selection;
- try {
- query = new FSpot.PhotoQuery (db.Photos);
- } catch (System.Exception e) {
- //FIXME assume any exception here is due to a corrupt db and handle that.
- new RepairDbDialog (e, db.Repair (), main_window);
- query = new FSpot.PhotoQuery (db.Photos);
- }
-
- UpdateStatusLabel ();
- query.Changed += HandleQueryChanged;
-
- db.Photos.ItemsChanged += HandleDbItemsChanged;
- db.Tags.ItemsChanged += HandleTagsChanged;
- db.Tags.ItemsAdded += HandleTagsChanged;
- db.Tags.ItemsRemoved += HandleTagsChanged;
-#if SHOW_CALENDAR
- FSpot.SimpleCalendar cal = new FSpot.SimpleCalendar (query);
- cal.DaySelected += HandleCalendarDaySelected;
- left_vbox.PackStart (cal, false, true, 0);
-#endif
-
- group_selector = new FSpot.GroupSelector ();
- group_selector.Adaptor = new FSpot.TimeAdaptor (query, Preferences.Get<bool> (Preferences.GROUP_ADAPTOR_ORDER_ASC));
+ // Other Widgets
+ [GtkBeans.Builder.Object] Scale zoom_scale;
+
+ [GtkBeans.Builder.Object] VBox info_vbox;
+
+ [GtkBeans.Builder.Object] Gtk.HBox tagbar;
+ [GtkBeans.Builder.Object] Gtk.VBox tag_entry_container;
+ [GtkBeans.Builder.Object] Gtk.VBox sidebar_vbox;
+ TagEntry tag_entry;
+
+ Gtk.Toolbar toolbar;
+
+ FindBar find_bar;
+
+ PhotoVersionMenu versions_submenu;
+
+ Gtk.ToggleToolButton browse_button;
+ Gtk.ToggleToolButton edit_button;
+
+ QueryView icon_view;
- group_selector.ShowAll ();
-
- if (zoom_scale != null) {
- zoom_scale.ValueChanged += HandleZoomScaleValueChanged;
+ PhotoView photo_view;
+ public PhotoView PhotoView {
+ get { return photo_view; }
}
-
- view_vbox.PackStart (group_selector, false, false, 0);
- view_vbox.ReorderChild (group_selector, 0);
-
- find_bar = new FindBar (query, tag_selection_widget.Model);
- view_vbox.PackStart (find_bar, false, false, 0);
- view_vbox.ReorderChild (find_bar, 1);
- main_window.KeyPressEvent += HandleKeyPressEvent;
-
- query_widget = new FSpot.QueryWidget (query, db);
- query_widget.Logic.Changed += HandleQueryLogicChanged;
- view_vbox.PackStart (query_widget, false, false, 0);
- view_vbox.ReorderChild (query_widget, 2);
-
- icon_view = new QueryView (query);
- icon_view.ZoomChanged += HandleZoomChanged;
- LoadPreference (Preferences.ZOOM);
- LoadPreference (Preferences.SHOW_TAGS);
- LoadPreference (Preferences.SHOW_DATES);
- LoadPreference (Preferences.SHOW_RATINGS);
- icon_view_scrolled.Add (icon_view);
- icon_view.DoubleClicked += HandleDoubleClicked;
- icon_view.Vadjustment.ValueChanged += HandleIconViewScroll;
- icon_view.GrabFocus ();
-
- new FSpot.PreviewPopup (icon_view);
-
- Gtk.Drag.SourceSet (icon_view, Gdk.ModifierType.Button1Mask | Gdk.ModifierType.Button3Mask,
- icon_source_target_table, DragAction.Copy | DragAction.Move);
+
+ FSpot.FullScreenView fsview;
+ FSpot.PhotoQuery query;
+ FSpot.GroupSelector group_selector;
+ FSpot.QueryWidget query_widget;
- icon_view.DragBegin += HandleIconViewDragBegin;
- icon_view.DragDataGet += HandleIconViewDragDataGet;
-
- TagMenu tag_menu = new TagMenu (null, Database.Tags);
- tag_menu.NewTagHandler += delegate { HandleCreateTagAndAttach (this, null); };
- tag_menu.TagSelected += HandleAttachTagMenuSelected;
- tag_menu.Populate();
- (uimanager.GetWidget("/ui/menubar1/edit2/attach_tag") as MenuItem).Submenu = tag_menu;
+ ToolButton rl_button;
+ ToolButton rr_button;
+
+ Label count_label;
+
+ Gtk.ToolButton display_next_button;
+ Gtk.ToolButton display_previous_button;
- PhotoTagMenu pmenu = new PhotoTagMenu ();
- pmenu.TagSelected += HandleRemoveTagMenuSelected;
- (uimanager.GetWidget("/ui/menubar1/edit2/remove_tag") as MenuItem).Submenu = pmenu;
+ bool write_metadata = false;
+
+ Gdk.Cursor watch = new Gdk.Cursor (Gdk.CursorType.Watch);
+
+ // Tag Icon Sizes
+ public int TagsIconSize {
+ get { return (int) Tag.TagIconSize; }
+ set { Tag.TagIconSize = (Tag.IconSize) value; }
+ }
+
+ private static TargetEntry [] icon_source_target_table =
+ new TargetEntry [] {
+ DragDropTargets.PhotoListEntry,
+ DragDropTargets.TagQueryEntry,
+ DragDropTargets.UriListEntry,
+ DragDropTargets.RootWindowEntry
+ };
+
+ private static TargetEntry [] icon_dest_target_table =
+ new TargetEntry [] {
+ #if ENABLE_REPARENTING
+ DragDropTargets.PhotoListEntry,
+ #endif
+ DragDropTargets.TagListEntry,
+ DragDropTargets.UriListEntry
+ };
+
+ private static TargetEntry [] tag_target_table =
+ new TargetEntry [] {
+ DragDropTargets.TagListEntry
+ };
+
+ private static TargetEntry [] tag_dest_target_table =
+ new TargetEntry [] {
+ DragDropTargets.PhotoListEntry,
+ DragDropTargets.UriListEntry,
+ DragDropTargets.TagListEntry
+ };
+
+ const int PHOTO_IDX_NONE = -1;
+
+ private static Gtk.Tooltips toolTips;
+ public static Gtk.Tooltips ToolTips {
+ get {
+ if (toolTips == null)
+ toolTips = new Gtk.Tooltips ();
+ return toolTips;
+ }
+ }
+
+ public Db Database { get; private set; }
+ public ModeType ViewMode { get; private set; }
+ public MainSelection Selection { get; private set; }
+ public InfoBox InfoBox { get; private set; }
+
+ public MenuItem FindByTag {
+ get { return uimanager.GetWidget ("/ui/menubar1/find/find_by_tag") as MenuItem; }
+ }
+
+
+ //
+ // Constructor
+ //
+ public MainWindow (Db db)
+ {
+ foreach (ServiceNode service in AddinManager.GetExtensionNodes ("/FSpot/Services")) {
+ try {
+ service.Initialize ();
+ service.Start ();
+ } catch (Exception e) {
+ Log.Warning ("Something went wrong while starting the {0} extension.", service.Id);
+ Log.DebugException (e);
+ }
+ }
- Gtk.Drag.DestSet (icon_view, DestDefaults.All, icon_dest_target_table,
- DragAction.Copy | DragAction.Move);
-
- // icon_view.DragLeave += new DragLeaveHandler (HandleIconViewDragLeave);
- icon_view.DragMotion += HandleIconViewDragMotion;
- icon_view.DragDrop += HandleIconViewDragDrop;
- icon_view.DragDataReceived += HandleIconViewDragDataReceived;
- icon_view.KeyPressEvent += HandleIconViewKeyPressEvent;
-
- photo_view = new PhotoView (query);
- photo_box.Add (photo_view);
-
- photo_view.DoubleClicked += HandleDoubleClicked;
- photo_view.KeyPressEvent += HandlePhotoViewKeyPressEvent;
- photo_view.UpdateStarted += HandlePhotoViewUpdateStarted;
- photo_view.UpdateFinished += HandlePhotoViewUpdateFinished;
-
- photo_view.View.ZoomChanged += HandleZoomChanged;
-
- // Tag typing: focus the tag entry if the user starts typing a tag
- icon_view.KeyPressEvent += HandlePossibleTagTyping;
- photo_view.KeyPressEvent += HandlePossibleTagTyping;
- tag_entry = new TagEntry (db.Tags);
- tag_entry.KeyPressEvent += HandleTagEntryKeyPressEvent;
- tag_entry.TagsAttached += HandleTagEntryTagsAttached;
- tag_entry.TagsRemoved += HandleTagEntryRemoveTags;
- tag_entry.Activated += HandleTagEntryActivate;
- tag_entry_container.Add (tag_entry);
-
- Gtk.Drag.DestSet (photo_view, DestDefaults.All, tag_target_table,
- DragAction.Copy | DragAction.Move);
-
- photo_view.DragMotion += HandlePhotoViewDragMotion;
- photo_view.DragDrop += HandlePhotoViewDragDrop;
- photo_view.DragDataReceived += HandlePhotoViewDragDataReceived;
-
- view_notebook.SwitchPage += HandleViewNotebookSwitchPage;
- group_selector.Adaptor.GlassSet += HandleAdaptorGlassSet;
- group_selector.Adaptor.Changed += HandleAdaptorChanged;
- LoadPreference (Preferences.GROUP_ADAPTOR_ORDER_ASC);
- LoadPreference (Preferences.FILMSTRIP_ORIENTATION);
-
- this.selection = new MainSelection (this);
- this.selection.Changed += HandleSelectionChanged;
- this.selection.ItemsChanged += HandleSelectionItemsChanged;
- this.selection.Changed += Sidebar.HandleSelectionChanged;
- this.selection.ItemsChanged += Sidebar.HandleSelectionItemsChanged;
-
- Mono.Addins.AddinManager.ExtensionChanged += PopulateExtendableMenus;
- PopulateExtendableMenus (null, null);
-
- UpdateMenus ();
-
- main_window.ShowAll ();
-
- tagbar.Hide ();
- find_bar.Hide ();
-
- UpdateFindByTagMenu ();
-
- LoadPreference (Preferences.SHOW_TOOLBAR);
- LoadPreference (Preferences.SHOW_SIDEBAR);
- LoadPreference (Preferences.SHOW_TIMELINE);
- LoadPreference (Preferences.SHOW_FILMSTRIP);
+#if GSD_2_24
+ Log.Information ("Hack for gnome-settings-daemon engaged");
+ int max_age, max_size;
+ if (Preferences.TryGet<int> (Preferences.GSD_THUMBS_MAX_AGE, out max_age)) {
+ if (max_age < 0)
+ Log.Debug ("maximum_age check already disabled, good");
+ else if (max_age == 0)
+ Log.Warning ("maximum_age is 0 (tin-hat mode), not overriding");
+ else if (max_age < 180) {
+ Log.Debug ("Setting maximum_age to a saner value");
+ Preferences.Set (Preferences.GSD_THUMBS_MAX_AGE, 180);
+ }
+ }
- LoadPreference (Preferences.GNOME_MAILTO_ENABLED);
-
- Preferences.SettingChanged += OnPreferencesChanged;
+ if (Preferences.TryGet<int> (Preferences.GSD_THUMBS_MAX_SIZE, out max_size)) {
+ int count = App.Instance.Database.Photos.Count ("photos");
+ // average thumbs are taking 70K, so this will push the threshold
+ //if f-spot takes more than 70% of the thumbs space
+ int size = count / 10;
+ if (max_size < 0)
+ Log.Debug ("maximum_size check already disabled, good");
+ else if (max_size == 0)
+ Log.Warning ("maximum_size is 0 (tin-hat mode), not overriding");
+ else if (max_size < size) {
+ Log.Debug ("Setting maximum_size to a saner value ({0}MB), according to your db size", size);
+ Preferences.Set (Preferences.GSD_THUMBS_MAX_SIZE, size);
+ }
+ }
- main_window.DeleteEvent += HandleDeleteEvent;
+#endif
+ Database = db;
+
+ if (Toplevel == null)
+ Toplevel = this;
+
+ GtkBeans.Builder builder = new GtkBeans.Builder ("main_window.ui");
+ builder.Autoconnect (this);
+
+ //Set the global DefaultColormap. Allows transparency according
+ //to the theme (work on murrine engine)
+ Gdk.Colormap colormap = ((Widget)main_window).Screen.RgbaColormap;
+ if (colormap == null) {
+ Log.Debug ("Your screen doesn't support alpha channels!");
+ colormap = ((Widget)main_window).Screen.RgbColormap;
+ }
+ Gtk.Widget.DefaultColormap = colormap;
+
+ LoadPreference (Preferences.MAIN_WINDOW_WIDTH);
+ LoadPreference (Preferences.MAIN_WINDOW_X);
+ LoadPreference (Preferences.MAIN_WINDOW_MAXIMIZED);
+ main_window.ShowAll ();
+
+ LoadPreference (Preferences.SIDEBAR_POSITION);
+ LoadPreference (Preferences.METADATA_EMBED_IN_IMAGE);
+
+ pagesetup_menu_item.Activated += HandlePageSetupActivated;
+
+ toolbar = new Gtk.Toolbar ();
+ toolbar_vbox.PackStart (toolbar);
+
+ ToolButton import_button = GtkUtil.ToolButtonFromTheme ("gtk-add", Catalog.GetString ("Import"), true);
+ import_button.Clicked += HandleImportCommand;
+ import_button.SetTooltip (ToolTips, Catalog.GetString ("Import new images"), null);
+ toolbar.Insert (import_button, -1);
- query_widget.HandleChanged (query);
- query_widget.Close ();
-
- // When the icon_view is loaded, set it's initial scroll position
- icon_view.SizeAllocated += HandleIconViewReady;
-
- export.Activated += HandleExportActivated;
- UpdateToolbar ();
-
- (uimanager.GetWidget("/ui/menubar1/file1/close1") as MenuItem).Hide ();
-
- Banshee.Kernel.Scheduler.Resume ();
- }
-
- private void HandleDisplayNextButtonClicked (object sender, EventArgs args)
- {
- PhotoView.View.Item.MoveNext ();
- }
-
- private void HandleDisplayPreviousButtonClicked (object sender, EventArgs args)
- {
- PhotoView.View.Item.MovePrevious ();
- }
-
- private void OnSidebarExtensionChanged (object s, ExtensionNodeEventArgs args) {
- // FIXME: No sidebar page removal yet!
- if (args.Change == ExtensionChange.Add)
- Sidebar.AppendPage ((args.ExtensionNode as SidebarPageNode).GetSidebarPage ());
- }
-
- private Photo CurrentPhoto {
- get {
- int active = ActiveIndex ();
- if (active >= 0)
- return query [active] as Photo;
- else
- return null;
- }
- }
-
- // Index into the PhotoQuery. If -1, no photo is selected or multiple photos are selected.
- private int ActiveIndex ()
- {
- if (selection.Count == 1)
- return SelectedIds() [0];
- else
- return PHOTO_IDX_NONE;
- }
-
- // Switching mode.
- public enum ModeType {
- IconView,
- PhotoView
- };
-
- public event EventHandler ViewModeChanged;
-
- public void SetViewMode (ModeType value)
- {
- if (view_mode == value)
- return;
-
- view_mode = value;
- switch (view_mode) {
- case ModeType.IconView:
- if (view_notebook.CurrentPage != 0)
- view_notebook.CurrentPage = 0;
-
- display_timeline.Sensitive = true;
- display_filmstrip.Sensitive = false;
- group_selector.Visible = display_timeline.Active;
-
- if (photo_view.View.Loupe != null)
- loupe_menu_item.Active = false;
- JumpTo (photo_view.Item.Index);
- zoom_scale.Value = icon_view.Zoom;
- break;
- case ModeType.PhotoView:
- if (view_notebook.CurrentPage != 1)
- view_notebook.CurrentPage = 1;
-
- display_timeline.Sensitive = false;
- display_filmstrip.Sensitive = true;
- group_selector.Visible = false;
+ toolbar.Insert (new SeparatorToolItem (), -1);
+
+ rl_button = GtkUtil.ToolButtonFromTheme ("object-rotate-left", Catalog.GetString ("Rotate Left"), false);
+ rl_button.Clicked += HandleRotate270Command;
+ toolbar.Insert (rl_button, -1);
+
+ rr_button = GtkUtil.ToolButtonFromTheme ("object-rotate-right", Catalog.GetString ("Rotate Right"), false);
+ rr_button.Clicked += HandleRotate90Command;
+ toolbar.Insert (rr_button, -1);
+
+ toolbar.Insert (new SeparatorToolItem (), -1);
+
+ browse_button = new ToggleToolButton ();
+ browse_button.Label = Catalog.GetString ("Browse");
+ browse_button.IconName = "mode-browse";
+ browse_button.IsImportant = true;
+ browse_button.Toggled += HandleToggleViewBrowse;
+ browse_button.SetTooltip (ToolTips, Catalog.GetString ("Browse many photos simultaneously"), null);
+ toolbar.Insert (browse_button, -1);
+
+ edit_button = new ToggleToolButton ();
+ edit_button.Label = Catalog.GetString ("Edit Image");
+ edit_button.IconName = "mode-image-edit";
+ edit_button.IsImportant = true;
+ edit_button.Toggled += HandleToggleViewPhoto;
+ edit_button.SetTooltip (ToolTips, Catalog.GetString ("View and edit a photo"), null);
+ toolbar.Insert (edit_button, -1);
+
+ toolbar.Insert (new SeparatorToolItem (), -1);
+
+ ToolButton fs_button = GtkUtil.ToolButtonFromTheme ("view-fullscreen", Catalog.GetString ("Fullscreen"), false);
+ fs_button.Clicked += HandleViewFullscreen;
+ fs_button.SetTooltip (ToolTips, Catalog.GetString ("View photos fullscreen"), null);
+ toolbar.Insert (fs_button, -1);
+
+ ToolButton ss_button = GtkUtil.ToolButtonFromTheme ("media-playback-start", Catalog.GetString ("Slideshow"), false);
+ ss_button.Clicked += HandleViewSlideShow;
+ ss_button.SetTooltip (ToolTips, Catalog.GetString ("View photos in a slideshow"), null);
+ toolbar.Insert (ss_button, -1);
+
+ SeparatorToolItem white_space = new SeparatorToolItem ();
+ white_space.Draw = false;
+ white_space.Expand = true;
+ toolbar.Insert (white_space, -1);
+
+ ToolItem label_item = new ToolItem ();
+ count_label = new Label (String.Empty);
+ label_item.Child = count_label;
+ toolbar.Insert (label_item, -1);
+
+ display_previous_button = new ToolButton (Stock.GoBack);
+ toolbar.Insert (display_previous_button, -1);
+ display_previous_button.SetTooltip (ToolTips, Catalog.GetString ("Previous photo"), String.Empty);
+ display_previous_button.Clicked += new EventHandler (HandleDisplayPreviousButtonClicked);
+
+ display_next_button = new ToolButton (Stock.GoForward);
+ toolbar.Insert (display_next_button, -1);
+ display_next_button.SetTooltip (ToolTips, Catalog.GetString ("Next photo"), String.Empty);
+ display_next_button.Clicked += new EventHandler (HandleDisplayNextButtonClicked);
+
+ Sidebar = new Sidebar ();
+ ViewModeChanged += Sidebar.HandleMainWindowViewModeChanged;
+ sidebar_vbox.Add (Sidebar);
+
+ tag_selection_scrolled = new ScrolledWindow ();
+ tag_selection_scrolled.ShadowType = ShadowType.In;
+
+ tag_selection_widget = new TagSelectionWidget (Database.Tags);
+ tag_selection_scrolled.Add (tag_selection_widget);
+
+ Sidebar.AppendPage (tag_selection_scrolled, Catalog.GetString ("Tags"), "tag");
+
+ AddinManager.AddExtensionNodeHandler ("/FSpot/Sidebar", OnSidebarExtensionChanged);
+
+ Sidebar.Context = ViewContext.Library;
+
+ Sidebar.CloseRequested += HideSidebar;
+ Sidebar.Show ();
+
+ InfoBox = new InfoBox ();
+ ViewModeChanged += InfoBox.HandleMainWindowViewModeChanged;
+ InfoBox.VersionIdChanged += delegate (InfoBox box, uint version_id) { UpdateForVersionIdChange (version_id);};
+ sidebar_vbox.PackEnd (InfoBox, false, false, 0);
+
+ InfoBox.Context = ViewContext.Library;
+
+ tag_selection_widget.Selection.Changed += HandleTagSelectionChanged;
+ tag_selection_widget.KeyPressEvent += HandleTagSelectionKeyPress;
+ tag_selection_widget.ButtonPressEvent += HandleTagSelectionButtonPressEvent;
+ tag_selection_widget.PopupMenu += HandleTagSelectionPopupMenu;
+ tag_selection_widget.RowActivated += HandleTagSelectionRowActivated;
- JumpTo (icon_view.FocusCell);
- zoom_scale.Value = photo_view.NormalizedZoom;
+ LoadPreference (Preferences.TAG_ICON_SIZE);
+
+ try {
+ query = new FSpot.PhotoQuery (Database.Photos);
+ } catch (System.Exception e) {
+ //FIXME assume any exception here is due to a corrupt db and handle that.
+ new RepairDbDialog (e, Database.Repair (), main_window);
+ query = new FSpot.PhotoQuery (Database.Photos);
+ }
+
+ UpdateStatusLabel ();
+ query.Changed += HandleQueryChanged;
+
+ Database.Photos.ItemsChanged += HandleDbItemsChanged;
+ Database.Tags.ItemsChanged += HandleTagsChanged;
+ Database.Tags.ItemsAdded += HandleTagsChanged;
+ Database.Tags.ItemsRemoved += HandleTagsChanged;
+ #if SHOW_CALENDAR
+ FSpot.SimpleCalendar cal = new FSpot.SimpleCalendar (query);
+ cal.DaySelected += HandleCalendarDaySelected;
+ left_vbox.PackStart (cal, false, true, 0);
+ #endif
+
+ group_selector = new FSpot.GroupSelector ();
+ group_selector.Adaptor = new FSpot.TimeAdaptor (query, Preferences.Get<bool> (Preferences.GROUP_ADAPTOR_ORDER_ASC));
+
+ group_selector.ShowAll ();
+
+ if (zoom_scale != null) {
+ zoom_scale.ValueChanged += HandleZoomScaleValueChanged;
+ }
+
+ view_vbox.PackStart (group_selector, false, false, 0);
+ view_vbox.ReorderChild (group_selector, 0);
+
+ find_bar = new FindBar (query, tag_selection_widget.Model);
+ view_vbox.PackStart (find_bar, false, false, 0);
+ view_vbox.ReorderChild (find_bar, 1);
+ main_window.KeyPressEvent += HandleKeyPressEvent;
+
+ query_widget = new FSpot.QueryWidget (query, Database);
+ query_widget.Logic.Changed += HandleQueryLogicChanged;
+ view_vbox.PackStart (query_widget, false, false, 0);
+ view_vbox.ReorderChild (query_widget, 2);
+
+ icon_view = new QueryView (query);
+ icon_view.ZoomChanged += HandleZoomChanged;
+ LoadPreference (Preferences.ZOOM);
+ LoadPreference (Preferences.SHOW_TAGS);
+ LoadPreference (Preferences.SHOW_DATES);
+ LoadPreference (Preferences.SHOW_RATINGS);
+ icon_view_scrolled.Add (icon_view);
+ icon_view.DoubleClicked += HandleDoubleClicked;
+ icon_view.Vadjustment.ValueChanged += HandleIconViewScroll;
+ icon_view.GrabFocus ();
+
+ new FSpot.PreviewPopup (icon_view);
+
+ Gtk.Drag.SourceSet (icon_view, Gdk.ModifierType.Button1Mask | Gdk.ModifierType.Button3Mask,
+ icon_source_target_table, DragAction.Copy | DragAction.Move);
+
+ icon_view.DragBegin += HandleIconViewDragBegin;
+ icon_view.DragDataGet += HandleIconViewDragDataGet;
+
+ TagMenu tag_menu = new TagMenu (null, Database.Tags);
+ tag_menu.NewTagHandler += delegate { HandleCreateTagAndAttach (this, null); };
+ tag_menu.TagSelected += HandleAttachTagMenuSelected;
+ tag_menu.Populate();
+ (uimanager.GetWidget("/ui/menubar1/edit2/attach_tag") as MenuItem).Submenu = tag_menu;
+
+ PhotoTagMenu pmenu = new PhotoTagMenu ();
+ pmenu.TagSelected += HandleRemoveTagMenuSelected;
+ (uimanager.GetWidget("/ui/menubar1/edit2/remove_tag") as MenuItem).Submenu = pmenu;
+
+ Gtk.Drag.DestSet (icon_view, DestDefaults.All, icon_dest_target_table,
+ DragAction.Copy | DragAction.Move);
+
+ // icon_view.DragLeave += new DragLeaveHandler (HandleIconViewDragLeave);
+ icon_view.DragMotion += HandleIconViewDragMotion;
+ icon_view.DragDrop += HandleIconViewDragDrop;
+ icon_view.DragDataReceived += HandleIconViewDragDataReceived;
+ icon_view.KeyPressEvent += HandleIconViewKeyPressEvent;
+
+ photo_view = new PhotoView (query);
+ photo_box.Add (photo_view);
+
+ photo_view.DoubleClicked += HandleDoubleClicked;
+ photo_view.KeyPressEvent += HandlePhotoViewKeyPressEvent;
+ photo_view.UpdateStarted += HandlePhotoViewUpdateStarted;
+ photo_view.UpdateFinished += HandlePhotoViewUpdateFinished;
+
+ photo_view.View.ZoomChanged += HandleZoomChanged;
+
+ // Tag typing: focus the tag entry if the user starts typing a tag
+ icon_view.KeyPressEvent += HandlePossibleTagTyping;
+ photo_view.KeyPressEvent += HandlePossibleTagTyping;
+ tag_entry = new TagEntry (Database.Tags);
+ tag_entry.KeyPressEvent += HandleTagEntryKeyPressEvent;
+ tag_entry.TagsAttached += HandleTagEntryTagsAttached;
+ tag_entry.TagsRemoved += HandleTagEntryRemoveTags;
+ tag_entry.Activated += HandleTagEntryActivate;
+ tag_entry_container.Add (tag_entry);
+
+ Gtk.Drag.DestSet (photo_view, DestDefaults.All, tag_target_table,
+ DragAction.Copy | DragAction.Move);
+
+ photo_view.DragMotion += HandlePhotoViewDragMotion;
+ photo_view.DragDrop += HandlePhotoViewDragDrop;
+ photo_view.DragDataReceived += HandlePhotoViewDragDataReceived;
+
+ view_notebook.SwitchPage += HandleViewNotebookSwitchPage;
+ group_selector.Adaptor.GlassSet += HandleAdaptorGlassSet;
+ group_selector.Adaptor.Changed += HandleAdaptorChanged;
+ LoadPreference (Preferences.GROUP_ADAPTOR_ORDER_ASC);
+ LoadPreference (Preferences.FILMSTRIP_ORIENTATION);
+
+ Selection = new MainSelection (this);
+ Selection.Changed += HandleSelectionChanged;
+ Selection.ItemsChanged += HandleSelectionItemsChanged;
+ Selection.Changed += Sidebar.HandleSelectionChanged;
+ Selection.ItemsChanged += Sidebar.HandleSelectionItemsChanged;
+
+ Mono.Addins.AddinManager.ExtensionChanged += PopulateExtendableMenus;
+ PopulateExtendableMenus (null, null);
+
+ UpdateMenus ();
+
+ main_window.ShowAll ();
+
+ tagbar.Hide ();
+ find_bar.Hide ();
+
+ UpdateFindByTagMenu ();
+
+ LoadPreference (Preferences.SHOW_TOOLBAR);
+ LoadPreference (Preferences.SHOW_SIDEBAR);
+ LoadPreference (Preferences.SHOW_TIMELINE);
+ LoadPreference (Preferences.SHOW_FILMSTRIP);
+
+ LoadPreference (Preferences.GNOME_MAILTO_ENABLED);
+
+ Preferences.SettingChanged += OnPreferencesChanged;
+
+ main_window.DeleteEvent += HandleDeleteEvent;
+
+ query_widget.HandleChanged (query);
+ query_widget.Close ();
+
+ // When the icon_view is loaded, set it's initial scroll position
+ icon_view.SizeAllocated += HandleIconViewReady;
+
+ export.Activated += HandleExportActivated;
+ UpdateToolbar ();
+
+ (uimanager.GetWidget("/ui/menubar1/file1/close1") as MenuItem).Hide ();
- photo_view.View.GrabFocus();
- break;
+
+ Banshee.Kernel.Scheduler.Resume ();
}
- Selection.MarkChanged ();
- UpdateToolbar ();
- if (ViewModeChanged != null)
- ViewModeChanged (this, null);
- }
- void UpdateToolbar ()
- {
- if (browse_button != null) {
- bool state = view_mode == ModeType.IconView;
-
- if (browse_button.Active != state)
- browse_button.Active = state;
+ private void HandleDisplayNextButtonClicked (object sender, EventArgs args)
+ {
+ PhotoView.View.Item.MoveNext ();
}
-
- if (edit_button != null) {
- bool state = view_mode == ModeType.PhotoView;
-
- if (edit_button.Active != state)
- edit_button.Active = state;
+
+ private void HandleDisplayPreviousButtonClicked (object sender, EventArgs args)
+ {
+ PhotoView.View.Item.MovePrevious ();
}
-
- if (view_mode == ModeType.PhotoView) {
- display_previous_button.Visible = true;
- display_next_button.Visible = true;
- count_label.Visible = true;
-
- bool valid = photo_view.View.Item.IsValid;
- bool prev = valid && photo_view.View.Item.Index > 0;
- bool next = valid && photo_view.View.Item.Index < query.Count - 1;
-
- display_previous_button.Sensitive = prev;
- display_next_button.Sensitive = next;
-
- if (Query == null)
- count_label.Text = String.Empty;
- else
- // Note for translators: This indicates the current photo is photo {0} of {1} out of photos
- count_label.Text = String.Format (Catalog.GetString ("{0} of {1}"), Query.Count == 0 ? 0 : photo_view.View.Item.Index + 1, Query.Count == 0 ? 0 : Query.Count);
- } else {
- display_previous_button.Visible = false;
- display_next_button.Visible = false;
- count_label.Visible = false;
+
+ private void OnSidebarExtensionChanged (object s, ExtensionNodeEventArgs args) {
+ // FIXME: No sidebar page removal yet!
+ if (args.Change == ExtensionChange.Add)
+ Sidebar.AppendPage ((args.ExtensionNode as SidebarPageNode).GetPage ());
}
-
- }
-
- private void HandleExportActivated (object o, EventArgs e)
- {
- FSpot.Extensions.ExportMenuItemNode.SelectedImages = delegate () {return new FSpot.PhotoArray (SelectedPhotos ()); };
- }
-
- private void HandleDbItemsChanged (object sender, DbItemEventArgs<Photo> args)
- {
- foreach (Photo p in args.Items) {
- if (p == null)
- continue;
- if (write_metadata)
- FSpot.Jobs.SyncMetadataJob.Create (db.Jobs, p);
+
+ private Photo CurrentPhoto {
+ get {
+ int active = ActiveIndex ();
+ if (active >= 0)
+ return query [active] as Photo;
+ else
+ return null;
+ }
}
-
- if (args is PhotoEventArgs && (args as PhotoEventArgs).Changes.TimeChanged)
- query.RequestReload ();
- }
-
- private void HandleTagsChanged (object sender, DbItemEventArgs<Tag> args)
- {
- icon_view.QueueDraw ();
- UpdateTagEntryFromSelection ();
- }
-
- void HandleViewNotebookSwitchPage (object sender, SwitchPageArgs args)
- {
- switch (view_notebook.CurrentPage) {
- case 0:
- SetViewMode (ModeType.IconView);
- break;
- case 1:
- SetViewMode (ModeType.PhotoView);
- break;
+
+ // Index into the PhotoQuery. If -1, no photo is selected or multiple photos are selected.
+ private int ActiveIndex ()
+ {
+ if (Selection.Count == 1)
+ return SelectedIds() [0];
+ else
+ return PHOTO_IDX_NONE;
}
- }
-
- private int [] SelectedIds () {
- int [] ids = new int [0];
-
- if (fsview != null && fsview.View.Item.IsValid)
- ids = new int [] { fsview.View.Item.Index };
- else {
- switch (view_mode) {
+
+ // Switching mode.
+ public enum ModeType {
+ IconView,
+ PhotoView
+ };
+
+ public event EventHandler ViewModeChanged;
+
+ public void SetViewMode (ModeType value)
+ {
+ if (ViewMode == value)
+ return;
+
+ ViewMode = value;
+ switch (ViewMode) {
case ModeType.IconView:
- ids = icon_view.Selection.Ids;
+ if (view_notebook.CurrentPage != 0)
+ view_notebook.CurrentPage = 0;
+
+ display_timeline.Sensitive = true;
+ display_filmstrip.Sensitive = false;
+ group_selector.Visible = display_timeline.Active;
+
+ if (photo_view.View.Loupe != null)
+ loupe_menu_item.Active = false;
+ JumpTo (photo_view.Item.Index);
+ zoom_scale.Value = icon_view.Zoom;
break;
- default:
case ModeType.PhotoView:
- if (photo_view.Item.IsValid)
- ids = new int [] { photo_view.Item.Index };
+ if (view_notebook.CurrentPage != 1)
+ view_notebook.CurrentPage = 1;
+
+ display_timeline.Sensitive = false;
+ display_filmstrip.Sensitive = true;
+ group_selector.Visible = false;
+
+ JumpTo (icon_view.FocusCell);
+ zoom_scale.Value = photo_view.NormalizedZoom;
+
+ photo_view.View.GrabFocus();
break;
}
- }
-
- return ids;
- }
-
- public class MainSelection : IBrowsableCollection {
- MainWindow win;
-
- public MainSelection (MainWindow win)
- {
- this.win = win;
- win.icon_view.Selection.Changed += HandleSelectionChanged;
- win.icon_view.Selection.ItemsChanged += HandleSelectionItemsChanged;
- win.photo_view.PhotoChanged += HandlePhotoChanged;
- win.query.ItemsChanged += HandleQueryItemsChanged;
+ Selection.MarkChanged ();
+ UpdateToolbar ();
+ if (ViewModeChanged != null)
+ ViewModeChanged (this, null);
}
- public int Count {
- get {
- switch (win.view_mode) {
- case ModeType.PhotoView:
- return win.photo_view.Item.IsValid ? 1 : 0;
- case ModeType.IconView:
- return win.icon_view.Selection.Count;
- }
- return 0;
+ void UpdateToolbar ()
+ {
+ if (browse_button != null) {
+ bool state = ViewMode == ModeType.IconView;
+
+ if (browse_button.Active != state)
+ browse_button.Active = state;
+ }
+
+ if (edit_button != null) {
+ bool state = ViewMode == ModeType.PhotoView;
+
+ if (edit_button.Active != state)
+ edit_button.Active = state;
+ }
+
+ if (ViewMode == ModeType.PhotoView) {
+ display_previous_button.Visible = true;
+ display_next_button.Visible = true;
+ count_label.Visible = true;
+
+ bool valid = photo_view.View.Item.IsValid;
+ bool prev = valid && photo_view.View.Item.Index > 0;
+ bool next = valid && photo_view.View.Item.Index < query.Count - 1;
+
+ display_previous_button.Sensitive = prev;
+ display_next_button.Sensitive = next;
+
+ if (Query == null)
+ count_label.Text = String.Empty;
+ else
+ // Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+ count_label.Text = String.Format (Catalog.GetString ("{0} of {1}"), Query.Count == 0 ? 0 : photo_view.View.Item.Index + 1, Query.Count == 0 ? 0 : Query.Count);
+ } else {
+ display_previous_button.Visible = false;
+ display_next_button.Visible = false;
+ count_label.Visible = false;
}
+
}
-
- public int IndexOf (IBrowsableItem item)
+
+ private void HandleExportActivated (object o, EventArgs e)
{
- switch (win.view_mode) {
- case ModeType.PhotoView:
- return item == win.photo_view.Item.Current ? 0 : -1;
- case ModeType.IconView:
- return win.icon_view.Selection.IndexOf (item);
- }
- return -1;
+ FSpot.Extensions.ExportMenuItemNode.SelectedImages = delegate () {return new FSpot.PhotoArray (SelectedPhotos ()); };
}
-
- public bool Contains (IBrowsableItem item)
+
+ private void HandleDbItemsChanged (object sender, DbItemEventArgs<Photo> args)
{
- switch (win.view_mode) {
- case ModeType.PhotoView:
- return item == win.photo_view.Item.Current ? true : false;
- case ModeType.IconView:
- return win.icon_view.Selection.Contains (item);
+ foreach (Photo p in args.Items) {
+ if (p == null)
+ continue;
+ if (write_metadata)
+ FSpot.Jobs.SyncMetadataJob.Create (Database.Jobs, p);
}
- return false;
+
+ if (args is PhotoEventArgs && (args as PhotoEventArgs).Changes.TimeChanged)
+ query.RequestReload ();
}
-
- public void MarkChanged ()
+
+ private void HandleTagsChanged (object sender, DbItemEventArgs<Tag> args)
{
- if (Changed != null)
- Changed (this);
+ icon_view.QueueDraw ();
+ UpdateTagEntryFromSelection ();
}
-
- public void MarkChanged (int index, IBrowsableItemChanges changes)
+
+ void HandleViewNotebookSwitchPage (object sender, SwitchPageArgs args)
{
- throw new System.NotImplementedException ("I didn't think you'd find me");
+ switch (view_notebook.CurrentPage) {
+ case 0:
+ SetViewMode (ModeType.IconView);
+ break;
+ case 1:
+ SetViewMode (ModeType.PhotoView);
+ break;
+ }
}
-
- public IBrowsableItem this [int index] {
- get {
- switch (win.view_mode) {
+
+ private int [] SelectedIds () {
+ int [] ids = new int [0];
+
+ if (fsview != null && fsview.View.Item.IsValid)
+ ids = new int [] { fsview.View.Item.Index };
+ else {
+ switch (ViewMode) {
+ case ModeType.IconView:
+ ids = icon_view.Selection.Ids;
+ break;
+ default:
case ModeType.PhotoView:
- if (index == 0)
- return win.photo_view.Item.Current;
+ if (photo_view.Item.IsValid)
+ ids = new int [] { photo_view.Item.Index };
break;
- case ModeType.IconView:
- return win.icon_view.Selection [index];
}
- throw new ArgumentOutOfRangeException ();
}
+
+ return ids;
}
-
- public IBrowsableItem [] Items {
- get {
- switch (win.view_mode) {
+
+ public class MainSelection : IBrowsableCollection {
+ MainWindow win;
+
+ public MainSelection (MainWindow win)
+ {
+ this.win = win;
+ win.icon_view.Selection.Changed += HandleSelectionChanged;
+ win.icon_view.Selection.ItemsChanged += HandleSelectionItemsChanged;
+ win.photo_view.PhotoChanged += HandlePhotoChanged;
+ win.query.ItemsChanged += HandleQueryItemsChanged;
+ }
+
+ public int Count {
+ get {
+ switch (win.ViewMode) {
+ case ModeType.PhotoView:
+ return win.photo_view.Item.IsValid ? 1 : 0;
+ case ModeType.IconView:
+ return win.icon_view.Selection.Count;
+ }
+ return 0;
+ }
+ }
+
+ public int IndexOf (IBrowsableItem item)
+ {
+ switch (win.ViewMode) {
case ModeType.PhotoView:
- if (win.photo_view.Item.IsValid)
- return new IBrowsableItem [] {win.photo_view.Item.Current};
-
- break;
+ return item == win.photo_view.Item.Current ? 0 : -1;
case ModeType.IconView:
- return win.icon_view.Selection.Items;
+ return win.icon_view.Selection.IndexOf (item);
}
- return new IBrowsableItem [0];
+ return -1;
}
- }
-
- private void HandleQueryItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
- {
- // FIXME for now we only listen to changes directly from the query
- // when we are in PhotoView mode because we presume that we'll get
- // proper notification from the icon view selection in icon view mode
- if (win.view_mode != ModeType.PhotoView || ItemsChanged == null)
- return;
-
- foreach (int item in args.Items) {
- if (win.photo_view.Item.Index == item ) {
- ItemsChanged (this, new BrowsableEventArgs (item, args.Changes));
- break;
+
+ public bool Contains (IBrowsableItem item)
+ {
+ switch (win.ViewMode) {
+ case ModeType.PhotoView:
+ return item == win.photo_view.Item.Current ? true : false;
+ case ModeType.IconView:
+ return win.icon_view.Selection.Contains (item);
+ }
+ return false;
+ }
+
+ public void MarkChanged ()
+ {
+ if (Changed != null)
+ Changed (this);
+ }
+
+ public void MarkChanged (int index, IBrowsableItemChanges changes)
+ {
+ throw new System.NotImplementedException ("I didn't think you'd find me");
+ }
+
+ public IBrowsableItem this [int index] {
+ get {
+ switch (win.ViewMode) {
+ case ModeType.PhotoView:
+ if (index == 0)
+ return win.photo_view.Item.Current;
+ break;
+ case ModeType.IconView:
+ return win.icon_view.Selection [index];
+ }
+ throw new ArgumentOutOfRangeException ();
+ }
+ }
+
+ public IBrowsableItem [] Items {
+ get {
+ switch (win.ViewMode) {
+ case ModeType.PhotoView:
+ if (win.photo_view.Item.IsValid)
+ return new IBrowsableItem [] {win.photo_view.Item.Current};
+
+ break;
+ case ModeType.IconView:
+ return win.icon_view.Selection.Items;
+ }
+ return new IBrowsableItem [0];
+ }
+ }
+
+ private void HandleQueryItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
+ {
+ // FIXME for now we only listen to changes directly from the query
+ // when we are in PhotoView mode because we presume that we'll get
+ // proper notification from the icon view selection in icon view mode
+ if (win.ViewMode != ModeType.PhotoView || ItemsChanged == null)
+ return;
+
+ foreach (int item in args.Items) {
+ if (win.photo_view.Item.Index == item ) {
+ ItemsChanged (this, new BrowsableEventArgs (item, args.Changes));
+ break;
+ }
}
}
+
+ private void HandlePhotoChanged (PhotoView sender)
+ {
+ if (win.ViewMode == ModeType.PhotoView && Changed != null)
+ Changed (this);
+ }
+
+ public void HandleSelectionChanged (IBrowsableCollection collection)
+ {
+ if (win.ViewMode == ModeType.IconView && Changed != null)
+ Changed (this);
+
+
+ }
+
+ private void HandleSelectionItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
+ {
+ if (win.ViewMode == ModeType.IconView && ItemsChanged != null)
+ ItemsChanged (this, args);
+ }
+
+ public event IBrowsableCollectionChangedHandler Changed;
+ public event IBrowsableCollectionItemsChangedHandler ItemsChanged;
}
-
- private void HandlePhotoChanged (PhotoView sender)
+
+ private void HandleSelectionChanged (IBrowsableCollection collection)
{
- if (win.view_mode == ModeType.PhotoView && Changed != null)
- Changed (this);
+ UpdateMenus ();
+ UpdateTagEntryFromSelection ();
+ UpdateStatusLabel ();
+ UpdateToolbar ();
+
+ InfoBox.Photos = SelectedPhotos ();
}
-
- public void HandleSelectionChanged (IBrowsableCollection collection)
+
+ private void HandleSelectionItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
{
- if (win.view_mode == ModeType.IconView && Changed != null)
- Changed (this);
-
-
+ UpdateMenus ();
+ UpdateTagEntryFromSelection ();
+ photo_view.UpdateTagView ();
+ InfoBox.Photos = SelectedPhotos ();
}
-
- private void HandleSelectionItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
+
+
+ //
+ // Selection Interface
+ //
+
+ private Photo [] SelectedPhotos (int [] selected_ids)
{
- if (win.view_mode == ModeType.IconView && ItemsChanged != null)
- ItemsChanged (this, args);
+ Photo [] photo_list = new Photo [selected_ids.Length];
+
+ int i = 0;
+ foreach (int num in selected_ids)
+ photo_list [i ++] = query [num] as Photo;
+
+ return photo_list;
}
-
- public event IBrowsableCollectionChangedHandler Changed;
- public event IBrowsableCollectionItemsChangedHandler ItemsChanged;
- }
-
- private void HandleSelectionChanged (IBrowsableCollection collection)
- {
- UpdateMenus ();
- UpdateTagEntryFromSelection ();
- UpdateStatusLabel ();
- UpdateToolbar ();
-
- info_box.Photos = SelectedPhotos ();
- }
-
- private void HandleSelectionItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
- {
- UpdateMenus ();
- UpdateTagEntryFromSelection ();
- photo_view.UpdateTagView ();
- info_box.Photos = SelectedPhotos ();
- }
-
-
- //
- // Selection Interface
- //
-
- private Photo [] SelectedPhotos (int [] selected_ids)
- {
- Photo [] photo_list = new Photo [selected_ids.Length];
- int i = 0;
- foreach (int num in selected_ids)
- photo_list [i ++] = query [num] as Photo;
+ public Photo [] SelectedPhotos ()
+ {
+ return SelectedPhotos (SelectedIds ());
+ }
+
+ public PhotoQuery Query {
+ get { return query; }
+ }
+
+ //
+ // Change Notification functions
+ //
+
+ private void InvalidateViews ()
+ {
+ icon_view.QueueDraw ();
+ photo_view.Reload ();
+ if (fsview != null)
+ fsview.View.Reload ();
+ }
+
+ //
+ // Commands
+ //
+
+ private void RotateSelectedPictures (Gtk.Window parent, RotateDirection direction)
+ {
+ RotateCommand command = new RotateCommand (parent);
+
+ int [] selected_ids = SelectedIds ();
+ if (command.Execute (direction, SelectedPhotos (selected_ids)))
+ query.MarkChanged (selected_ids, new PhotoChanges () {DataChanged = true});
+ }
+
+ //
+ // Tag Selection Drag Handlers
+ //
- return photo_list;
- }
-
- public Photo [] SelectedPhotos ()
- {
- return SelectedPhotos (SelectedIds ());
- }
-
- public PhotoQuery Query {
- get { return query; }
- }
-
- //
- // Change Notification functions
- //
-
- private void InvalidateViews ()
- {
- icon_view.QueueDraw ();
- photo_view.Reload ();
- if (fsview != null)
- fsview.View.Reload ();
- }
+ public void AddTagExtended (int [] nums, Tag [] tags)
+ {
+ foreach (int num in nums)
+ (query[num] as Photo).AddTag (tags);
+ query.Commit (nums);
+
+ foreach (Tag t in tags) {
+ if (t.Icon != null || t.IconWasCleared)
+ continue;
+ // FIXME this needs a lot more work.
+ Pixbuf icon = null;
+ try {
+ Pixbuf tmp = FSpot.PhotoLoader.LoadAtMaxSize (query [nums[0]], 128, 128);
+ icon = PixbufUtils.TagIconFromPixbuf (tmp);
+ tmp.Dispose ();
+ } catch {
+ icon = null;
+ }
+
+ t.Icon = icon;
+ Database.Tags.Commit (t);
+ }
+ }
- //
- // Commands
- //
-
- private void RotateSelectedPictures (Gtk.Window parent, RotateDirection direction)
- {
- RotateCommand command = new RotateCommand (parent);
+ public void SetFolderQuery (IEnumerable<Uri> uri_list)
+ {
+ ShowQueryWidget ();
+ query_widget.SetFolders (uri_list);
+ }
- int [] selected_ids = SelectedIds ();
- if (command.Execute (direction, SelectedPhotos (selected_ids)))
- query.MarkChanged (selected_ids, new PhotoChanges () {DataChanged = true});
- }
-
- //
- // Tag Selection Drag Handlers
- //
+ public void RemoveTags (int [] nums, Tag [] tags)
+ {
+ foreach (int num in nums)
+ (query[num] as Photo).RemoveTag (tags);
+ query.Commit (nums);
+ }
- public void AddTagExtended (int [] nums, Tag [] tags)
- {
- foreach (int num in nums)
- (query[num] as Photo).AddTag (tags);
- query.Commit (nums);
-
- foreach (Tag t in tags) {
- if (t.Icon != null || t.IconWasCleared)
- continue;
- // FIXME this needs a lot more work.
- Pixbuf icon = null;
- try {
- Pixbuf tmp = FSpot.PhotoLoader.LoadAtMaxSize (query [nums[0]], 128, 128);
- icon = PixbufUtils.TagIconFromPixbuf (tmp);
- tmp.Dispose ();
- } catch {
- icon = null;
+ void HandleTagSelectionButtonPressEvent (object sender, ButtonPressEventArgs args)
+ {
+ if (args.Event.Button == 3) {
+ TagPopup popup = new TagPopup ();
+ popup.Activate (args.Event, tag_selection_widget.TagAtPosition (args.Event.X, args.Event.Y),
+ tag_selection_widget.TagHighlight);
+ args.RetVal = true;
}
-
- t.Icon = icon;
- db.Tags.Commit (t);
}
- }
-
- public void SetFolderQuery (IEnumerable<Uri> uri_list)
- {
- ShowQueryWidget ();
- query_widget.SetFolders (uri_list);
- }
- public void AddTagsQuery (Tag [] tags)
- {
- ShowQueryWidget ();
- query_widget.Include (tags);
- }
-
- public void RemoveTags (int [] nums, Tag [] tags)
- {
- foreach (int num in nums)
- (query[num] as Photo).RemoveTag (tags);
- query.Commit (nums);
- }
-
- void HandleTagSelectionButtonPressEvent (object sender, ButtonPressEventArgs args)
- {
- if (args.Event.Button == 3) {
+ void HandleTagSelectionPopupMenu (object sender, PopupMenuArgs args)
+ {
TagPopup popup = new TagPopup ();
- popup.Activate (args.Event, tag_selection_widget.TagAtPosition (args.Event.X, args.Event.Y),
- tag_selection_widget.TagHighlight);
+ popup.Activate (null, null, tag_selection_widget.TagHighlight);
args.RetVal = true;
}
- }
-
- void HandleTagSelectionPopupMenu (object sender, PopupMenuArgs args)
- {
- TagPopup popup = new TagPopup ();
- popup.Activate (null, null, tag_selection_widget.TagHighlight);
- args.RetVal = true;
- }
-
-#if SHOW_CALENDAR
- void HandleCalendarDaySelected (object sender, System.EventArgs args)
- {
- FSpot.SimpleCalendar cal = sender as FSpot.SimpleCalendar;
- JumpTo (cal.Date);
- }
-
- void JumpTo (System.DateTime time)
- {
- JumpTo (query.LookupItem (time));*/
- }
-#endif
-
- void JumpTo (int index)
- {
- switch (view_mode) {
- case ModeType.PhotoView:
- photo_view.Item.Index = index;
- break;
- case ModeType.IconView:
- icon_view.ScrollTo (index);
- icon_view.Throb (index);
- break;
+
+ void HandleTagSelectionRowActivated (object sender, RowActivatedArgs args)
+ {
+ ShowQueryWidget ();
+ query_widget.Include (new Tag [] {tag_selection_widget.TagByPath (args.Path)});
}
- }
-
- void HandleAdaptorGlassSet (FSpot.GroupAdaptor sender, int index)
- {
- JumpTo (index);
- }
-
- void HandleAdaptorChanged (FSpot.GroupAdaptor sender)
- {
- UpdateGlass ();
- }
-
- /*
- * Keep the glass temporal slider in sync with the user's scrolling in the icon_view
- */
- private void UpdateGlass ()
- {
- // If people cant see the timeline don't update it.
- if (! display_timeline.Active)
- return;
-
- int cell_num = icon_view.TopLeftVisibleCell();
- if (cell_num == -1 /*|| cell_num == lastTopLeftCell*/)
- return;
-
- FSpot.IBrowsableItem photo = icon_view.Collection [cell_num];
-#if false
- group_selector.Adaptor.GlassSet -= HandleAdaptorGlassSet;
- group_selector.Adaptor.SetGlass (group_selector.Adaptor.IndexFromPhoto (photo));
- group_selector.Adaptor.GlassSet = HandleAdaptorGlassSet;
-#else
- /*
- * FIXME this is a lame hack to get around a delegate chain. This should
- * actually operate directly on the adaptor not on the selector but I don't have
- * time to fix it right now.
+
+
+ #if SHOW_CALENDAR
+ void HandleCalendarDaySelected (object sender, System.EventArgs args)
+ {
+ FSpot.SimpleCalendar cal = sender as FSpot.SimpleCalendar;
+ JumpTo (cal.Date);
+ }
+
+ void JumpTo (System.DateTime time)
+ {
+ JumpTo (query.LookupItem (time));*/
+ }
+ #endif
+
+ void JumpTo (int index)
+ {
+ switch (ViewMode) {
+ case ModeType.PhotoView:
+ photo_view.Item.Index = index;
+ break;
+ case ModeType.IconView:
+ icon_view.ScrollTo (index);
+ icon_view.Throb (index);
+ break;
+ }
+ }
+
+ void HandleAdaptorGlassSet (FSpot.GroupAdaptor sender, int index)
+ {
+ JumpTo (index);
+ }
+
+ void HandleAdaptorChanged (FSpot.GroupAdaptor sender)
+ {
+ UpdateGlass ();
+ }
+
+ /*
+ * Keep the glass temporal slider in sync with the user's scrolling in the icon_view
*/
- group_selector.SetPosition (group_selector.Adaptor.IndexFromPhoto (photo));
-#endif
- }
+ private void UpdateGlass ()
+ {
+ // If people cant see the timeline don't update it.
+ if (! display_timeline.Active)
+ return;
- void HandleIconViewScroll (object sender, EventArgs args)
- {
- UpdateGlass ();
- }
-
- void HandleIconViewReady (object sender, EventArgs args)
- {
- LoadPreference (Preferences.GLASS_POSITION);
-
- // We only want to set the position the first time
- // the icon_view is ready (eg on startup)
- icon_view.SizeAllocated -= HandleIconViewReady;
- }
-
- //
- // IconView Drag Handlers
- //
-
- void HandleIconViewDragBegin (object sender, DragBeginArgs args)
- {
- Photo [] photos = SelectedPhotos ();
+ int cell_num = icon_view.TopLeftVisibleCell();
+ if (cell_num == -1 /*|| cell_num == lastTopLeftCell*/)
+ return;
+
+ FSpot.IBrowsableItem photo = icon_view.Collection [cell_num];
+ #if false
+ group_selector.Adaptor.GlassSet -= HandleAdaptorGlassSet;
+ group_selector.Adaptor.SetGlass (group_selector.Adaptor.IndexFromPhoto (photo));
+ group_selector.Adaptor.GlassSet = HandleAdaptorGlassSet;
+ #else
+ /*
+ * FIXME this is a lame hack to get around a delegate chain. This should
+ * actually operate directly on the adaptor not on the selector but I don't have
+ * time to fix it right now.
+ */
+ group_selector.SetPosition (group_selector.Adaptor.IndexFromPhoto (photo));
+ #endif
+ }
- if (photos.Length > 0) {
- int len = Math.Min (photos.Length, 4);
- int size = 48;
- int border = 2;
- int csize = size/2 + len * size / 2 + 2 * border ;
-
- Pixbuf container = new Pixbuf (Gdk.Colorspace.Rgb, true, 8, csize, csize);
- container.Fill (0x00000000);
-
- bool use_icon = false;;
- while (len-- > 0) {
- FSpot.PixbufCache.CacheEntry entry = icon_view.Cache.Lookup (photos [len].DefaultVersionUri);
-
- Pixbuf thumbnail = null;
- if (entry != null) {
- Cms.Profile screen_profile;
- if (FSpot.ColorManagement.Profiles.TryGetValue (Preferences.Get<string> (Preferences.COLOR_MANAGEMENT_DISPLAY_PROFILE), out screen_profile)) {
- thumbnail = entry.Pixbuf.Copy ();
- FSpot.ColorManagement.ApplyProfile (thumbnail, screen_profile);
- } else
- thumbnail = entry.ShallowCopyPixbuf ();
- }
+ void HandleIconViewScroll (object sender, EventArgs args)
+ {
+ UpdateGlass ();
+ }
+
+ void HandleIconViewReady (object sender, EventArgs args)
+ {
+ LoadPreference (Preferences.GLASS_POSITION);
+
+ // We only want to set the position the first time
+ // the icon_view is ready (eg on startup)
+ icon_view.SizeAllocated -= HandleIconViewReady;
+ }
+
+ //
+ // IconView Drag Handlers
+ //
+
+ void HandleIconViewDragBegin (object sender, DragBeginArgs args)
+ {
+ Photo [] photos = SelectedPhotos ();
+
+ if (photos.Length > 0) {
+ int len = Math.Min (photos.Length, 4);
+ int size = 48;
+ int border = 2;
+ int csize = size/2 + len * size / 2 + 2 * border ;
- if (thumbnail != null) {
- Pixbuf small = PixbufUtils.ScaleToMaxSize (thumbnail, size, size);
-
- int x = border + len * (size/2) + (size - small.Width)/2;
- int y = border + len * (size/2) + (size - small.Height)/2;
- Pixbuf box = new Pixbuf (container, x - border, y - border,
- small.Width + 2 * border, small.Height + 2 * border);
-
- box.Fill (0x000000ff);
- small.CopyArea (0, 0, small.Width, small.Height, container, x, y);
+ Pixbuf container = new Pixbuf (Gdk.Colorspace.Rgb, true, 8, csize, csize);
+ container.Fill (0x00000000);
+
+ bool use_icon = false;;
+ while (len-- > 0) {
+ FSpot.PixbufCache.CacheEntry entry = icon_view.Cache.Lookup (photos [len].DefaultVersionUri);
+
+ Pixbuf thumbnail = null;
+ if (entry != null) {
+ Cms.Profile screen_profile;
+ if (FSpot.ColorManagement.Profiles.TryGetValue (Preferences.Get<string> (Preferences.COLOR_MANAGEMENT_DISPLAY_PROFILE), out screen_profile)) {
+ thumbnail = entry.Pixbuf.Copy ();
+ FSpot.ColorManagement.ApplyProfile (thumbnail, screen_profile);
+ } else
+ thumbnail = entry.ShallowCopyPixbuf ();
+ }
- thumbnail.Dispose ();
- small.Dispose ();
- use_icon = true;
+ if (thumbnail != null) {
+ Pixbuf small = PixbufUtils.ScaleToMaxSize (thumbnail, size, size);
+
+ int x = border + len * (size/2) + (size - small.Width)/2;
+ int y = border + len * (size/2) + (size - small.Height)/2;
+ Pixbuf box = new Pixbuf (container, x - border, y - border,
+ small.Width + 2 * border, small.Height + 2 * border);
+
+ box.Fill (0x000000ff);
+ small.CopyArea (0, 0, small.Width, small.Height, container, x, y);
+
+ thumbnail.Dispose ();
+ small.Dispose ();
+ use_icon = true;
+ }
}
+ if (use_icon)
+ Gtk.Drag.SetIconPixbuf (args.Context, container, 0, 0);
+ container.Dispose ();
}
- if (use_icon)
- Gtk.Drag.SetIconPixbuf (args.Context, container, 0, 0);
- container.Dispose ();
}
- }
-
- void HandleIconViewDragDataGet (object sender, DragDataGetArgs args)
- {
- if (args.Info == DragDropTargets.UriListEntry.Info) {
- args.SelectionData.SetUriListData (new UriList (SelectedPhotos ()), args.Context.Targets[0]);
- return;
+
+ void HandleIconViewDragDataGet (object sender, DragDataGetArgs args)
+ {
+ if (args.Info == DragDropTargets.UriListEntry.Info) {
+ args.SelectionData.SetUriListData (new UriList (SelectedPhotos ()), args.Context.Targets[0]);
+ return;
+ }
+
+ if (args.Info == DragDropTargets.PhotoListEntry.Info) {
+ args.SelectionData.SetPhotosData (SelectedPhotos (), args.Context.Targets[0]);
+ return;
+ }
+
+ if (args.Info == DragDropTargets.RootWindowEntry.Info) {
+ HandleSetAsBackgroundCommand (null, null);
+ return;
+ }
}
-
- if (args.Info == DragDropTargets.PhotoListEntry.Info) {
- args.SelectionData.SetPhotosData (SelectedPhotos (), args.Context.Targets[0]);
- return;
+
+ void HandleIconViewDragDrop (object sender, DragDropArgs args)
+ {
+ args.RetVal = true;
}
-
- if (args.Info == DragDropTargets.RootWindowEntry.Info) {
- HandleSetAsBackgroundCommand (null, null);
- return;
+
+ void HandleIconViewDragMotion (object sender, DragMotionArgs args)
+ {
+ Gdk.Drag.Status (args.Context, args.Context.SuggestedAction, args.Time);
+ args.RetVal = true;
}
- }
-
- void HandleIconViewDragDrop (object sender, DragDropArgs args)
- {
- args.RetVal = true;
- }
-
- void HandleIconViewDragMotion (object sender, DragMotionArgs args)
- {
- Gdk.Drag.Status (args.Context, args.Context.SuggestedAction, args.Time);
- args.RetVal = true;
- }
-
- public void ImportUriList (UriList list, bool copy)
- {
- ImportCommand command = new ImportCommand (main_window);
- if (command.ImportFromPaths (db.Photos, list.ToLocalPaths (), copy) > 0) {
- query.RollSet = new RollSet (db.Rolls.GetRolls (1)[0]);
- UpdateQuery ();
+
+ public void ImportUriList (UriList list, bool copy)
+ {
+ ImportCommand command = new ImportCommand (main_window);
+ if (command.ImportFromPaths (Database.Photos, list.ToLocalPaths (), copy) > 0) {
+ query.RollSet = new RollSet (Database.Rolls.GetRolls (1)[0]);
+ UpdateQuery ();
+ }
}
- }
-
- public void ImportFile (string path)
- {
- ImportCommand command = new ImportCommand (main_window);
- if (command.ImportFromFile (db.Photos, path) > 0) {
- query.RollSet = new RollSet (db.Rolls.GetRolls (1)[0]);
- UpdateQuery ();
+
+ public void ImportFile (string path)
+ {
+ ImportCommand command = new ImportCommand (main_window);
+ if (command.ImportFromFile (Database.Photos, path) > 0) {
+ query.RollSet = new RollSet (Database.Rolls.GetRolls (1)[0]);
+ UpdateQuery ();
+ }
}
- }
-
-#if false
- public void ImportUdi (string udi)
- {
- /* probably a camera we need to contruct on of our gphoto2 uris */
- Hal.Device dev = new Hal.Device (Core.HalContext, udi);
- string mount_point = dev.GetPropertyString ("volume.mount_point");
- int bus = dev.GetPropertyInt ("usb.bus_number");
- int device = dev.GetPropertyInt ("usb.linux.device_number");
- System.Console.WriteLine ("dev = {1} exists = {2} mount_point = {0} {3},{4}", mount_point, dev, dev.Exists, bus, device);
-
- if (! dev.Exists || mount_point != null) {
- ImportFile (mount_point);
- } else {
- string gphoto_uri = String.Format ("gphoto2:usb:{0},{1}", bus.ToString ("d3") , device.ToString ("d3"));
- System.Console.WriteLine ("gphoto_uri = {0}", gphoto_uri);
- ImportCamera (gphoto_uri);
- }
+
+ #if false
+ public void ImportUdi (string udi)
+ {
+ /* probably a camera we need to contruct on of our gphoto2 uris */
+ Hal.Device dev = new Hal.Device (Core.HalContext, udi);
+ string mount_point = dev.GetPropertyString ("volume.mount_point");
+ int bus = dev.GetPropertyInt ("usb.bus_number");
+ int device = dev.GetPropertyInt ("usb.linux.device_number");
+ System.Console.WriteLine ("dev = {1} exists = {2} mount_point = {0} {3},{4}", mount_point, dev, dev.Exists, bus, device);
+
+ if (! dev.Exists || mount_point != null) {
+ ImportFile (mount_point);
+ } else {
+ string gphoto_uri = String.Format ("gphoto2:usb:{0},{1}", bus.ToString ("d3") , device.ToString ("d3"));
+ System.Console.WriteLine ("gphoto_uri = {0}", gphoto_uri);
+ ImportCamera (gphoto_uri);
+ }
+
+ }
+ #endif
+
+ void HandleIconViewDragDataReceived (object sender, DragDataReceivedArgs args)
+ {
+ Widget source = Gtk.Drag.GetSourceWidget (args.Context);
- }
-#endif
-
- void HandleIconViewDragDataReceived (object sender, DragDataReceivedArgs args)
- {
- Widget source = Gtk.Drag.GetSourceWidget (args.Context);
-
- if (args.Info == DragDropTargets.TagListEntry.Info) {
- //
- // Translate the event args from viewport space to window space,
- // drag events use the viewport. Owen sends his regrets.
- //
- int item = icon_view.CellAtPosition (args.X + (int) icon_view.Hadjustment.Value,
- args.Y + (int) icon_view.Vadjustment.Value);
-
- //Console.WriteLine ("Drop cell = {0} ({1},{2})", item, args.X, args.Y);
- if (item >= 0) {
- if (icon_view.Selection.Contains (item))
- AttachTags (tag_selection_widget.TagHighlight, SelectedIds());
- else
- AttachTags (tag_selection_widget.TagHighlight, new int [] {item});
+ if (args.Info == DragDropTargets.TagListEntry.Info) {
+ //
+ // Translate the event args from viewport space to window space,
+ // drag events use the viewport. Owen sends his regrets.
+ //
+ int item = icon_view.CellAtPosition (args.X + (int) icon_view.Hadjustment.Value,
+ args.Y + (int) icon_view.Vadjustment.Value);
+
+ //Console.WriteLine ("Drop cell = {0} ({1},{2})", item, args.X, args.Y);
+ if (item >= 0) {
+ if (icon_view.Selection.Contains (item))
+ AttachTags (tag_selection_widget.TagHighlight, SelectedIds());
+ else
+ AttachTags (tag_selection_widget.TagHighlight, new int [] {item});
+ }
+
+ Gtk.Drag.Finish (args.Context, true, false, args.Time);
+ return;
}
- Gtk.Drag.Finish (args.Context, true, false, args.Time);
- return;
+ if (args.Info == DragDropTargets.UriListEntry.Info) {
+
+ /*
+ * If the drop is coming from inside f-spot then we don't want to import
+ */
+ if (source != null)
+ return;
+
+ UriList list = args.SelectionData.GetUriListData ();
+ ImportUriList (list, (args.Context.Action & Gdk.DragAction.Copy) != 0);
+
+ Gtk.Drag.Finish (args.Context, true, false, args.Time);
+ return;
+ }
+
+ #if ENABLE_REPARENTING
+ if (args.Info == DragDropTargets.PhotoListEntry.Info) {
+ int p_item = icon_view.CellAtPosition (args.X + (int) icon_view.Hadjustment.Value,
+ args.Y + (int) icon_view.Vadjustment.Value);
+
+ if (p_item >= 0) {
+ if (icon_view.Selection.Contains (p_item)) //We don't want to reparent ourselves!
+ return;
+ PhotoVersionCommands.Reparent cmd = new PhotoVersionCommands.Reparent ();
+
+ cmd.Execute (Database.Photos, SelectedPhotos(), query.Photos [p_item], GetToplevel (null));
+ UpdateQuery ();
+ }
+ Gtk.Drag.Finish (args.Context, true, false, args.Time);
+ return;
+ }
+ #endif
}
-
- if (args.Info == DragDropTargets.UriListEntry.Info) {
-
- /*
- * If the drop is coming from inside f-spot then we don't want to import
- */
- if (source != null)
+
+ //
+ // IconView event handlers
+ //
+
+ void HandleDoubleClicked (object sender, BrowsableEventArgs args)
+ {
+ Widget widget = sender as Widget;
+ if (widget == null)
return;
-
- UriList list = args.SelectionData.GetUriListData ();
- ImportUriList (list, (args.Context.Action & Gdk.DragAction.Copy) != 0);
+
+ switch (ViewMode) {
+ case ModeType.IconView:
+ icon_view.FocusCell = args.Items[0];
+ SetViewMode (ModeType.PhotoView);
+ break;
+ case ModeType.PhotoView:
+ SetViewMode (ModeType.IconView);
+ break;
+ }
+ }
+
+ public void HandleCommonPhotoCommands (object sender, Gtk.KeyPressEventArgs args) {
+ bool alt = ModifierType.Mod1Mask == (args.Event.State & ModifierType.Mod1Mask);
+ bool shift = ModifierType.ShiftMask == (args.Event.State & ModifierType.ShiftMask);
+
+ if (args.RetVal == null)
+ args.RetVal = false;
- Gtk.Drag.Finish (args.Context, true, false, args.Time);
- return;
+ switch (args.Event.Key) {
+ case Gdk.Key.Delete:
+ if (shift)
+ HandleDeleteCommand (sender, args);
+ else
+ HandleRemoveCommand (sender, args);
+ break;
+ case Gdk.Key.Key_0:
+ case Gdk.Key.KP_0:
+ if (alt)
+ HandleRatingMenuSelected (0);
+ break;
+ case Gdk.Key.Key_1:
+ case Gdk.Key.KP_1:
+ if (alt)
+ HandleRatingMenuSelected (1);
+ break;
+ case Gdk.Key.Key_2:
+ case Gdk.Key.KP_2:
+ if (alt)
+ HandleRatingMenuSelected (2);
+ break;
+ case Gdk.Key.Key_3:
+ case Gdk.Key.KP_3:
+ if (alt)
+ HandleRatingMenuSelected (3);
+ break;
+ case Gdk.Key.Key_4:
+ case Gdk.Key.KP_4:
+ if (alt)
+ HandleRatingMenuSelected (4);
+ break;
+ case Gdk.Key.Key_5:
+ case Gdk.Key.KP_5:
+ if (alt)
+ HandleRatingMenuSelected (5);
+ break;
+ default:
+ return; //do not set the RetVal to true
+ }
+ args.RetVal = true;
}
-
-#if ENABLE_REPARENTING
- if (args.Info == DragDropTargets.PhotoListEntry.Info) {
- int p_item = icon_view.CellAtPosition (args.X + (int) icon_view.Hadjustment.Value,
- args.Y + (int) icon_view.Vadjustment.Value);
-
- if (p_item >= 0) {
- if (icon_view.Selection.Contains (p_item)) //We don't want to reparent ourselves!
- return;
- PhotoVersionCommands.Reparent cmd = new PhotoVersionCommands.Reparent ();
-
- cmd.Execute (db.Photos, SelectedPhotos(), query.Photos [p_item], GetToplevel (null));
- UpdateQuery ();
+
+ void HandleIconViewKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
+ {
+ HandleCommonPhotoCommands (sender, args);
+ if ((bool)args.RetVal)
+ return;
+
+ switch (args.Event.Key) {
+ case Gdk.Key.F:
+ case Gdk.Key.f:
+ HandleViewFullscreen (sender, args);
+ args.RetVal = true;
+ break;
}
- Gtk.Drag.Finish (args.Context, true, false, args.Time);
- return;
}
-#endif
- }
-
- //
- // IconView event handlers
- //
-
- void HandleDoubleClicked (object sender, BrowsableEventArgs args)
- {
- Widget widget = sender as Widget;
- if (widget == null)
- return;
-
- switch (ViewMode) {
- case ModeType.IconView:
- icon_view.FocusCell = args.Items[0];
- SetViewMode (ModeType.PhotoView);
- break;
- case ModeType.PhotoView:
- SetViewMode (ModeType.IconView);
- break;
+
+ //
+ // FullScreenView event handlers.
+ //
+
+ void HandleFullScreenViewKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
+ {
+ HandleCommonPhotoCommands (sender, args);
+ if ((bool)args.RetVal)
+ // this will hide any panels again that might have appeared above the fullscreen view
+ fsview.Present ();
}
- }
-
- public void HandleCommonPhotoCommands (object sender, Gtk.KeyPressEventArgs args) {
- bool alt = ModifierType.Mod1Mask == (args.Event.State & ModifierType.Mod1Mask);
- bool shift = ModifierType.ShiftMask == (args.Event.State & ModifierType.ShiftMask);
-
- if (args.RetVal == null)
- args.RetVal = false;
-
- switch (args.Event.Key) {
- case Gdk.Key.Delete:
- if (shift)
- HandleDeleteCommand (sender, args);
- else
- HandleRemoveCommand (sender, args);
- break;
- case Gdk.Key.Key_0:
- case Gdk.Key.KP_0:
- if (alt)
- HandleRatingMenuSelected (0);
- break;
- case Gdk.Key.Key_1:
- case Gdk.Key.KP_1:
- if (alt)
- HandleRatingMenuSelected (1);
- break;
- case Gdk.Key.Key_2:
- case Gdk.Key.KP_2:
- if (alt)
- HandleRatingMenuSelected (2);
- break;
- case Gdk.Key.Key_3:
- case Gdk.Key.KP_3:
- if (alt)
- HandleRatingMenuSelected (3);
- break;
- case Gdk.Key.Key_4:
- case Gdk.Key.KP_4:
- if (alt)
- HandleRatingMenuSelected (4);
- break;
- case Gdk.Key.Key_5:
- case Gdk.Key.KP_5:
- if (alt)
- HandleRatingMenuSelected (5);
- break;
- default:
- return; //do not set the RetVal to true
- }
- args.RetVal = true;
- }
-
- void HandleIconViewKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
- {
- HandleCommonPhotoCommands (sender, args);
- if ((bool)args.RetVal)
- return;
-
- switch (args.Event.Key) {
- case Gdk.Key.F:
- case Gdk.Key.f:
- HandleViewFullscreen (sender, args);
- args.RetVal = true;
- break;
+
+ //
+ // PhotoView event handlers.
+ //
+
+ void HandlePhotoViewKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
+ {
+ HandleCommonPhotoCommands (sender, args);
+ if ((bool)args.RetVal)
+ return;
+
+ switch (args.Event.Key) {
+ case Gdk.Key.F:
+ case Gdk.Key.f:
+ HandleViewFullscreen (sender, args);
+ args.RetVal = true;
+ break;
+ case Gdk.Key.Escape:
+ SetViewMode (ModeType.IconView);
+ args.RetVal = true;
+ break;
+ }
}
- }
-
- //
- // FullScreenView event handlers.
- //
-
- void HandleFullScreenViewKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
- {
- HandleCommonPhotoCommands (sender, args);
- if ((bool)args.RetVal)
- // this will hide any panels again that might have appeared above the fullscreen view
- fsview.Present ();
- }
-
- //
- // PhotoView event handlers.
- //
-
- void HandlePhotoViewKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
- {
- HandleCommonPhotoCommands (sender, args);
- if ((bool)args.RetVal)
- return;
-
- switch (args.Event.Key) {
- case Gdk.Key.F:
- case Gdk.Key.f:
- HandleViewFullscreen (sender, args);
+
+ void HandlePhotoViewUpdateStarted (PhotoView sender)
+ {
+ main_window.GdkWindow.Cursor = watch;
+ // FIXME: use gdk_display_flush() when available
+ main_window.GdkWindow.Display.Sync ();
+ }
+
+ void HandlePhotoViewUpdateFinished (PhotoView sender)
+ {
+ main_window.GdkWindow.Cursor = null;
+ // FIXME: use gdk_display_flush() when available
+ main_window.GdkWindow.Display.Sync ();
+ }
+
+ //
+ // PhotoView drag handlers.
+ //
+
+ void HandlePhotoViewDragDrop (object sender, DragDropArgs args)
+ {
+ //Widget source = Gtk.Drag.GetSourceWidget (args.Context);
+ //Console.WriteLine ("Drag Drop {0}", source == null ? "null" : source.TypeName);
+
args.RetVal = true;
- break;
- case Gdk.Key.Escape:
- SetViewMode (ModeType.IconView);
+ }
+
+ void HandlePhotoViewDragMotion (object sender, DragMotionArgs args)
+ {
+ //Widget source = Gtk.Drag.GetSourceWidget (args.Context);
+ //Console.WriteLine ("Drag Motion {0}", source == null ? "null" : source.TypeName);
+
+ Gdk.Drag.Status (args.Context, args.Context.SuggestedAction, args.Time);
args.RetVal = true;
- break;
}
- }
-
- void HandlePhotoViewUpdateStarted (PhotoView sender)
- {
- main_window.GdkWindow.Cursor = watch;
- // FIXME: use gdk_display_flush() when available
- main_window.GdkWindow.Display.Sync ();
- }
-
- void HandlePhotoViewUpdateFinished (PhotoView sender)
- {
- main_window.GdkWindow.Cursor = null;
- // FIXME: use gdk_display_flush() when available
- main_window.GdkWindow.Display.Sync ();
- }
-
- //
- // PhotoView drag handlers.
- //
-
- void HandlePhotoViewDragDrop (object sender, DragDropArgs args)
- {
- //Widget source = Gtk.Drag.GetSourceWidget (args.Context);
- //Console.WriteLine ("Drag Drop {0}", source == null ? "null" : source.TypeName);
-
- args.RetVal = true;
- }
-
- void HandlePhotoViewDragMotion (object sender, DragMotionArgs args)
- {
- //Widget source = Gtk.Drag.GetSourceWidget (args.Context);
- //Console.WriteLine ("Drag Motion {0}", source == null ? "null" : source.TypeName);
-
- Gdk.Drag.Status (args.Context, args.Context.SuggestedAction, args.Time);
- args.RetVal = true;
- }
-
- void HandlePhotoViewDragDataReceived (object sender, DragDataReceivedArgs args)
- {
- //Widget source = Gtk.Drag.GetSourceWidget (args.Context);
- //Console.WriteLine ("Drag received {0}", source == null ? "null" : source.TypeName);
-
- HandleAttachTagCommand (sender, null);
+
+ void HandlePhotoViewDragDataReceived (object sender, DragDataReceivedArgs args)
+ {
+ //Widget source = Gtk.Drag.GetSourceWidget (args.Context);
+ //Console.WriteLine ("Drag received {0}", source == null ? "null" : source.TypeName);
+
+ HandleAttachTagCommand (sender, null);
+
+ Gtk.Drag.Finish (args.Context, true, false, args.Time);
+
+ photo_view.View.GrabFocus();
+ }
+
+ //
+ // RatingMenu commands
+ //
- Gtk.Drag.Finish (args.Context, true, false, args.Time);
-
- photo_view.View.GrabFocus();
- }
-
- //
- // RatingMenu commands
- //
+ public void HandleRatingMenuSelected (int r)
+ {
+ if (ViewMode == ModeType.PhotoView)
+ this.photo_view.UpdateRating(r);
- public void HandleRatingMenuSelected (int r)
- {
- if (view_mode == ModeType.PhotoView)
- this.photo_view.UpdateRating(r);
-
- Photo p;
- db.BeginTransaction ();
- int [] selected_photos = SelectedIds ();
- foreach (int num in selected_photos) {
- p = query [num] as Photo;
- p.Rating = (uint) r;
- }
- query.Commit (selected_photos);
- db.CommitTransaction ();
- }
-
- //
- // TagMenu commands.
- //
-
- public void HandleTagMenuActivate (object sender, EventArgs args)
- {
-
- MenuItem parent = sender as MenuItem;
- if (parent == null) // We have a Gtk.Action for UI menus, so the "Edit > Remove tag" item needs special treatment
- parent = uimanager.GetWidget("/ui/menubar1/edit2/remove_tag") as MenuItem;
- if (parent != null && parent.Submenu is PhotoTagMenu) {
- PhotoTagMenu menu = (PhotoTagMenu) parent.Submenu;
- menu.Populate (SelectedPhotos ());
+ Photo p;
+ Database.BeginTransaction ();
+ int [] selected_photos = SelectedIds ();
+ foreach (int num in selected_photos) {
+ p = query [num] as Photo;
+ p.Rating = (uint) r;
+ }
+ query.Commit (selected_photos);
+ Database.CommitTransaction ();
}
- }
-
- public void HandleAttachTagMenuSelected (Tag t)
- {
- db.BeginTransaction ();
- AddTagExtended (SelectedIds (), new Tag [] {t});
- db.CommitTransaction ();
- query_widget.PhotoTagsChanged (new Tag[] {t});
- }
- public void HandleRequireTag (object sender, EventArgs args)
- {
- ShowQueryWidget ();
- query_widget.Require (tag_selection_widget.TagHighlight);
- }
-
- public void HandleUnRequireTag (object sender, EventArgs args)
- {
- query_widget.UnRequire (tag_selection_widget.TagHighlight);
- }
-
- public void HandleRemoveTagMenuSelected (Tag t)
- {
- db.BeginTransaction ();
- RemoveTags (SelectedIds (), new Tag [] {t});
- db.CommitTransaction ();
- query_widget.PhotoTagsChanged (new Tag [] {t});
- }
-
- //
- // Main menu commands
- //
-
- void HandleOpenCommand (object sender, EventArgs e)
- {
- new FSpot.SingleView ();
- }
-
- void HandleImportCommand (object sender, EventArgs e)
- {
- db.Sync = false;
- ImportCommand command = new ImportCommand (main_window);
- if (command.ImportFromFile (db.Photos, null) > 0) {
- query.RollSet = new RollSet (db.Rolls.GetRolls (1)[0]);
- UpdateQuery ();
+ //
+ // TagMenu commands.
+ //
+
+ public void HandleTagMenuActivate (object sender, EventArgs args)
+ {
+
+ MenuItem parent = sender as MenuItem;
+ if (parent == null) // We have a Gtk.Action for UI menus, so the "Edit > Remove tag" item needs special treatment
+ parent = uimanager.GetWidget("/ui/menubar1/edit2/remove_tag") as MenuItem;
+ if (parent != null && parent.Submenu is PhotoTagMenu) {
+ PhotoTagMenu menu = (PhotoTagMenu) parent.Submenu;
+ menu.Populate (SelectedPhotos ());
+ }
}
- db.Sync = true;
- }
-
- void HandleImportFromCameraCommand (object sender, EventArgs e)
- {
- ImportCamera (null);
- }
-
- public void ImportCamera (string camera_device)
- {
- Log.Debug ("ImportCamera {0}", camera_device);
- GPhotoCamera cam = new GPhotoCamera();
-
- try {
- int num_cameras = cam.DetectCameras();
- int selected_cam = 0;
-
- if (num_cameras < 1) {
+
+ public void HandleAttachTagMenuSelected (Tag t)
+ {
+ Database.BeginTransaction ();
+ AddTagExtended (SelectedIds (), new Tag [] {t});
+ Database.CommitTransaction ();
+ query_widget.PhotoTagsChanged (new Tag[] {t});
+ }
+
+ public void HandleRequireTag (object sender, EventArgs args)
+ {
+ ShowQueryWidget ();
+ query_widget.Require (tag_selection_widget.TagHighlight);
+ }
+
+ public void HandleUnRequireTag (object sender, EventArgs args)
+ {
+ query_widget.UnRequire (tag_selection_widget.TagHighlight);
+ }
+
+ public void HandleRemoveTagMenuSelected (Tag t)
+ {
+ Database.BeginTransaction ();
+ RemoveTags (SelectedIds (), new Tag [] {t});
+ Database.CommitTransaction ();
+ query_widget.PhotoTagsChanged (new Tag [] {t});
+ }
+
+ //
+ // Main menu commands
+ //
+
+ void HandleImportCommand (object sender, EventArgs e)
+ {
+ Database.Sync = false;
+ ImportCommand command = new ImportCommand (main_window);
+ if (command.ImportFromFile (Database.Photos, null) > 0) {
+ query.RollSet = new RollSet (Database.Rolls.GetRolls (1)[0]);
+ UpdateQuery ();
+ }
+ Database.Sync = true;
+ }
+
+ void HandleImportFromCameraCommand (object sender, EventArgs e)
+ {
+ ImportCamera (null);
+ }
+
+ public void ImportCamera (string camera_device)
+ {
+ Log.Debug ("ImportCamera {0}", camera_device);
+ GPhotoCamera cam = new GPhotoCamera();
+
+ try {
+ int num_cameras = cam.DetectCameras();
+ int selected_cam = 0;
+
+ if (num_cameras < 1) {
+ HigMessageDialog md = new HigMessageDialog (main_window, DialogFlags.DestroyWithParent,
+ MessageType.Warning, ButtonsType.Ok,
+ Catalog.GetString ("No cameras detected."),
+ Catalog.GetString ("F-Spot was unable to find any cameras attached to this system." +
+ " Double check that the camera is connected and has power"));
+
+ md.Run ();
+ md.Destroy ();
+ return;
+ } else if (num_cameras == 1) {
+ selected_cam = 0;
+ } else {
+ bool found = false;
+ if (camera_device != null)
+ for (int i = 0; i < num_cameras; i++) {
+ if (camera_device.IndexOf (cam.CameraList.GetValue(i)) != 0) {
+ selected_cam = i;
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ FSpot.CameraSelectionDialog camselect = new FSpot.CameraSelectionDialog (cam.CameraList);
+ selected_cam = camselect.Run ();
+ }
+ }
+
+ if (selected_cam >= 0) {
+ cam.SelectCamera (selected_cam);
+ cam.InitializeCamera ();
+
+ FSpot.CameraFileSelectionDialog selector = new FSpot.CameraFileSelectionDialog (cam, Database);
+ if (selector.Run() > 0)
+ query.RollSet = new RollSet (Database.Rolls.GetRolls (1)[0]);
+ UpdateQuery ();
+ }
+ }
+ catch (GPhotoException ge) {
+ System.Console.WriteLine (ge.ToString ());
HigMessageDialog md = new HigMessageDialog (main_window, DialogFlags.DestroyWithParent,
- MessageType.Warning, ButtonsType.Ok,
- Catalog.GetString ("No cameras detected."),
- Catalog.GetString ("F-Spot was unable to find any cameras attached to this system." +
- " Double check that the camera is connected and has power"));
-
+ MessageType.Error, ButtonsType.Ok,
+ Catalog.GetString ("Error connecting to camera"),
+ String.Format (Catalog.GetString ("Received error \"{0}\" while connecting to camera"),
+ ge.Message));
+
md.Run ();
md.Destroy ();
+ } finally {
+ cam.ReleaseGPhotoResources ();
+ }
+ }
+ void HandlePageSetupActivated (object o, EventArgs e)
+ {
+ FSpot.Global.PageSetup = Print.RunPageSetupDialog (this.Window, FSpot.Global.PageSetup, null);
+ }
+
+ void HandlePrintCommand (object sender, EventArgs e)
+ {
+ FSpot.PrintOperation print = new FSpot.PrintOperation (SelectedPhotos ());
+ print.Run (PrintOperationAction.PrintDialog, null);
+ }
+
+ public void HandlePreferences (object sender, EventArgs args)
+ {
+ var pref = new PreferenceDialog (GetToplevel (sender));
+ pref.Run ();
+ pref.Destroy ();
+ }
+
+ public void HandleManageExtensions (object sender, EventArgs args)
+ {
+ Mono.Addins.Gui.AddinManagerWindow.Run (main_window);
+ }
+
+ private void TestDisplay ()
+ {
+ Gtk.Window win = new Gtk.Window ("hello");
+ VBox box = new VBox ();
+ box.PackStart (new FSpot.Widgets.ImageDisplay (new BrowsablePointer (new FSpot.PhotoArray (SelectedPhotos ()), 0)));
+ win.Add (box);
+ win.ShowAll ();
+ }
+
+ void HandleSendMailCommand (object sender, EventArgs args)
+ {
+ //TestDisplay ();
+ new FSpot.SendEmail (new FSpot.PhotoArray (SelectedPhotos ()), Window);
+ }
+
+ public static void HandleHelp (object sender, EventArgs args)
+ {
+ GtkBeans.Global.ShowUri (Toplevel.Window.Screen, "ghelp:f-spot");
+ }
+
+ public static void HandleAbout (object sender, EventArgs args)
+ {
+ FSpot.UI.Dialog.AboutDialog.ShowUp ();
+ }
+
+ void HandleTagSizeChange (object sender, EventArgs args)
+ {
+ RadioAction choice = sender as RadioAction;
+
+ //Get this callback twice. Once for the active going menuitem,
+ //once for the inactive leaving one. Ignore the inactive.
+ if (!choice.Active)
return;
- } else if (num_cameras == 1) {
- selected_cam = 0;
+
+ int old_size = TagsIconSize;
+
+ if (choice == tag_icon_hidden) {
+ TagsIconSize = (int) Tag.IconSize.Hidden;
+ } else if (choice == tag_icon_small) {
+ TagsIconSize = (int) Tag.IconSize.Small;
+ } else if (choice == tag_icon_medium) {
+ TagsIconSize = (int) Tag.IconSize.Medium;
+ } else if (choice == tag_icon_large) {
+ TagsIconSize = (int) Tag.IconSize.Large;
} else {
- bool found = false;
- if (camera_device != null)
- for (int i = 0; i < num_cameras; i++) {
- if (camera_device.IndexOf (cam.CameraList.GetValue(i)) != 0) {
- selected_cam = i;
- found = true;
- break;
- }
- }
-
- if (!found) {
- FSpot.CameraSelectionDialog camselect = new FSpot.CameraSelectionDialog (cam.CameraList);
- selected_cam = camselect.Run ();
- }
+ return;
}
-
- if (selected_cam >= 0) {
- cam.SelectCamera (selected_cam);
- cam.InitializeCamera ();
-
- FSpot.CameraFileSelectionDialog selector = new FSpot.CameraFileSelectionDialog (cam, db);
- if (selector.Run() > 0)
- query.RollSet = new RollSet (db.Rolls.GetRolls (1)[0]);
- UpdateQuery ();
+
+ if (old_size != TagsIconSize) {
+ tag_selection_widget.ColumnsAutosize();
+ Preferences.Set (Preferences.TAG_ICON_SIZE, TagsIconSize);
}
}
- catch (GPhotoException ge) {
- System.Console.WriteLine (ge.ToString ());
- HigMessageDialog md = new HigMessageDialog (main_window, DialogFlags.DestroyWithParent,
- MessageType.Error, ButtonsType.Ok,
- Catalog.GetString ("Error connecting to camera"),
- String.Format (Catalog.GetString ("Received error \"{0}\" while connecting to camera"),
- ge.Message));
-
- md.Run ();
- md.Destroy ();
- } finally {
- cam.ReleaseGPhotoResources ();
+
+ public void HandleFilmstripHorizontal (object sender, EventArgs args)
+ {
+ if (photo_view.FilmstripOrientation == Orientation.Horizontal)
+ return;
+ (sender as Gtk.CheckMenuItem).Active = false;
+ photo_view.PlaceFilmstrip (Orientation.Horizontal);
}
- }
- void HandlePageSetupActivated (object o, EventArgs e)
- {
- FSpot.Global.PageSetup = Print.RunPageSetupDialog (this.Window, FSpot.Global.PageSetup, null);
- }
- void HandlePrintCommand (object sender, EventArgs e)
- {
- FSpot.PrintOperation print = new FSpot.PrintOperation (SelectedPhotos ());
- print.Run (PrintOperationAction.PrintDialog, null);
- }
-
- public void HandlePreferences (object sender, EventArgs args)
- {
- var pref = new PreferenceDialog (GetToplevel (sender));
- pref.Run ();
- pref.Destroy ();
- }
-
- public void HandleManageExtensions (object sender, EventArgs args)
- {
- Mono.Addins.Gui.AddinManagerWindow.Run (main_window);
- }
-
- private void TestDisplay ()
- {
- Gtk.Window win = new Gtk.Window ("hello");
- VBox box = new VBox ();
- box.PackStart (new FSpot.Widgets.ImageDisplay (new BrowsablePointer (new FSpot.PhotoArray (SelectedPhotos ()), 0)));
- win.Add (box);
- win.ShowAll ();
- }
-
- void HandleSendMailCommand (object sender, EventArgs args)
- {
- //TestDisplay ();
- new FSpot.SendEmail (new FSpot.PhotoArray (SelectedPhotos ()), Window);
- }
-
- public static void HandleHelp (object sender, EventArgs args)
- {
- GtkBeans.Global.ShowUri (Toplevel.Window.Screen, "ghelp:f-spot");
- }
-
- public static void HandleAbout (object sender, EventArgs args)
- {
- FSpot.UI.Dialog.AboutDialog.ShowUp ();
- }
-
- void HandleTagSizeChange (object sender, EventArgs args)
- {
- RadioAction choice = sender as RadioAction;
+ public void HandleFilmstripVertical (object sender, EventArgs args)
+ {
+ if (photo_view.FilmstripOrientation == Orientation.Vertical)
+ return;
+ (sender as Gtk.CheckMenuItem).Active = false;
+ photo_view.PlaceFilmstrip (Orientation.Vertical);
+ }
+
+ public void HandleReverseOrder (object sender, EventArgs args)
+ {
+ ToggleAction item = sender as ToggleAction;
+
+ if (group_selector.Adaptor.OrderAscending == item.Active)
+ return;
+
+ group_selector.Adaptor.OrderAscending = item.Active;
+ query.TimeOrderAsc = item.Active;
+
+ // FIXME this is blah...we need UIManager love here
+ if (item != reverse_order)
+ reverse_order.Active = item.Active;
+
+ //update the selection in the timeline
+ if ( query.Range != null && group_selector.Adaptor is TimeAdaptor) {
+ group_selector.SetLimitsToDates(query.Range.Start, query.Range.End);
+
+ }
- //Get this callback twice. Once for the active going menuitem,
- //once for the inactive leaving one. Ignore the inactive.
- if (!choice.Active)
- return;
-
- int old_size = TagsIconSize;
-
- if (choice == tag_icon_hidden) {
- TagsIconSize = (int) Tag.IconSize.Hidden;
- } else if (choice == tag_icon_small) {
- TagsIconSize = (int) Tag.IconSize.Small;
- } else if (choice == tag_icon_medium) {
- TagsIconSize = (int) Tag.IconSize.Medium;
- } else if (choice == tag_icon_large) {
- TagsIconSize = (int) Tag.IconSize.Large;
- } else {
- return;
+ }
+
+ // Called when the user clicks the X button
+ void HandleDeleteEvent (object sender, DeleteEventArgs args)
+ {
+ Close();
+ args.RetVal = true;
+ }
+
+ void HandleCloseCommand (object sender, EventArgs args)
+ {
+ Close();
}
- if (old_size != TagsIconSize) {
- tag_selection_widget.ColumnsAutosize();
- Preferences.Set (Preferences.TAG_ICON_SIZE, TagsIconSize);
+ public void Close ()
+ {
+ int x, y, width, height;
+ main_window.GetPosition (out x, out y);
+ main_window.GetSize (out width, out height);
+
+ bool maximized = ((main_window.GdkWindow.State & Gdk.WindowState.Maximized) > 0);
+ Preferences.Set (Preferences.MAIN_WINDOW_MAXIMIZED, maximized);
+
+ if (!maximized) {
+ Preferences.Set (Preferences.MAIN_WINDOW_X, x);
+ Preferences.Set (Preferences.MAIN_WINDOW_Y, y);
+ Preferences.Set (Preferences.MAIN_WINDOW_WIDTH, width);
+ Preferences.Set (Preferences.MAIN_WINDOW_HEIGHT, height);
+ }
+
+ Preferences.Set (Preferences.SHOW_TOOLBAR, toolbar.Visible);
+ Preferences.Set (Preferences.SHOW_SIDEBAR, info_vbox.Visible);
+ Preferences.Set (Preferences.SHOW_TIMELINE, display_timeline.Active);
+ Preferences.Set (Preferences.SHOW_FILMSTRIP, display_filmstrip.Active);
+ Preferences.Set (Preferences.SHOW_TAGS, icon_view.DisplayTags);
+ Preferences.Set (Preferences.SHOW_DATES, icon_view.DisplayDates);
+ Preferences.Set (Preferences.SHOW_RATINGS, icon_view.DisplayRatings);
+
+ Preferences.Set (Preferences.GROUP_ADAPTOR_ORDER_ASC, group_selector.Adaptor.OrderAscending);
+ Preferences.Set (Preferences.GLASS_POSITION, group_selector.GlassPosition);
+
+ Preferences.Set (Preferences.SIDEBAR_POSITION, main_hpaned.Position);
+ Preferences.Set (Preferences.ZOOM, icon_view.Zoom);
+
+ tag_selection_widget.SaveExpandDefaults ();
+
+ this.Window.Destroy ();
}
- }
-
- public void HandleFilmstripHorizontal (object sender, EventArgs args)
- {
- if (photo_view.FilmstripOrientation == Orientation.Horizontal)
- return;
- (sender as Gtk.CheckMenuItem).Active = false;
- photo_view.PlaceFilmstrip (Orientation.Horizontal);
- }
-
- public void HandleFilmstripVertical (object sender, EventArgs args)
- {
- if (photo_view.FilmstripOrientation == Orientation.Vertical)
- return;
- (sender as Gtk.CheckMenuItem).Active = false;
- photo_view.PlaceFilmstrip (Orientation.Vertical);
- }
-
- public void HandleReverseOrder (object sender, EventArgs args)
- {
- ToggleAction item = sender as ToggleAction;
-
- if (group_selector.Adaptor.OrderAscending == item.Active)
- return;
- group_selector.Adaptor.OrderAscending = item.Active;
- query.TimeOrderAsc = item.Active;
-
- // FIXME this is blah...we need UIManager love here
- if (item != reverse_order)
- reverse_order.Active = item.Active;
+ void HandleCreateVersionCommand (object obj, EventArgs args)
+ {
+ PhotoVersionCommands.Create cmd = new PhotoVersionCommands.Create ();
+
+ cmd.Execute (Database.Photos, CurrentPhoto, GetToplevel (null));
+ // if (cmd.Execute (db.Photos, CurrentPhoto, GetToplevel (null))) {
+ // query.MarkChanged (ActiveIndex (), true, false);
+ // }
+ }
+
+ void HandleDeleteVersionCommand (object obj, EventArgs args)
+ {
+ PhotoVersionCommands.Delete cmd = new PhotoVersionCommands.Delete ();
+
+ cmd.Execute (Database.Photos, CurrentPhoto, GetToplevel (null));
+ // if (cmd.Execute (db.Photos, CurrentPhoto, GetToplevel (null))) {
+ // query.MarkChanged (ActiveIndex (), true, true);
+ // }
+ }
+
+ void HandleRenameVersionCommand (object obj, EventArgs args)
+ {
+ PhotoVersionCommands.Rename cmd = new PhotoVersionCommands.Rename ();
+
+ cmd.Execute (Database.Photos, CurrentPhoto, main_window);
+ // if (cmd.Execute (db.Photos, CurrentPhoto, main_window)) {
+ // query.MarkChanged (ActiveIndex (), true, false);
+ // }
+ }
- //update the selection in the timeline
- if ( query.Range != null && group_selector.Adaptor is TimeAdaptor) {
- group_selector.SetLimitsToDates(query.Range.Start, query.Range.End);
+ public void HandleCreateTagAndAttach (object sender, EventArgs args)
+ {
+ Tag new_tag = CreateTag (sender, args);
+
+ if (new_tag != null)
+ HandleAttachTagMenuSelected (new_tag);
+ }
+
+ public void HandleCreateNewCategoryCommand (object sender, EventArgs args)
+ {
+ Tag new_tag = CreateTag (sender, args);
+ if (new_tag != null) {
+ tag_selection_widget.ScrollTo (new_tag);
+ tag_selection_widget.TagHighlight = new Tag [] {new_tag};
+ }
}
-
- }
-
- // Called when the user clicks the X button
- void HandleDeleteEvent (object sender, DeleteEventArgs args)
- {
- Close();
- args.RetVal = true;
- }
-
- void HandleCloseCommand (object sender, EventArgs args)
- {
- Close();
- }
- public void Close ()
- {
- int x, y, width, height;
- main_window.GetPosition (out x, out y);
- main_window.GetSize (out width, out height);
-
- bool maximized = ((main_window.GdkWindow.State & Gdk.WindowState.Maximized) > 0);
- Preferences.Set (Preferences.MAIN_WINDOW_MAXIMIZED, maximized);
-
- if (!maximized) {
- Preferences.Set (Preferences.MAIN_WINDOW_X, x);
- Preferences.Set (Preferences.MAIN_WINDOW_Y, y);
- Preferences.Set (Preferences.MAIN_WINDOW_WIDTH, width);
- Preferences.Set (Preferences.MAIN_WINDOW_HEIGHT, height);
+ public Tag CreateTag (object sender, EventArgs args)
+ {
+ TagCommands.Create command = new TagCommands.Create (Database.Tags, GetToplevel (sender));
+ return command.Execute (TagCommands.TagType.Category, tag_selection_widget.TagHighlight);
}
-
- Preferences.Set (Preferences.SHOW_TOOLBAR, toolbar.Visible);
- Preferences.Set (Preferences.SHOW_SIDEBAR, info_vbox.Visible);
- Preferences.Set (Preferences.SHOW_TIMELINE, display_timeline.Active);
- Preferences.Set (Preferences.SHOW_FILMSTRIP, display_filmstrip.Active);
- Preferences.Set (Preferences.SHOW_TAGS, icon_view.DisplayTags);
- Preferences.Set (Preferences.SHOW_DATES, icon_view.DisplayDates);
- Preferences.Set (Preferences.SHOW_RATINGS, icon_view.DisplayRatings);
-
- Preferences.Set (Preferences.GROUP_ADAPTOR_ORDER_ASC, group_selector.Adaptor.OrderAscending);
- Preferences.Set (Preferences.GLASS_POSITION, group_selector.GlassPosition);
-
- Preferences.Set (Preferences.SIDEBAR_POSITION, main_hpaned.Position);
- Preferences.Set (Preferences.ZOOM, icon_view.Zoom);
-
- tag_selection_widget.SaveExpandDefaults ();
-
- this.Window.Destroy ();
- }
- void HandleCreateVersionCommand (object obj, EventArgs args)
- {
- PhotoVersionCommands.Create cmd = new PhotoVersionCommands.Create ();
-
- cmd.Execute (db.Photos, CurrentPhoto, GetToplevel (null));
-// if (cmd.Execute (db.Photos, CurrentPhoto, GetToplevel (null))) {
-// query.MarkChanged (ActiveIndex (), true, false);
-// }
- }
-
- void HandleDeleteVersionCommand (object obj, EventArgs args)
- {
- PhotoVersionCommands.Delete cmd = new PhotoVersionCommands.Delete ();
-
- cmd.Execute (db.Photos, CurrentPhoto, GetToplevel (null));
-// if (cmd.Execute (db.Photos, CurrentPhoto, GetToplevel (null))) {
-// query.MarkChanged (ActiveIndex (), true, true);
-// }
- }
-
- void HandlePropertiesCommand (object obje, EventArgs args)
- {
- Photo [] photos = SelectedPhotos ();
-
- long length = 0;
-
- foreach (Photo p in photos) {
- System.IO.FileInfo fi = new System.IO.FileInfo (p.DefaultVersionUri.LocalPath);
-
- length += fi.Length;
+ public void HandleAttachTagCommand (object obj, EventArgs args)
+ {
+ AttachTags (tag_selection_widget.TagHighlight, SelectedIds ());
}
-
- Console.WriteLine ("{0} Selected Photos : Total length = {1} - {2}kB - {3}MB", photos.Length, length, length / 1024, length / (1024 * 1024));
- }
-
- void HandleRenameVersionCommand (object obj, EventArgs args)
- {
- PhotoVersionCommands.Rename cmd = new PhotoVersionCommands.Rename ();
-
- cmd.Execute (db.Photos, CurrentPhoto, main_window);
-// if (cmd.Execute (db.Photos, CurrentPhoto, main_window)) {
-// query.MarkChanged (ActiveIndex (), true, false);
-// }
- }
- public void HandleCreateTagAndAttach (object sender, EventArgs args)
- {
- Tag new_tag = CreateTag (sender, args);
-
- if (new_tag != null)
- HandleAttachTagMenuSelected (new_tag);
- }
-
- public void HandleCreateNewCategoryCommand (object sender, EventArgs args)
- {
- Tag new_tag = CreateTag (sender, args);
-
- if (new_tag != null) {
- tag_selection_widget.ScrollTo (new_tag);
- tag_selection_widget.TagHighlight = new Tag [] {new_tag};
+ void AttachTags (Tag [] tags, int [] ids)
+ {
+ Database.BeginTransaction ();
+ AddTagExtended (ids, tags);
+ Database.CommitTransaction ();
+ query_widget.PhotoTagsChanged (tags);
}
- }
-
- public Tag CreateTag (object sender, EventArgs args)
- {
- TagCommands.Create command = new TagCommands.Create (db.Tags, GetToplevel (sender));
- return command.Execute (TagCommands.TagType.Category, tag_selection_widget.TagHighlight);
- }
-
- public void HandleAttachTagCommand (object obj, EventArgs args)
- {
- AttachTags (tag_selection_widget.TagHighlight, SelectedIds ());
- }
-
- void AttachTags (Tag [] tags, int [] ids)
- {
- db.BeginTransaction ();
- AddTagExtended (ids, tags);
- db.CommitTransaction ();
- query_widget.PhotoTagsChanged (tags);
- }
-
- public void HandleRemoveTagCommand (object obj, EventArgs args)
- {
- Tag [] tags = this.tag_selection_widget.TagHighlight;
-
- db.BeginTransaction ();
- RemoveTags (SelectedIds (), tags);
- db.CommitTransaction ();
- query_widget.PhotoTagsChanged (tags);
- }
-
- public void HandleEditSelectedTag (object sender, EventArgs ea)
- {
- Tag [] tags = this.tag_selection_widget.TagHighlight;
- if (tags.Length != 1)
- return;
-
- HandleEditSelectedTagWithTag (tags [0]);
- }
-
- public void HandleEditSelectedTagWithTag (Tag tag)
- {
- if (tag == null)
- return;
-
- EditTagDialog dialog = new EditTagDialog (db, tag, main_window);
- if ((ResponseType)dialog.Run () == ResponseType.Ok) {
- bool name_changed = false;
- try {
- if (tag.Name != dialog.TagName) {
- tag.Name = dialog.TagName;
- name_changed = true;
+
+ public void HandleRemoveTagCommand (object obj, EventArgs args)
+ {
+ Tag [] tags = this.tag_selection_widget.TagHighlight;
+
+ Database.BeginTransaction ();
+ RemoveTags (SelectedIds (), tags);
+ Database.CommitTransaction ();
+ query_widget.PhotoTagsChanged (tags);
+ }
+
+ public void HandleEditSelectedTag (object sender, EventArgs ea)
+ {
+ Tag [] tags = this.tag_selection_widget.TagHighlight;
+ if (tags.Length != 1)
+ return;
+
+ HandleEditSelectedTagWithTag (tags [0]);
+ }
+
+ public void HandleEditSelectedTagWithTag (Tag tag)
+ {
+ if (tag == null)
+ return;
+
+ EditTagDialog dialog = new EditTagDialog (Database, tag, main_window);
+ if ((ResponseType)dialog.Run () == ResponseType.Ok) {
+ bool name_changed = false;
+ try {
+ if (tag.Name != dialog.TagName) {
+ tag.Name = dialog.TagName;
+ name_changed = true;
+ }
+ tag.Category = dialog.TagCategory;
+ Database.Tags.Commit (tag, name_changed);
+ } catch (Exception ex) {
+ Log.Exception (ex);
}
- tag.Category = dialog.TagCategory;
- db.Tags.Commit (tag, name_changed);
- } catch (Exception ex) {
- Log.Exception (ex);
}
+
+ dialog.Destroy ();
}
-
- dialog.Destroy ();
- }
-
- public void HandleMergeTagsCommand (object obj, EventArgs args)
- {
- Tag [] tags = this.tag_selection_widget.TagHighlight;
- if (tags.Length < 2)
- return;
-
- // Translators, The singular case will never happen here.
- string header = Catalog.GetPluralString ("Merge the selected tag",
- "Merge the {0} selected tags?", tags.Length);
- header = String.Format (header, tags.Length);
-
- // If a tag with children tags is selected for merging, we
- // should also merge its children..
- List<Tag> all_tags = new List<Tag> (tags.Length);
- foreach (Tag tag in tags) {
- if (! all_tags.Contains (tag))
- all_tags.Add (tag);
+
+ public void HandleMergeTagsCommand (object obj, EventArgs args)
+ {
+ Tag [] tags = this.tag_selection_widget.TagHighlight;
+ if (tags.Length < 2)
+ return;
+
+ // Translators, The singular case will never happen here.
+ string header = Catalog.GetPluralString ("Merge the selected tag",
+ "Merge the {0} selected tags?", tags.Length);
+ header = String.Format (header, tags.Length);
+
+ // If a tag with children tags is selected for merging, we
+ // should also merge its children..
+ List<Tag> all_tags = new List<Tag> (tags.Length);
+ foreach (Tag tag in tags) {
+ if (! all_tags.Contains (tag))
+ all_tags.Add (tag);
+ else
+ continue;
+
+ if (! (tag is Category))
+ continue;
+
+ (tag as Category).AddDescendentsTo (all_tags);
+ }
+
+ // debug..
+ tags = all_tags.ToArray ();
+ System.Array.Sort (tags, new TagRemoveComparer ());
+
+ foreach (Tag tag in tags) {
+ System.Console.WriteLine ("tag: {0}", tag.Name);
+ }
+
+ string msg = Catalog.GetString("This operation will merge the selected tags and any sub-tags into a single tag.");
+
+ string ok_caption = Catalog.GetString ("_Merge Tags");
+
+ if (ResponseType.Ok != HigMessageDialog.RunHigConfirmation(main_window,
+ DialogFlags.DestroyWithParent,
+ MessageType.Warning,
+ header,
+ msg,
+ ok_caption))
+ return;
+
+ // The surviving tag is the last tag, as it is definitely not a child of any other the
+ // other tags. removetags will contain the tags to be merged.
+ Tag survivor = tags[tags.Length - 1];
+
+ Tag [] removetags = new Tag [tags.Length - 1];
+ Array.Copy (tags, 0, removetags, 0, tags.Length - 1);
+
+ // Add the surviving tag to all the photos with the other tags
+ Photo [] photos = Database.Photos.Query (removetags);
+ foreach (Photo p in photos) {
+ p.AddTag (survivor);
+ }
+
+ // Remove the defunct tags, which removes them from the photos, commits
+ // the photos, and removes the tags from the TagStore
+ Database.BeginTransaction ();
+ Database.Photos.Remove (removetags);
+ Database.CommitTransaction ();
+
+ HandleEditSelectedTagWithTag (survivor);
+ }
+
+ void HandleAdjustTime (object sender, EventArgs args)
+ {
+ PhotoList list = new PhotoList (Selection.Items);
+ list.Sort (new Photo.CompareDateName ());
+ (new AdjustTimeDialog (Database, list)).Run ();
+ }
+
+ public void HideLoupe ()
+ {
+ loupe_menu_item.Active = false;
+ }
+
+ void HandleLoupe (object sender, EventArgs args)
+ {
+ // Don't steal characters from any text entries
+ if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
+ Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
+ return;
+ }
+
+ photo_view.View.ShowHideLoupe ();
+ }
+
+ void HandleSharpen (object sender, EventArgs args)
+ {
+ // Don't steal characters from any text entries
+ if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
+ Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
+ return;
+ }
+
+ photo_view.View.ShowSharpener ();
+ }
+
+ void HandleDisplayToolbar (object sender, EventArgs args)
+ {
+ if (display_toolbar.Active)
+ toolbar.Show ();
else
- continue;
-
- if (! (tag is Category))
- continue;
-
- (tag as Category).AddDescendentsTo (all_tags);
+ toolbar.Hide ();
}
-
- // debug..
- tags = all_tags.ToArray ();
- System.Array.Sort (tags, new TagRemoveComparer ());
-
- foreach (Tag tag in tags) {
- System.Console.WriteLine ("tag: {0}", tag.Name);
+
+ void HandleDisplayTags (object sender, EventArgs args)
+ {
+ icon_view.DisplayTags = !icon_view.DisplayTags;
}
-
- string msg = Catalog.GetString("This operation will merge the selected tags and any sub-tags into a single tag.");
-
- string ok_caption = Catalog.GetString ("_Merge Tags");
-
- if (ResponseType.Ok != HigMessageDialog.RunHigConfirmation(main_window,
- DialogFlags.DestroyWithParent,
- MessageType.Warning,
- header,
- msg,
- ok_caption))
- return;
-
- // The surviving tag is the last tag, as it is definitely not a child of any other the
- // other tags. removetags will contain the tags to be merged.
- Tag survivor = tags[tags.Length - 1];
- Tag [] removetags = new Tag [tags.Length - 1];
- Array.Copy (tags, 0, removetags, 0, tags.Length - 1);
-
- // Add the surviving tag to all the photos with the other tags
- Photo [] photos = db.Photos.Query (removetags);
- foreach (Photo p in photos) {
- p.AddTag (survivor);
+ void HandleDisplayDates (object sender, EventArgs args)
+ {
+ // Peg the icon_view's value to the MenuItem's active state,
+ // as icon_view.DisplayDates's get won't always be equal to it's true value
+ // because of logic to hide dates when zoomed way out.
+ icon_view.DisplayDates = display_dates_menu_item.Active;
}
-
- // Remove the defunct tags, which removes them from the photos, commits
- // the photos, and removes the tags from the TagStore
- db.BeginTransaction ();
- db.Photos.Remove (removetags);
- db.CommitTransaction ();
-
- HandleEditSelectedTagWithTag (survivor);
- }
-
- void HandleAdjustTime (object sender, EventArgs args)
- {
- PhotoList list = new PhotoList (Selection.Items);
- list.Sort (new Photo.CompareDateName ());
- (new AdjustTimeDialog (db, list)).Run ();
- }
-
- public void HideLoupe ()
- {
- loupe_menu_item.Active = false;
- }
-
- void HandleLoupe (object sender, EventArgs args)
- {
- // Don't steal characters from any text entries
- if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
- Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
- return;
+
+ void HandleDisplayRatings (object sender, EventArgs args)
+ {
+ icon_view.DisplayRatings = display_ratings_menu_item.Active;
}
-
- photo_view.View.ShowHideLoupe ();
- }
-
- void HandleSharpen (object sender, EventArgs args)
- {
- // Don't steal characters from any text entries
- if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
- Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
- return;
+
+ void HandleDisplayGroupSelector (object sender, EventArgs args)
+ {
+ if (group_selector.Visible)
+ group_selector.Hide ();
+ else
+ group_selector.Show ();
}
-
- photo_view.View.ShowSharpener ();
- }
-
- void HandleDisplayToolbar (object sender, EventArgs args)
- {
- if (display_toolbar.Active)
- toolbar.Show ();
- else
- toolbar.Hide ();
- }
-
- void HandleDisplayTags (object sender, EventArgs args)
- {
- icon_view.DisplayTags = !icon_view.DisplayTags;
- }
- void HandleDisplayDates (object sender, EventArgs args)
- {
- // Peg the icon_view's value to the MenuItem's active state,
- // as icon_view.DisplayDates's get won't always be equal to it's true value
- // because of logic to hide dates when zoomed way out.
- icon_view.DisplayDates = display_dates_menu_item.Active;
- }
-
- void HandleDisplayRatings (object sender, EventArgs args)
- {
- icon_view.DisplayRatings = display_ratings_menu_item.Active;
- }
-
- void HandleDisplayGroupSelector (object sender, EventArgs args)
- {
- if (group_selector.Visible)
- group_selector.Hide ();
- else
- group_selector.Show ();
- }
-
- void HandleDisplayFilmstrip (object sender, EventArgs args)
- {
- photo_view.FilmStripVisibility = display_filmstrip.Active;
- if (view_mode == ModeType.PhotoView)
- photo_view.QueueDraw ();
- }
-
- void HandleDisplayInfoSidebar (object sender, EventArgs args)
- {
- if (info_vbox.Visible)
- info_vbox.Hide ();
- else
- info_vbox.Show ();
- }
-
- void HandleViewSlideShow (object sender, EventArgs args)
- {
- HandleViewFullscreen (sender, args);
- fsview.PlayPause ();
- }
-
- void HandleToggleViewBrowse (object sender, EventArgs args)
- {
- if (view_mode == ModeType.IconView)
- browse_button.Active = true;
- else if (browse_button.Active)
- SetViewMode (ModeType.IconView);
- }
-
- void HandleToggleViewPhoto (object sender, EventArgs args)
- {
- if (view_mode == ModeType.PhotoView)
- edit_button.Active = true;
- else if (edit_button.Active)
- SetViewMode (ModeType.PhotoView);
- }
-
- void HandleViewBrowse (object sender, EventArgs args)
- {
- SetViewMode (ModeType.IconView);
- }
-
- void HandleViewPhoto (object sender, EventArgs args)
- {
- SetViewMode (ModeType.PhotoView);
- }
-
- void HandleViewFullscreen (object sender, EventArgs args)
- {
- int active = (selection.Count > 0 ? SelectedIds() [0] : 0);
- if (fsview == null) {
- fsview = new FSpot.FullScreenView (query, main_window);
- fsview.Destroyed += HandleFullScreenViewDestroy;
- fsview.KeyPressEvent += HandleFullScreenViewKeyPressEvent;
- fsview.View.Item.Index = active;
- } else {
- // FIXME this needs to be another mode like PhotoView and IconView mode.
- fsview.View.Item.Index = active;
+ void HandleDisplayFilmstrip (object sender, EventArgs args)
+ {
+ photo_view.FilmStripVisibility = display_filmstrip.Active;
+ if (ViewMode == ModeType.PhotoView)
+ photo_view.QueueDraw ();
}
-
- fsview.Show ();
- }
-
- void HandleFullScreenViewDestroy (object sender, EventArgs args)
- {
- JumpTo (fsview.View.Item.Index);
- fsview = null;
- }
- void HandleZoomScaleValueChanged (object sender, System.EventArgs args)
- {
- switch (view_mode) {
- case ModeType.PhotoView:
- photo_view.View.ZoomChanged -= HandleZoomChanged;
- photo_view.NormalizedZoom = zoom_scale.Value;
- photo_view.View.ZoomChanged += HandleZoomChanged;
- break;
- case ModeType.IconView:
- icon_view.ZoomChanged -= HandleZoomChanged;
- icon_view.Zoom = zoom_scale.Value;
- icon_view.ZoomChanged += HandleZoomChanged;
- break;
+ void HandleDisplayInfoSidebar (object sender, EventArgs args)
+ {
+ if (info_vbox.Visible)
+ info_vbox.Hide ();
+ else
+ info_vbox.Show ();
}
-
- zoom_in.Sensitive = (zoom_scale.Value != 1.0);
- zoom_out.Sensitive = (zoom_scale.Value != 0.0);
- }
- void HandleQueryChanged (IBrowsableCollection sender)
- {
- if (find_untagged.Active != query.Untagged)
- find_untagged.Active = query.Untagged;
-
- clear_date_range.Sensitive = (query.Range != null);
- clear_rating_filter.Sensitive = (query.RatingRange != null);
- update_status_label = true;
- GLib.Idle.Add (UpdateStatusLabel);
- }
-
- bool update_status_label;
- private bool UpdateStatusLabel ()
- {
- update_status_label = false;
- int total_photos = Database.Photos.TotalPhotos;
- if (total_photos != query.Count)
- status_label.Text = String.Format (Catalog.GetPluralString ("{0} Photo out of {1}", "{0} Photos out of {1}", query.Count), query.Count, total_photos);
- else
- status_label.Text = String.Format (Catalog.GetPluralString ("{0} Photo", "{0} Photos", query.Count), query.Count);
-
- if ((selection != null) && (selection.Count > 0))
- status_label.Text += String.Format (Catalog.GetPluralString (" ({0} selected)", " ({0} selected)", selection.Count), selection.Count);
- status_label.UseMarkup = true;
- return update_status_label;
- }
+ void HandleViewSlideShow (object sender, EventArgs args)
+ {
+ HandleViewFullscreen (sender, args);
+ fsview.PlayPause ();
+ }
- void HandleZoomChanged (object sender, System.EventArgs args)
- {
- zoom_scale.ValueChanged -= HandleZoomScaleValueChanged;
-
- double zoom = .5;
- switch (view_mode) {
- case ModeType.PhotoView:
- zoom = photo_view.NormalizedZoom;
- zoom_scale.Value = zoom;
- break;
- case ModeType.IconView:
- zoom = icon_view.Zoom;
- if (zoom == 0.0 || zoom == 100.0 || zoom != zoom_scale.Value)
- zoom_scale.Value = zoom;
-
- break;
+ void HandleToggleViewBrowse (object sender, EventArgs args)
+ {
+ if (ViewMode == ModeType.IconView)
+ browse_button.Active = true;
+ else if (browse_button.Active)
+ SetViewMode (ModeType.IconView);
}
-
- zoom_in.Sensitive = (zoom != 1.0);
- zoom_out.Sensitive = (zoom != 0.0);
-
- zoom_scale.ValueChanged += HandleZoomScaleValueChanged;
- }
-
- void HandleZoomOut (object sender, ButtonPressEventArgs args)
- {
- ZoomOut ();
- }
- void HandleZoomOut (object sender, EventArgs args)
- {
- ZoomOut ();
- }
+ void HandleToggleViewPhoto (object sender, EventArgs args)
+ {
+ if (ViewMode == ModeType.PhotoView)
+ edit_button.Active = true;
+ else if (edit_button.Active)
+ SetViewMode (ModeType.PhotoView);
+ }
- void HandleZoomIn (object sender, ButtonPressEventArgs args)
- {
- ZoomIn ();
- }
+ void HandleViewBrowse (object sender, EventArgs args)
+ {
+ SetViewMode (ModeType.IconView);
+ }
- void HandleZoomIn (object sender, EventArgs args)
- {
- ZoomIn ();
- }
+ void HandleViewPhoto (object sender, EventArgs args)
+ {
+ SetViewMode (ModeType.PhotoView);
+ }
- private void ZoomOut ()
- {
- switch (view_mode) {
- case ModeType.PhotoView:
- photo_view.ZoomOut ();
- break;
- case ModeType.IconView:
- icon_view.ZoomOut ();
- break;
+ void HandleViewFullscreen (object sender, EventArgs args)
+ {
+ int active = (Selection.Count > 0 ? SelectedIds() [0] : 0);
+ if (fsview == null) {
+ fsview = new FSpot.FullScreenView (query, main_window);
+ fsview.Destroyed += HandleFullScreenViewDestroy;
+ fsview.KeyPressEvent += HandleFullScreenViewKeyPressEvent;
+ fsview.View.Item.Index = active;
+ } else {
+ // FIXME this needs to be another mode like PhotoView and IconView mode.
+ fsview.View.Item.Index = active;
+ }
+
+ fsview.Show ();
}
- }
- private void ZoomIn ()
- {
- switch (view_mode) {
- case ModeType.PhotoView:
- double old_zoom = photo_view.Zoom;
- try {
- photo_view.ZoomIn ();
- } catch {
- photo_view.Zoom = old_zoom;
+ void HandleFullScreenViewDestroy (object sender, EventArgs args)
+ {
+ JumpTo (fsview.View.Item.Index);
+ fsview = null;
+ }
+
+ void HandleZoomScaleValueChanged (object sender, System.EventArgs args)
+ {
+ switch (ViewMode) {
+ case ModeType.PhotoView:
+ photo_view.View.ZoomChanged -= HandleZoomChanged;
+ photo_view.NormalizedZoom = zoom_scale.Value;
+ photo_view.View.ZoomChanged += HandleZoomChanged;
+ break;
+ case ModeType.IconView:
+ icon_view.ZoomChanged -= HandleZoomChanged;
+ icon_view.Zoom = zoom_scale.Value;
+ icon_view.ZoomChanged += HandleZoomChanged;
+ break;
}
- break;
- case ModeType.IconView:
- icon_view.ZoomIn ();
- break;
+ zoom_in.Sensitive = (zoom_scale.Value != 1.0);
+ zoom_out.Sensitive = (zoom_scale.Value != 0.0);
}
- }
-
- public void DeleteException (Exception e, string fname)
- {
- string ok_caption = Catalog.GetString ("_Ok");
- string error = Catalog.GetString ("Error Deleting Picture");
- string msg;
-
- if (e is UnauthorizedAccessException)
- msg = String.Format (
- Catalog.GetString ("No permission to delete the file:{1}{0}"),
- fname, Environment.NewLine).Replace ("_", "__");
- else
- msg = String.Format (
- Catalog.GetString ("An error of type {0} occurred while deleting the file:{2}{1}"),
- e.GetType (), fname.Replace ("_", "__"), Environment.NewLine);
- HigMessageDialog.RunHigConfirmation (
- main_window, DialogFlags.DestroyWithParent, MessageType.Error,
- error, msg, ok_caption);
- }
-
- public Gtk.Window GetToplevel (object sender)
- {
- Widget wsender = sender as Widget;
- Gtk.Window toplevel = null;
-
- if (wsender != null && !(wsender is MenuItem))
- toplevel = (Gtk.Window) wsender.Toplevel;
- else if (fsview != null)
- toplevel = fsview;
- else
- toplevel = main_window;
-
- return toplevel;
- }
-
- public void HandleDeleteCommand (object sender, EventArgs args)
- {
- // Don't steal characters from any text entries
- if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
- Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
- return;
+ void HandleQueryChanged (IBrowsableCollection sender)
+ {
+ if (find_untagged.Active != query.Untagged)
+ find_untagged.Active = query.Untagged;
+
+ clear_date_range.Sensitive = (query.Range != null);
+ clear_rating_filter.Sensitive = (query.RatingRange != null);
+ update_status_label = true;
+ GLib.Idle.Add (UpdateStatusLabel);
}
+
+ bool update_status_label;
+ private bool UpdateStatusLabel ()
+ {
+ update_status_label = false;
+ int total_photos = Database.Photos.TotalPhotos;
+ if (total_photos != query.Count)
+ status_label.Text = String.Format (Catalog.GetPluralString ("{0} Photo out of {1}", "{0} Photos out of {1}", query.Count), query.Count, total_photos);
+ else
+ status_label.Text = String.Format (Catalog.GetPluralString ("{0} Photo", "{0} Photos", query.Count), query.Count);
- Photo[] photos = SelectedPhotos();
- string header = Catalog.GetPluralString ("Delete the selected photo permanently?",
- "Delete the {0} selected photos permanently?",
- photos.Length);
- header = String.Format (header, photos.Length);
- string msg = Catalog.GetPluralString ("This deletes all versions of the selected photo from your drive.",
- "This deletes all versions of the selected photos from your drive.",
- photos.Length);
- string ok_caption = Catalog.GetPluralString ("_Delete photo", "_Delete photos", photos.Length);
+ if ((Selection != null) && (Selection.Count > 0))
+ status_label.Text += String.Format (Catalog.GetPluralString (" ({0} selected)", " ({0} selected)", Selection.Count), Selection.Count);
+ status_label.UseMarkup = true;
+ return update_status_label;
+ }
- if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(GetToplevel (sender),
- DialogFlags.DestroyWithParent,
- MessageType.Warning,
- header, msg, ok_caption)) {
-
- uint timer = Log.DebugTimerStart ();
- foreach (Photo photo in photos) {
- foreach (uint id in photo.VersionIds) {
- try {
- photo.DeleteVersion (id, true);
- } catch (Exception e) {
- DeleteException (e, photo.VersionUri (id).ToString ());
- }
- }
+ void HandleZoomChanged (object sender, System.EventArgs args)
+ {
+ zoom_scale.ValueChanged -= HandleZoomScaleValueChanged;
+
+ double zoom = .5;
+ switch (ViewMode) {
+ case ModeType.PhotoView:
+ zoom = photo_view.NormalizedZoom;
+ zoom_scale.Value = zoom;
+ break;
+ case ModeType.IconView:
+ zoom = icon_view.Zoom;
+ if (zoom == 0.0 || zoom == 100.0 || zoom != zoom_scale.Value)
+ zoom_scale.Value = zoom;
+
+ break;
}
- db.Photos.Remove (photos);
- UpdateQuery ();
- Log.DebugTimerPrint (timer, "HandleDeleteCommand took {0}");
+ zoom_in.Sensitive = (zoom != 1.0);
+ zoom_out.Sensitive = (zoom != 0.0);
+
+ zoom_scale.ValueChanged += HandleZoomScaleValueChanged;
}
- }
-
- public void HandleRemoveCommand (object sender, EventArgs args)
- {
- // Don't steal characters from any text entries
- if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
- Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
- return;
+
+ void HandleZoomOut (object sender, ButtonPressEventArgs args)
+ {
+ ZoomOut ();
}
-
- Photo[] photos = SelectedPhotos();
- if (photos.Length == 0)
- return;
-
- string header = Catalog.GetPluralString ("Remove the selected photo from F-Spot?",
- "Remove the {0} selected photos from F-Spot?",
- photos.Length);
-
- header = String.Format (header, photos.Length);
- string msg = Catalog.GetString("If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again.");
- string ok_caption = Catalog.GetString("_Remove from Catalog");
- if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(GetToplevel (sender), DialogFlags.DestroyWithParent,
- MessageType.Warning, header, msg, ok_caption)) {
- db.Photos.Remove (photos);
- UpdateQuery ();
+
+ void HandleZoomOut (object sender, EventArgs args)
+ {
+ ZoomOut ();
}
- }
-
- void HandleSelectAllCommand (object sender, EventArgs args)
- {
- icon_view.SelectAllCells ();
- UpdateStatusLabel();
- }
-
- void HandleSelectNoneCommand (object sender, EventArgs args)
- {
- icon_view.Selection.Clear ();
- UpdateStatusLabel();
- }
-
- // This ConnectBefore is needed because otherwise the editability of the name
- // column will steal returns, spaces, and clicks if the tag name is focused
- [GLib.ConnectBefore]
- public void HandleTagSelectionKeyPress (object sender, Gtk.KeyPressEventArgs args)
- {
- args.RetVal = true;
-
- switch (args.Event.Key) {
- case Gdk.Key.Delete:
- HandleDeleteSelectedTagCommand (sender, (EventArgs) args);
- break;
- case Gdk.Key.space:
- case Gdk.Key.Return:
- case Gdk.Key.KP_Enter:
- ShowQueryWidget ();
- query_widget.Include (tag_selection_widget.TagHighlight);
- break;
-
- case Gdk.Key.F2:
- tag_selection_widget.EditSelectedTagName ();
- break;
+ void HandleZoomIn (object sender, ButtonPressEventArgs args)
+ {
+ ZoomIn ();
+ }
- default:
- args.RetVal = false;
- break;
+ void HandleZoomIn (object sender, EventArgs args)
+ {
+ ZoomIn ();
}
- }
-
- public void HandleDeleteSelectedTagCommand (object sender, EventArgs args)
- {
- Tag [] tags = this.tag_selection_widget.TagHighlight;
-
- System.Array.Sort (tags, new TagRemoveComparer ());
-
- //How many pictures are associated to these tags?
- Db db = MainWindow.Toplevel.Database;
- FSpot.PhotoQuery count_query = new FSpot.PhotoQuery(db.Photos);
- count_query.Terms = FSpot.OrTerm.FromTags(tags);
- int associated_photos = count_query.Count;
-
- string header;
- if (tags.Length == 1)
- header = String.Format (Catalog.GetString ("Delete tag \"{0}\"?"), tags [0].Name.Replace ("_", "__"));
- else
- header = String.Format (Catalog.GetString ("Delete the {0} selected tags?"), tags.Length);
- header = String.Format (header, tags.Length);
- string msg = String.Empty;
- if (associated_photos > 0) {
- string photodesc = Catalog.GetPluralString ("photo", "photos", associated_photos);
- msg = String.Format(
- Catalog.GetPluralString("If you delete this tag, the association with {0} {1} will be lost.",
- "If you delete these tags, the association with {0} {1} will be lost.",
- tags.Length),
- associated_photos, photodesc);
- }
- string ok_caption = Catalog.GetPluralString ("_Delete tag", "_Delete tags", tags.Length);
+ private void ZoomOut ()
+ {
+ switch (ViewMode) {
+ case ModeType.PhotoView:
+ photo_view.ZoomOut ();
+ break;
+ case ModeType.IconView:
+ icon_view.ZoomOut ();
+ break;
+ }
+ }
- if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(main_window,
- DialogFlags.DestroyWithParent,
- MessageType.Warning,
- header,
- msg,
- ok_caption)) {
- try {
- db.Photos.Remove (tags);
- } catch (InvalidTagOperationException e) {
- System.Console.WriteLine ("this is something or another");
-
- // A Category is not empty. Can not delete it.
- string error_msg = Catalog.GetString ("Tag is not empty");
- string error_desc = String.Format (Catalog.GetString ("Can not delete tags that have tags within them. " +
- "Please delete tags under \"{0}\" first"),
- e.Tag.Name.Replace ("_", "__"));
+ private void ZoomIn ()
+ {
+ switch (ViewMode) {
+ case ModeType.PhotoView:
+ double old_zoom = photo_view.Zoom;
+ try {
+ photo_view.ZoomIn ();
+ } catch {
+ photo_view.Zoom = old_zoom;
+ }
- HigMessageDialog md = new HigMessageDialog (main_window, DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, ButtonsType.Ok,
- error_msg,
- error_desc);
- md.Run ();
- md.Destroy ();
+ break;
+ case ModeType.IconView:
+ icon_view.ZoomIn ();
+ break;
}
}
- }
-
- void HandleUpdateThumbnailCommand (object sender, EventArgs args)
- {
- ThumbnailCommand command = new ThumbnailCommand (main_window);
-
- int [] selected_ids = SelectedIds ();
- if (command.Execute (SelectedPhotos (selected_ids)))
- query.MarkChanged (selected_ids, new PhotoChanges {DataChanged = true});
- }
-
- public void HandleRotate90Command (object sender, EventArgs args)
- {
- // Don't steal characters from any text entries
- if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
- Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
- return;
+
+ public void DeleteException (Exception e, string fname)
+ {
+ string ok_caption = Catalog.GetString ("_Ok");
+ string error = Catalog.GetString ("Error Deleting Picture");
+ string msg;
+
+ if (e is UnauthorizedAccessException)
+ msg = String.Format (
+ Catalog.GetString ("No permission to delete the file:{1}{0}"),
+ fname, Environment.NewLine).Replace ("_", "__");
+ else
+ msg = String.Format (
+ Catalog.GetString ("An error of type {0} occurred while deleting the file:{2}{1}"),
+ e.GetType (), fname.Replace ("_", "__"), Environment.NewLine);
+
+ HigMessageDialog.RunHigConfirmation (
+ main_window, DialogFlags.DestroyWithParent, MessageType.Error,
+ error, msg, ok_caption);
}
-
- RotateSelectedPictures (GetToplevel (sender), RotateDirection.Clockwise);
- }
-
- public void HandleRotate270Command (object sender, EventArgs args)
- {
- // Don't steal characters from any text entries
- if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
- Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
- return;
+
+ public Gtk.Window GetToplevel (object sender)
+ {
+ Widget wsender = sender as Widget;
+ Gtk.Window toplevel = null;
+
+ if (wsender != null && !(wsender is MenuItem))
+ toplevel = (Gtk.Window) wsender.Toplevel;
+ else if (fsview != null)
+ toplevel = fsview;
+ else
+ toplevel = main_window;
+
+ return toplevel;
}
-
- RotateSelectedPictures (GetToplevel (sender), RotateDirection.Counterclockwise);
- }
-
- public void HandleCopyLocation (object sender, EventArgs args)
- {
- /*
- * FIXME this should really set uri atoms as well as string atoms
- */
- Clipboard primary = Clipboard.Get (Atom.Intern ("PRIMARY", false));
- Clipboard clipboard = Clipboard.Get (Atom.Intern ("CLIPBOARD", false));
-
- StringBuilder paths = new StringBuilder ();
-
- int i = 0;
- foreach (Photo p in SelectedPhotos ()) {
- if (i++ > 0)
- paths.Append (" ");
-
- paths.Append (System.IO.Path.GetFullPath (p.DefaultVersionUri.LocalPath));
+
+ public void HandleDeleteCommand (object sender, EventArgs args)
+ {
+ // Don't steal characters from any text entries
+ if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
+ Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
+ return;
+ }
+
+ Photo[] photos = SelectedPhotos();
+ string header = Catalog.GetPluralString ("Delete the selected photo permanently?",
+ "Delete the {0} selected photos permanently?",
+ photos.Length);
+ header = String.Format (header, photos.Length);
+ string msg = Catalog.GetPluralString ("This deletes all versions of the selected photo from your drive.",
+ "This deletes all versions of the selected photos from your drive.",
+ photos.Length);
+ string ok_caption = Catalog.GetPluralString ("_Delete photo", "_Delete photos", photos.Length);
+
+ if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(GetToplevel (sender),
+ DialogFlags.DestroyWithParent,
+ MessageType.Warning,
+ header, msg, ok_caption)) {
+
+ uint timer = Log.DebugTimerStart ();
+ foreach (Photo photo in photos) {
+ foreach (uint id in photo.VersionIds) {
+ try {
+ photo.DeleteVersion (id, true);
+ } catch (Exception e) {
+ DeleteException (e, photo.VersionUri (id).ToString ());
+ }
+ }
+ }
+ Database.Photos.Remove (photos);
+
+ UpdateQuery ();
+ Log.DebugTimerPrint (timer, "HandleDeleteCommand took {0}");
+ }
}
-
- String data = paths.ToString ();
- primary.Text = data;
- clipboard.Text = data;
- }
-
- void HandleSetAsBackgroundCommand (object sender, EventArgs args)
- {
- Photo current = CurrentPhoto;
-
- if (current == null)
- return;
-
- Desktop.SetBackgroundImage (current.DefaultVersionUri.LocalPath);
- }
-
- void HandleSetDateRange (object sender, EventArgs args) {
- var date_range_dialog = new DateRangeDialog (query.Range, main_window);
- if ((ResponseType)date_range_dialog.Run () == ResponseType.Ok)
- query.Range = date_range_dialog.Range;
- date_range_dialog.Destroy ();
-
- //update the TimeLine
- if (group_selector.Adaptor is TimeAdaptor && query.Range != null)
- group_selector.SetLimitsToDates(query.Range.Start, query.Range.End);
- }
-
- public void HandleClearDateRange (object sender, EventArgs args) {
- if (group_selector.Adaptor is FSpot.TimeAdaptor) {
- group_selector.ResetLimits();
+
+ public void HandleRemoveCommand (object sender, EventArgs args)
+ {
+ // Don't steal characters from any text entries
+ if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
+ Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
+ return;
+ }
+
+ Photo[] photos = SelectedPhotos();
+ if (photos.Length == 0)
+ return;
+
+ string header = Catalog.GetPluralString ("Remove the selected photo from F-Spot?",
+ "Remove the {0} selected photos from F-Spot?",
+ photos.Length);
+
+ header = String.Format (header, photos.Length);
+ string msg = Catalog.GetString("If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again.");
+ string ok_caption = Catalog.GetString("_Remove from Catalog");
+ if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(GetToplevel (sender), DialogFlags.DestroyWithParent,
+ MessageType.Warning, header, msg, ok_caption)) {
+ Database.Photos.Remove (photos);
+ UpdateQuery ();
+ }
}
- query.Range = null;
- }
-
- void HandleSelectLastRoll (object sender, EventArgs args) {
- query.RollSet = new RollSet (db.Rolls.GetRolls (1));
- }
-
- void HandleSelectRolls (object sender, EventArgs args) {
- new LastRolls (query, db.Rolls, main_window);
- }
-
- void HandleClearRollFilter (object sender, EventArgs args) {
- query.RollSet = null;
- }
-
- void HandleSetRatingFilter (object sender, EventArgs args) {
- new RatingFilterDialog (query, main_window);
- }
-
- public void HandleClearRatingFilter (object sender, EventArgs args) {
- query.RatingRange = null;
- }
-
- void HandleFindUntagged (object sender, EventArgs args) {
- if (query.Untagged == find_untagged.Active)
- return;
-
- query.Untagged = !query.Untagged;
- }
- void OnPreferencesChanged (object sender, NotifyEventArgs args)
- {
- LoadPreference (args.Key);
- }
-
- void LoadPreference (String key)
- {
- switch (key) {
- case Preferences.MAIN_WINDOW_MAXIMIZED:
- if (Preferences.Get<bool> (key))
- main_window.Maximize ();
- else
- main_window.Unmaximize ();
- break;
-
- case Preferences.MAIN_WINDOW_X:
- case Preferences.MAIN_WINDOW_Y:
- main_window.Move(Preferences.Get<int> (Preferences.MAIN_WINDOW_X),
- Preferences.Get<int> (Preferences.MAIN_WINDOW_Y));
- break;
-
- case Preferences.MAIN_WINDOW_WIDTH:
- case Preferences.MAIN_WINDOW_HEIGHT:
- if (Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH) > 0 &&
- Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT) > 0)
- main_window.Resize(Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH),
- Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT));
-
- break;
-
- case Preferences.SHOW_TOOLBAR:
- if (display_toolbar.Active != Preferences.Get<bool> (key))
- display_toolbar.Active = Preferences.Get<bool> (key);
- break;
-
- case Preferences.SHOW_SIDEBAR:
- if (display_sidebar.Active != Preferences.Get<bool> (key))
- display_sidebar.Active = Preferences.Get<bool> (key);
- break;
-
- case Preferences.SHOW_TIMELINE:
- if (display_timeline.Active != Preferences.Get<bool> (key))
- display_timeline.Active = Preferences.Get<bool> (key);
- break;
-
- case Preferences.SHOW_FILMSTRIP:
- if (display_filmstrip.Active != Preferences.Get<bool> (key)) {
- display_filmstrip.Active = Preferences.Get<bool> (key);
+ void HandleSelectAllCommand (object sender, EventArgs args)
+ {
+ icon_view.SelectAllCells ();
+ UpdateStatusLabel();
+ }
+
+ void HandleSelectNoneCommand (object sender, EventArgs args)
+ {
+ icon_view.Selection.Clear ();
+ UpdateStatusLabel();
+ }
+
+ // This ConnectBefore is needed because otherwise the editability of the name
+ // column will steal returns, spaces, and clicks if the tag name is focused
+ [GLib.ConnectBefore]
+ public void HandleTagSelectionKeyPress (object sender, Gtk.KeyPressEventArgs args)
+ {
+ args.RetVal = true;
+
+ switch (args.Event.Key) {
+ case Gdk.Key.Delete:
+ HandleDeleteSelectedTagCommand (sender, (EventArgs) args);
+ break;
+
+ case Gdk.Key.space:
+ case Gdk.Key.Return:
+ case Gdk.Key.KP_Enter:
+ ShowQueryWidget ();
+ query_widget.Include (tag_selection_widget.TagHighlight);
+ break;
+
+ case Gdk.Key.F2:
+ tag_selection_widget.EditSelectedTagName ();
+ break;
+
+ default:
+ args.RetVal = false;
+ break;
}
- break;
-
- case Preferences.SHOW_TAGS:
- if (display_tags_menu_item.Active != Preferences.Get<bool> (key))
- display_tags_menu_item.Active = Preferences.Get<bool> (key);
- break;
-
- case Preferences.SHOW_DATES:
- if (display_dates_menu_item.Active != Preferences.Get<bool> (key))
- display_dates_menu_item.Active = Preferences.Get<bool> (key);
- //display_dates_menu_item.Toggle ();
- break;
+ }
+
+ public void HandleDeleteSelectedTagCommand (object sender, EventArgs args)
+ {
+ Tag [] tags = this.tag_selection_widget.TagHighlight;
+
+ System.Array.Sort (tags, new TagRemoveComparer ());
- case Preferences.SHOW_RATINGS:
- if (display_ratings_menu_item.Active != Preferences.Get<bool> (key))
- display_ratings_menu_item.Active = Preferences.Get<bool> (key);
- break;
-
- case Preferences.GROUP_ADAPTOR_ORDER_ASC:
- group_selector.Adaptor.OrderAscending = Preferences.Get<bool> (key);
- reverse_order.Active = Preferences.Get<bool> (key);
- query.TimeOrderAsc = group_selector.Adaptor.OrderAscending;
- break;
-
- case Preferences.GLASS_POSITION:
- if (query.Count > 0) {
- // If the database has changed since this pref was saved, this could cause
- // an exception to be thrown.
- try {
- IBrowsableItem photo = group_selector.Adaptor.PhotoFromIndex (Preferences.Get<int> (key));
+ //How many pictures are associated to these tags?
+ Db db = MainWindow.Toplevel.Database;
+ FSpot.PhotoQuery count_query = new FSpot.PhotoQuery(db.Photos);
+ count_query.Terms = FSpot.OrTerm.FromTags(tags);
+ int associated_photos = count_query.Count;
+
+ string header;
+ if (tags.Length == 1)
+ header = String.Format (Catalog.GetString ("Delete tag \"{0}\"?"), tags [0].Name.Replace ("_", "__"));
+ else
+ header = String.Format (Catalog.GetString ("Delete the {0} selected tags?"), tags.Length);
+
+ header = String.Format (header, tags.Length);
+ string msg = String.Empty;
+ if (associated_photos > 0) {
+ string photodesc = Catalog.GetPluralString ("photo", "photos", associated_photos);
+ msg = String.Format(
+ Catalog.GetPluralString("If you delete this tag, the association with {0} {1} will be lost.",
+ "If you delete these tags, the association with {0} {1} will be lost.",
+ tags.Length),
+ associated_photos, photodesc);
+ }
+ string ok_caption = Catalog.GetPluralString ("_Delete tag", "_Delete tags", tags.Length);
+
+ if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(main_window,
+ DialogFlags.DestroyWithParent,
+ MessageType.Warning,
+ header,
+ msg,
+ ok_caption)) {
+ try {
+ db.Photos.Remove (tags);
+ } catch (InvalidTagOperationException e) {
+ System.Console.WriteLine ("this is something or another");
+
+ // A Category is not empty. Can not delete it.
+ string error_msg = Catalog.GetString ("Tag is not empty");
+ string error_desc = String.Format (Catalog.GetString ("Can not delete tags that have tags within them. " +
+ "Please delete tags under \"{0}\" first"),
+ e.Tag.Name.Replace ("_", "__"));
- if (photo != null)
- JumpTo (query.IndexOf (photo));
- } catch (Exception) {}
+ HigMessageDialog md = new HigMessageDialog (main_window, DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Error, ButtonsType.Ok,
+ error_msg,
+ error_desc);
+ md.Run ();
+ md.Destroy ();
+ }
}
-
- icon_view.GrabFocus ();
- break;
- case Preferences.SIDEBAR_POSITION:
- if (main_hpaned.Position !=Preferences.Get<int> (key) )
- main_hpaned.Position = Preferences.Get<int> (key);
- break;
-
- case Preferences.TAG_ICON_SIZE:
- int s = Preferences.Get<int> (key);
- tag_icon_hidden.Active = (s == (int) Tag.IconSize.Hidden);
- tag_icon_small.Active = (s == (int) Tag.IconSize.Small);
- tag_icon_medium.Active = (s == (int) Tag.IconSize.Medium);
- tag_icon_large.Active = (s == (int) Tag.IconSize.Large);
-
- break;
-
- case Preferences.ZOOM:
- icon_view.Zoom = Preferences.Get<double> (key);
- break;
-
- case Preferences.METADATA_EMBED_IN_IMAGE:
- write_metadata =Preferences.Get<bool> (key) ;
- break;
- case Preferences.GNOME_MAILTO_ENABLED:
- send_mail.Visible = Preferences.Get<bool> (key);
- break;
}
- }
-
- // Version Id updates.
-
- void UpdateForVersionIdChange (uint version_id)
- {
- CurrentPhoto.DefaultVersionId = version_id;
- query.Commit (ActiveIndex ());
- }
-
- // Queries.
-
- public void UpdateQuery ()
- {
- main_window.GdkWindow.Cursor = watch;
- main_window.GdkWindow.Display.Sync ();
- query.RequestReload ();
- main_window.GdkWindow.Cursor = null;
- }
-
- void HandleTagSelectionChanged (object obj, EventArgs args)
- {
- UpdateMenus ();
- }
-
- public bool TagIncluded (Tag tag)
- {
- return query_widget.TagIncluded (tag);
- }
- public bool TagRequired (Tag tag)
- {
- return query_widget.TagRequired (tag);
- }
-
- private void HandleQueryLogicChanged (object sender, EventArgs args)
- {
- HandleFindAddTagWith (null, null);
- }
+ void HandleUpdateThumbnailCommand (object sender, EventArgs args)
+ {
+ ThumbnailCommand command = new ThumbnailCommand (main_window);
- public void HandleIncludeTag (object sender, EventArgs args)
- {
- ShowQueryWidget ();
- query_widget.Include (tag_selection_widget.TagHighlight);
- }
+ int [] selected_ids = SelectedIds ();
+ if (command.Execute (SelectedPhotos (selected_ids)))
+ query.MarkChanged (selected_ids, new PhotoChanges {DataChanged = true});
+ }
- public void HandleUnIncludeTag (object sender, EventArgs args)
- {
- query_widget.UnInclude (tag_selection_widget.TagHighlight);
- }
+ public void HandleRotate90Command (object sender, EventArgs args)
+ {
+ // Don't steal characters from any text entries
+ if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
+ Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
+ return;
+ }
+
+ RotateSelectedPictures (GetToplevel (sender), RotateDirection.Clockwise);
+ }
- void HandleFindByTag (object sender, EventArgs args)
- {
- UpdateFindByTagMenu ();
- }
+ public void HandleRotate270Command (object sender, EventArgs args)
+ {
+ // Don't steal characters from any text entries
+ if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
+ Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
+ return;
+ }
- public void UpdateFindByTagMenu ()
- {
- if (query_widget.Visible) {
- query_widget.Close ();
- } else {
- ShowQueryWidget ();
+ RotateSelectedPictures (GetToplevel (sender), RotateDirection.Counterclockwise);
}
- }
- void HandleFindAddTagWith (object sender, EventArgs args)
- {
- MenuItem find_add_tag_with = uimanager.GetWidget ("/ui/menubar1/find/find_add_tag_with") as MenuItem;
- if (find_add_tag_with.Submenu != null)
- find_add_tag_with.Submenu.Dispose ();
-
- Gtk.Menu submenu = FSpot.TermMenuItem.GetSubmenu (tag_selection_widget.TagHighlight);
- find_add_tag_with.Sensitive = (submenu != null);
- if (submenu != null)
- find_add_tag_with.Submenu = submenu;
- }
+ public void HandleCopy (object sender, EventArgs args)
+ {
+ Clipboard primary = Clipboard.Get (Atom.Intern ("PRIMARY", false));
+ Clipboard clipboard = Clipboard.Get (Atom.Intern ("CLIPBOARD", false));
+
+ clipboard.SetWithData (new TargetEntry[] {
+ DragDropTargets.PlainTextEntry,
+ DragDropTargets.UriListEntry,
+ DragDropTargets.CopyFilesEntry,},
+ delegate (Clipboard clip, SelectionData data, uint info) {
+ var paths = new List<string> ();
+ var uris = new List<string> ();
+ foreach (Photo p in SelectedPhotos ()) {
+ paths.Add (System.IO.Path.GetFullPath (p.DefaultVersionUri.LocalPath));
+ uris.Add (p.DefaultVersionUri.ToString ());
+ }
+ data.Text = String.Join (" ", paths.ToArray ());
+ data.SetUris (String.Join (" ", uris.ToArray ()));
+ data.Set (Atom.Intern ("x-special/gnome-copied-files", true), 8, System.Text.Encoding.UTF8.GetBytes ("copy\n" + String.Join ("\n", uris.ToArray ())));
+
+ },
+ delegate {});
- public void HandleAddTagToTerm (object sender, EventArgs args)
- {
- MenuItem item = sender as MenuItem;
-
- int item_pos = 0;
- foreach (MenuItem i in (item.Parent as Menu).Children) {
- if (item == i) {
- break;
+ var pt = new List<string> ();
+ foreach (Photo p in SelectedPhotos ()) {
+ pt.Add (System.IO.Path.GetFullPath (p.DefaultVersionUri.LocalPath));
}
- item_pos++;
+ primary.Text = String.Join (" ", pt.ToArray ());
}
- // account for All and separator menu items
- item_pos -= 2;
-
- FSpot.Term parent_term = (FSpot.Term) FSpot.LogicWidget.Root.SubTerms [item_pos];
-
- if (FSpot.LogicWidget.Box != null) {
- FSpot.Literal after = parent_term.Last as FSpot.Literal;
- FSpot.LogicWidget.Box.InsertTerm (tag_selection_widget.TagHighlight, parent_term, after);
+
+ void HandleSetAsBackgroundCommand (object sender, EventArgs args)
+ {
+ Photo current = CurrentPhoto;
+
+ if (current == null)
+ return;
+
+ Desktop.SetBackgroundImage (current.DefaultVersionUri.LocalPath);
}
- }
- void HandleFindTagIncluded (Tag t)
- {
- ShowQueryWidget ();
- query_widget.Include (new Tag [] {t});
- }
+ void HandleSetDateRange (object sender, EventArgs args) {
+ var date_range_dialog = new DateRangeDialog (query.Range, main_window);
+ if ((ResponseType)date_range_dialog.Run () == ResponseType.Ok)
+ query.Range = date_range_dialog.Range;
+ date_range_dialog.Destroy ();
- void HandleFindTagRequired (Tag t)
- {
- ShowQueryWidget ();
- query_widget.Require (new Tag [] {t});
- }
-
- //
- // Handle Main Menu
-
- void UpdateMenus ()
- {
- int tags_selected = tag_selection_widget.Selection.CountSelectedRows ();
- bool tag_sensitive = tags_selected > 0;
- bool active_selection = selection.Count > 0;
- bool single_active = CurrentPhoto != null;
- MenuItem version_menu_item = uimanager.GetWidget ("/ui/menubar1/file1/version_menu_item") as MenuItem;
+ //update the TimeLine
+ if (group_selector.Adaptor is TimeAdaptor && query.Range != null)
+ group_selector.SetLimitsToDates(query.Range.Start, query.Range.End);
+ }
+
+ public void HandleClearDateRange (object sender, EventArgs args) {
+ if (group_selector.Adaptor is FSpot.TimeAdaptor) {
+ group_selector.ResetLimits();
+ }
+ query.Range = null;
+ }
+
+ void HandleSelectLastRoll (object sender, EventArgs args) {
+ query.RollSet = new RollSet (Database.Rolls.GetRolls (1));
+ }
+
+ void HandleSelectRolls (object sender, EventArgs args) {
+ new LastRolls (query, Database.Rolls, main_window);
+ }
+
+ void HandleClearRollFilter (object sender, EventArgs args) {
+ query.RollSet = null;
+ }
+
+ void HandleSetRatingFilter (object sender, EventArgs args) {
+ new RatingFilterDialog (query, main_window);
+ }
+
+ public void HandleClearRatingFilter (object sender, EventArgs args) {
+ query.RatingRange = null;
+ }
+
+ void HandleFindUntagged (object sender, EventArgs args) {
+ if (query.Untagged == find_untagged.Active)
+ return;
+
+ query.Untagged = !query.Untagged;
+ }
- if (!single_active) {
- version_menu_item.Sensitive = false;
- version_menu_item.Submenu = new Menu ();
-
- create_version_menu_item.Sensitive = false;
- delete_version_menu_item.Sensitive = false;
- rename_version_menu_item.Sensitive = false;
-
- sharpen.Sensitive = false;
- loupe_menu_item.Sensitive = false;
- } else {
- version_menu_item.Sensitive = true;
- create_version_menu_item.Sensitive = true;
+ void OnPreferencesChanged (object sender, NotifyEventArgs args)
+ {
+ LoadPreference (args.Key);
+ }
+
+ void LoadPreference (String key)
+ {
+ switch (key) {
+ case Preferences.MAIN_WINDOW_MAXIMIZED:
+ if (Preferences.Get<bool> (key))
+ main_window.Maximize ();
+ else
+ main_window.Unmaximize ();
+ break;
+
+ case Preferences.MAIN_WINDOW_X:
+ case Preferences.MAIN_WINDOW_Y:
+ main_window.Move(Preferences.Get<int> (Preferences.MAIN_WINDOW_X),
+ Preferences.Get<int> (Preferences.MAIN_WINDOW_Y));
+ break;
- if (CurrentPhoto.DefaultVersionId == Photo.OriginalVersionId) {
- delete_version_menu_item.Sensitive = false;
- rename_version_menu_item.Sensitive = false;
- } else {
- delete_version_menu_item.Sensitive = true;
- rename_version_menu_item.Sensitive = true;
+ case Preferences.MAIN_WINDOW_WIDTH:
+ case Preferences.MAIN_WINDOW_HEIGHT:
+ if (Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH) > 0 &&
+ Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT) > 0)
+ main_window.Resize(Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH),
+ Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT));
+
+ break;
+
+ case Preferences.SHOW_TOOLBAR:
+ if (display_toolbar.Active != Preferences.Get<bool> (key))
+ display_toolbar.Active = Preferences.Get<bool> (key);
+ break;
+
+ case Preferences.SHOW_SIDEBAR:
+ if (display_sidebar.Active != Preferences.Get<bool> (key))
+ display_sidebar.Active = Preferences.Get<bool> (key);
+ break;
+
+ case Preferences.SHOW_TIMELINE:
+ if (display_timeline.Active != Preferences.Get<bool> (key))
+ display_timeline.Active = Preferences.Get<bool> (key);
+ break;
+
+ case Preferences.SHOW_FILMSTRIP:
+ if (display_filmstrip.Active != Preferences.Get<bool> (key)) {
+ display_filmstrip.Active = Preferences.Get<bool> (key);
+ }
+ break;
+
+ case Preferences.SHOW_TAGS:
+ if (display_tags_menu_item.Active != Preferences.Get<bool> (key))
+ display_tags_menu_item.Active = Preferences.Get<bool> (key);
+ break;
+
+ case Preferences.SHOW_DATES:
+ if (display_dates_menu_item.Active != Preferences.Get<bool> (key))
+ display_dates_menu_item.Active = Preferences.Get<bool> (key);
+ //display_dates_menu_item.Toggle ();
+ break;
+
+ case Preferences.SHOW_RATINGS:
+ if (display_ratings_menu_item.Active != Preferences.Get<bool> (key))
+ display_ratings_menu_item.Active = Preferences.Get<bool> (key);
+ break;
+
+ case Preferences.GROUP_ADAPTOR_ORDER_ASC:
+ group_selector.Adaptor.OrderAscending = Preferences.Get<bool> (key);
+ reverse_order.Active = Preferences.Get<bool> (key);
+ query.TimeOrderAsc = group_selector.Adaptor.OrderAscending;
+ break;
+
+ case Preferences.GLASS_POSITION:
+ if (query.Count > 0) {
+ // If the database has changed since this pref was saved, this could cause
+ // an exception to be thrown.
+ try {
+ IBrowsableItem photo = group_selector.Adaptor.PhotoFromIndex (Preferences.Get<int> (key));
+
+ if (photo != null)
+ JumpTo (query.IndexOf (photo));
+ } catch (Exception) {}
+ }
+
+ icon_view.GrabFocus ();
+ break;
+ case Preferences.SIDEBAR_POSITION:
+ if (main_hpaned.Position !=Preferences.Get<int> (key) )
+ main_hpaned.Position = Preferences.Get<int> (key);
+ break;
+
+ case Preferences.TAG_ICON_SIZE:
+ int s = Preferences.Get<int> (key);
+ tag_icon_hidden.Active = (s == (int) Tag.IconSize.Hidden);
+ tag_icon_small.Active = (s == (int) Tag.IconSize.Small);
+ tag_icon_medium.Active = (s == (int) Tag.IconSize.Medium);
+ tag_icon_large.Active = (s == (int) Tag.IconSize.Large);
+
+ break;
+
+ case Preferences.ZOOM:
+ icon_view.Zoom = Preferences.Get<double> (key);
+ break;
+
+ case Preferences.METADATA_EMBED_IN_IMAGE:
+ write_metadata =Preferences.Get<bool> (key) ;
+ break;
+ case Preferences.GNOME_MAILTO_ENABLED:
+ send_mail.Visible = Preferences.Get<bool> (key);
+ break;
}
-
- versions_submenu = new PhotoVersionMenu (CurrentPhoto);
- versions_submenu.VersionIdChanged += delegate (PhotoVersionMenu menu) { UpdateForVersionIdChange (menu.VersionId);};
- version_menu_item.Submenu = versions_submenu;
-
- sharpen.Sensitive = (view_mode == ModeType.IconView ? false : true);
- loupe_menu_item.Sensitive = (view_mode == ModeType.IconView ? false : true);
}
-
- set_as_background.Sensitive = single_active;
- adjust_time.Sensitive = active_selection;
-
- attach_tag.Sensitive = active_selection;
- remove_tag.Sensitive = active_selection;
-
- rotate_left.Sensitive = active_selection;
- rotate_right.Sensitive = active_selection;
- update_thumbnail.Sensitive = active_selection;
- delete_from_drive.Sensitive = active_selection;
+
+ // Version Id updates.
+
+ void UpdateForVersionIdChange (uint version_id)
+ {
+ CurrentPhoto.DefaultVersionId = version_id;
+ query.Commit (ActiveIndex ());
+ }
+
+ // Queries.
+
+ public void UpdateQuery ()
+ {
+ main_window.GdkWindow.Cursor = watch;
+ main_window.GdkWindow.Display.Sync ();
+ query.RequestReload ();
+ main_window.GdkWindow.Cursor = null;
+ }
+
+ void HandleTagSelectionChanged (object obj, EventArgs args)
+ {
+ UpdateMenus ();
+ }
+
+ public bool TagIncluded (Tag tag)
+ {
+ return query_widget.TagIncluded (tag);
+ }
+
+ public bool TagRequired (Tag tag)
+ {
+ return query_widget.TagRequired (tag);
+ }
+
+ private void HandleQueryLogicChanged (object sender, EventArgs args)
+ {
+ HandleFindAddTagWith (null, null);
+ }
- send_mail.Sensitive = active_selection;
- print.Sensitive = active_selection;
- select_none.Sensitive = active_selection;
- copy_location.Sensitive = active_selection;
- remove_from_catalog.Sensitive = active_selection;
+ public void HandleIncludeTag (object sender, EventArgs args)
+ {
+ ShowQueryWidget ();
+ query_widget.Include (tag_selection_widget.TagHighlight);
+ }
- clear_rating_filter.Sensitive = (query.RatingRange != null);
-
- clear_roll_filter.Sensitive = (query.RollSet != null);
+ public void HandleUnIncludeTag (object sender, EventArgs args)
+ {
+ query_widget.UnInclude (tag_selection_widget.TagHighlight);
+ }
- delete_selected_tag.Sensitive = tag_sensitive;
- edit_selected_tag.Sensitive = tag_sensitive;
-
-
- attach_tag_to_selection.Sensitive = tag_sensitive && active_selection;
- remove_tag_from_selection.Sensitive = tag_sensitive && active_selection;
-
- export.Sensitive = active_selection;
-
- MenuItem toolsmenu = uimanager.GetWidget ("/ui/menubar1/tools") as MenuItem;
- try {
- tools.Visible = (toolsmenu.Submenu as Menu).Children.Length > 0;
- } catch {
- tools.Visible = false;
+ void HandleFindByTag (object sender, EventArgs args)
+ {
+ UpdateFindByTagMenu ();
}
-
- if (rl_button != null) {
- if (selection.Count == 0) {
- rl_button.Sensitive = false;
- rl_button.SetTooltip (ToolTips, Catalog.GetString (String.Empty), null);
+
+ public void UpdateFindByTagMenu ()
+ {
+ if (query_widget.Visible) {
+ query_widget.Close ();
} else {
- rl_button.Sensitive = true;
-
- string msg = Catalog.GetPluralString ("Rotate selected photo left",
- "Rotate selected photos left", selection.Count);
- rl_button.SetTooltip (ToolTips, String.Format (msg, selection.Count), null);
+ ShowQueryWidget ();
}
}
- if (rr_button != null) {
- if (selection.Count == 0) {
- rr_button.Sensitive = false;
- rr_button.SetTooltip (ToolTips, Catalog.GetString (String.Empty), null);
- } else {
- rr_button.Sensitive = true;
-
- string msg = Catalog.GetPluralString ("Rotate selected photo right",
- "Rotate selected photos right", selection.Count);
- rr_button.SetTooltip (ToolTips, String.Format (msg, selection.Count), null);
+ void HandleFindAddTagWith (object sender, EventArgs args)
+ {
+ MenuItem find_add_tag_with = uimanager.GetWidget ("/ui/menubar1/find/find_add_tag_with") as MenuItem;
+ if (find_add_tag_with.Submenu != null)
+ find_add_tag_with.Submenu.Dispose ();
+
+ Gtk.Menu submenu = FSpot.TermMenuItem.GetSubmenu (tag_selection_widget.TagHighlight);
+ find_add_tag_with.Sensitive = (submenu != null);
+ if (submenu != null)
+ find_add_tag_with.Submenu = submenu;
+ }
+
+ public void HandleAddTagToTerm (object sender, EventArgs args)
+ {
+ MenuItem item = sender as MenuItem;
+
+ int item_pos = 0;
+ foreach (MenuItem i in (item.Parent as Menu).Children) {
+ if (item == i) {
+ break;
+ }
+
+ item_pos++;
+ }
+ // account for All and separator menu items
+ item_pos -= 2;
+
+ FSpot.Term parent_term = (FSpot.Term) FSpot.LogicWidget.Root.SubTerms [item_pos];
+
+ if (FSpot.LogicWidget.Box != null) {
+ FSpot.Literal after = parent_term.Last as FSpot.Literal;
+ FSpot.LogicWidget.Box.InsertTerm (tag_selection_widget.TagHighlight, parent_term, after);
}
}
-
- //if (last_tags_selected_count != tags_selected) {
- MenuItem find_add_tag = uimanager.GetWidget ("/ui/menubar1/find/find_add_tag") as MenuItem;
- MenuItem find_add_tag_with = uimanager.GetWidget ("/ui/menubar1/find/find_add_tag_with") as MenuItem;
-
- ((Gtk.Label)find_add_tag.Child).TextWithMnemonic = String.Format (
- Catalog.GetPluralString ("Find _Selected Tag", "Find _Selected Tags", tags_selected), tags_selected
- );
-
- ((Gtk.Label)find_add_tag_with.Child).TextWithMnemonic = String.Format (
- Catalog.GetPluralString ("Find Selected Tag _With", "Find Selected Tags _With", tags_selected), tags_selected
- );
-
- find_add_tag.Sensitive = tag_sensitive;
- find_add_tag_with.Sensitive = tag_sensitive && find_add_tag_with.Submenu != null;
-
- //last_tags_selected_count = tags_selected;
- //}
- }
-
- void PopulateExtendableMenus (object o, EventArgs args)
- {
- MenuItem exportmenu = uimanager.GetWidget ("/ui/menubar1/file1/export") as MenuItem;
- MenuItem toolsmenu = uimanager.GetWidget ("/ui/menubar1/tools") as MenuItem;
- try {
- if (exportmenu.Submenu != null)
- exportmenu.Submenu.Dispose ();
- if (toolsmenu.Submenu != null)
- toolsmenu.RemoveSubmenu ();
-
- exportmenu.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Exports") as FSpot.Extensions.SubmenuNode).GetSubmenu ();
- exportmenu.Submenu.ShowAll ();
-
- toolsmenu.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Tools") as FSpot.Extensions.SubmenuNode).GetSubmenu ();
- toolsmenu.Submenu.ShowAll ();
-
- tools.Visible = (toolsmenu.Submenu as Menu).Children.Length > 0;
- } catch {
- Log.Warning ("There's (maybe) something wrong with some of the installed extensions. You can try removing the directory addin-db-000 from ~/.config/f-spot/");
- toolsmenu.Visible = false;
+
+ void HandleFindTagIncluded (Tag t)
+ {
+ ShowQueryWidget ();
+ query_widget.Include (new Tag [] {t});
+ }
+
+ void HandleFindTagRequired (Tag t)
+ {
+ ShowQueryWidget ();
+ query_widget.Require (new Tag [] {t});
}
- }
-
- public void HandleOpenWith (object sender, ApplicationActivatedEventArgs e)
- {
- GLib.AppInfo application = e.AppInfo;
- Photo[] selected = SelectedPhotos ();
-
- if (selected == null || selected.Length < 1)
- return;
-
- string header = Catalog.GetPluralString ("Create New Version?", "Create New Versions?", selected.Length);
- string msg = String.Format (Catalog.GetPluralString (
- "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?",
- "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?", selected.Length),
- selected.Length, application.Name);
-
- // FIXME add cancel button? add help button?
- HigMessageDialog hmd = new HigMessageDialog(GetToplevel (sender), DialogFlags.DestroyWithParent,
- MessageType.Question, Gtk.ButtonsType.None,
- header, msg);
-
- hmd.AddButton (Gtk.Stock.No, Gtk.ResponseType.No, false);
- //hmd.AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel, false);
- hmd.AddButton (Gtk.Stock.Yes, Gtk.ResponseType.Yes, true);
-
- bool support_xcf = false;;
- if (application.Id == "gimp.desktop")
- foreach (Gdk.PixbufFormat format in Gdk.Pixbuf.Formats)
- if (format.Name == "xcf")
- support_xcf = true;
-
- //This allows creating a version with a .xcf extension.
- //There's no need to convert the file to xcf file format, gimp will take care of this
- if (support_xcf) {
- CheckButton cb = new CheckButton (Catalog.GetString ("XCF version"));
- cb.Active = Preferences.Get<bool> (Preferences.EDIT_CREATE_XCF_VERSION);
- hmd.VBox.Add (cb);
- cb.Toggled += delegate (object s, EventArgs ea) {
- Preferences.Set (Preferences.EDIT_CREATE_XCF_VERSION, (s as CheckButton).Active);
- };
- cb.Show ();
+
+ //
+ // Handle Main Menu
+
+ void UpdateMenus ()
+ {
+ int tags_selected = tag_selection_widget.Selection.CountSelectedRows ();
+ bool tag_sensitive = tags_selected > 0;
+ bool active_selection = Selection.Count > 0;
+ bool single_active = CurrentPhoto != null;
+ MenuItem version_menu_item = uimanager.GetWidget ("/ui/menubar1/file1/version_menu_item") as MenuItem;
+
+ if (!single_active) {
+ version_menu_item.Sensitive = false;
+ version_menu_item.Submenu = new Menu ();
+
+ create_version_menu_item.Sensitive = false;
+ delete_version_menu_item.Sensitive = false;
+ rename_version_menu_item.Sensitive = false;
+
+ sharpen.Sensitive = false;
+ loupe_menu_item.Sensitive = false;
+ } else {
+ version_menu_item.Sensitive = true;
+ create_version_menu_item.Sensitive = true;
+
+ if (CurrentPhoto.DefaultVersionId == Photo.OriginalVersionId) {
+ delete_version_menu_item.Sensitive = false;
+ rename_version_menu_item.Sensitive = false;
+ } else {
+ delete_version_menu_item.Sensitive = true;
+ rename_version_menu_item.Sensitive = true;
+ }
+
+ versions_submenu = new PhotoVersionMenu (CurrentPhoto);
+ versions_submenu.VersionIdChanged += delegate (PhotoVersionMenu menu) { UpdateForVersionIdChange (menu.VersionId);};
+ version_menu_item.Submenu = versions_submenu;
+
+ sharpen.Sensitive = (ViewMode == ModeType.IconView ? false : true);
+ loupe_menu_item.Sensitive = (ViewMode == ModeType.IconView ? false : true);
+ }
+
+ set_as_background.Sensitive = single_active;
+ adjust_time.Sensitive = active_selection;
+
+ attach_tag.Sensitive = active_selection;
+ remove_tag.Sensitive = active_selection;
+
+ rotate_left.Sensitive = active_selection;
+ rotate_right.Sensitive = active_selection;
+ update_thumbnail.Sensitive = active_selection;
+ delete_from_drive.Sensitive = active_selection;
+
+ send_mail.Sensitive = active_selection;
+ print.Sensitive = active_selection;
+ select_none.Sensitive = active_selection;
+ copy.Sensitive = active_selection;
+ remove_from_catalog.Sensitive = active_selection;
+
+ clear_rating_filter.Sensitive = (query.RatingRange != null);
+
+ clear_roll_filter.Sensitive = (query.RollSet != null);
+
+ delete_selected_tag.Sensitive = tag_sensitive;
+ edit_selected_tag.Sensitive = tag_sensitive;
+
+
+ attach_tag_to_selection.Sensitive = tag_sensitive && active_selection;
+ remove_tag_from_selection.Sensitive = tag_sensitive && active_selection;
+
+ export.Sensitive = active_selection;
+
+ MenuItem toolsmenu = uimanager.GetWidget ("/ui/menubar1/tools") as MenuItem;
+ try {
+ tools.Visible = (toolsmenu.Submenu as Menu).Children.Length > 0;
+ } catch {
+ tools.Visible = false;
+ }
+
+ if (rl_button != null) {
+ if (Selection.Count == 0) {
+ rl_button.Sensitive = false;
+ rl_button.SetTooltip (ToolTips, Catalog.GetString (String.Empty), null);
+ } else {
+ rl_button.Sensitive = true;
+
+ string msg = Catalog.GetPluralString ("Rotate selected photo left",
+ "Rotate selected photos left", Selection.Count);
+ rl_button.SetTooltip (ToolTips, String.Format (msg, Selection.Count), null);
+ }
+ }
+
+ if (rr_button != null) {
+ if (Selection.Count == 0) {
+ rr_button.Sensitive = false;
+ rr_button.SetTooltip (ToolTips, Catalog.GetString (String.Empty), null);
+ } else {
+ rr_button.Sensitive = true;
+
+ string msg = Catalog.GetPluralString ("Rotate selected photo right",
+ "Rotate selected photos right", Selection.Count);
+ rr_button.SetTooltip (ToolTips, String.Format (msg, Selection.Count), null);
+ }
+ }
+
+ //if (last_tags_selected_count != tags_selected) {
+ MenuItem find_add_tag = uimanager.GetWidget ("/ui/menubar1/find/find_add_tag") as MenuItem;
+ MenuItem find_add_tag_with = uimanager.GetWidget ("/ui/menubar1/find/find_add_tag_with") as MenuItem;
+
+ ((Gtk.Label)find_add_tag.Child).TextWithMnemonic = String.Format (
+ Catalog.GetPluralString ("Find _Selected Tag", "Find _Selected Tags", tags_selected), tags_selected
+ );
+
+ ((Gtk.Label)find_add_tag_with.Child).TextWithMnemonic = String.Format (
+ Catalog.GetPluralString ("Find Selected Tag _With", "Find Selected Tags _With", tags_selected), tags_selected
+ );
+
+ find_add_tag.Sensitive = tag_sensitive;
+ find_add_tag_with.Sensitive = tag_sensitive && find_add_tag_with.Submenu != null;
+
+ //last_tags_selected_count = tags_selected;
+ //}
}
-
- Gtk.ResponseType response = Gtk.ResponseType.Cancel;
-
- try {
- response = (Gtk.ResponseType) hmd.Run();
- } finally {
- hmd.Destroy ();
+
+ void PopulateExtendableMenus (object o, EventArgs args)
+ {
+ MenuItem exportmenu = uimanager.GetWidget ("/ui/menubar1/file1/export") as MenuItem;
+ MenuItem toolsmenu = uimanager.GetWidget ("/ui/menubar1/tools") as MenuItem;
+ try {
+ if (exportmenu.Submenu != null)
+ exportmenu.Submenu.Dispose ();
+ if (toolsmenu.Submenu != null)
+ toolsmenu.RemoveSubmenu ();
+
+ exportmenu.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Exports") as FSpot.Extensions.SubmenuNode).GetSubmenu ();
+ exportmenu.Submenu.ShowAll ();
+
+ toolsmenu.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Tools") as FSpot.Extensions.SubmenuNode).GetSubmenu ();
+ toolsmenu.Submenu.ShowAll ();
+
+ tools.Visible = (toolsmenu.Submenu as Menu).Children.Length > 0;
+ } catch {
+ Log.Warning ("There's (maybe) something wrong with some of the installed extensions. You can try removing the directory addin-db-000 from ~/.config/f-spot/");
+ toolsmenu.Visible = false;
+ }
}
-
- bool create_xcf = false;
- if (support_xcf)
- create_xcf = Preferences.Get<bool> (Preferences.EDIT_CREATE_XCF_VERSION);
-
- Console.WriteLine ("XCF ? {0}", create_xcf);
-
- if (response == Gtk.ResponseType.Cancel)
- return;
-
- bool create_new_versions = (response == Gtk.ResponseType.Yes);
-
- ArrayList errors = new ArrayList ();
- GLib.List uri_list = new GLib.List (typeof (string));
- foreach (Photo photo in selected) {
+
+ public void HandleOpenWith (object sender, ApplicationActivatedEventArgs e)
+ {
+ GLib.AppInfo application = e.AppInfo;
+ Photo[] selected = SelectedPhotos ();
+
+ if (selected == null || selected.Length < 1)
+ return;
+
+ string header = Catalog.GetPluralString ("Create New Version?", "Create New Versions?", selected.Length);
+ string msg = String.Format (Catalog.GetPluralString (
+ "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?",
+ "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?", selected.Length),
+ selected.Length, application.Name);
+
+ // FIXME add cancel button? add help button?
+ HigMessageDialog hmd = new HigMessageDialog(GetToplevel (sender), DialogFlags.DestroyWithParent,
+ MessageType.Question, Gtk.ButtonsType.None,
+ header, msg);
+
+ hmd.AddButton (Gtk.Stock.No, Gtk.ResponseType.No, false);
+ //hmd.AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel, false);
+ hmd.AddButton (Gtk.Stock.Yes, Gtk.ResponseType.Yes, true);
+
+ bool support_xcf = false;;
+ if (application.Id == "gimp.desktop")
+ foreach (Gdk.PixbufFormat format in Gdk.Pixbuf.Formats)
+ if (format.Name == "xcf")
+ support_xcf = true;
+
+ //This allows creating a version with a .xcf extension.
+ //There's no need to convert the file to xcf file format, gimp will take care of this
+ if (support_xcf) {
+ CheckButton cb = new CheckButton (Catalog.GetString ("XCF version"));
+ cb.Active = Preferences.Get<bool> (Preferences.EDIT_CREATE_XCF_VERSION);
+ hmd.VBox.Add (cb);
+ cb.Toggled += delegate (object s, EventArgs ea) {
+ Preferences.Set (Preferences.EDIT_CREATE_XCF_VERSION, (s as CheckButton).Active);
+ };
+ cb.Show ();
+ }
+
+ Gtk.ResponseType response = Gtk.ResponseType.Cancel;
+
try {
- if (create_new_versions) {
- uint version = photo.CreateNamedVersion (application.Name, create_xcf ? ".xcf" : null, photo.DefaultVersionId, true);
- photo.DefaultVersionId = version;
+ response = (Gtk.ResponseType) hmd.Run();
+ } finally {
+ hmd.Destroy ();
+ }
+
+ bool create_xcf = false;
+ if (support_xcf)
+ create_xcf = Preferences.Get<bool> (Preferences.EDIT_CREATE_XCF_VERSION);
+
+ Console.WriteLine ("XCF ? {0}", create_xcf);
+
+ if (response == Gtk.ResponseType.Cancel)
+ return;
+
+ bool create_new_versions = (response == Gtk.ResponseType.Yes);
+
+ ArrayList errors = new ArrayList ();
+ GLib.List uri_list = new GLib.List (typeof (string));
+ foreach (Photo photo in selected) {
+ try {
+ if (create_new_versions) {
+ uint version = photo.CreateNamedVersion (application.Name, create_xcf ? ".xcf" : null, photo.DefaultVersionId, true);
+ photo.DefaultVersionId = version;
+ }
+ } catch (Exception ex) {
+ errors.Add (new EditException (photo, ex));
}
- } catch (Exception ex) {
- errors.Add (new EditException (photo, ex));
+
+ uri_list.Append (photo.DefaultVersionUri.ToString ());
+ }
+
+ // FIXME need to clean up the error dialog here.
+ if (errors.Count > 0) {
+ Dialog md = new EditExceptionDialog (GetToplevel (sender), errors.ToArray (typeof (EditException)) as EditException []);
+ md.Run ();
+ md.Destroy ();
+ }
+
+ if (create_new_versions)
+ Database.Photos.Commit (selected);
+
+ try {
+ application.LaunchUris (uri_list, null);
+ } catch (System.Exception) {
+ Log.Error ("Failed to lauch {0}", application.Name);
}
-
- uri_list.Append (photo.DefaultVersionUri.ToString ());
}
-
- // FIXME need to clean up the error dialog here.
- if (errors.Count > 0) {
- Dialog md = new EditExceptionDialog (GetToplevel (sender), errors.ToArray (typeof (EditException)) as EditException []);
- md.Run ();
- md.Destroy ();
+
+ public void GetWidgetPosition(Widget widget, out int x, out int y)
+ {
+ main_window.GdkWindow.GetOrigin(out x, out y);
+
+ x += widget.Allocation.X;
+ y += widget.Allocation.Y;
+ }
+
+ // Tag typing ...
+
+ private void UpdateTagEntryFromSelection ()
+ {
+ if (!tagbar.Visible)
+ return;
+ tag_entry.UpdateFromSelection (SelectedPhotos ());
}
-
- if (create_new_versions)
- db.Photos.Commit (selected);
-
- try {
- application.LaunchUris (uri_list, null);
- } catch (System.Exception) {
- Log.Error ("Failed to lauch {0}", application.Name);
+
+ public void HandlePossibleTagTyping (object sender, Gtk.KeyPressEventArgs args)
+ {
+ if (Selection.Count == 0 || tagbar.Visible && tag_entry.HasFocus)
+ return;
+
+ #if !ALLOW_TAG_TYPING_WITHOUT_HOTKEY
+ if (args.Event.Key != Gdk.Key.t)
+ return;
+ #endif
+
+ #if ALLOW_TAG_TYPING_WITHOUT_HOTKEY
+ char c = System.Convert.ToChar (Gdk.Keyval.ToUnicode ((uint) args.Event.Key));
+ if (! System.Char.IsLetter (c))
+ return;
+ #endif
+
+ #if ALLOW_TAG_TYPING_WITHOUT_HOTKEY
+ tag_entry.Text += c;
+ #endif
+
+ tagbar.Show ();
+ UpdateTagEntryFromSelection ();
+ tag_entry.GrabFocus ();
+ tag_entry.SelectRegion (-1, -1);
}
- }
-
- public void GetWidgetPosition(Widget widget, out int x, out int y)
- {
- main_window.GdkWindow.GetOrigin(out x, out y);
-
- x += widget.Allocation.X;
- y += widget.Allocation.Y;
- }
-
- // Tag typing ...
-
- private void UpdateTagEntryFromSelection ()
- {
- if (!tagbar.Visible)
- return;
- tag_entry.UpdateFromSelection (SelectedPhotos ());
- }
-
- public void HandlePossibleTagTyping (object sender, Gtk.KeyPressEventArgs args)
- {
- if (Selection.Count == 0 || tagbar.Visible && tag_entry.HasFocus)
- return;
-
-#if !ALLOW_TAG_TYPING_WITHOUT_HOTKEY
- if (args.Event.Key != Gdk.Key.t)
- return;
-#endif
-
-#if ALLOW_TAG_TYPING_WITHOUT_HOTKEY
- char c = System.Convert.ToChar (Gdk.Keyval.ToUnicode ((uint) args.Event.Key));
- if (! System.Char.IsLetter (c))
- return;
-#endif
-
-#if ALLOW_TAG_TYPING_WITHOUT_HOTKEY
- tag_entry.Text += c;
-#endif
-
- tagbar.Show ();
- UpdateTagEntryFromSelection ();
- tag_entry.GrabFocus ();
- tag_entry.SelectRegion (-1, -1);
- }
-
- // "Activate" means the user pressed the enter key
- public void HandleTagEntryActivate (object sender, EventArgs args)
- {
- if (view_mode == ModeType.IconView) {
- icon_view.GrabFocus ();
- } else {
- photo_view.QueueDraw ();
- photo_view.View.GrabFocus ();
- }
- }
-
- private void HandleTagEntryTagsAttached (object o, string [] new_tags)
- {
- int [] selected_photos = SelectedIds ();
- if (selected_photos == null || new_tags == null || new_tags.Length == 0)
- return;
-
- Category default_category = null;
- Tag [] selection = tag_selection_widget.TagHighlight;
- if (selection.Length > 0) {
- if (selection [0] is Category)
- default_category = (Category) selection [0];
- else
- default_category = selection [0].Category;
+
+ // "Activate" means the user pressed the enter key
+ public void HandleTagEntryActivate (object sender, EventArgs args)
+ {
+ if (ViewMode == ModeType.IconView) {
+ icon_view.GrabFocus ();
+ } else {
+ photo_view.QueueDraw ();
+ photo_view.View.GrabFocus ();
+ }
}
- Tag [] tags = new Tag [new_tags.Length];
- int i = 0;
- db.BeginTransaction ();
- foreach (string tagname in new_tags) {
- Tag t = db.Tags.GetTagByName (tagname);
- if (t == null) {
- t = db.Tags.CreateCategory (default_category, tagname, true) as Tag;
- db.Tags.Commit (t);
+
+ private void HandleTagEntryTagsAttached (object o, string [] new_tags)
+ {
+ int [] selected_photos = SelectedIds ();
+ if (selected_photos == null || new_tags == null || new_tags.Length == 0)
+ return;
+
+ Category default_category = null;
+ Tag [] selection = tag_selection_widget.TagHighlight;
+ if (selection.Length > 0) {
+ if (selection [0] is Category)
+ default_category = (Category) selection [0];
+ else
+ default_category = selection [0].Category;
+ }
+ Tag [] tags = new Tag [new_tags.Length];
+ int i = 0;
+ Database.BeginTransaction ();
+ foreach (string tagname in new_tags) {
+ Tag t = Database.Tags.GetTagByName (tagname);
+ if (t == null) {
+ t = Database.Tags.CreateCategory (default_category, tagname, true) as Tag;
+ Database.Tags.Commit (t);
+ }
+ tags [i++] = t;
}
- tags [i++] = t;
+ AddTagExtended (selected_photos, tags);
+ Database.CommitTransaction ();
}
- AddTagExtended (selected_photos, tags);
- db.CommitTransaction ();
- }
-
- private void HandleTagEntryRemoveTags (object o, Tag [] remove_tags)
- {
- int [] selected_photos = SelectedIds ();
- if (selected_photos == null || remove_tags == null || remove_tags.Length == 0)
- return;
-
- db.BeginTransaction ();
- RemoveTags (selected_photos, remove_tags);
- db.CommitTransaction ();
- }
-
- private void HideTagbar ()
- {
- if (! tagbar.Visible)
- return;
-
- UpdateTagEntryFromSelection ();
-
- // Cancel any pending edits...
- tagbar.Hide ();
-
- if (view_mode == ModeType.IconView)
- icon_view.GrabFocus ();
- else {
- photo_view.QueueDraw ();
- photo_view.View.GrabFocus ();
+
+ private void HandleTagEntryRemoveTags (object o, Tag [] remove_tags)
+ {
+ int [] selected_photos = SelectedIds ();
+ if (selected_photos == null || remove_tags == null || remove_tags.Length == 0)
+ return;
+
+ Database.BeginTransaction ();
+ RemoveTags (selected_photos, remove_tags);
+ Database.CommitTransaction ();
}
-
- tag_entry.ClearTagCompletions ();
- }
-
- public void HandleTagBarCloseButtonPressed (object sender, EventArgs args)
- {
- HideTagbar ();
- }
-
- public void HandleTagEntryKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
- {
- args.RetVal = false;
-
- if (args.Event.Key == Gdk.Key.Escape) {
+
+ private void HideTagbar ()
+ {
+ if (! tagbar.Visible)
+ return;
+
+ UpdateTagEntryFromSelection ();
+
+ // Cancel any pending edits...
+ tagbar.Hide ();
+
+ if (ViewMode == ModeType.IconView)
+ icon_view.GrabFocus ();
+ else {
+ photo_view.QueueDraw ();
+ photo_view.View.GrabFocus ();
+ }
+
+ tag_entry.ClearTagCompletions ();
+ }
+
+ public void HandleTagBarCloseButtonPressed (object sender, EventArgs args)
+ {
HideTagbar ();
- args.RetVal = true;
}
- }
-
- public List<string> SelectedMimeTypes ()
- {
- List<string> contents = new List<string> ();
-
- foreach (Photo p in SelectedPhotos ()) {
- string content;
- try {
- content = GLib.FileFactory.NewForUri (p.DefaultVersionUri).QueryInfo ("standard::content-type", GLib.FileQueryInfoFlags.None, null).ContentType;
- } catch (GLib.GException) {
- content = null;
+
+ public void HandleTagEntryKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
+ {
+ args.RetVal = false;
+
+ if (args.Event.Key == Gdk.Key.Escape) {
+ HideTagbar ();
+ args.RetVal = true;
}
-
- if (! contents.Contains (content))
- contents.Add (content);
}
-
- return contents;
- }
-
- private void ShowQueryWidget ()
- {
- if (find_bar.Visible) {
- find_bar.Entry.Text = String.Empty;
- find_bar.Hide ();
- }
-
- query_widget.ShowBar ();
- return;
- }
-
- public void HideSidebar (object o, EventArgs args) {
- display_sidebar.Active = false;
- }
- public void HandleKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
- {
- bool ctrl = ModifierType.ControlMask == (args.Event.State & ModifierType.ControlMask);
-
- if ((ctrl && args.Event.Key == Gdk.Key.F) || args.Event.Key == Gdk.Key.slash) {
- if (!find_bar.Visible) {
- if (query_widget.Visible) {
- query_widget.Close ();
+ public List<string> SelectedMimeTypes ()
+ {
+ List<string> contents = new List<string> ();
+
+ foreach (Photo p in SelectedPhotos ()) {
+ string content;
+ try {
+ content = GLib.FileFactory.NewForUri (p.DefaultVersionUri).QueryInfo ("standard::content-type", GLib.FileQueryInfoFlags.None, null).ContentType;
+ } catch (GLib.GException) {
+ content = null;
}
-
- find_bar.ShowAll();
+
+ if (! contents.Contains (content))
+ contents.Add (content);
}
-
- // Grab the focus even if it's already shown
- find_bar.Entry.GrabFocus ();
- args.RetVal = true;
+
+ return contents;
+ }
+
+ private void ShowQueryWidget ()
+ {
+ if (find_bar.Visible) {
+ find_bar.Entry.Text = String.Empty;
+ find_bar.Hide ();
+ }
+
+ query_widget.ShowBar ();
return;
}
+
+ public void HideSidebar (object o, EventArgs args) {
+ display_sidebar.Active = false;
+ }
- args.RetVal = false;
+ public void HandleKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
+ {
+ bool ctrl = ModifierType.ControlMask == (args.Event.State & ModifierType.ControlMask);
+
+ if ((ctrl && args.Event.Key == Gdk.Key.F) || args.Event.Key == Gdk.Key.slash) {
+ if (!find_bar.Visible) {
+ if (query_widget.Visible) {
+ query_widget.Close ();
+ }
+
+ find_bar.ShowAll();
+ }
+
+ // Grab the focus even if it's already shown
+ find_bar.Entry.GrabFocus ();
+ args.RetVal = true;
+ return;
+ }
+
+ args.RetVal = false;
+ }
}
}
diff --git a/src/Makefile.am b/src/Makefile.am
index 58a97a5..35800c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ CMS_CSDISTFILES = \
$(srcdir)/Cms/Format.cs \
$(srcdir)/Cms/GammaTable.cs \
$(srcdir)/Cms/IccColorSpace.cs \
+ $(srcdir)/Cms/IccProfileClass.cs \
$(srcdir)/Cms/Intent.cs \
$(srcdir)/Cms/NativeMethods.cs \
$(srcdir)/Cms/Profile.cs \
@@ -86,6 +87,8 @@ WIDGETS_CSDISTFILES = \
$(srcdir)/Widgets/BuilderWindow.cs \
$(srcdir)/Widgets/CheckPattern.cs \
$(srcdir)/Widgets/ComplexMenuItem.cs \
+ $(srcdir)/Widgets/Curve.cs \
+ $(srcdir)/Widgets/CurveType.cs \
$(srcdir)/Widgets/CustomPrintWidget.cs \
$(srcdir)/Widgets/DateEdit.cs \
$(srcdir)/Widgets/DateEditFlags.cs \
@@ -128,7 +131,7 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/ColorAdjustment/FullColorAdjustment.cs \
$(srcdir)/ColorAdjustment/SepiaTone.cs \
$(srcdir)/ControlOverlay.cs \
- $(srcdir)/Core.cs \
+ $(srcdir)/Core/App.cs \
$(srcdir)/Core/ColorManagement.cs \
$(srcdir)/Core/Photo.cs \
$(srcdir)/Core/PhotoVersion.cs \
@@ -156,6 +159,8 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/Extensions/PhotoSelectionCondition.cs \
$(srcdir)/Extensions/PopupCommands.cs \
$(srcdir)/Extensions/ServiceNode.cs \
+ $(srcdir)/Extensions/SidebarPage.cs \
+ $(srcdir)/Extensions/SidebarPageNode.cs \
$(srcdir)/Extensions/TransitionNode.cs \
$(srcdir)/Extensions/ViewModeCondition.cs \
$(srcdir)/Fader.cs \
@@ -174,7 +179,6 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/FolderQueryWidget.cs \
$(srcdir)/FormClient.cs \
$(srcdir)/FullScreenView.cs \
- $(srcdir)/GdkGlx.cs \
$(srcdir)/GroupAdaptor.cs \
$(srcdir)/GroupSelector.cs \
$(srcdir)/Accelerometer.cs \
@@ -238,7 +242,7 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/RollStore.cs \
$(srcdir)/SelectionDataExtensions.cs \
$(srcdir)/SendEmail.cs \
- $(srcdir)/SlideView.cs \
+ $(srcdir)/XScreenSaverSlide.cs \
$(srcdir)/SingleView.cs \
$(srcdir)/SimpleCalendar.cs \
$(srcdir)/Sharpener.cs \
@@ -339,9 +343,7 @@ UTILS_ASSEMBLIES = \
-pkg:gnome-sharp-2.0 \
-r:Mono.Posix \
-r:Mono.Cairo \
- $(LINK_GLITZ) \
- $(GCONF_PKG) \
- $(LINK_DBUS)
+ $(GCONF_PKG)
JOBSCHEDULER_ASSEMBLIES = \
-r:FSpot.Utils.dll
@@ -349,13 +351,14 @@ JOBSCHEDULER_ASSEMBLIES = \
BLING_ASSEMBLIES = \
-pkg:gtk-sharp-2.0 \
-r:Mono.Cairo \
+ $(LINK_GIOSHARP) \
$(LINK_GTKSHARPBEANS)
WIDGETS_ASSEMBLIES = \
- $(LINK_MONO_ADDINS) \
$(LINK_GIOSHARP) \
-pkg:gtk-sharp-2.0 \
-pkg:gnome-sharp-2.0 \
+ -pkg:mono-addins \
$(LINK_GTKSHARPBEANS) \
-r:Mono.Cairo \
-r:Cms.dll \
@@ -368,7 +371,7 @@ GNOME_PLATFORM_ASSEMBLIES = \
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-pkg:gconf-sharp-2.0 \
- $(LINK_DBUS) \
+ $(NDESK_DBUS_LIBS) \
-r:Mono.Posix \
-r:FSpot.Utils.dll
@@ -376,15 +379,14 @@ NULL_PLATFORM_ASSEMBLIES = \
-r:FSpot.Utils.dll
F_SPOT_ASSEMBLIES = \
- $(LINK_DBUS) \
$(LINK_GPHOTO2) \
- $(LINK_MONO_ADDINS) \
$(LINK_FLICKR) \
$(LINK_KEYRING) \
$(LINK_SMUGMUG) \
$(LINK_SEMWEB) \
$(LINK_GTKSHARPBEANS) \
$(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
-r:System.Data \
-r:System.Web \
-r:Mono.Data.SqliteClient \
@@ -401,8 +403,12 @@ F_SPOT_ASSEMBLIES = \
-r:FSpot.Platform.dll \
-r:Cms.dll \
$(NUNIT_LIBS) \
+ $(NDESK_DBUS_LIBS) \
$(GCONF_PKG) \
$(GTKHTML_SHARP_PKG) \
+ -pkg:mono-addins \
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui \
-pkg:glade-sharp-2.0 \
-pkg:gnome-sharp-2.0 \
-pkg:gnome-vfs-sharp-2.0
diff --git a/src/Makefile.in b/src/Makefile.in
index 22664bb..5ded565 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,11 +41,14 @@ DIST_COMMON = $(srcdir)/AssemblyInfo.cs.in $(srcdir)/Cms.dll.config.in \
$(srcdir)/f-spot.in $(top_srcdir)/Makefile.include
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = f-spot AssemblyInfo.cs f-spot.exe.config \
Cms.dll.config FSpot.Widgets.dll.config
@@ -78,16 +81,17 @@ DIST_SOURCES =
DATA = $(fspotlib_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -104,8 +108,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -118,9 +121,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -169,16 +177,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -189,6 +199,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -199,21 +210,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -241,6 +256,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -265,18 +282,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -286,17 +300,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -315,6 +325,7 @@ CMS_CSDISTFILES = \
$(srcdir)/Cms/Format.cs \
$(srcdir)/Cms/GammaTable.cs \
$(srcdir)/Cms/IccColorSpace.cs \
+ $(srcdir)/Cms/IccProfileClass.cs \
$(srcdir)/Cms/Intent.cs \
$(srcdir)/Cms/NativeMethods.cs \
$(srcdir)/Cms/Profile.cs \
@@ -388,6 +399,8 @@ WIDGETS_CSDISTFILES = \
$(srcdir)/Widgets/BuilderWindow.cs \
$(srcdir)/Widgets/CheckPattern.cs \
$(srcdir)/Widgets/ComplexMenuItem.cs \
+ $(srcdir)/Widgets/Curve.cs \
+ $(srcdir)/Widgets/CurveType.cs \
$(srcdir)/Widgets/CustomPrintWidget.cs \
$(srcdir)/Widgets/DateEdit.cs \
$(srcdir)/Widgets/DateEditFlags.cs \
@@ -430,7 +443,7 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/ColorAdjustment/FullColorAdjustment.cs \
$(srcdir)/ColorAdjustment/SepiaTone.cs \
$(srcdir)/ControlOverlay.cs \
- $(srcdir)/Core.cs \
+ $(srcdir)/Core/App.cs \
$(srcdir)/Core/ColorManagement.cs \
$(srcdir)/Core/Photo.cs \
$(srcdir)/Core/PhotoVersion.cs \
@@ -458,6 +471,8 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/Extensions/PhotoSelectionCondition.cs \
$(srcdir)/Extensions/PopupCommands.cs \
$(srcdir)/Extensions/ServiceNode.cs \
+ $(srcdir)/Extensions/SidebarPage.cs \
+ $(srcdir)/Extensions/SidebarPageNode.cs \
$(srcdir)/Extensions/TransitionNode.cs \
$(srcdir)/Extensions/ViewModeCondition.cs \
$(srcdir)/Fader.cs \
@@ -476,7 +491,6 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/FolderQueryWidget.cs \
$(srcdir)/FormClient.cs \
$(srcdir)/FullScreenView.cs \
- $(srcdir)/GdkGlx.cs \
$(srcdir)/GroupAdaptor.cs \
$(srcdir)/GroupSelector.cs \
$(srcdir)/Accelerometer.cs \
@@ -540,7 +554,7 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/RollStore.cs \
$(srcdir)/SelectionDataExtensions.cs \
$(srcdir)/SendEmail.cs \
- $(srcdir)/SlideView.cs \
+ $(srcdir)/XScreenSaverSlide.cs \
$(srcdir)/SingleView.cs \
$(srcdir)/SimpleCalendar.cs \
$(srcdir)/Sharpener.cs \
@@ -638,9 +652,7 @@ UTILS_ASSEMBLIES = \
-pkg:gnome-sharp-2.0 \
-r:Mono.Posix \
-r:Mono.Cairo \
- $(LINK_GLITZ) \
- $(GCONF_PKG) \
- $(LINK_DBUS)
+ $(GCONF_PKG)
JOBSCHEDULER_ASSEMBLIES = \
-r:FSpot.Utils.dll
@@ -648,13 +660,14 @@ JOBSCHEDULER_ASSEMBLIES = \
BLING_ASSEMBLIES = \
-pkg:gtk-sharp-2.0 \
-r:Mono.Cairo \
+ $(LINK_GIOSHARP) \
$(LINK_GTKSHARPBEANS)
WIDGETS_ASSEMBLIES = \
- $(LINK_MONO_ADDINS) \
$(LINK_GIOSHARP) \
-pkg:gtk-sharp-2.0 \
-pkg:gnome-sharp-2.0 \
+ -pkg:mono-addins \
$(LINK_GTKSHARPBEANS) \
-r:Mono.Cairo \
-r:Cms.dll \
@@ -667,7 +680,7 @@ GNOME_PLATFORM_ASSEMBLIES = \
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-pkg:gconf-sharp-2.0 \
- $(LINK_DBUS) \
+ $(NDESK_DBUS_LIBS) \
-r:Mono.Posix \
-r:FSpot.Utils.dll
@@ -675,15 +688,14 @@ NULL_PLATFORM_ASSEMBLIES = \
-r:FSpot.Utils.dll
F_SPOT_ASSEMBLIES = \
- $(LINK_DBUS) \
$(LINK_GPHOTO2) \
- $(LINK_MONO_ADDINS) \
$(LINK_FLICKR) \
$(LINK_KEYRING) \
$(LINK_SMUGMUG) \
$(LINK_SEMWEB) \
$(LINK_GTKSHARPBEANS) \
$(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
-r:System.Data \
-r:System.Web \
-r:Mono.Data.SqliteClient \
@@ -700,8 +712,12 @@ F_SPOT_ASSEMBLIES = \
-r:FSpot.Platform.dll \
-r:Cms.dll \
$(NUNIT_LIBS) \
+ $(NDESK_DBUS_LIBS) \
$(GCONF_PKG) \
$(GTKHTML_SHARP_PKG) \
+ -pkg:mono-addins \
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui \
-pkg:glade-sharp-2.0 \
-pkg:gnome-sharp-2.0 \
-pkg:gnome-vfs-sharp-2.0
@@ -824,9 +840,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
+ $(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/src/MetadataStore.cs b/src/MetadataStore.cs
index 8e407bf..991b175 100644
--- a/src/MetadataStore.cs
+++ b/src/MetadataStore.cs
@@ -22,6 +22,10 @@ namespace FSpot {
new Description ("dc:subject", Catalog.GetString ("Subject and Keywords")),
new Description ("tiff:Compression", Catalog.GetString ("Compression"),
typeof (FSpot.Tiff.Compression)),
+ /* Translators: Planar Configuration is the label for the tiff:PlanarConfiguration tag
+ "when Planar Configuration=1, this implies that all components must have
+ the same BitsPerSample value; when Planar Configuration=2, different
+ components could have different bit depths." */
new Description ("tiff:PlanarConfiguration", Catalog.GetString ("Planar Configuration"),
typeof (FSpot.Tiff.PlanarConfiguration)),
new Description ("tiff:Orientation", Catalog.GetString ("Orientation"),
@@ -54,6 +58,8 @@ namespace FSpot {
typeof (FSpot.Tiff.FileSource)),
new Description ("exif:SceneCaptureType", Catalog.GetString ("Scene Capture Type"),
typeof (FSpot.Tiff.SceneCaptureType)),
+ /* Translators: Gain Control is the label for the exif:GainControl tag
+ "This tag indicates the degree of overall image gain adjustment." */
new Description ("exif:GainControl", Catalog.GetString ("Gain Control"),
typeof (FSpot.Tiff.GainControl)),
new Description ("exif:Contrast", Catalog.GetString ("Contrast"),
diff --git a/src/PhotoImageView.cs b/src/PhotoImageView.cs
index 84d48b2..8f24595 100644
--- a/src/PhotoImageView.cs
+++ b/src/PhotoImageView.cs
@@ -161,35 +161,6 @@ namespace FSpot.Widgets {
}
base.OnDestroyed ();
}
-
- //FIXME: I think OnRealized and OnUnrealized are here for the Loupe to work. If it's true, the Loupe should
- //listen to the Realized/Unrealized events and do its initialization on its own
- protected override void OnRealized ()
- {
- int [] attr = new int [] {
- (int) GdkGlx.GlxAttribute.Rgba,
- (int) GdkGlx.GlxAttribute.DepthSize, 16,
- (int) GdkGlx.GlxAttribute.DoubleBuffer,
- (int) GdkGlx.GlxAttribute.None
- };
-
- try {
- Glx = new GdkGlx.Context (Screen, attr);
- Colormap = Glx.GetColormap ();
- } catch (GdkGlx.GlxException e) {
- Console.WriteLine ("Error initializing the OpenGL context:{1} {0}", e, Environment.NewLine);
- }
-
- base.OnRealized ();
- }
-
- protected override void OnUnrealized ()
- {
- base.OnUnrealized ();
-
- if (Glx != null)
- Glx.Destroy ();
- }
#endregion
#region loader
@@ -284,7 +255,6 @@ namespace FSpot.Widgets {
protected BrowsablePointer item;
protected Loupe loupe;
protected Loupe sharpener;
- GdkGlx.Context Glx;
void HandleOrientationChanged (object sender, EventArgs e)
{
diff --git a/src/PhotoStore.cs b/src/PhotoStore.cs
index f5b4210..550a5f3 100644
--- a/src/PhotoStore.cs
+++ b/src/PhotoStore.cs
@@ -229,14 +229,14 @@ public class PhotoStore : DbStore<Photo> {
while (reader.Read ()) {
uint tag_id = Convert.ToUInt32 (reader ["tag_id"]);
- Tag tag = Core.Database.Tags.Get (tag_id) as Tag;
+ Tag tag = App.Instance.Database.Tags.Get (tag_id) as Tag;
photo.AddTagUnsafely (tag);
}
reader.Close();
}
- private void GetAllVersions () {
- SqliteDataReader reader = Database.Query("SELECT photo_id, version_id, name, base_uri, filename, md5_sum, protected FROM photo_versions");
+ private void GetAllVersions (string ids) {
+ SqliteDataReader reader = Database.Query ("SELECT photo_id, version_id, name, base_uri, filename, md5_sum, protected FROM photo_versions WHERE photo_id IN " + ids);
while (reader.Read ()) {
uint id = Convert.ToUInt32 (reader ["photo_id"]);
@@ -272,8 +272,8 @@ public class PhotoStore : DbStore<Photo> {
reader.Close();
}
- private void GetAllTags () {
- SqliteDataReader reader = Database.Query("SELECT photo_id, tag_id FROM photo_tags");
+ private void GetAllTags (string ids) {
+ SqliteDataReader reader = Database.Query ("SELECT photo_id, tag_id FROM photo_tags WHERE photo_id IN " + ids);
while (reader.Read ()) {
uint id = Convert.ToUInt32 (reader ["photo_id"]);
@@ -289,9 +289,9 @@ public class PhotoStore : DbStore<Photo> {
continue;
}
- if (reader [1] != null) {
+ if (reader [1] != null) {
uint tag_id = Convert.ToUInt32 (reader ["tag_id"]);
- Tag tag = Core.Database.Tags.Get (tag_id) as Tag;
+ Tag tag = App.Instance.Database.Tags.Get (tag_id) as Tag;
photo.AddTagUnsafely (tag);
}
}
@@ -443,7 +443,7 @@ public class PhotoStore : DbStore<Photo> {
Commit (photos);
foreach (Tag tag in tags)
- Core.Database.Tags.Remove (tag);
+ App.Instance.Database.Tags.Remove (tag);
}
@@ -892,19 +892,24 @@ public class PhotoStore : DbStore<Photo> {
reader.Close();
bool need_load = false;
+ string photo_ids = "(";
foreach (Photo photo in new_photos) {
AddToCache (photo);
+ photo_ids = photo_ids + Convert.ToString(photo.Id) + ",";
need_load |= !photo.Loaded;
}
+ photo_ids = photo_ids + "-1)";
+
if (need_load) {
- GetAllTags ();
- GetAllVersions ();
+ GetAllTags (photo_ids);
+ GetAllVersions (photo_ids);
foreach (Photo photo in new_photos)
photo.Loaded = true;
} else {
//Console.WriteLine ("Skipped Loading Data");
}
+
foreach (Photo photo in new_photos)
photo.Changes = null;
@@ -1015,9 +1020,9 @@ public class PhotoStore : DbStore<Photo> {
where_clauses.Add (importidrange.SqlClause ());
}
- if (hide && Core.Database.Tags.Hidden != null) {
+ if (hide && App.Instance.Database.Tags.Hidden != null) {
where_clauses.Add (String.Format ("id NOT IN (SELECT photo_id FROM photo_tags WHERE tag_id = {0})",
- FSpot.Core.Database.Tags.Hidden.Id));
+ App.Instance.Database.Tags.Hidden.Id));
}
if (searchexpression != null) {
diff --git a/src/PhotoView.cs b/src/PhotoView.cs
index 6c79d10..2e5cd10 100644
--- a/src/PhotoView.cs
+++ b/src/PhotoView.cs
@@ -328,11 +328,12 @@ namespace FSpot {
photo_view = new PhotoImageView (bp);
filmstrip = new Filmstrip (bp);
- Gdk.Pixbuf bg = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, true, 8, 1, 69);
+ Gdk.Pixbuf bg = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, true, 8, 1, 77);
bg.Fill (0x00000000);
filmstrip.BackgroundTile = bg;
filmstrip.ThumbOffset = 1;
filmstrip.Spacing = 4;
+ filmstrip.ThumbSize = 75;
PlaceFilmstrip ((Orientation) Preferences.Get <int> (Preferences.FILMSTRIP_ORIENTATION), true);
photo_view.PhotoChanged += HandlePhotoChanged;
diff --git a/src/Platform/Null/ThumbnailFactory.cs b/src/Platform/Null/ThumbnailFactory.cs
index c53c0be..0a3666c 100644
--- a/src/Platform/Null/ThumbnailFactory.cs
+++ b/src/Platform/Null/ThumbnailFactory.cs
@@ -75,5 +75,6 @@ namespace FSpot.Platform
public static bool ThumbnailIsRecent (Uri image_uri)
{
return cache.ContainsKey(image_uri);
+ }
}
}
diff --git a/src/Preferences.cs b/src/Preferences.cs
index 144eab7..706ba47 100644
--- a/src/Preferences.cs
+++ b/src/Preferences.cs
@@ -61,11 +61,11 @@ namespace FSpot
public const string EXPORT_EMAIL_SIZE = APP_FSPOT + "export/email/size";
public const string EXPORT_EMAIL_ROTATE = APP_FSPOT + "export/email/auto_rotate";
- public const string EXPORT_EMAIL_DELETE_TIMEOUT_SEC = APP_FSPOT + "export/email/delete_timeout_seconds";
public const string IMPORT_GUI_ROLL_HISTORY = APP_FSPOT + "import/gui_roll_history";
public const string SCREENSAVER_TAG = APP_FSPOT + "screensaver/tag_id";
+ public const string SCREENSAVER_DELAY = APP_FSPOT + "screensaver/delay";
public const string STORAGE_PATH = APP_FSPOT + "import/storage_path";
@@ -145,6 +145,8 @@ namespace FSpot
case SCREENSAVER_TAG:
return 1;
+ case SCREENSAVER_DELAY:
+ return 4.0;
case STORAGE_PATH:
return System.IO.Path.Combine (FSpot.Global.HomeDirectory, Catalog.GetString("Photos"));
case EXPORT_EMAIL_SIZE:
@@ -152,8 +154,6 @@ namespace FSpot
case EXPORT_EMAIL_ROTATE:
case VIEWER_INTERPOLATION:
return true;
- case EXPORT_EMAIL_DELETE_TIMEOUT_SEC:
- return 30; // delete temporary email pictures after 30 seconds
case VIEWER_TRANSPARENCY:
return "NONE";
case VIEWER_TRANS_COLOR:
diff --git a/src/Query/HiddenTag.cs b/src/Query/HiddenTag.cs
index 901417b..0990b47 100644
--- a/src/Query/HiddenTag.cs
+++ b/src/Query/HiddenTag.cs
@@ -50,7 +50,7 @@ namespace FSpot.Query
public string SqlClause ()
{
- Tag hidden = Core.Database.Tags.Hidden;
+ Tag hidden = App.Instance.Database.Tags.Hidden;
if ( ! show_hidden && hidden != null)
return String.Format (" photos.id NOT IN (SELECT photo_id FROM photo_tags WHERE tag_id = {0}) ",
diff --git a/src/QueryWidget.cs b/src/QueryWidget.cs
index df9f5a3..c77e5e5 100644
--- a/src/QueryWidget.cs
+++ b/src/QueryWidget.cs
@@ -81,7 +81,7 @@ namespace FSpot {
rollfilter.Visible = false;
box.PackStart (rollfilter, false, false, 0);
- folder_query_widget = new FolderQueryWidget ();
+ folder_query_widget = new FolderQueryWidget (query);
folder_query_widget.Visible = false;
box.PackStart (folder_query_widget, false, false, 0);
diff --git a/src/QueuedSqliteDatabase.cs b/src/QueuedSqliteDatabase.cs
index b8374af..86a387c 100644
--- a/src/QueuedSqliteDatabase.cs
+++ b/src/QueuedSqliteDatabase.cs
@@ -343,6 +343,7 @@ namespace Banshee.Database
private int insert_id;
private Exception execution_exception;
private bool finished = false;
+ private Object finishedLock = new Object();
private SqliteCommand command;
@@ -397,12 +398,19 @@ namespace Banshee.Database
}
command.Dispose();
+ Monitor.Enter(finishedLock);
finished = true;
+ Monitor.Pulse(finishedLock);
+ Monitor.Exit(finishedLock);
}
public object WaitForResult()
{
- while(!finished);
+ Monitor.Enter(finishedLock);
+ while (!finished) {
+ Monitor.Wait(finishedLock);
+ };
+ Monitor.Exit(finishedLock);
if(execution_exception != null) {
throw execution_exception;
diff --git a/src/SendEmail.cs b/src/SendEmail.cs
index dbe58b8..29ce5d1 100644
--- a/src/SendEmail.cs
+++ b/src/SendEmail.cs
@@ -203,26 +203,6 @@ namespace FSpot {
}
- private bool DeleteTempFile ()
- {
-// System.Console.WriteLine ("Lets delete all temp files");
-
- // Lets delete all the temporary files now
- for (int k = 0; k < tmp_paths.Count; k++) {
- if (System.IO.File.Exists((string) tmp_paths[k])) {
- System.IO.File.Delete ((string) tmp_paths[k]);
-// System.Console.WriteLine ("Lets delete temp file {0}", tmp_paths[k]);
- }
- }
-
- if (System.IO.Directory.Exists(tmp_mail_dir)) {
- System.IO.Directory.Delete(tmp_mail_dir);
-// System.Console.WriteLine ("Lets delete temp dir {0}", tmp_mail_dir);
- }
-
- return false;
- }
-
private void HandleResponse (object sender, Gtk.ResponseArgs args)
{
int size = 0;
@@ -247,17 +227,17 @@ namespace FSpot {
// evaluate mailto command and define attachment args for cli
System.Text.StringBuilder attach_arg = new System.Text.StringBuilder ();
switch (Preferences.Get<string> (Preferences.GNOME_MAILTO_COMMAND)) {
- case "thunderbird %s":
- case "mozilla-thunderbird %s":
- case "seamonkey -mail -compose %s":
- case "icedove %s":
- attach_arg.Append(",");
+ case "thunderbird %s":
+ case "mozilla-thunderbird %s":
+ case "seamonkey -mail -compose %s":
+ case "icedove %s":
+ attach_arg.Append(",");
break;
- case "kmail %s":
- attach_arg.Append(" --attach ");
+ case "kmail %s":
+ attach_arg.Append(" --attach ");
break;
- default: //evolution falls into default, since it supports mailto uri correctly
- attach_arg.Append("&attach=");
+ default: //evolution falls into default, since it supports mailto uri correctly
+ attach_arg.Append("&attach=");
break;
}
@@ -323,42 +303,33 @@ namespace FSpot {
if (progress_dialog != null)
progress_dialog.Destroy (); // No need to keep this window
- if (UserCancelled)
- DeleteTempFile();
- else {
+
+ if (!UserCancelled) {
// Send the mail :)
- string mail_subject = Catalog.GetString("my photos");
+ string mail_subject = Catalog.GetString("My Photos");
switch (Preferences.Get<string> (Preferences.GNOME_MAILTO_COMMAND)) {
- // openSuSE
- case "thunderbird %s":
- System.Diagnostics.Process.Start("thunderbird", " -compose \"subject=" + mail_subject + ",attachment='" + mail_attach + "'\"");
+ // openSuSE
+ case "thunderbird %s":
+ System.Diagnostics.Process.Start("thunderbird", " -compose \"subject=" + mail_subject + ",attachment='" + mail_attach + "'\"");
break;
- case "icedove %s":
- System.Diagnostics.Process.Start("icedove", " -compose \"subject=" + mail_subject + ",attachment='" + mail_attach + "'\"");
+ case "icedove %s":
+ System.Diagnostics.Process.Start("icedove", " -compose \"subject=" + mail_subject + ",attachment='" + mail_attach + "'\"");
break;
- case "mozilla-thunderbird %s":
- System.Diagnostics.Process.Start("mozilla-thunderbird", " -compose \"subject=" + mail_subject + ",attachment='" + mail_attach + "'\"");
+ case "mozilla-thunderbird %s":
+ System.Diagnostics.Process.Start("mozilla-thunderbird", " -compose \"subject=" + mail_subject + ",attachment='" + mail_attach + "'\"");
break;
- case "seamonkey -mail -compose %s":
- System.Diagnostics.Process.Start("seamonkey", " -mail -compose \"subject=" + mail_subject + ",attachment='" + mail_attach + "'\"");
+ case "seamonkey -mail -compose %s":
+ System.Diagnostics.Process.Start("seamonkey", " -mail -compose \"subject=" + mail_subject + ",attachment='" + mail_attach + "'\"");
break;
- case "kmail %s":
- System.Diagnostics.Process.Start("kmail", " --composer --subject \"" + mail_subject + "\"" + mail_attach);
+ case "kmail %s":
+ System.Diagnostics.Process.Start("kmail", " --composer --subject \"" + mail_subject + "\"" + mail_attach);
break;
- default:
- GtkBeans.Global.ShowUri (Dialog.Screen, "mailto:?subject=" + System.Web.HttpUtility.UrlEncode(mail_subject) + mail_attach);
+ case "evolution %s": //evo doesn't urldecode the subject
+ GtkBeans.Global.ShowUri (Dialog.Screen, "mailto:?subject=" + mail_subject + mail_attach);
+ break;
+ default:
+ GtkBeans.Global.ShowUri (Dialog.Screen, "mailto:?subject=" + System.Web.HttpUtility.UrlEncode(mail_subject) + mail_attach);
break;
- }
-
- // Check if we have any temporary files to be deleted
- if (tmp_paths.Count > 0) {
- // Fetch timeout value from preferences. In seconds. Needs to be multiplied with 1000 to get msec
- uint delete_timeout;
- delete_timeout = (uint) (Preferences.Get<int> (Preferences.EXPORT_EMAIL_DELETE_TIMEOUT_SEC));
- delete_timeout = delete_timeout * 1000; // to get milliseconds.
-
- // Start a timer and when it occurs, delete the temp files.
- GLib.Timeout.Add (delete_timeout, new GLib.TimeoutHandler (DeleteTempFile));
}
}
}
diff --git a/src/Sharpener.cs b/src/Sharpener.cs
index fe978dd..d38b435 100644
--- a/src/Sharpener.cs
+++ b/src/Sharpener.cs
@@ -67,7 +67,7 @@ namespace FSpot.Widgets {
photo.SaveVersion (final, create_version);
photo.Changes.DataChanged = true;
- Core.Database.Photos.Commit (photo);
+ App.Instance.Database.Photos.Commit (photo);
} catch (System.Exception e) {
string msg = Catalog.GetString ("Error saving sharpened photo");
string desc = String.Format (Catalog.GetString ("Received exception \"{0}\". Unable to save photo {1}"),
diff --git a/src/SingleView.cs b/src/SingleView.cs
index 0f0a6db..99369bc 100644
--- a/src/SingleView.cs
+++ b/src/SingleView.cs
@@ -1,6 +1,8 @@
using Gtk;
using Gdk;
using System;
+using System.Collections.Generic;
+
using Mono.Addins;
using Mono.Unix;
@@ -51,21 +53,6 @@ namespace FSpot {
private static Gtk.Tooltips toolTips = new Gtk.Tooltips ();
- public SingleView () : this (FSpot.Global.HomeDirectory) {}
-
-
- public SingleView (string path) : this (UriUtils.PathToFileUri (path))
- {
- }
-
- public SingleView (Uri uri) : this (new Uri [] { uri })
- {
- }
-
- public SingleView (UriList list) : this (list.ToArray ())
- {
- }
-
public SingleView (Uri [] uris)
{
string glade_name = "single_view";
@@ -190,7 +177,7 @@ namespace FSpot {
private void OnSidebarExtensionChanged (object s, ExtensionNodeEventArgs args) {
// FIXME: No sidebar page removal yet!
if (args.Change == ExtensionChange.Add)
- sidebar.AppendPage ((args.ExtensionNode as SidebarPageNode).GetSidebarPage ());
+ sidebar.AppendPage ((args.ExtensionNode as SidebarPageNode).GetPage ());
}
void HandleExportActivated (object o, EventArgs e)
@@ -331,7 +318,7 @@ namespace FSpot {
private void HandleNewWindow (object sender, System.EventArgs args)
{
/* FIXME this needs to register witth the core */
- new SingleView (uri);
+ new SingleView (new Uri[] {uri});
}
private void HandlePreferences (object sender, System.EventArgs args)
@@ -373,19 +360,6 @@ namespace FSpot {
chooser.Destroy ();
}
- private bool SlideShow ()
- {
- IBrowsableItem [] items = new IBrowsableItem [collection.Count];
- for (int i = 0; i < collection.Count; i++) {
- items [i] = collection [i];
- }
-
- FSpot.FullSlide full = new FSpot.FullSlide (Window, items);
- full.Play ();
- this.Window.GdkWindow.Cursor = null;
- return false;
- }
-
private void HandleViewFullscreen (object sender, System.EventArgs args)
{
if (fsview != null)
@@ -529,9 +503,12 @@ namespace FSpot {
int response = file_selector.Run ();
if ((Gtk.ResponseType) response == Gtk.ResponseType.Ok) {
- open = file_selector.Filename;
- new FSpot.SingleView (open);
+ var l = new List<Uri> ();
+ foreach (var s in file_selector.Uris)
+ l.Add (new Uri (s));
+ new FSpot.SingleView (l.ToArray ());
}
+
file_selector.Destroy ();
}
diff --git a/src/SlideView.cs b/src/SlideView.cs
deleted file mode 100644
index a531840..0000000
--- a/src/SlideView.cs
+++ /dev/null
@@ -1,558 +0,0 @@
-using Gtk;
-using Gdk;
-using System;
-using GLib;
-using System.Runtime.InteropServices;
-using FSpot;
-using FSpot.Utils;
-
-namespace FSpot {
- public class XScreenSaverSlide : Gtk.Window {
- public const string ScreenSaverEnviroment = "XSCREENSAVER_WINDOW";
-
- public XScreenSaverSlide () : base (String.Empty)
- {
- }
-
- protected override void OnRealized ()
- {
- string env = Environment.GetEnvironmentVariable (ScreenSaverEnviroment);
-
- if (env != null) {
- try {
- env = env.ToLower ();
-
- if (env.StartsWith ("0x"))
- env = env.Substring (2);
-
- uint xid = UInt32.Parse (env, System.Globalization.NumberStyles.HexNumber);
-
- GdkWindow = Gdk.Window.ForeignNew (xid);
- Style.Attach (GdkWindow);
- GdkWindow.Events = EventMask.ExposureMask
- | EventMask.StructureMask
- | EventMask.EnterNotifyMask
- | EventMask.LeaveNotifyMask
- | EventMask.FocusChangeMask;
-
- Style.SetBackground (GdkWindow, Gtk.StateType.Normal);
- GdkWindow.SetDecorations ((Gdk.WMDecoration) 0);
- GdkWindow.UserData = this.Handle;
- SetFlag (WidgetFlags.Realized);
- SizeRequest ();
- Gdk.Rectangle geom;
- int depth;
- GdkWindow.GetGeometry (out geom.X, out geom.Y, out geom.Width, out geom.Height, out depth);
- SizeAllocate (new Gdk.Rectangle (geom.X, geom.Y, geom.Width, geom.Height));
- Resize (geom.Width, geom.Height);
- return;
- } catch (System.Exception e) {
- System.Console.WriteLine (e);
- }
- } else {
- System.Console.WriteLine ("{0} not set, falling back to window", ScreenSaverEnviroment);
- }
-
- SetSizeRequest (640, 480);
- base.OnRealized ();
- }
- }
-
- public class FullSlide : Gtk.Window {
- private SlideView slideview;
- private Gdk.Pixbuf screenshot;
- private Delay hide;
- private Gdk.Cursor busy;
- private Gdk.Cursor none;
-
- public FullSlide (Gtk.Window parent, IBrowsableItem [] items) : base ("Slideshow")
- {
- screenshot = PixbufUtils.LoadFromScreen (parent.GdkWindow);
-
- this.Destroyed += HandleDestroyed;
-
- this.TransientFor = parent;
-
- this.ButtonPressEvent += HandleSlideViewButtonPressEvent;
- this.KeyPressEvent += HandleSlideViewKeyPressEvent;
- this.AddEvents ((int) (EventMask.ButtonPressMask | EventMask.KeyPressMask | EventMask.PointerMotionMask));
- slideview = new SlideView (screenshot, items, 2.0);
- this.Add (slideview);
- this.Decorated = false;
- this.Fullscreen();
- this.Realize ();
-
- busy = new Gdk.Cursor (Gdk.CursorType.Watch);
- this.GdkWindow.Cursor = busy;
- none = GdkUtils.CreateEmptyCursor (GdkWindow.Display);
-
- hide = new Delay (2000, new GLib.IdleHandler (HideCursor));
- }
-
- public void Play ()
- {
- Gdk.GCValues values = new Gdk.GCValues ();
- values.SubwindowMode = SubwindowMode.IncludeInferiors;
- Gdk.GC fillgc = new Gdk.GC (this.GdkWindow, values, Gdk.GCValuesMask.Subwindow);
-
- slideview.Show ();
- this.GdkWindow.SetBackPixmap (null, false);
- this.Show ();
- screenshot.RenderToDrawable (this.GdkWindow, fillgc,
- 0, 0, 0, 0, -1, -1, RgbDither.Normal, 0, 0);
-
- slideview.Play ();
- hide.Start ();
- }
-
- [GLib.ConnectBefore]
- private void HandleSlideViewKeyPressEvent (object sender, KeyPressEventArgs args)
- {
- this.Destroy ();
- args.RetVal = true;
- }
-
- protected override bool OnMotionNotifyEvent (Gdk.EventMotion args)
- {
- base.OnMotionNotifyEvent (args);
- this.GdkWindow.Cursor = busy;
- hide.Start ();
- return true;
- }
-
- private bool HideCursor ()
- {
- this.GdkWindow.Cursor = none;
- return false;
- }
-
- private void HandleDestroyed (object sender, System.EventArgs args)
- {
- hide.Stop ();
- }
-
- private void HandleSlideViewButtonPressEvent (object sender, ButtonPressEventArgs args)
- {
- this.Destroy ();
- args.RetVal = true;
- }
- }
-
- public class SlideView : Gtk.Image {
- IBrowsableItem [] photos;
- Pixbuf last;
- Pixbuf next;
-
-
- Pixbuf [] tweens = new Pixbuf [10];
- int current_tween;
- uint tween_idle;
- uint resize_idle;
-
- int current_idx = 0;
- int next_idx = 0;
-
- uint flip_timer = 0;
- uint transition_timer = 0;
-
- uint fail_count = 0;
- bool animate = true;
- uint animate_max = 200;
-
- bool black = false;
- uint flip_interval = 2000;
- uint transition_interval = 75;
-
- public bool Running {
- get {
- return flip_timer != 0 || transition_timer != 0;
- }
- }
-
- public bool Animate {
- get { return animate; }
- set { animate = value; }
- }
-
- public void Play ()
- {
- if (photos.Length < 1)
- return;
-
- StopTweenIdle ();
- if (current_idx >= 0) {
- Pixbuf frame = GetScaled (photos[current_idx]);
- this.Pixbuf = frame;
- frame.Dispose ();
- }
-
- if (PreloadNextImage (current_idx + 1))
- StartFlipTimer ();
- }
-
- public void Pause ()
- {
- StopTranstionTimer ();
- StopFlipTimer ();
- }
-
- public void Stop ()
- {
- StopTweenIdle ();
- StopTranstionTimer ();
- StopFlipTimer ();
- }
-
- public void Forward ()
- {
- if (PreloadNextImage (current_idx + 1))
- ShowNext ();
- }
-
- public void Back ()
- {
- if (PreloadNextImage (current_idx - 1))
- ShowNext ();
- }
-
- private void ShowNext ()
- {
- StopTweenIdle ();
-
- if (current_idx != next_idx && next != null)
- this.Pixbuf = next;
-
- current_idx = next_idx;
-
- black = false;
- }
-
- private bool PreloadNextImage (int idx)
- {
- try {
- if (idx < photos.Length && idx >= 0) {
- if (next != null)
- next.Dispose ();
-
- next = GetScaled (photos [idx]);
- if (next == null)
- next = GetScaled (PixbufUtils.ShallowCopy (PixbufUtils.ErrorPixbuf));
-
- next_idx = idx;
- StartTweenIdle ();
-
- return true;
- } else {
- if (next != null)
- next.Dispose ();
-
- next = GetScaled (photos [0]);
- if (next == null)
- next = GetScaled (PixbufUtils.ShallowCopy (PixbufUtils.ErrorPixbuf));
- next_idx = 0;
- StartTweenIdle ();
-
- return false;
- }
- } catch (GLib.GException e) {
- System.Console.WriteLine (e);
- idx = (idx + 1) % photos.Length;
- return PreloadNextImage (idx);
- }
- }
-
- private Pixbuf CrossFade (Pixbuf current, Pixbuf prev, Pixbuf next, double percent)
- {
- Rectangle area = new Rectangle (0, 0, Allocation.Width, Allocation.Height);
- BlockProcessor proc = new BlockProcessor (area, 256);
- Rectangle subarea;
-
- while (proc.Step (out subarea)) {
- if (IsRealized)
- GdkWindow.ProcessUpdates (false);
-
- prev.CopyArea (subarea.X, subarea.Y, subarea.Width, subarea.Height, current, subarea.X, subarea.Y);
- next.Composite (current, subarea.X, subarea.Y, subarea.Width, subarea.Height, 0, 0, 1, 1,
- Gdk.InterpType.Nearest, (int) System.Math.Round (255 * percent));
- }
- return current;
- }
-
- private Pixbuf BlackFade (Pixbuf current, Pixbuf prev, Pixbuf next, double percent)
- {
- int width = Allocation.Width;
- int height = Allocation.Height;
-
- current.Fill (0);
-
- if (percent < 0.5)
- prev.Composite (current, 0,0, width, height, 0, 0, 1, 1,
- Gdk.InterpType.Nearest, (int)System.Math.Round (255 * (1 - percent * 2)));
- else
- next.Composite (current, 0,0, width, height, 0, 0, 1, 1,
- Gdk.InterpType.Nearest, (int)System.Math.Round (255 * (percent * 2 - 1)));
- return current;
- }
-
- private Pixbuf Blend (Pixbuf current, Pixbuf prev, Pixbuf next, double percent)
- {
- if (black) {
- return BlackFade (current, prev, next, percent);
- } else {
- return CrossFade (current, prev, next, percent);
- }
- }
-
- private Pixbuf GetScaled (Pixbuf orig)
- {
- Gdk.Rectangle pos;
- int width = Allocation.Width;
- int height = Allocation.Height;
- double scale = PixbufUtils.Fit (orig, width, height, false, out pos.Width, out pos.Height);
- pos.X = (width - pos.Width) / 2;
- pos.Y = (height - pos.Height) / 2;
-
- Pixbuf scaled = new Pixbuf (Colorspace.Rgb, false, 8, width, height);
- scaled.Fill (0x000000);
-
- Rectangle rect = new Rectangle (pos.X, pos.Y, 256, 256);
- Rectangle subarea;
-
- while (rect.Top < pos.Bottom) {
- while (rect.X < pos.Right) {
- if (IsRealized)
- GdkWindow.ProcessUpdates (false);
-
- rect.Intersect (pos, out subarea);
- orig.Composite (scaled, subarea.X, subarea.Y,
- subarea.Width, subarea.Height,
- pos.X, pos.Y, scale, scale,
- Gdk.InterpType.Bilinear,
- 255);
- rect.X += rect.Width;
- }
- rect.X = pos.X;
- rect.Y += rect.Height;
- }
-
- orig.Dispose ();
- return scaled;
- }
-
- private Pixbuf GetScaled (IBrowsableItem photo)
- {
- Pixbuf orig;
- try {
- orig = FSpot.PhotoLoader.LoadAtMaxSize (photo, Allocation.Width, Allocation.Height);
- } catch {
- orig = null;
- }
-
- if (orig == null)
- return null;
-
- Pixbuf result = GetScaled (orig);
- if (orig != result)
- orig.Dispose ();
-
- return result;
- }
-
- private bool HandleFlipTimer ()
- {
- StopTweenIdle ();
-
- StartTransitionTimer ();
-
- flip_timer = 0;
- return false;
- }
-
- private bool HandleTransitionTimer ()
- {
- System.DateTime start_time = System.DateTime.Now;
- transition_timer = 0;
- if (current_tween-- > 0) {
- StartTransitionTimer ();
- this.Pixbuf = tweens[current_tween];
- GdkWindow.ProcessUpdates (false);
- System.TimeSpan span = System.DateTime.Now - start_time;
-
- if (Animate) {
- if (span.TotalMilliseconds > animate_max) {
- fail_count++;
-
- if (fail_count > 3) {
- Animate = false;
- System.Console.WriteLine ("Disabling slide animation due to 3 consecutive excessive frame intervals {0}ms",
- span.TotalMilliseconds);
- current_tween = 0;
- }
- } else {
- fail_count = 0;
- }
- }
- } else {
- ShowNext ();
-
- PreloadNextImage (current_idx + 1);
- StartFlipTimer ();
- }
-
- return false;
- }
-
-
- private bool HandleTweenIdle ()
- {
- using (Pixbuf prev = this.Pixbuf) {
- if (!Animate) {
- ClearTweens ();
- return false;
- }
-
- if (photos.Length < 2) { // Only one photo. Nothing to do
- ClearTweens ();
- return false;
- }
-
- if (current_tween >= tweens.Length) {
- tween_idle = 0;
- return false;
- }
-
- if (current_tween < tweens.Length && tweens[current_tween] == null) {
- tweens[current_tween] = new Pixbuf (Colorspace.Rgb, false, 8,
- Allocation.Width, Allocation.Height);
- }
-
- double blend_val;
-#if USE_EXP
- double blend_t = (-10 * current_tween) / ((double)tweens.Length - 1);
- blend_val = 1.0 - (.01 / (.01 + (.99 * Math.Exp(blend_t))));
-#else
- double [] blends = new double [] { .99, .97, .9, .8, .7, .6, .5, .4, .3, .15};
- blend_val = blends [current_tween];
-#endif
- tweens[current_tween] = Blend (tweens[current_tween], prev, next, blend_val);
- current_tween++;
- return true;
- }
- }
-
- private void StartTweenIdle ()
- {
- if (tween_idle == 0) {
- current_tween = 0;
- tween_idle = GLib.Idle.Add (new GLib.IdleHandler (HandleTweenIdle));
- }
- }
-
- private void StopTweenIdle ()
- {
- if (tween_idle != 0) {
- GLib.Source.Remove (tween_idle);
- }
- tween_idle = 0;
-
- }
-
- private void StartTransitionTimer ()
- {
- if (transition_timer == 0)
- transition_timer = GLib.Timeout.Add (transition_interval,
- new TimeoutHandler (HandleTransitionTimer));
- }
-
- private void StopTranstionTimer ()
- {
- if (transition_timer != 0)
- GLib.Source.Remove (transition_timer);
-
- transition_timer = 0;
- }
-
- private void StartFlipTimer ()
- {
- if (flip_timer == 0)
- flip_timer = GLib.Timeout.Add (flip_interval,
- new TimeoutHandler (HandleFlipTimer));
- }
-
- private void StopFlipTimer ()
- {
- if (flip_timer != 0)
- GLib.Source.Remove (flip_timer);
-
- flip_timer = 0;
- }
-
-
- private void HandleSizeAllocate (object sender, SizeAllocatedArgs args)
- {
- Pixbuf current = this.Pixbuf;
-
- if (current == null)
- return;
-
- //
- // The size has changed so we need to reload the images.
- //
- if (current.Width != Allocation.Width || current.Height != Allocation.Height) {
- bool playing = (flip_timer != 0 || transition_timer != 0);
-
- if (current_idx < 0) {
- using (Gdk.Pixbuf old = this.Pixbuf) {
- this.Pixbuf = GetScaled (old);
- current.Dispose ();
- }
- } else {
- using (Pixbuf frame = GetScaled (photos[current_idx])) {
- this.Pixbuf = frame;
- current.Dispose ();
- }
- }
-
- Stop ();
-
- ClearTweens ();
-
- if (playing && current_idx != next_idx)
- Play ();
-
-
- }
- }
-
- private void ClearTweens () {
- for (int i = 0; i < tweens.Length; i++) {
- if (tweens[i] != null)
- tweens[i].Dispose ();
- tweens[i] = null;
- }
- }
-
- private void HandleDestroyed (object sender, EventArgs args)
- {
- ClearTweens ();
- Stop ();
- }
-
- public SlideView (Pixbuf background, IBrowsableItem [] photos, double delay) : base ()
- {
- this.photos = photos;
-
- if (background != null) {
- this.Pixbuf = background;
- background.Dispose ();
-
- current_idx = -1;
- black = true;
- flip_interval = (uint)(delay * 1000);
- }
-
- SizeAllocated += new SizeAllocatedHandler (HandleSizeAllocate);
- Destroyed += new EventHandler (HandleDestroyed);
- }
- }
-}
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 7291d5a..7cb54f2 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
namespace FSpot.Widgets {
- public class SoftFocus {
+ public class SoftFocus : IDisposable {
ImageInfo info;
double radius;
diff --git a/src/TagPopup.cs b/src/TagPopup.cs
index cbacca8..ab6bb5b 100644
--- a/src/TagPopup.cs
+++ b/src/TagPopup.cs
@@ -39,7 +39,7 @@ public class TagPopup {
GtkUtil.MakeMenuSeparator (popup_menu);
GtkUtil.MakeMenuItem (popup_menu,
- Catalog.GetString ("Edit Selected Tag..."), "gtk-edit",
+ Catalog.GetString ("Edit Tag..."), "gtk-edit",
delegate { MainWindow.Toplevel.HandleEditSelectedTagWithTag (tag); }, tag != null && tags_count == 1);
GtkUtil.MakeMenuItem (popup_menu,
diff --git a/src/TagSelectionWidget.cs b/src/TagSelectionWidget.cs
index 4a89f5d..eb3dbac 100644
--- a/src/TagSelectionWidget.cs
+++ b/src/TagSelectionWidget.cs
@@ -759,11 +759,6 @@ namespace FSpot {
}
}
- protected override void OnRowActivated (Gtk.TreePath path, Gtk.TreeViewColumn column)
- {
- MainWindow.Toplevel.AddTagsQuery (new Tag [] {TagByPath (path)});
- }
-
#if TEST_TAG_SELECTION_WIDGET
diff --git a/src/TagStore.cs b/src/TagStore.cs
index ab0ecd3..3adb4c1 100644
--- a/src/TagStore.cs
+++ b/src/TagStore.cs
@@ -180,8 +180,8 @@ public class TagStore : DbStore<Tag> {
}
reader.Close ();
- if (FSpot.Core.Database.Meta.HiddenTagId.Value != null)
- hidden = LookupInCache ((uint) FSpot.Core.Database.Meta.HiddenTagId.ValueAsInt) as Tag;
+ if (FSpot.App.Instance.Database.Meta.HiddenTagId.Value != null)
+ hidden = LookupInCache ((uint) FSpot.App.Instance.Database.Meta.HiddenTagId.ValueAsInt) as Tag;
}
@@ -210,8 +210,8 @@ public class TagStore : DbStore<Tag> {
hidden_tag.SortPriority = -9;
this.hidden = hidden_tag;
Commit (hidden_tag);
- FSpot.Core.Database.Meta.HiddenTagId.ValueAsInt = (int) hidden_tag.Id;
- FSpot.Core.Database.Meta.Commit (FSpot.Core.Database.Meta.HiddenTagId);
+ FSpot.App.Instance.Database.Meta.HiddenTagId.ValueAsInt = (int) hidden_tag.Id;
+ FSpot.App.Instance.Database.Meta.Commit (FSpot.App.Instance.Database.Meta.HiddenTagId);
Tag people_category = CreateCategory (RootCategory, Catalog.GetString ("People"), false);
people_category.ThemeIconName = "emblem-people";
@@ -364,10 +364,10 @@ public class TagStore : DbStore<Tag> {
"id", tag.Id));
if (update_xmp && Preferences.Get<bool> (Preferences.METADATA_EMBED_IN_IMAGE)) {
- Photo [] photos = Core.Database.Photos.Query (new Tag [] { tag });
+ Photo [] photos = App.Instance.Database.Photos.Query (new Tag [] { tag });
foreach (Photo p in photos)
if (p.HasTag (tag)) // the query returns all the pics of the tag and all its child. this avoids updating child tags
- SyncMetadataJob.Create (Core.Database.Jobs, p);
+ SyncMetadataJob.Create (App.Instance.Database.Jobs, p);
}
}
diff --git a/src/Term.cs b/src/Term.cs
index 2c9bffb..c015ee4 100644
--- a/src/Term.cs
+++ b/src/Term.cs
@@ -330,7 +330,7 @@ namespace FSpot {
condition.Append (base.SqlCondition());
- Tag hidden = Core.Database.Tags.Hidden;
+ Tag hidden = App.Instance.Database.Tags.Hidden;
if (hidden != null) {
if (FindByTag (hidden, true).Count == 0) {
condition.Append (String.Format (
diff --git a/src/ThumbnailGenerator.cs b/src/ThumbnailGenerator.cs
index 8837453..ae4d408 100644
--- a/src/ThumbnailGenerator.cs
+++ b/src/ThumbnailGenerator.cs
@@ -12,6 +12,9 @@ using System.IO;
using FSpot.Utils;
using FSpot.Platform;
+using Mono.Unix.Native;
+using GFileInfo = GLib.FileInfo;
+
namespace FSpot {
public class ThumbnailGenerator : ImageLoaderThread {
@@ -35,8 +38,8 @@ namespace FSpot {
return null;
try { //Setting the thumb options
- Gnome.Vfs.FileInfo vfs = new Gnome.Vfs.FileInfo (UriUtils.UriToStringEscaped (uri));
- DateTime mtime = vfs.Mtime;
+ GFileInfo info = GLib.FileFactory.NewForUri (uri).QueryInfo ("time::modified", GLib.FileQueryInfoFlags.None, null);
+ DateTime mtime = NativeConvert.ToDateTime ((long)info.GetAttributeULong ("time::modified"));
FSpot.Utils.PixbufUtils.SetOption (thumb, ThumbUri, UriUtils.UriToStringEscaped (uri));
FSpot.Utils.PixbufUtils.SetOption (thumb, ThumbMTime, ((uint)GLib.Marshaller.DateTimeTotime_t (mtime)).ToString ());
diff --git a/src/UI.Dialog/AdjustTimeDialog.cs b/src/UI.Dialog/AdjustTimeDialog.cs
index 31b61e6..bf34919 100644
--- a/src/UI.Dialog/AdjustTimeDialog.cs
+++ b/src/UI.Dialog/AdjustTimeDialog.cs
@@ -122,7 +122,7 @@ namespace FSpot.UI.Dialog {
IBrowsableItem item = Item.Current;
name_label.Text = System.Uri.UnescapeDataString(item.Name);
- old_label.Text = item.Time.ToLocalTime ().ToString ();
+ old_label.Text = (item.Time).ToString ();
int i = collection.Count > 0 ? Item.Index + 1: 0;
// Note for translators: This indicates the current photo is photo {0} of {1} out of photos
diff --git a/src/UI.Dialog/LastRollDialog.cs b/src/UI.Dialog/LastRollDialog.cs
index e34f58f..1e83c6c 100644
--- a/src/UI.Dialog/LastRollDialog.cs
+++ b/src/UI.Dialog/LastRollDialog.cs
@@ -86,6 +86,7 @@ namespace FSpot.UI.Dialog {
for (uint k = 0; k < rolls.Length; k++)
{
uint numphotos = rollstore.PhotosInRoll (rolls [k]);
+ // Roll time is in UTC always
DateTime date = rolls [k].Time.ToLocalTime ();
string header = String.Format ("{0} ({1})",
diff --git a/src/UI.Dialog/PreferenceDialog.cs b/src/UI.Dialog/PreferenceDialog.cs
index 7aa01fd..c0191bd 100644
--- a/src/UI.Dialog/PreferenceDialog.cs
+++ b/src/UI.Dialog/PreferenceDialog.cs
@@ -6,7 +6,7 @@
* Stephane Delcroix <stephane at delcroix.org>
*
* Copyright (c) 2005-2009 Novell, Inc.
- * Copyright (c) 2007 Stephane Delcroix <stephane at delcroix.org>
+ * Copyright (c) 2007,2010 Stephane Delcroix
*
* This is free software. See COPYING for details.
*/
@@ -14,6 +14,7 @@
using System;
using System.IO;
using System.Collections.Generic;
+using System.Linq;
using Gtk;
using Mono.Unix;
@@ -54,9 +55,14 @@ namespace FSpot.UI.Dialog {
if (FSpot.ColorManagement.XProfile != null)
sprofiles.AppendValues (Catalog.GetString ("System profile"), -1);
sprofiles.AppendValues (null, 0);
- foreach (string profile_name in FSpot.ColorManagement.Profiles.Keys)
- if (profile_name != "_x_profile_") //avoid adding the XProfile twice
- sprofiles.AppendValues (profile_name, 1);
+
+ //Pick the display profiles from the full list, avoid _x_profile_
+ var dprofs = from profile in FSpot.ColorManagement.Profiles
+ where (profile.Value.DeviceClass == Cms.IccProfileClass.Display && profile.Key != "_x_profile_")
+ select profile;
+ foreach (var p in dprofs)
+ sprofiles.AppendValues (p.Key, 1);
+
CellRendererText profilecellrenderer = new CellRendererText ();
profilecellrenderer.Ellipsize = Pango.EllipsizeMode.End;
@@ -70,9 +76,13 @@ namespace FSpot.UI.Dialog {
ListStore pprofiles = new ListStore (typeof (string), typeof (int));
pprofiles.AppendValues (Catalog.GetString ("None"), 0);
pprofiles.AppendValues (null, 0);
- foreach (string profile_name in FSpot.ColorManagement.Profiles.Keys)
- if (profile_name != "_x_profile_") //don't list XProfile for printers
- pprofiles.AppendValues (profile_name, 1);
+
+ var pprofs = from profile in FSpot.ColorManagement.Profiles
+ where (profile.Value.DeviceClass == Cms.IccProfileClass.Output && profile.Key != "_x_profile_")
+ select profile;
+ foreach (var p in pprofs)
+ pprofiles.AppendValues (p.Key, 1);
+
printprofile_combo.Model = pprofiles;
printprofile_combo.PackStart (profilecellrenderer, true);
printprofile_combo.RowSeparatorFunc = ProfileSeparatorFunc;
diff --git a/src/UI.Dialog/ui/PreferenceDialog.ui b/src/UI.Dialog/ui/PreferenceDialog.ui
index 07326d7..98945ae 100644
--- a/src/UI.Dialog/ui/PreferenceDialog.ui
+++ b/src/UI.Dialog/ui/PreferenceDialog.ui
@@ -156,7 +156,7 @@
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Store tags and descriptions for photos:</property>
</object>
<packing>
diff --git a/src/Updater.cs b/src/Updater.cs
index 5e23e32..bc56161 100644
--- a/src/Updater.cs
+++ b/src/Updater.cs
@@ -582,6 +582,12 @@ namespace FSpot.Database {
}, true);
+
+ // Update to version 17.1, Rename 'Import Tags' to 'Imported Tags'
+ AddUpdate (new Version (17,1),delegate () {
+ Execute ("UPDATE tags SET name = 'Imported Tags' WHERE name = 'Import Tags'");
+ });
+
}
public static void Run (Db database)
diff --git a/src/Utils/CairoUtils.cs b/src/Utils/CairoUtils.cs
index 1bf5c39..9de10bd 100644
--- a/src/Utils/CairoUtils.cs
+++ b/src/Utils/CairoUtils.cs
@@ -24,35 +24,5 @@ namespace FSpot.Utils {
width, height);
return surface;
}
-
- public static Surface CreateGlitzSurface (Gdk.Drawable d)
- {
-
- Console.WriteLine ("XvisID: " + GdkUtils.GetXVisualId (d.Visual));
- IntPtr fmt = NDesk.Glitz.GlitzAPI.glitz_glx_find_drawable_format_for_visual (GdkUtils.GetXDisplay (d.Display),
- d.Screen.Number,
- GdkUtils.GetXVisualId (d.Visual));
-
- Console.WriteLine ("fmt: " + fmt);
-
- uint w = 100, h = 100;
- IntPtr glitz_drawable = NDesk.Glitz.GlitzAPI.glitz_glx_create_drawable_for_window (GdkUtils.GetXDisplay (d.Display),
- d.Screen.Number,
- fmt,
- GdkUtils.GetXid (d), w, h);
-
- NDesk.Glitz.Drawable ggd = new NDesk.Glitz.Drawable (glitz_drawable);
- IntPtr glitz_format = ggd.FindStandardFormat (NDesk.Glitz.FormatName.ARGB32);
-
- NDesk.Glitz.Surface ggs = new NDesk.Glitz.Surface (ggd, glitz_format, 100, 100, 0, IntPtr.Zero);
- Console.WriteLine (ggd.Features);
- bool doublebuffer = false;
- ggs.Attach (ggd, doublebuffer ? NDesk.Glitz.DrawableBuffer.BackColor : NDesk.Glitz.DrawableBuffer.FrontColor);
-
- //GlitzAPI.glitz_drawable_destroy (glitz_drawable);
- GlitzSurface gs = new GlitzSurface (ggs.Handle);
-
- return gs;
- }
}
}
diff --git a/src/Utils/DbUtils.cs b/src/Utils/DbUtils.cs
index 1e5cd2e..2de5205 100644
--- a/src/Utils/DbUtils.cs
+++ b/src/Utils/DbUtils.cs
@@ -17,23 +17,23 @@ namespace FSpot.Utils
public static DateTime DateTimeFromUnixTime (long unix_time)
{
DateTime date_time = new DateTime (1970, 1, 1);
- return date_time.AddSeconds (unix_time).ToLocalTime ();
+ return date_time.AddSeconds (unix_time);
}
public static long UnixTimeFromDateTime (DateTime date_time)
{
- return (long) (date_time.ToUniversalTime () - new DateTime (1970, 1, 1)).TotalSeconds;
+ return (long) (date_time - new DateTime (1970, 1, 1)).TotalSeconds;
}
#else
public static DateTime DateTimeFromUnixTime (long unix_time)
{
- DateTime date_time = new DateTime (1970, 1, 1).ToLocalTime ();
+ DateTime date_time = new DateTime (1970, 1, 1);
return date_time.AddSeconds (unix_time);
}
public static long UnixTimeFromDateTime (DateTime date_time)
{
- return (long) (date_time - new DateTime (1970, 1, 1).ToLocalTime ()).TotalSeconds;
+ return (long) (date_time - new DateTime (1970, 1, 1)).TotalSeconds;
}
#endif
}
diff --git a/src/Utils/UriUtils.cs b/src/Utils/UriUtils.cs
index 93580f6..3c14a52 100644
--- a/src/Utils/UriUtils.cs
+++ b/src/Utils/UriUtils.cs
@@ -45,7 +45,7 @@ namespace FSpot.Utils
return new Uri (builder.ToString ());
}
- static char[] CharsToQuote = { ';', '?', ':', '@', '&', '=', '$', ',', '#' };
+ static char[] CharsToQuote = { ';', '?', ':', '@', '&', '=', '$', ',', '#', '%' };
// NOTE: this was copied from mono's System.Uri where it is internal.
public static string EscapeString (string str, bool escapeReserved, bool escapeHex, bool escapeBrackets)
{
diff --git a/src/Widgets/Curve.cs b/src/Widgets/Curve.cs
new file mode 100644
index 0000000..6ba85c9
--- /dev/null
+++ b/src/Widgets/Curve.cs
@@ -0,0 +1,435 @@
+//
+// FSpot.Widgets.Curve.cs
+//
+// Author(s):
+// Stephane Delcroix <stephane at delcroix.org>
+//
+// Copyright (c) 2009 Novell, Inc.
+//
+// This is open source software. See COPYING for details.
+//
+// Ported from Gtk+, where this widget and is no longer really supported.
+//
+
+using System;
+using System.Collections.Generic;
+using Gtk;
+using Gdk;
+
+namespace FSpot.Widgets
+{
+ public class Curve : DrawingArea
+ {
+#region public API
+ public Curve () : base ()
+ {
+ Events |= EventMask.ExposureMask
+ | EventMask.PointerMotionMask
+ | EventMask.PointerMotionHintMask
+ | EventMask.EnterNotifyMask
+ | EventMask.ButtonPressMask
+ | EventMask.ButtonReleaseMask
+ | EventMask.Button1MotionMask;
+ ResetVector ();
+ }
+
+ public void Reset ()
+ {
+ CurveType old_type = CurveType;
+ CurveType = CurveType.Spline;
+ ResetVector ();
+ EventHandler eh;
+ if (old_type != CurveType.Spline && (eh = CurveTypeChanged) != null)
+ eh (this, EventArgs.Empty);
+ }
+
+ float min_x = 0f;
+ public float MinX {
+ get { return min_x; }
+ set { SetRange (value, max_x, min_y, max_y); }
+ }
+
+ float max_x = 1.0f;
+ public float MaxX {
+ get { return max_x; }
+ set { SetRange (min_x, value, min_y, max_y); }
+ }
+
+ float min_y = 0f;
+ public float MinY {
+ get { return min_y; }
+ set { SetRange (min_x, max_x, value, max_y); }
+ }
+
+ float max_y = 1.0f;
+ public float MaxY {
+ get { return max_y; }
+ set { SetRange (min_x, max_x, min_y, value); }
+ }
+
+ public void SetRange (float min_x, float max_x, float min_y, float max_y)
+ {
+ this.min_x = min_x;
+ this.max_x = max_x;
+ this.min_y = min_y;
+ this.max_y = max_y;
+
+ ResetVector ();
+ QueueDraw ();
+ }
+
+ CurveType curve_type = CurveType.Spline;
+ public CurveType CurveType {
+ get { return curve_type; }
+ set {
+ curve_type = value;
+ QueueDraw ();
+ }
+ }
+
+ public float [] GetVector (int len)
+ {
+ if (len <= 0)
+ return null;
+
+ var vector = new float [len];
+
+ var xv = new float [points.Count];
+ var yv = new float [points.Count];
+ int i = 0;
+ foreach (var keyval in points) {
+ xv[i] = keyval.Key;
+ yv[i] = keyval.Value;
+ i++;
+ }
+ float rx = MinX;
+ float dx = (MaxX - MinX) / (len - 1.0f);
+
+ switch (CurveType) {
+ case CurveType.Spline:
+ var y2v = SplineSolve (xv, yv);
+
+ for (int x = 0; x < len; x++, rx += dx) {
+ float ry = SplineEval (xv, yv, y2v, rx);
+ if (ry < MinY)
+ ry = MinY;
+ if (ry > MaxY)
+ ry = MaxY;
+ vector[x] = ry;
+ }
+ break;;
+ case CurveType.Linear:
+ for (int x = 0; x < len; x++, rx += dx) {
+ float ry = LinearEval (xv, yv, rx);
+ if (ry < MinY)
+ ry = MinY;
+ if (ry > MaxY)
+ ry = MaxY;
+ vector[x] = ry;
+ }
+ break;
+ case CurveType.Free:
+ throw new NotImplementedException ();
+ }
+
+ return vector;
+ }
+
+ public void SetVector (float[] vector)
+ {
+ }
+
+ public void AddPoint (float x, float y)
+ {
+ points.Add (x, y);
+ EventHandler eh = CurveChanged;
+ if (eh != null)
+ eh (this, EventArgs.Empty);
+ }
+
+ public event EventHandler CurveTypeChanged;
+ public event EventHandler CurveChanged;
+#endregion
+
+#region vector handling
+ SortedDictionary<float, float> points;
+ void ResetVector ()
+ {
+ points = new SortedDictionary<float, float> ();
+ points.Add (min_x, min_y);
+ points.Add (max_x, max_y);
+ points.Add (.2f, .1f);
+ points.Add (.5f, .5f);
+ points.Add (.8f, .9f);
+ }
+#endregion
+
+#region math helpers
+ /* Solve the tridiagonal equation system that determines the second
+ derivatives for the interpolation points. (Based on Numerical
+ Recipies 2nd Edition) */
+ static float [] SplineSolve (float[] x, float[] y)
+ {
+ var y2 = new float [x.Length];
+ var u = new float [x.Length - 1];
+
+ y2[0] = u[0] = 0.0f; //Set lower boundary condition to "natural"
+
+ for (int i = 1; i < x.Length - 1; ++i) {
+ float sig = (x[i] - x[i - 1]) / (x[i + 1] - x[i - 1]);
+ float p = sig * y2[i - 1] + 2.0f;
+ y2[i] = (sig - 1.0f) / p;
+ u[i] = ((y[i + 1] - y[i]) / (x[i + 1] - x[i]) - (y[i] - y[i - 1]) / (x[i] - x[i - 1]));
+ u[i] = (6.0f * u[i] / (x[i + 1] - x[i - 1]) - sig * u[i - 1]) / p;
+ }
+
+ y2[x.Length - 1] = 0.0f;
+ for (int k = x.Length - 2; k >= 0; --k)
+ y2[k] = y2[k] * y2[k + 1] + u[k];
+
+ return y2;
+ }
+
+ /* Returns a y value for val, given x[], y[] and y2[] */
+ static float SplineEval (float[] x, float[] y, float[] y2, float val)
+ {
+ //binary search for the right interval
+ int k_lo = 0;
+ int k_hi = x.Length - 1;
+ while (k_hi - k_lo > 1) {
+ int k = (k_hi + k_lo) / 2;
+ if (x[k] > val)
+ k_hi = k;
+ else
+ k_lo = k;
+ }
+ float h = x[k_hi] - x[k_lo];
+ float a = (x[k_hi] - val) / h;
+ float b = (val - x[k_lo]) / h;
+ return a * y[k_lo] + b * y[k_hi] + ((a*a*a - a) * y2[k_lo] + (b*b*b - b) * y2[k_hi]) * (h*h)/6.0f;
+ }
+
+ static float LinearEval (float[] x, float[] y, float val)
+ {
+ //binary search for the right interval
+ int k_lo = 0;
+ int k_hi = x.Length - 1;
+ while (k_hi - k_lo > 1) {
+ int k = (k_hi + k_lo) / 2;
+ if (x[k] > val)
+ k_hi = k;
+ else
+ k_lo = k;
+ }
+ float dx = x[k_hi] - x[k_lo];
+ float dy = y[k_hi] - y[k_lo];
+ return val*dy/dx + y[k_lo] - dy/dx*x[k_lo];
+ }
+
+ static int Project (float val, float min, float max, int norm)
+ {
+ return (int)((norm - 1) * ((val - min) / (max - min)) + .5f);
+ }
+
+ static float Unproject (int val, float min, float max, int norm)
+ {
+ return val / (float) (norm - 1) * (max - min) + min;
+ }
+#endregion
+
+#region Gtk widgetry
+ const int radius = 3; //radius of the control points
+ const int min_distance = 8; //min distance between control points
+ int x_offset = radius;
+ int y_offset = radius;
+ int width, height; //the real graph
+
+ Pixmap pixmap = null;
+
+ protected override bool OnConfigureEvent (EventConfigure evnt)
+ {
+ pixmap = null;
+ return base.OnConfigureEvent (evnt);
+ }
+
+ protected override bool OnExposeEvent (EventExpose evnt)
+ {
+ pixmap = new Pixmap (GdkWindow, Allocation.Width, Allocation.Height);
+ Draw ();
+ return base.OnExposeEvent (evnt);
+ }
+
+ Gdk.Point [] Interpolate (int width, int height)
+ {
+ var vector = GetVector (width);
+ var retval = new Gdk.Point [width];
+ for (int i = 0; i < width; i++) {
+ retval[i].X = x_offset + i;
+ retval[i].Y = y_offset + height - Project (vector[i], MinY, MaxY, height);
+ }
+ return retval;
+ }
+
+ void Draw ()
+ {
+ if (pixmap == null)
+ return;
+
+ Style style = Style;
+ StateType state = Sensitive ? StateType.Normal : StateType.Insensitive;
+
+ if (width <= 0 || height <= 0)
+ return;
+
+ //clear the pixmap
+ GtkBeans.Style.PaintFlatBox (style, pixmap, StateType.Normal, ShadowType.None, null, this, "curve_bg", 0, 0, Allocation.Width, Allocation.Height);
+
+ //draw the grid lines
+ for (int i = 0; i < 5; i++) {
+ pixmap.DrawLine (style.DarkGC (state),
+ x_offset,
+ i * (int)(height / 4.0) + y_offset,
+ width + x_offset,
+ i * (int)(height / 4.0) + y_offset);
+ pixmap.DrawLine (style.DarkGC (state),
+ i * (int)(width / 4.0) + x_offset,
+ y_offset,
+ i * (int)(width / 4.0) + x_offset,
+ height + y_offset);
+ }
+
+ //draw the curve
+ pixmap.DrawPoints (style.ForegroundGC (state), Interpolate (width, height));
+
+ //draw the bullets
+ if (CurveType != CurveType.Free)
+ foreach (var keyval in points) {
+ if (keyval.Key < MinX)
+ continue;
+ int x = Project (keyval.Key, MinX, MaxX, width);
+ int y = height - Project (keyval.Value, MinY, MaxY, height);
+ pixmap.DrawArc (style.ForegroundGC (state), true, x, y, radius * 2, radius * 2, 0, 360*64);
+ }
+ GdkWindow.DrawDrawable (style.ForegroundGC (state), pixmap, 0, 0, 0, 0, Allocation.Width, Allocation.Height);
+ }
+
+ protected override void OnSizeAllocated (Rectangle allocation)
+ {
+ width = allocation.Width - 2 * radius;
+ height = allocation.Height - 2 * radius;
+ base.OnSizeAllocated (allocation);
+ }
+
+ protected override void OnSizeRequested (ref Requisition requisition)
+ {
+ requisition.Width = 128 + 2 * x_offset;
+ requisition.Height = 128 + 2 * y_offset;
+ }
+
+ float? grab_point = null;
+ protected override bool OnButtonPressEvent (EventButton evnt)
+ {
+ int px = (int)evnt.X - x_offset;
+ int py = (int)evnt.Y - y_offset;
+ if (px < 0) px = 0;
+ if (px > width - 1) px = width - 1;
+ if (py < 0) py = 0;
+ if (py > height - 1) py = height - 1;
+
+ //find the closest point
+ float closest_x = MinX - 1;
+ var distance = Int32.MaxValue;
+ foreach (var point in points) {
+ int cx = Project (point.Key, MinX, MaxX, width);
+ if (Math.Abs (px - cx) < distance) {
+ distance = Math.Abs (px - cx);
+ closest_x = point.Key;
+ }
+ }
+
+ Grab.Add (this);
+ CursorType = CursorType.Tcross;
+ switch (CurveType) {
+ case CurveType.Linear:
+ case CurveType.Spline:
+ if (distance > min_distance) {
+ //insert a new control point
+ AddPoint ((closest_x = Unproject (px, MinX, MaxX, width)), MaxY - Unproject (py, MinY, MaxY, height));
+ QueueDraw ();
+ }
+ grab_point = closest_x;
+ break;
+ case CurveType.Free:
+ throw new NotImplementedException ();
+ }
+
+ return true;
+ }
+
+ protected override bool OnButtonReleaseEvent (EventButton evnt)
+ {
+ Grab.Remove (this);
+ //FIXME: remove inactive points
+
+ CursorType = CursorType.Fleur;
+ grab_point = null;
+ return true;
+ }
+
+ protected override bool OnMotionNotifyEvent (EventMotion evnt)
+ {
+ int px = (int)evnt.X - x_offset;
+ int py = (int)evnt.Y - y_offset;
+ if (px < 0) px = 0;
+ if (px > width - 1) px = width - 1;
+ if (py < 0) py = 0;
+ if (py > height - 1) py = height - 1;
+
+ //find the closest point
+ float closest_x = MinX - 1;
+ var distance = Int32.MaxValue;
+ foreach (var point in points) {
+ int cx = Project (point.Key, MinX, MaxX, width);
+ if (Math.Abs (px - cx) < distance) {
+ distance = Math.Abs (px - cx);
+ closest_x = point.Key;
+ }
+ }
+
+ switch (CurveType) {
+ case CurveType.Spline:
+ case CurveType.Linear:
+ if (grab_point == null) { //No grabbed point
+ if (distance <= min_distance)
+ CursorType = CursorType.Fleur;
+ else
+ CursorType = CursorType.Tcross;
+ return true;
+ }
+
+ CursorType = CursorType.Tcross;
+ points.Remove (grab_point.Value);
+ AddPoint ((closest_x = Unproject (px, MinX, MaxX, width)), MaxY - Unproject (py, MinY, MaxY, height));
+ QueueDraw ();
+ grab_point = closest_x;
+
+ break;
+ case CurveType.Free:
+ throw new NotImplementedException ();
+ }
+ return true;
+ }
+
+ Gdk.CursorType cursor_type = Gdk.CursorType.TopLeftArrow;
+ CursorType CursorType {
+ get { return cursor_type; }
+ set {
+ if (value == cursor_type)
+ return;
+ cursor_type = value;
+ GdkWindow.Cursor = new Cursor (CursorType);
+ }
+ }
+#endregion
+ }
+}
diff --git a/src/Widgets/CurveType.cs b/src/Widgets/CurveType.cs
new file mode 100644
index 0000000..046d72f
--- /dev/null
+++ b/src/Widgets/CurveType.cs
@@ -0,0 +1,23 @@
+//
+// FSpot.Widgets.CurveType.cs
+//
+// Author(s):
+// Stephane Delcroix <stephane at delcroix.org>
+//
+// Copyright (c) 2009 Novell, Inc.
+//
+// This is open source software. See COPYING for details.
+//
+// Ported from Gtk+, where this widget and is no longer really supported.
+//
+
+namespace FSpot.Widgets
+{
+ public enum CurveType {
+ Linear,
+ Spline,
+ Free,
+ }
+}
+
+
diff --git a/src/Widgets/EditorPage.cs b/src/Widgets/EditorPage.cs
index 09589b3..bb4664a 100644
--- a/src/Widgets/EditorPage.cs
+++ b/src/Widgets/EditorPage.cs
@@ -8,6 +8,7 @@
*/
using FSpot;
+using FSpot.Extensions;
using FSpot.Editors;
using FSpot.UI.Dialog;
using FSpot.Utils;
@@ -35,13 +36,13 @@ namespace FSpot.Widgets {
}
protected override void AddedToSidebar () {
- Sidebar.SelectionChanged += delegate (IBrowsableCollection collection) { EditorPageWidget.ShowTools (); };
- Sidebar.ContextChanged += HandleContextChanged;
+ (Sidebar as Sidebar).SelectionChanged += delegate (IBrowsableCollection collection) { EditorPageWidget.ShowTools (); };
+ (Sidebar as Sidebar).ContextChanged += HandleContextChanged;
}
private void HandleContextChanged (object sender, EventArgs args)
{
- InPhotoView = (Sidebar.Context == ViewContext.Edit);
+ InPhotoView = ((Sidebar as Sidebar).Context == ViewContext.Edit);
EditorPageWidget.ChangeButtonVisibility ();
}
}
@@ -180,9 +181,9 @@ namespace FSpot.Widgets {
state.Selection = Gdk.Rectangle.Zero;
state.PhotoImageView = null;
}
- if (Page.Sidebar.Selection == null)
+ if ((Page.Sidebar as Sidebar).Selection == null)
return false;
- state.Items = Page.Sidebar.Selection.Items;
+ state.Items = (Page.Sidebar as Sidebar).Selection.Items;
editor.Initialize (state);
return true;
diff --git a/src/Widgets/Filmstrip.cs b/src/Widgets/Filmstrip.cs
index fbd6745..074c399 100644
--- a/src/Widgets/Filmstrip.cs
+++ b/src/Widgets/Filmstrip.cs
@@ -308,7 +308,7 @@ namespace FSpot.Widgets
thumb_cache = new DisposableCache<Uri, Pixbuf> (30);
ThumbnailGenerator.Default.OnPixbufLoaded += HandlePixbufLoaded;
- animation = new DoubleAnimation (0, 0, TimeSpan.FromSeconds (4), SetPositionCore, new CubicEase (EasingMode.EaseOut));
+ animation = new DoubleAnimation (0, 0, TimeSpan.FromSeconds (1.5), SetPositionCore, new CubicEase (EasingMode.EaseOut));
}
int min_length = 400;
@@ -649,6 +649,12 @@ namespace FSpot.Widgets
FSpot.ColorManagement.ApplyProfile (current, screen_profile);
}
+ // Add a four pixel white border around the thumbnail
+ Pixbuf whiteBorder = new Pixbuf (Gdk.Colorspace.Rgb, true, 8, current.Width, current.Height);
+ whiteBorder.Fill (0);
+ current.CopyArea (1, 1, current.Width - 8, current.Height - 8, whiteBorder, 4, 4);
+ current = whiteBorder;
+
if (!highlighted)
return current;
@@ -656,7 +662,10 @@ namespace FSpot.Widgets
Gdk.Color color = Style.Background (StateType.Selected);
uint ucol = (uint)((uint)color.Red / 256 << 24 ) + ((uint)color.Green / 256 << 16) + ((uint)color.Blue / 256 << 8) + 255;
highlight.Fill (ucol);
- current.CopyArea (1, 1, current.Width - 2, current.Height - 2, highlight, 1, 1);
+
+ // Add a two pixel highlight around the thumbnail
+ current.CopyArea (2, 2, current.Width - 4, current.Height - 4, highlight, 2, 2);
+
return highlight;
}
diff --git a/src/Widgets/FindBar.cs b/src/Widgets/FindBar.cs
index c1b6cd3..13a4c20 100644
--- a/src/Widgets/FindBar.cs
+++ b/src/Widgets/FindBar.cs
@@ -115,7 +115,7 @@ namespace FSpot.Widgets {
{
int length = args.EndPos - args.StartPos;
//Log.Debug ("start {0} end {1} len {2} last {3}", args.StartPos, args.EndPos, length, last_entry_text);
- string txt = last_entry_text.Substring (args.StartPos, length);
+ string txt = length < 0 ? last_entry_text : last_entry_text.Substring (args.StartPos, length);
for (int i = 0; i < txt.Length; i++) {
if (txt [i] == '(')
diff --git a/src/Widgets/FolderTreePage.cs b/src/Widgets/FolderTreePage.cs
index f99faa8..6221794 100644
--- a/src/Widgets/FolderTreePage.cs
+++ b/src/Widgets/FolderTreePage.cs
@@ -10,6 +10,7 @@
using System;
using Gtk;
using Mono.Unix;
+using FSpot.Extensions;
namespace FSpot.Widgets
{
diff --git a/src/Widgets/IconView.cs b/src/Widgets/IconView.cs
index c126dc7..2874e3a 100644
--- a/src/Widgets/IconView.cs
+++ b/src/Widgets/IconView.cs
@@ -902,9 +902,9 @@ namespace FSpot.Widgets
if (DisplayDates) {
string date;
if (cell_width > 200) {
- date = photo.Time.ToLocalTime ().ToString ();
+ date = photo.Time.ToString ();
} else {
- date = photo.Time.ToLocalTime ().ToShortDateString ();
+ date = photo.Time.ToShortDateString ();
}
Pango.Layout layout = (Pango.Layout)date_layouts [date];
@@ -975,7 +975,7 @@ namespace FSpot.Widgets
Pixbuf icon = t.Icon;
Tag tag_iter = t.Category;
- while (icon == null && tag_iter != Core.Database.Tags.RootCategory && tag_iter != null) {
+ while (icon == null && tag_iter != App.Instance.Database.Tags.RootCategory && tag_iter != null) {
icon = tag_iter.Icon;
tag_iter = tag_iter.Category;
}
diff --git a/src/Widgets/ImageDisplay.cs b/src/Widgets/ImageDisplay.cs
index 5be2044..7429656 100644
--- a/src/Widgets/ImageDisplay.cs
+++ b/src/Widgets/ImageDisplay.cs
@@ -191,8 +191,6 @@ namespace FSpot.Widgets {
base.OnExposeEvent (args);
Context ctx = Gdk.CairoHelper.Create (GdkWindow);
- //Surface glitz = CairoUtils.CreateGlitzSurface (GdkWindow);
- //Context ctx = new Context (glitz);
if (double_buffer) {
ImageSurface cim = new ImageSurface (Format.RGB24,
Allocation.Width,
@@ -215,7 +213,6 @@ namespace FSpot.Widgets {
OnExpose (ctx, args.Region);
}
- //glitz.Flush ();
((IDisposable)ctx).Dispose ();
return true;
}
diff --git a/src/Widgets/ImageView.cs b/src/Widgets/ImageView.cs
index c6ba5c4..8a9db32 100644
--- a/src/Widgets/ImageView.cs
+++ b/src/Widgets/ImageView.cs
@@ -406,16 +406,6 @@ namespace FSpot.Widgets
GdkWindow.MoveResize (allocation.X, allocation.Y, allocation.Width, allocation.Height);
}
- Hadjustment.PageSize = Math.Min (scaled_width, allocation.Width);
- Hadjustment.PageIncrement = scaled_width * .9;
- Hadjustment.StepIncrement = 32;
- Hadjustment.Lower = 0;
-
- Vadjustment.PageSize = Math.Min (scaled_height, allocation.Height);
- Vadjustment.PageIncrement = scaled_height * .9;
- Vadjustment.StepIncrement = 32;
- Vadjustment.Lower = 0;
-
if (XOffset > Hadjustment.Upper - Hadjustment.PageSize)
ScrollTo ((int)(Hadjustment.Upper - Hadjustment.PageSize), YOffset, false);
if (YOffset > Vadjustment.Upper - Vadjustment.PageSize)
@@ -770,8 +760,18 @@ namespace FSpot.Widgets
scaled_height = (uint)Math.Floor (height * Zoom + .5);
}
+ Hadjustment.PageSize = Math.Min (scaled_width, Allocation.Width);
+ Hadjustment.PageIncrement = scaled_width * .9;
+ Hadjustment.StepIncrement = 32;
Hadjustment.Upper = scaled_width;
+ Hadjustment.Lower = 0;
+
+ Vadjustment.PageSize = Math.Min (scaled_height, Allocation.Height);
+ Vadjustment.PageIncrement = scaled_height * .9;
+ Vadjustment.StepIncrement = 32;
Vadjustment.Upper = scaled_height;
+ Vadjustment.Lower = 0;
+
}
event EventHandler AdjustmentsChanged;
diff --git a/src/Widgets/InfoBox.cs b/src/Widgets/InfoBox.cs
index 8b7b11b..afac668 100644
--- a/src/Widgets/InfoBox.cs
+++ b/src/Widgets/InfoBox.cs
@@ -7,7 +7,7 @@
* Gabriel Burt
* Stephane Delcroix <stephane at delcroix.org>
* Ruben Vermeersch <ruben at savanne.be>
- * Mike Gemuende <mike at gemuende.de>
+ * Mike Gemuende <mike at gemuende.de>
*
* This is free software. See COPYING for details.
*/
@@ -184,17 +184,18 @@ namespace FSpot.Widgets
ContextSwitchStrategy.SetHistogramVisible (Context, histogram_expander.Expanded);
UpdateHistogram ();
};
+ histogram_expander.StyleSet += delegate (object sender, StyleSetArgs args) {
+ Gdk.Color c = this.Toplevel.Style.Backgrounds [(int)Gtk.StateType.Active];
+ histogram.RedColorHint = (byte) (c.Red / 0xff);
+ histogram.GreenColorHint = (byte) (c.Green / 0xff);
+ histogram.BlueColorHint = (byte) (c.Blue / 0xff);
+ histogram.BackgroundColorHint = 0xff;
+ UpdateHistogram ();
+ };
histogram_image = new Gtk.Image ();
histogram = new Histogram ();
histogram_expander.Add (histogram_image);
- Window window = MainWindow.Toplevel.Window;
- Gdk.Color c = window.Style.Backgrounds [(int)Gtk.StateType.Active];
- histogram.RedColorHint = (byte) (c.Red / 0xff);
- histogram.GreenColorHint = (byte) (c.Green / 0xff);
- histogram.BlueColorHint = (byte) (c.Blue / 0xff);
- histogram.BackgroundColorHint = 0xff;
-
Add (histogram_expander);
info_expander = new Expander (Catalog.GetString ("Image Information"));
@@ -337,7 +338,7 @@ namespace FSpot.Widgets
height = real_height.ToString ();
}
#if USE_EXIF_DATE
- date = img.Date.ToLocalTime ();
+ date = img.Date;
#endif
}
@@ -521,7 +522,7 @@ namespace FSpot.Widgets
#if USE_EXIF_DATE
date_value_label.Text = info.Date;
#else
- DateTime local_time = photo.Time.ToLocalTime ();
+ DateTime local_time = photo.Time;
date_value_label.Text = String.Format ("{0}{2}{1}",
local_time.ToShortDateString (),
local_time.ToShortTimeString (),
@@ -546,15 +547,23 @@ namespace FSpot.Widgets
version_combo.Visible = true;
version_list.Clear ();
version_combo.Changed -= OnVersionComboChanged;
- int i = 0;
- foreach (uint version_id in photo.VersionIds) {
- version_list.AppendValues (version_id, (photo.GetVersion (version_id) as PhotoVersion).Name, true);
- if (version_id == photo.DefaultVersionId)
- version_combo.Active = i;
- i++;
+
+ bool hasVersions = photo.VersionIds.Length > 1;
+ version_combo.Sensitive = hasVersions;
+ if (hasVersions) {
+ int i = 0;
+ foreach (uint version_id in photo.VersionIds) {
+ version_list.AppendValues (version_id, (photo.GetVersion (version_id) as PhotoVersion).Name, true);
+ if (version_id == photo.DefaultVersionId)
+ version_combo.Active = i;
+ i++;
+ }
+ version_combo.TooltipText = String.Format (Catalog.GetPluralString ("(One Edit)", "({0} Edits)", i - 1), i - 1);
+ } else {
+ version_list.AppendValues (photo.DefaultVersionId, photo.DefaultVersion.Name + " " + Catalog.GetString ("(No Edits)"), true);
+ version_combo.Active = 0;
+ version_combo.TooltipText = Catalog.GetString ("(No Edits)");
}
- if (photo.VersionIds.Length == 1)
- version_list.AppendValues ((uint)0, Catalog.GetString ("(No Edits)"), false);
version_combo.Changed += OnVersionComboChanged;
if (show_file_size) {
@@ -629,13 +638,13 @@ namespace FSpot.Widgets
if (first.Time.Date == last.Time.Date) {
//Note for translators: {0} is a date, {1} and {2} are times.
date_value_label.Text = String.Format(Catalog.GetString("On {0} between \n{1} and {2}"),
- first.Time.ToLocalTime ().ToShortDateString (),
- first.Time.ToLocalTime ().ToShortTimeString (),
- last.Time.ToLocalTime ().ToShortTimeString ());
+ first.Time.ToShortDateString (),
+ first.Time.ToShortTimeString (),
+ last.Time.ToShortTimeString ());
} else {
date_value_label.Text = String.Format(Catalog.GetString("Between {0} \nand {1}"),
- first.Time.ToLocalTime ().ToShortDateString (),
- last.Time.ToLocalTime ().ToShortDateString ());
+ first.Time.ToShortDateString (),
+ last.Time.ToShortDateString ());
}
}
date_label.Visible = show_date;
diff --git a/src/Widgets/MetadataDisplay.cs b/src/Widgets/MetadataDisplay.cs
index ce2fabf..cb7cc5f 100644
--- a/src/Widgets/MetadataDisplay.cs
+++ b/src/Widgets/MetadataDisplay.cs
@@ -17,6 +17,8 @@ using Gtk;
using Mono.Unix;
+using FSpot.Extensions;
+
namespace FSpot.Widgets {
public class MetadataDisplayPage : SidebarPage {
public MetadataDisplayPage() : base(new MetadataDisplayWidget(),
@@ -28,8 +30,8 @@ namespace FSpot.Widgets {
protected override void AddedToSidebar ()
{
MetadataDisplayWidget widget = SidebarWidget as MetadataDisplayWidget;
- Sidebar.SelectionChanged += widget.HandleSelectionChanged;
- Sidebar.SelectionItemsChanged += widget.HandleSelectionItemsChanged;
+ (Sidebar as Sidebar).SelectionChanged += widget.HandleSelectionChanged;
+ (Sidebar as Sidebar).SelectionItemsChanged += widget.HandleSelectionItemsChanged;
}
}
@@ -135,7 +137,7 @@ namespace FSpot.Widgets {
exif_info = null;
}
- if (!Page.IsActive) {
+ if (!((Page.Sidebar as Sidebar).IsActive (Page))) {
up_to_date = false;
} else {
update_delay.Start ();
@@ -162,7 +164,7 @@ namespace FSpot.Widgets {
if (!args.Changes.MetadataChanged)
return;
- if (!Page.IsActive)
+ if (!((Page.Sidebar as Sidebar).IsActive (Page)))
up_to_date = false;
else
update_delay.Start ();
diff --git a/src/Widgets/Sidebar.cs b/src/Widgets/Sidebar.cs
index 2eafd34..75b9ddc 100644
--- a/src/Widgets/Sidebar.cs
+++ b/src/Widgets/Sidebar.cs
@@ -17,16 +17,8 @@ using Mono.Unix;
using System;
using System.Collections.Generic;
-namespace FSpot.Widgets {
- [ExtensionNode ("SidebarPage")]
- public class SidebarPageNode : ExtensionNode {
- [NodeAttribute (Required=true)]
- protected string sidebar_page_type;
-
- public SidebarPage GetSidebarPage () {
- return (SidebarPage) Addin.CreateInstance (sidebar_page_type);
- }
- }
+namespace FSpot.Widgets
+{
// Decides which sidebar page should be shown for each context. Implemented
// using the Strategy pattern, to make it swappable easily, in case the
@@ -65,63 +57,6 @@ namespace FSpot.Widgets {
}
}
- public class SidebarPage {
- // The widget shown on the sidebar page.
- private readonly Widget widget;
- public Widget SidebarWidget {
- get { return widget; }
- }
-
- // Whether this page can be selected
- private bool can_select;
- public bool CanSelect {
- protected set {
- can_select = value;
- if (CanSelectChanged != null)
- CanSelectChanged (this, null);
- }
- get { return can_select; }
- }
-
- public event EventHandler CanSelectChanged;
-
- // The label of the sidebar page.
- private readonly string label;
- public string Label {
- get { return label; }
- }
-
- // The icon name, used for the selector
- private readonly string icon_name;
- public string IconName {
- get { return icon_name; }
- }
-
- // The sidebar onto which this page is attached
- private Sidebar sidebar;
- public Sidebar Sidebar {
- get { return sidebar; }
- set {
- sidebar = value;
- AddedToSidebar ();
- }
- }
-
- // Can be overriden to get notified as soon as we're added to a sidebar.
- protected virtual void AddedToSidebar () { }
-
- // Whether this page is currently visible
- public bool IsActive {
- get { return Sidebar.IsActive (this); }
- }
-
- public SidebarPage (Widget widget, string label, string icon_name) {
- this.widget = widget;
- this.label = label;
- this.icon_name = icon_name;
- }
- }
-
public class Sidebar : VBox {
private HBox button_box;
diff --git a/src/Widgets/SlideShow.cs b/src/Widgets/SlideShow.cs
index cf67ffb..03d7bc9 100644
--- a/src/Widgets/SlideShow.cs
+++ b/src/Widgets/SlideShow.cs
@@ -23,7 +23,12 @@ namespace FSpot.Widgets
bool running;
BrowsablePointer item;
#region Public API
- public SlideShow (BrowsablePointer item) : base ()
+
+ public SlideShow (BrowsablePointer item) : this (item, 6000, false)
+ {
+ }
+
+ public SlideShow (BrowsablePointer item, uint interval_ms, bool init) : base ()
{
this.item = item;
DoubleBuffered = false;
@@ -37,8 +42,12 @@ namespace FSpot.Widgets
transitions.Add (transition.Transition);
}
- flip = new Delay (6000, delegate {item.MoveNext (true); return true;});
+ flip = new Delay (interval_ms, delegate {item.MoveNext (true); return true;});
animation = new DoubleAnimation (0, 1, new TimeSpan (0, 0, 2), HandleProgressChanged, GLib.Priority.Default);
+
+ if (init) {
+ HandleItemChanged (null, null);
+ }
}
SlideShowTransition transition;
@@ -111,7 +120,7 @@ namespace FSpot.Widgets
int h = (int)(pb.Height * scale);
if (w > 0 && h > 0)
- next = pb.ScaleSimple ((int)(pb.Width * scale), (int)(pb.Height * scale), InterpType.Nearest);
+ next = pb.ScaleSimple ((int)(pb.Width * scale), (int)(pb.Height * scale), InterpType.Bilinear);
}
Cms.Profile screen_profile;
if (FSpot.ColorManagement.Profiles.TryGetValue (Preferences.Get<string> (Preferences.COLOR_MANAGEMENT_DISPLAY_PROFILE), out screen_profile))
diff --git a/src/XScreenSaverSlide.cs b/src/XScreenSaverSlide.cs
new file mode 100644
index 0000000..815c055
--- /dev/null
+++ b/src/XScreenSaverSlide.cs
@@ -0,0 +1,60 @@
+using Gtk;
+using Gdk;
+using System;
+using GLib;
+using System.Runtime.InteropServices;
+using FSpot;
+using FSpot.Utils;
+
+namespace FSpot {
+ public class XScreenSaverSlide : Gtk.Window {
+ public const string ScreenSaverEnviroment = "XSCREENSAVER_WINDOW";
+
+ public XScreenSaverSlide () : base (String.Empty)
+ {
+ }
+
+ protected override void OnRealized ()
+ {
+ string env = Environment.GetEnvironmentVariable (ScreenSaverEnviroment);
+
+ if (env != null) {
+ try {
+ env = env.ToLower ();
+
+ if (env.StartsWith ("0x"))
+ env = env.Substring (2);
+
+ uint xid = UInt32.Parse (env, System.Globalization.NumberStyles.HexNumber);
+
+ GdkWindow = Gdk.Window.ForeignNew (xid);
+ Style.Attach (GdkWindow);
+ GdkWindow.Events = EventMask.ExposureMask
+ | EventMask.StructureMask
+ | EventMask.EnterNotifyMask
+ | EventMask.LeaveNotifyMask
+ | EventMask.FocusChangeMask;
+
+ Style.SetBackground (GdkWindow, Gtk.StateType.Normal);
+ GdkWindow.SetDecorations ((Gdk.WMDecoration) 0);
+ GdkWindow.UserData = this.Handle;
+ SetFlag (WidgetFlags.Realized);
+ SizeRequest ();
+ Gdk.Rectangle geom;
+ int depth;
+ GdkWindow.GetGeometry (out geom.X, out geom.Y, out geom.Width, out geom.Height, out depth);
+ SizeAllocate (new Gdk.Rectangle (geom.X, geom.Y, geom.Width, geom.Height));
+ Resize (geom.Width, geom.Height);
+ return;
+ } catch (System.Exception e) {
+ System.Console.WriteLine (e);
+ }
+ } else {
+ System.Console.WriteLine ("{0} not set, falling back to window", ScreenSaverEnviroment);
+ }
+
+ SetSizeRequest (640, 480);
+ base.OnRealized ();
+ }
+ }
+}
diff --git a/src/XmpTagsImporter.cs b/src/XmpTagsImporter.cs
index a458e59..6404179 100644
--- a/src/XmpTagsImporter.cs
+++ b/src/XmpTagsImporter.cs
@@ -86,7 +86,7 @@ namespace FSpot.Xmp {
this.tag_store = tag_store;
tags_created = new Stack<Tag> ();
- li_root_tag = new TagInfo (Catalog.GetString ("Import Tags"), LastImportIcon);
+ li_root_tag = new TagInfo (Catalog.GetString ("Imported Tags"), LastImportIcon);
taginfo_table [(Entity)Location] = new TagInfo (Catalog.GetString ("Location"), PlacesIcon);
taginfo_table [(Entity)Country] = new TagInfo (Catalog.GetString ("Country"), PlacesIcon);
taginfo_table [(Entity)City] = new TagInfo (Catalog.GetString ("City"), PlacesIcon);
diff --git a/src/f-spot.glade b/src/f-spot.glade
index cc2e99e..2b05d2b 100644
--- a/src/f-spot.glade
+++ b/src/f-spot.glade
@@ -239,7 +239,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">_Create</property>
+ <property name="label" translatable="yes">C_reate</property>
<property name="use_underline">True</property>
<property name="response_id">-5</property>
</widget>
diff --git a/src/f-spot.in b/src/f-spot.in
index 7eb7876..0145a95 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -4,7 +4,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
turtledir=@TURTLEDIR@
-beagledir=@BEAGLE_DIR@
EXE_TO_RUN="$libdir/f-spot/f-spot.exe"
@@ -19,10 +18,6 @@ if test "x$turtledir" != "x"; then
export MONO_PATH=$turtledir/lib:$turtledir/gui:$MONO_PATH
fi
-if test "x$beagledir" != "x"; then
- export MONO_PATH=$beagledir:$MONO_PATH
-fi
-
[ -n "$FSPOT_DEBUG" ] && FSPOT_DEBUG="--debug"
[ -n "$FSPOT_TRACE" ] && FSPOT_TRACE="--trace=$FSPOT_TRACE"
[ -n "$FSPOT_PROFILE" ] && FSPOT_PROFILE="--profile=$FSPOT_PROFILE"
@@ -60,7 +55,7 @@ for arg in "$@"; do
x--uninstalled)
echo "*** Running uninstalled f-spot ***"
EXE_TO_RUN="./f-spot.exe"
- export MONO_PATH=@PATH_DBUS@:../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:$MONO_PATH
+ export MONO_PATH=../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:../lib/unique-sharp/unique:$MONO_PATH
;;
esac
done
@@ -93,7 +88,7 @@ fi
if $run_mdb; then
mdb $EXE_TO_RUN -args "$@"
elif $run_gdb; then
- gdb --eval-command=run --args mono $MONO_OPTIONS $EXE_TO_RUN "$@"
+ gdb --eval-command="handle SIGXCPU SIG33 SIG35 SIGPWR nostop noprint" --eval-command=run --args mono $MONO_OPTIONS $EXE_TO_RUN "$@"
elif $run_valgrind; then
valgrind --tool=memcheck --leak-check=full --show-reachable=yes --log-file=valgrind --smc-check=all --suppressions=/home/sde/Mono/mono/data/mono.supp mono $MONO_OPTIONS $EXE_TO_RUN "$@"
elif $run_strace; then
diff --git a/src/main.cs b/src/main.cs
index 9f52676..2b02ede 100644
--- a/src/main.cs
+++ b/src/main.cs
@@ -19,7 +19,9 @@ namespace FSpot
static void Version ()
{
Console.WriteLine (
- "F-Spot {0} - (c)2003-2009, Novell Inc" + Environment.NewLine +
+ "F-Spot {0}" + Environment.NewLine +
+ "\t(c)2003-2009, Novell Inc" + Environment.NewLine +
+ "\t(c)2009 Stephane Delcroix" + Environment.NewLine +
"Personal photo management for the GNOME Desktop" + Environment.NewLine,
FSpot.Defines.VERSION);
}
@@ -57,7 +59,6 @@ namespace FSpot
static int Main (string [] args)
{
bool empty = false;
- ICore control = null;
List<string> uris = new List<string> ();
Unix.SetProcessName (Defines.PACKAGE);
@@ -174,177 +175,73 @@ namespace FSpot
return 1;
}
- Application.Init (Defines.PACKAGE, ref args);
-
- if (slideshow == true) {
- Gnome.Vfs.Vfs.Initialize ();
- Core core = new Core ();
- core.ShowSlides (null);
- Application.Run ();
- return 0;
- }
-
- try {
- uint timer = Log.InformationTimerStart ("Initializing DBus");
- try {
- NDesk.DBus.BusG.Init();
- } catch (Exception e) {
- throw new ApplicationException ("F-Spot cannot find the Dbus session bus. " +
- "Make sure dbus is configured properly or start a new session for f-spot using \"dbus-launch f-spot\"", e);
- }
- Log.DebugTimerPrint (timer, "DBusInitialization took {0}");
-
- timer = Log.InformationTimerStart ("Initializing Mono.Addins");
- AddinManager.Initialize (FSpot.Global.BaseDirectory);
- AddinManager.Registry.Update (null);
- SetupService setupService = new SetupService (AddinManager.Registry);
- string maj_version = String.Join (".", Defines.VERSION.Split ('.'), 0, 3);
- foreach (AddinRepository repo in setupService.Repositories.GetRepositories ())
- if (repo.Url.StartsWith ("http://addins.f-spot.org/") && !repo.Url.StartsWith ("http://addins.f-spot.org/" + maj_version)) {
- Log.Information ("Unregistering {0}", repo.Url);
- setupService.Repositories.RemoveRepository (repo.Url);
- }
- setupService.Repositories.RegisterRepository (null, "http://addins.f-spot.org/" + maj_version, false);
- Log.DebugTimerPrint (timer, "Mono.Addins Initialization took {0}");
-
- bool is_main = true;
-
- try {
- control = Core.FindInstance ();
- is_main = false;
- } catch (System.Exception) {
+ //Initialize Mono.Addins
+ uint timer = Log.InformationTimerStart ("Initializing Mono.Addins");
+ AddinManager.Initialize (FSpot.Global.BaseDirectory);
+ AddinManager.Registry.Update (null);
+ SetupService setupService = new SetupService (AddinManager.Registry);
+ string maj_version = String.Join (".", Defines.VERSION.Split ('.'), 0, 3);
+ foreach (AddinRepository repo in setupService.Repositories.GetRepositories ())
+ if (repo.Url.StartsWith ("http://addins.f-spot.org/") && !repo.Url.StartsWith ("http://addins.f-spot.org/" + maj_version)) {
+ Log.Information ("Unregistering {0}", repo.Url);
+ setupService.Repositories.RemoveRepository (repo.Url);
}
+ setupService.Repositories.RegisterRepository (null, "http://addins.f-spot.org/" + maj_version, false);
+ Log.DebugTimerPrint (timer, "Mono.Addins Initialization took {0}");
- if (control == null) {
- if (!shutdown)
- Log.Information ("Starting new FSpot server (f-spot {0})", FSpot.Defines.VERSION);
- } else
- Log.Information ("Found active FSpot server: {0}", control);
-
- Core core = null;
- try {
- if (control == null) {
- Gnome.Vfs.Vfs.Initialize ();
- if (File.Exists (Preferences.Get<string> (Preferences.GTK_RC))) {
- if (File.Exists (Path.Combine (Global.BaseDirectory, "gtkrc")))
- Gtk.Rc.AddDefaultFile (Path.Combine (Global.BaseDirectory, "gtkrc"));
+ //Gtk initialization
+ Gtk.Application.Init (Defines.PACKAGE, ref args);
+ Gnome.Vfs.Vfs.Initialize ();
- Global.DefaultRcFiles = Gtk.Rc.DefaultFiles;
- Gtk.Rc.AddDefaultFile (Preferences.Get<string> (Preferences.GTK_RC));
- Gtk.Rc.ReparseAllForSettings (Gtk.Settings.Default, true);
- }
+ // init web proxy globally
+ Platform.WebProxy.Init ();
- try {
- Gtk.Window.DefaultIconList = new Gdk.Pixbuf [] {
- GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 16, (Gtk.IconLookupFlags)0),
- GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 22, (Gtk.IconLookupFlags)0),
- GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 32, (Gtk.IconLookupFlags)0),
- GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 48, (Gtk.IconLookupFlags)0)
- };
- } catch {}
+ if (File.Exists (Preferences.Get<string> (Preferences.GTK_RC))) {
+ if (File.Exists (Path.Combine (Global.BaseDirectory, "gtkrc")))
+ Gtk.Rc.AddDefaultFile (Path.Combine (Global.BaseDirectory, "gtkrc"));
- core = new Core ();
- core.RegisterServer ();
-
- empty = view || Core.Database.Empty;
- control = core;
- }
- } catch (System.Exception e) {
- Log.Exception (e);
- control = null;
-
- if (core != null)
- core.UnregisterServer ();
-
- // if there is a problem with the DB, so is no way we can survive
- if (e is DbException) {
- throw;
- }
- }
-
- if (control == null)
- throw new ApplicationException ("Sorry, couldn't start F-Spot.");
+ Global.DefaultRcFiles = Gtk.Rc.DefaultFiles;
+ Gtk.Rc.AddDefaultFile (Preferences.Get<string> (Preferences.GTK_RC));
+ Gtk.Rc.ReparseAllForSettings (Gtk.Settings.Default, true);
+ }
- UriList list = new UriList ();
+ try {
+ Gtk.Window.DefaultIconList = new Gdk.Pixbuf [] {
+ GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 16, (Gtk.IconLookupFlags)0),
+ GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 22, (Gtk.IconLookupFlags)0),
+ GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 32, (Gtk.IconLookupFlags)0),
+ GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 48, (Gtk.IconLookupFlags)0)
+ };
+ } catch {}
- if (shutdown) {
+ try {
+ if (slideshow == true) {
+ App.Instance.Slideshow (null);
+ } else if (shutdown) {
try {
- control.Shutdown ();
+ App.Instance.Shutdown ();
} catch (System.Exception) { // trap errors
}
System.Environment.Exit (0);
- }
-
- if (import_uri != null) {
- control.Import (import_uri);
- }
-
- if (view) {
+ } else if (view) {
+ UriList list = new UriList ();
foreach (string s in uris)
list.AddUnknown (s);
if (list.Count == 0) {
Help ();
return 1;
}
- control.View (list.ToString ());
- }
-
- if (empty && import_uri == null && !view)
- control.Import (null);
-
- if (is_main && import_uri != null || !view) {
- control.Organize ();
- Gdk.Global.NotifyStartupComplete ();
- foreach (ServiceNode service in AddinManager.GetExtensionNodes ("/FSpot/Services")) {
- try {
- service.Initialize ();
- service.Start ();
- } catch (Exception e) {
- Log.Warning ("Something went wrong while starting the {0} extension.", service.Id);
- Log.DebugException (e);
- }
- }
+ App.Instance.View (list);
+ } else if (import_uri != null) {
+ App.Instance.Import (import_uri);
+ } else {
+ App.Instance.Organize ();
}
-
- if (!is_main)
+
+ if (App.Instance.IsRunning)
return 0;
-
- // init web proxy globally
- Platform.WebProxy.Init ();
-
-#if GSD_2_24
- Log.Information ("Hack for gnome-settings-daemon engaged");
- int max_age, max_size;
- if (Preferences.TryGet<int> (Preferences.GSD_THUMBS_MAX_AGE, out max_age)) {
- if (max_age < 0)
- Log.Debug ("maximum_age check already disabled, good");
- else if (max_age == 0)
- Log.Warning ("maximum_age is 0 (tin-hat mode), not overriding");
- else if (max_age < 180) {
- Log.Debug ("Setting maximum_age to a saner value");
- Preferences.Set (Preferences.GSD_THUMBS_MAX_AGE, 180);
- }
- }
-
- if (Preferences.TryGet<int> (Preferences.GSD_THUMBS_MAX_SIZE, out max_size)) {
- int count = Core.Database.Photos.Count ("photos");
- // average thumbs are taking 70K, so this will push the threshold
- //if f-spot takes more than 70% of the thumbs space
- int size = count / 10;
- if (max_size < 0)
- Log.Debug ("maximum_size check already disabled, good");
- else if (max_size == 0)
- Log.Warning ("maximum_size is 0 (tin-hat mode), not overriding");
- else if (max_size < size) {
- Log.Debug ("Setting maximum_size to a saner value ({0}MB), according to your db size", size);
- Preferences.Set (Preferences.GSD_THUMBS_MAX_SIZE, size);
- }
- }
-
-#endif
- Application.Run ();
- Log.Information ("exiting");
+ Gtk.Application.Run ();
} catch (System.Exception e) {
Log.Exception (e);
ExceptionDialog dlg = new ExceptionDialog(e);
diff --git a/src/ui/main_window.ui b/src/ui/main_window.ui
index b165189..5c7ee79 100644
--- a/src/ui/main_window.ui
+++ b/src/ui/main_window.ui
@@ -106,11 +106,12 @@
</object>
</child>
<child>
- <object class="GtkAction" id="copy_location">
- <property name="name">copy_location</property>
- <property name="label" translatable="yes">Copy Locat_ion</property>
- <signal handler="HandleCopyLocation" name="activate"/>
+ <object class="GtkAction" id="copy">
+ <property name="name">copy</property>
+ <property name="label" translatable="yes">Copy</property>
+ <signal handler="HandleCopy" name="activate"/>
</object>
+ <accelerator key="C" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="select_all">
@@ -505,7 +506,7 @@
<object class="GtkAction" id="edit_selected_tag">
<property name="stock_id">gtk-edit</property>
<property name="name">edit_selected_tag</property>
- <property name="label" translatable="yes">_Edit Selected Tag...</property>
+ <property name="label" translatable="yes">_Edit Tag...</property>
<signal handler="HandleEditSelectedTag" name="activate"/>
</object>
</child>
@@ -583,7 +584,7 @@
<menuitem action="quit"/>
</menu>
<menu action="edit2">
- <menuitem action="copy_location"/>
+ <menuitem action="copy"/>
<menuitem action="select_all"/>
<menuitem action="select_none"/>
<separator/>
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1914869..abe3c2e 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,11 +36,14 @@ host_triplet = @host@
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -88,16 +91,17 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -114,8 +118,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -128,9 +131,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -179,16 +187,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -199,6 +209,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -209,21 +220,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -251,6 +266,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -275,6 +292,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -299,9 +317,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu tests/Makefile
+ $(AUTOMAKE) --foreign tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -334,7 +352,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -359,7 +377,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index c044859..7c6e600 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -21,15 +21,14 @@ PKGS = \
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0
-REFS = \
- $(LINK_GPHOTO2) \
- $(LINK_MONO_ADDINS) \
- $(LINK_GIOSHARP) \
- $(LINK_DBUS) \
- -r:$(top_builddir)/src/f-spot.exe \
+REFS = \
+ $(LINK_GPHOTO2) \
+ $(LINK_GIOSHARP) \
+ $(LINK_UNIQUESHARP) \
+ -r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll \
- -r:$(top_builddir)/src/FSpot.Utils.dll \
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ -r:$(top_builddir)/src/FSpot.Utils.dll \
-r:$(top_builddir)/src/FSpot.Platform.dll \
-r:$(top_builddir)/src/Cms.dll \
-r:$(top_builddir)/lib/semweb/SemWeb.dll
diff --git a/tests/src/Makefile.in b/tests/src/Makefile.in
index b5ebd26..40ff7fb 100644
--- a/tests/src/Makefile.in
+++ b/tests/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,27 +37,31 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.include
subdir = tests/src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -74,8 +78,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -88,9 +91,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -139,16 +147,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -159,6 +169,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -169,21 +180,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -211,6 +226,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -235,18 +252,15 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -256,17 +270,13 @@ DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
+LINK_UNIQUESHARP = -r:$(DIR_UNIQUESHARP)/unique-sharp.dll
CSC_FLAGS = -debug
CSC = $(MCS) $(CSC_FLAGS) -target:exe
CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
@@ -290,14 +300,13 @@ SOURCES = \
@ENABLE_TESTS_TRUE@ -pkg:gtk-sharp-2.0
@ENABLE_TESTS_TRUE at REFS = \
- at ENABLE_TESTS_TRUE@ $(LINK_GPHOTO2) \
- at ENABLE_TESTS_TRUE@ $(LINK_MONO_ADDINS) \
- at ENABLE_TESTS_TRUE@ $(LINK_GIOSHARP) \
- at ENABLE_TESTS_TRUE@ $(LINK_DBUS) \
- at ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/f-spot.exe \
+ at ENABLE_TESTS_TRUE@ $(LINK_GPHOTO2) \
+ at ENABLE_TESTS_TRUE@ $(LINK_GIOSHARP) \
+ at ENABLE_TESTS_TRUE@ $(LINK_UNIQUESHARP) \
+ at ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/f-spot.exe \
@ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/FSpot.Core.dll \
- at ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/FSpot.Query.dll \
- at ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/FSpot.Utils.dll \
+ at ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/FSpot.Query.dll \
+ at ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/FSpot.Utils.dll \
@ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/FSpot.Platform.dll \
@ENABLE_TESTS_TRUE@ -r:$(top_builddir)/src/Cms.dll \
@ENABLE_TESTS_TRUE@ -r:$(top_builddir)/lib/semweb/SemWeb.dll
@@ -334,9 +343,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu tests/src/Makefile
+ $(AUTOMAKE) --foreign tests/src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 55313af..65dbdbd 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,11 +38,14 @@ host_triplet = @host@
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -75,16 +78,17 @@ DIST_SOURCES =
DATA = $(themes_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
AR = @AR@
+ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEAGLE_CFLAGS = @BEAGLE_CFLAGS@
-BEAGLE_DIR = @BEAGLE_DIR@
-BEAGLE_LIBS = @BEAGLE_LIBS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -101,8 +105,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIR_DBUS = @DIR_DBUS@
-DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+DISPLAY_VERSION = @DISPLAY_VERSION@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
@@ -115,9 +118,14 @@ EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
EXIF_SOVERSION = @EXIF_SOVERSION@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
F_CFLAGS = @F_CFLAGS@
F_LIBS = @F_LIBS@
+GAPI2CODEGEN = @GAPI2CODEGEN@
+GAPI2FIXUP = @GAPI2FIXUP@
+GAPI2PARSER = @GAPI2PARSER@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
@@ -166,16 +174,18 @@ LIBJPEG = @LIBJPEG@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LINK_BEAGLE = @LINK_BEAGLE@
-LINK_DBUS = @LINK_DBUS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -186,6 +196,7 @@ NMEDIT = @NMEDIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_DEFINES = @NUNIT_DEFINES@
NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
@@ -196,21 +207,25 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_DBUS = @PATH_DBUS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TURTLEDIR = @TURTLEDIR@
+UNIQUE_CFLAGS = @UNIQUE_CFLAGS@
+UNIQUE_LIBS = @UNIQUE_LIBS@
USE_NLS = @USE_NLS@
+V = @V@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -238,6 +253,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
expanded_libdir = @expanded_libdir@
host = @host@
host_alias = @host_alias@
@@ -262,6 +279,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -299,9 +317,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu tools/Makefile
+ $(AUTOMAKE) --foreign tools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
--
f-spot
More information about the Pkg-cli-apps-commits
mailing list